LDAP: convert binary objectGUID-value to string before storing in DB

diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index dd195f289783461a2409171f30a8e5eecee453c1..b8e50d8036dcf216629bb45f440bce0b84837a7d 100644 (file)
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -73,7 +73,13 @@ abstract class Access {
                if(isset($result[$attr]) && $result[$attr]['count'] > 0) {
                        $values = array();
                        for($i=0;$i<$result[$attr]['count'];$i++) {
-                               $values[] = $this->resemblesDN($attr) ? $this->sanitizeDN($result[$attr][$i]) : $result[$attr][$i];
+                               if($this->resemblesDN($attr)) {
+                                       $values[] = $this->sanitizeDN($result[$attr][$i]);
+                               } elseif(strtolower($attr) == 'objectguid') {
+                                       $values[] = $this->convertObjectGUID2Str($result[$attr][$i]);
+                               } else {
+                                       $values[] = $result[$attr][$i];
+                               }
                        }
                        return $values;
                }
@@ -686,4 +692,32 @@ abstract class Access {
                }
                return $uuid;
        }
+
+       /**
+        * @brief converts a binary ObjectGUID into a string representation
+        * @param $oguid the ObjectGUID in it's binary form as retrieved from AD
+        * @returns String
+        *
+        * converts a binary ObjectGUID into a string representation
+        * http://www.php.net/manual/en/function.ldap-get-values-len.php#73198
+        */
+       private function convertObjectGUID2Str($oguid) {
+               $hex_guid = bin2hex($oguid);
+               $hex_guid_to_guid_str = '';
+               for($k = 1; $k <= 4; ++$k) {
+                       $hex_guid_to_guid_str .= substr($hex_guid, 8 - 2 * $k, 2);
+               }
+               $hex_guid_to_guid_str .= '-';
+               for($k = 1; $k <= 2; ++$k) {
+                       $hex_guid_to_guid_str .= substr($hex_guid, 12 - 2 * $k, 2);
+               }
+               $hex_guid_to_guid_str .= '-';
+               for($k = 1; $k <= 2; ++$k) {
+                       $hex_guid_to_guid_str .= substr($hex_guid, 16 - 2 * $k, 2);
+               }
+               $hex_guid_to_guid_str .= '-' . substr($hex_guid, 16, 4);
+               $hex_guid_to_guid_str .= '-' . substr($hex_guid, 20);
+
+               return strtoupper($hex_guid_to_guid_str);
+       }
 }
\ No newline at end of file