libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases 1 Packages Activity Actions

KEYCLOAK-10942 Incorporate comments from code review

Browse source 
see https://github.com/keycloak/keycloak/pull/6251/files#r325212980
This commit is contained in:
Sven-Torben Janus 2019-09-17 20:11:47 +02:00 committed by Marek Posolda
parent f261c43fab
commit 1887d3b038
2 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
federation/ldap/src/main/java/org/keycloak/storage/ldap/idm/store/ldap/LDAPOperationManager.java
View file

@ -658,7 +658,6 @@ public class LDAPOperationManager {
} }
public String decodeEntryUUID(final Object entryUUID) { public String decodeEntryUUID(final Object entryUUID) {
String id;
if (entryUUID instanceof byte[]) { if (entryUUID instanceof byte[]) {
if (this.config.isObjectGUID()) { if (this.config.isObjectGUID()) {
return LDAPUtil.decodeObjectGUID((byte[]) entryUUID); return LDAPUtil.decodeObjectGUID((byte[]) entryUUID);

35
federation/ldap/src/main/java/org/keycloak/storage/ldap/idm/store/ldap/LDAPUtil.java
View file

@ -129,35 +129,42 @@ public class LDAPUtil {
public static String decodeObjectGUID(byte[] objectGUID) { public static String decodeObjectGUID(byte[] objectGUID) {
StringBuilder displayStr = new StringBuilder(); StringBuilder displayStr = new StringBuilder();
byte[] withLittleEndian = new byte[] { objectGUID[3], objectGUID[2], objectGUID[1], objectGUID[0], displayStr.append(convertToDashedString(objectGUID));
objectGUID[5], objectGUID[4],
objectGUID[7], objectGUID[6],
objectGUID[8], objectGUID[9], objectGUID[10], objectGUID[11], objectGUID[12], objectGUID[13], objectGUID[14], objectGUID[15]
};
displayStr.append(convertToDashedString(withLittleEndian));
return displayStr.toString(); return displayStr.toString();
} }
/**
* <p>Decode a raw byte array representing the value of the <code>guid</code> attribute retrieved from Novell
* eDirectory.</p>
*
* @param guid A raw byte array representing the value of the <code>guid</code> attribute retrieved from
* Novell eDirectory.
*
* @return A string representing the decoded value in the form of [0][1][2][3]-[4][5]-[6][7]-[8][9]-[10][11][12][13][14][15].
*/
public static String decodeGuid(byte[] guid) { public static String decodeGuid(byte[] guid) {
StringBuilder displayStr = new StringBuilder(); byte[] withBigEndian = new byte[] { guid[3], guid[2], guid[1], guid[0],
displayStr.append(convertToDashedString(guid)); guid[5], guid[4],
return displayStr.toString(); guid[7], guid[6],
guid[8], guid[9], guid[10], guid[11], guid[12], guid[13], guid[14], guid[15]
};
return convertToDashedString(withBigEndian);
} }
private static String convertToDashedString(byte[] objectGUID) { private static String convertToDashedString(byte[] objectGUID) {
StringBuilder displayStr = new StringBuilder(); StringBuilder displayStr = new StringBuilder();
displayStr.append(prefixZeros((int) objectGUID[0] & 0xFF));
displayStr.append(prefixZeros((int) objectGUID[1] & 0xFF));
displayStr.append(prefixZeros((int) objectGUID[2] & 0xFF));
displayStr.append(prefixZeros((int) objectGUID[3] & 0xFF)); displayStr.append(prefixZeros((int) objectGUID[3] & 0xFF));
displayStr.append(prefixZeros((int) objectGUID[2] & 0xFF));
displayStr.append(prefixZeros((int) objectGUID[1] & 0xFF));
displayStr.append(prefixZeros((int) objectGUID[0] & 0xFF));
displayStr.append("-"); displayStr.append("-");
displayStr.append(prefixZeros((int) objectGUID[4] & 0xFF));
displayStr.append(prefixZeros((int) objectGUID[5] & 0xFF)); displayStr.append(prefixZeros((int) objectGUID[5] & 0xFF));
displayStr.append(prefixZeros((int) objectGUID[4] & 0xFF));
displayStr.append("-"); displayStr.append("-");
displayStr.append(prefixZeros((int) objectGUID[6] & 0xFF));
displayStr.append(prefixZeros((int) objectGUID[7] & 0xFF)); displayStr.append(prefixZeros((int) objectGUID[7] & 0xFF));
displayStr.append(prefixZeros((int) objectGUID[6] & 0xFF));
displayStr.append("-"); displayStr.append("-");
displayStr.append(prefixZeros((int) objectGUID[8] & 0xFF)); displayStr.append(prefixZeros((int) objectGUID[8] & 0xFF));
displayStr.append(prefixZeros((int) objectGUID[9] & 0xFF)); displayStr.append(prefixZeros((int) objectGUID[9] & 0xFF));