@@ -124,7 +124,7 @@ discard block |
||
| 124 | 124 | * @return AbstractMapping |
| 125 | 125 | */ |
| 126 | 126 | public function getUserMapper() { |
| 127 | - if(is_null($this->userMapper)) { |
|
| 127 | + if (is_null($this->userMapper)) { |
|
| 128 | 128 | throw new \Exception('UserMapper was not assigned to this Access instance.'); |
| 129 | 129 | } |
| 130 | 130 | return $this->userMapper; |
@@ -144,7 +144,7 @@ discard block |
||
| 144 | 144 | * @return AbstractMapping |
| 145 | 145 | */ |
| 146 | 146 | public function getGroupMapper() { |
| 147 | - if(is_null($this->groupMapper)) { |
|
| 147 | + if (is_null($this->groupMapper)) { |
|
| 148 | 148 | throw new \Exception('GroupMapper was not assigned to this Access instance.'); |
| 149 | 149 | } |
| 150 | 150 | return $this->groupMapper; |
@@ -175,14 +175,14 @@ discard block |
||
| 175 | 175 | * array if $attr is empty, false otherwise |
| 176 | 176 | */ |
| 177 | 177 | public function readAttribute($dn, $attr, $filter = 'objectClass=*') { |
| 178 | - if(!$this->checkConnection()) { |
|
| 178 | + if (!$this->checkConnection()) { |
|
| 179 | 179 | \OCP\Util::writeLog('user_ldap', |
| 180 | 180 | 'No LDAP Connector assigned, access impossible for readAttribute.', |
| 181 | 181 | \OCP\Util::WARN); |
| 182 | 182 | return false; |
| 183 | 183 | } |
| 184 | 184 | $cr = $this->connection->getConnectionResource(); |
| 185 | - if(!$this->ldap->isResource($cr)) { |
|
| 185 | + if (!$this->ldap->isResource($cr)) { |
|
| 186 | 186 | //LDAP not available |
| 187 | 187 | \OCP\Util::writeLog('user_ldap', 'LDAP resource not available.', \OCP\Util::DEBUG); |
| 188 | 188 | return false; |
@@ -205,7 +205,7 @@ discard block |
||
| 205 | 205 | $isRangeRequest = false; |
| 206 | 206 | do { |
| 207 | 207 | $result = $this->executeRead($cr, $dn, $attrToRead, $filter, $maxResults); |
| 208 | - if(is_bool($result)) { |
|
| 208 | + if (is_bool($result)) { |
|
| 209 | 209 | // when an exists request was run and it was successful, an empty |
| 210 | 210 | // array must be returned |
| 211 | 211 | return $result ? [] : false; |
@@ -222,22 +222,22 @@ discard block |
||
| 222 | 222 | $result = $this->extractRangeData($result, $attr); |
| 223 | 223 | if (!empty($result)) { |
| 224 | 224 | $normalizedResult = $this->extractAttributeValuesFromResult( |
| 225 | - [ $attr => $result['values'] ], |
|
| 225 | + [$attr => $result['values']], |
|
| 226 | 226 | $attr |
| 227 | 227 | ); |
| 228 | 228 | $values = array_merge($values, $normalizedResult); |
| 229 | 229 | |
| 230 | - if($result['rangeHigh'] === '*') { |
|
| 230 | + if ($result['rangeHigh'] === '*') { |
|
| 231 | 231 | // when server replies with * as high range value, there are |
| 232 | 232 | // no more results left |
| 233 | 233 | return $values; |
| 234 | 234 | } else { |
| 235 | - $low = $result['rangeHigh'] + 1; |
|
| 236 | - $attrToRead = $result['attributeName'] . ';range=' . $low . '-*'; |
|
| 235 | + $low = $result['rangeHigh'] + 1; |
|
| 236 | + $attrToRead = $result['attributeName'].';range='.$low.'-*'; |
|
| 237 | 237 | $isRangeRequest = true; |
| 238 | 238 | } |
| 239 | 239 | } |
| 240 | - } while($isRangeRequest); |
|
| 240 | + } while ($isRangeRequest); |
|
| 241 | 241 | |
| 242 | 242 | \OCP\Util::writeLog('user_ldap', 'Requested attribute '.$attr.' not found for '.$dn, \OCP\Util::DEBUG); |
| 243 | 243 | return false; |
@@ -262,13 +262,13 @@ discard block |
||
| 262 | 262 | if (!$this->ldap->isResource($rr)) { |
| 263 | 263 | if ($attribute !== '') { |
| 264 | 264 | //do not throw this message on userExists check, irritates |
| 265 | - \OCP\Util::writeLog('user_ldap', 'readAttribute failed for DN ' . $dn, \OCP\Util::DEBUG); |
|
| 265 | + \OCP\Util::writeLog('user_ldap', 'readAttribute failed for DN '.$dn, \OCP\Util::DEBUG); |
|
| 266 | 266 | } |
| 267 | 267 | //in case an error occurs , e.g. object does not exist |
| 268 | 268 | return false; |
| 269 | 269 | } |
| 270 | 270 | if ($attribute === '' && ($filter === 'objectclass=*' || $this->invokeLDAPMethod('countEntries', $cr, $rr) === 1)) { |
| 271 | - \OCP\Util::writeLog('user_ldap', 'readAttribute: ' . $dn . ' found', \OCP\Util::DEBUG); |
|
| 271 | + \OCP\Util::writeLog('user_ldap', 'readAttribute: '.$dn.' found', \OCP\Util::DEBUG); |
|
| 272 | 272 | return true; |
| 273 | 273 | } |
| 274 | 274 | $er = $this->invokeLDAPMethod('firstEntry', $cr, $rr); |
@@ -293,12 +293,12 @@ discard block |
||
| 293 | 293 | */ |
| 294 | 294 | public function extractAttributeValuesFromResult($result, $attribute) { |
| 295 | 295 | $values = []; |
| 296 | - if(isset($result[$attribute]) && $result[$attribute]['count'] > 0) { |
|
| 296 | + if (isset($result[$attribute]) && $result[$attribute]['count'] > 0) { |
|
| 297 | 297 | $lowercaseAttribute = strtolower($attribute); |
| 298 | - for($i=0;$i<$result[$attribute]['count'];$i++) { |
|
| 299 | - if($this->resemblesDN($attribute)) { |
|
| 298 | + for ($i = 0; $i < $result[$attribute]['count']; $i++) { |
|
| 299 | + if ($this->resemblesDN($attribute)) { |
|
| 300 | 300 | $values[] = $this->helper->sanitizeDN($result[$attribute][$i]); |
| 301 | - } elseif($lowercaseAttribute === 'objectguid' || $lowercaseAttribute === 'guid') { |
|
| 301 | + } elseif ($lowercaseAttribute === 'objectguid' || $lowercaseAttribute === 'guid') { |
|
| 302 | 302 | $values[] = $this->convertObjectGUID2Str($result[$attribute][$i]); |
| 303 | 303 | } else { |
| 304 | 304 | $values[] = $result[$attribute][$i]; |
@@ -320,10 +320,10 @@ discard block |
||
| 320 | 320 | */ |
| 321 | 321 | public function extractRangeData($result, $attribute) { |
| 322 | 322 | $keys = array_keys($result); |
| 323 | - foreach($keys as $key) { |
|
| 324 | - if($key !== $attribute && strpos($key, $attribute) === 0) { |
|
| 323 | + foreach ($keys as $key) { |
|
| 324 | + if ($key !== $attribute && strpos($key, $attribute) === 0) { |
|
| 325 | 325 | $queryData = explode(';', $key); |
| 326 | - if(strpos($queryData[1], 'range=') === 0) { |
|
| 326 | + if (strpos($queryData[1], 'range=') === 0) { |
|
| 327 | 327 | $high = substr($queryData[1], 1 + strpos($queryData[1], '-')); |
| 328 | 328 | $data = [ |
| 329 | 329 | 'values' => $result[$key], |
@@ -348,18 +348,18 @@ discard block |
||
| 348 | 348 | * @throws \Exception |
| 349 | 349 | */ |
| 350 | 350 | public function setPassword($userDN, $password) { |
| 351 | - if(intval($this->connection->turnOnPasswordChange) !== 1) { |
|
| 351 | + if (intval($this->connection->turnOnPasswordChange) !== 1) { |
|
| 352 | 352 | throw new \Exception('LDAP password changes are disabled.'); |
| 353 | 353 | } |
| 354 | 354 | $cr = $this->connection->getConnectionResource(); |
| 355 | - if(!$this->ldap->isResource($cr)) { |
|
| 355 | + if (!$this->ldap->isResource($cr)) { |
|
| 356 | 356 | //LDAP not available |
| 357 | 357 | \OCP\Util::writeLog('user_ldap', 'LDAP resource not available.', \OCP\Util::DEBUG); |
| 358 | 358 | return false; |
| 359 | 359 | } |
| 360 | 360 | try { |
| 361 | 361 | return @$this->invokeLDAPMethod('modReplace', $cr, $userDN, $password); |
| 362 | - } catch(ConstraintViolationException $e) { |
|
| 362 | + } catch (ConstraintViolationException $e) { |
|
| 363 | 363 | throw new HintException('Password change rejected.', \OC::$server->getL10N('user_ldap')->t('Password change rejected. Hint: ').$e->getMessage(), $e->getCode()); |
| 364 | 364 | } |
| 365 | 365 | } |
@@ -401,17 +401,17 @@ discard block |
||
| 401 | 401 | */ |
| 402 | 402 | public function getDomainDNFromDN($dn) { |
| 403 | 403 | $allParts = $this->ldap->explodeDN($dn, 0); |
| 404 | - if($allParts === false) { |
|
| 404 | + if ($allParts === false) { |
|
| 405 | 405 | //not a valid DN |
| 406 | 406 | return ''; |
| 407 | 407 | } |
| 408 | 408 | $domainParts = array(); |
| 409 | 409 | $dcFound = false; |
| 410 | - foreach($allParts as $part) { |
|
| 411 | - if(!$dcFound && strpos($part, 'dc=') === 0) { |
|
| 410 | + foreach ($allParts as $part) { |
|
| 411 | + if (!$dcFound && strpos($part, 'dc=') === 0) { |
|
| 412 | 412 | $dcFound = true; |
| 413 | 413 | } |
| 414 | - if($dcFound) { |
|
| 414 | + if ($dcFound) { |
|
| 415 | 415 | $domainParts[] = $part; |
| 416 | 416 | } |
| 417 | 417 | } |
@@ -438,7 +438,7 @@ discard block |
||
| 438 | 438 | |
| 439 | 439 | //Check whether the DN belongs to the Base, to avoid issues on multi- |
| 440 | 440 | //server setups |
| 441 | - if(is_string($fdn) && $this->isDNPartOfBase($fdn, $this->connection->ldapBaseUsers)) { |
|
| 441 | + if (is_string($fdn) && $this->isDNPartOfBase($fdn, $this->connection->ldapBaseUsers)) { |
|
| 442 | 442 | return $fdn; |
| 443 | 443 | } |
| 444 | 444 | |
@@ -455,7 +455,7 @@ discard block |
||
| 455 | 455 | //To avoid bypassing the base DN settings under certain circumstances |
| 456 | 456 | //with the group support, check whether the provided DN matches one of |
| 457 | 457 | //the given Bases |
| 458 | - if(!$this->isDNPartOfBase($fdn, $this->connection->ldapBaseGroups)) { |
|
| 458 | + if (!$this->isDNPartOfBase($fdn, $this->connection->ldapBaseGroups)) { |
|
| 459 | 459 | return false; |
| 460 | 460 | } |
| 461 | 461 | |
@@ -472,11 +472,11 @@ discard block |
||
| 472 | 472 | */ |
| 473 | 473 | public function groupsMatchFilter($groupDNs) { |
| 474 | 474 | $validGroupDNs = []; |
| 475 | - foreach($groupDNs as $dn) { |
|
| 475 | + foreach ($groupDNs as $dn) { |
|
| 476 | 476 | $cacheKey = 'groupsMatchFilter-'.$dn; |
| 477 | 477 | $groupMatchFilter = $this->connection->getFromCache($cacheKey); |
| 478 | - if(!is_null($groupMatchFilter)) { |
|
| 479 | - if($groupMatchFilter) { |
|
| 478 | + if (!is_null($groupMatchFilter)) { |
|
| 479 | + if ($groupMatchFilter) { |
|
| 480 | 480 | $validGroupDNs[] = $dn; |
| 481 | 481 | } |
| 482 | 482 | continue; |
@@ -484,13 +484,13 @@ discard block |
||
| 484 | 484 | |
| 485 | 485 | // Check the base DN first. If this is not met already, we don't |
| 486 | 486 | // need to ask the server at all. |
| 487 | - if(!$this->isDNPartOfBase($dn, $this->connection->ldapBaseGroups)) { |
|
| 487 | + if (!$this->isDNPartOfBase($dn, $this->connection->ldapBaseGroups)) { |
|
| 488 | 488 | $this->connection->writeToCache($cacheKey, false); |
| 489 | 489 | continue; |
| 490 | 490 | } |
| 491 | 491 | |
| 492 | 492 | $result = $this->readAttribute($dn, 'cn', $this->connection->ldapGroupFilter); |
| 493 | - if(is_array($result)) { |
|
| 493 | + if (is_array($result)) { |
|
| 494 | 494 | $this->connection->writeToCache($cacheKey, true); |
| 495 | 495 | $validGroupDNs[] = $dn; |
| 496 | 496 | } else { |
@@ -511,7 +511,7 @@ discard block |
||
| 511 | 511 | //To avoid bypassing the base DN settings under certain circumstances |
| 512 | 512 | //with the group support, check whether the provided DN matches one of |
| 513 | 513 | //the given Bases |
| 514 | - if(!$this->isDNPartOfBase($fdn, $this->connection->ldapBaseUsers)) { |
|
| 514 | + if (!$this->isDNPartOfBase($fdn, $this->connection->ldapBaseUsers)) { |
|
| 515 | 515 | return false; |
| 516 | 516 | } |
| 517 | 517 | |
@@ -530,7 +530,7 @@ discard block |
||
| 530 | 530 | */ |
| 531 | 531 | public function dn2ocname($fdn, $ldapName = null, $isUser = true, &$newlyMapped = null, array $record = null) { |
| 532 | 532 | $newlyMapped = false; |
| 533 | - if($isUser) { |
|
| 533 | + if ($isUser) { |
|
| 534 | 534 | $mapper = $this->getUserMapper(); |
| 535 | 535 | $nameAttribute = $this->connection->ldapUserDisplayName; |
| 536 | 536 | } else { |
@@ -540,15 +540,15 @@ discard block |
||
| 540 | 540 | |
| 541 | 541 | //let's try to retrieve the Nextcloud name from the mappings table |
| 542 | 542 | $ncName = $mapper->getNameByDN($fdn); |
| 543 | - if(is_string($ncName)) { |
|
| 543 | + if (is_string($ncName)) { |
|
| 544 | 544 | return $ncName; |
| 545 | 545 | } |
| 546 | 546 | |
| 547 | 547 | //second try: get the UUID and check if it is known. Then, update the DN and return the name. |
| 548 | 548 | $uuid = $this->getUUID($fdn, $isUser, $record); |
| 549 | - if(is_string($uuid)) { |
|
| 549 | + if (is_string($uuid)) { |
|
| 550 | 550 | $ncName = $mapper->getNameByUUID($uuid); |
| 551 | - if(is_string($ncName)) { |
|
| 551 | + if (is_string($ncName)) { |
|
| 552 | 552 | $mapper->setDNbyUUID($fdn, $uuid); |
| 553 | 553 | return $ncName; |
| 554 | 554 | } |
@@ -558,16 +558,16 @@ discard block |
||
| 558 | 558 | return false; |
| 559 | 559 | } |
| 560 | 560 | |
| 561 | - if(is_null($ldapName)) { |
|
| 561 | + if (is_null($ldapName)) { |
|
| 562 | 562 | $ldapName = $this->readAttribute($fdn, $nameAttribute); |
| 563 | - if(!isset($ldapName[0]) && empty($ldapName[0])) { |
|
| 563 | + if (!isset($ldapName[0]) && empty($ldapName[0])) { |
|
| 564 | 564 | \OCP\Util::writeLog('user_ldap', 'No or empty name for '.$fdn.'.', \OCP\Util::INFO); |
| 565 | 565 | return false; |
| 566 | 566 | } |
| 567 | 567 | $ldapName = $ldapName[0]; |
| 568 | 568 | } |
| 569 | 569 | |
| 570 | - if($isUser) { |
|
| 570 | + if ($isUser) { |
|
| 571 | 571 | $usernameAttribute = strval($this->connection->ldapExpertUsernameAttr); |
| 572 | 572 | if ($usernameAttribute !== '') { |
| 573 | 573 | $username = $this->readAttribute($fdn, $usernameAttribute); |
@@ -586,9 +586,9 @@ discard block |
||
| 586 | 586 | // outside of core user management will still cache the user as non-existing. |
| 587 | 587 | $originalTTL = $this->connection->ldapCacheTTL; |
| 588 | 588 | $this->connection->setConfiguration(array('ldapCacheTTL' => 0)); |
| 589 | - if(($isUser && !\OCP\User::userExists($intName)) |
|
| 589 | + if (($isUser && !\OCP\User::userExists($intName)) |
|
| 590 | 590 | || (!$isUser && !\OC::$server->getGroupManager()->groupExists($intName))) { |
| 591 | - if($mapper->map($fdn, $intName, $uuid)) { |
|
| 591 | + if ($mapper->map($fdn, $intName, $uuid)) { |
|
| 592 | 592 | $this->connection->setConfiguration(array('ldapCacheTTL' => $originalTTL)); |
| 593 | 593 | $newlyMapped = true; |
| 594 | 594 | return $intName; |
@@ -597,7 +597,7 @@ discard block |
||
| 597 | 597 | $this->connection->setConfiguration(array('ldapCacheTTL' => $originalTTL)); |
| 598 | 598 | |
| 599 | 599 | $altName = $this->createAltInternalOwnCloudName($intName, $isUser); |
| 600 | - if(is_string($altName) && $mapper->map($fdn, $altName, $uuid)) { |
|
| 600 | + if (is_string($altName) && $mapper->map($fdn, $altName, $uuid)) { |
|
| 601 | 601 | $newlyMapped = true; |
| 602 | 602 | return $altName; |
| 603 | 603 | } |
@@ -635,7 +635,7 @@ discard block |
||
| 635 | 635 | * @return array |
| 636 | 636 | */ |
| 637 | 637 | private function ldap2NextcloudNames($ldapObjects, $isUsers) { |
| 638 | - if($isUsers) { |
|
| 638 | + if ($isUsers) { |
|
| 639 | 639 | $nameAttribute = $this->connection->ldapUserDisplayName; |
| 640 | 640 | $sndAttribute = $this->connection->ldapUserDisplayName2; |
| 641 | 641 | } else { |
@@ -643,9 +643,9 @@ discard block |
||
| 643 | 643 | } |
| 644 | 644 | $nextcloudNames = array(); |
| 645 | 645 | |
| 646 | - foreach($ldapObjects as $ldapObject) { |
|
| 646 | + foreach ($ldapObjects as $ldapObject) { |
|
| 647 | 647 | $nameByLDAP = null; |
| 648 | - if( isset($ldapObject[$nameAttribute]) |
|
| 648 | + if (isset($ldapObject[$nameAttribute]) |
|
| 649 | 649 | && is_array($ldapObject[$nameAttribute]) |
| 650 | 650 | && isset($ldapObject[$nameAttribute][0]) |
| 651 | 651 | ) { |
@@ -654,12 +654,12 @@ discard block |
||
| 654 | 654 | } |
| 655 | 655 | |
| 656 | 656 | $ncName = $this->dn2ocname($ldapObject['dn'][0], $nameByLDAP, $isUsers); |
| 657 | - if($ncName) { |
|
| 657 | + if ($ncName) { |
|
| 658 | 658 | $nextcloudNames[] = $ncName; |
| 659 | - if($isUsers) { |
|
| 659 | + if ($isUsers) { |
|
| 660 | 660 | //cache the user names so it does not need to be retrieved |
| 661 | 661 | //again later (e.g. sharing dialogue). |
| 662 | - if(is_null($nameByLDAP)) { |
|
| 662 | + if (is_null($nameByLDAP)) { |
|
| 663 | 663 | continue; |
| 664 | 664 | } |
| 665 | 665 | $sndName = isset($ldapObject[$sndAttribute][0]) |
@@ -697,7 +697,7 @@ discard block |
||
| 697 | 697 | */ |
| 698 | 698 | public function cacheUserDisplayName($ocName, $displayName, $displayName2 = '') { |
| 699 | 699 | $user = $this->userManager->get($ocName); |
| 700 | - if($user === null) { |
|
| 700 | + if ($user === null) { |
|
| 701 | 701 | return; |
| 702 | 702 | } |
| 703 | 703 | $displayName = $user->composeAndStoreDisplayName($displayName, $displayName2); |
@@ -717,9 +717,9 @@ discard block |
||
| 717 | 717 | $attempts = 0; |
| 718 | 718 | //while loop is just a precaution. If a name is not generated within |
| 719 | 719 | //20 attempts, something else is very wrong. Avoids infinite loop. |
| 720 | - while($attempts < 20){ |
|
| 721 | - $altName = $name . '_' . rand(1000,9999); |
|
| 722 | - if(!\OCP\User::userExists($altName)) { |
|
| 720 | + while ($attempts < 20) { |
|
| 721 | + $altName = $name.'_'.rand(1000, 9999); |
|
| 722 | + if (!\OCP\User::userExists($altName)) { |
|
| 723 | 723 | return $altName; |
| 724 | 724 | } |
| 725 | 725 | $attempts++; |
@@ -741,25 +741,25 @@ discard block |
||
| 741 | 741 | */ |
| 742 | 742 | private function _createAltInternalOwnCloudNameForGroups($name) { |
| 743 | 743 | $usedNames = $this->groupMapper->getNamesBySearch($name, "", '_%'); |
| 744 | - if(!($usedNames) || count($usedNames) === 0) { |
|
| 744 | + if (!($usedNames) || count($usedNames) === 0) { |
|
| 745 | 745 | $lastNo = 1; //will become name_2 |
| 746 | 746 | } else { |
| 747 | 747 | natsort($usedNames); |
| 748 | 748 | $lastName = array_pop($usedNames); |
| 749 | 749 | $lastNo = intval(substr($lastName, strrpos($lastName, '_') + 1)); |
| 750 | 750 | } |
| 751 | - $altName = $name.'_'.strval($lastNo+1); |
|
| 751 | + $altName = $name.'_'.strval($lastNo + 1); |
|
| 752 | 752 | unset($usedNames); |
| 753 | 753 | |
| 754 | 754 | $attempts = 1; |
| 755 | - while($attempts < 21){ |
|
| 755 | + while ($attempts < 21) { |
|
| 756 | 756 | // Check to be really sure it is unique |
| 757 | 757 | // while loop is just a precaution. If a name is not generated within |
| 758 | 758 | // 20 attempts, something else is very wrong. Avoids infinite loop. |
| 759 | - if(!\OC::$server->getGroupManager()->groupExists($altName)) { |
|
| 759 | + if (!\OC::$server->getGroupManager()->groupExists($altName)) { |
|
| 760 | 760 | return $altName; |
| 761 | 761 | } |
| 762 | - $altName = $name . '_' . ($lastNo + $attempts); |
|
| 762 | + $altName = $name.'_'.($lastNo + $attempts); |
|
| 763 | 763 | $attempts++; |
| 764 | 764 | } |
| 765 | 765 | return false; |
@@ -774,7 +774,7 @@ discard block |
||
| 774 | 774 | private function createAltInternalOwnCloudName($name, $isUser) { |
| 775 | 775 | $originalTTL = $this->connection->ldapCacheTTL; |
| 776 | 776 | $this->connection->setConfiguration(array('ldapCacheTTL' => 0)); |
| 777 | - if($isUser) { |
|
| 777 | + if ($isUser) { |
|
| 778 | 778 | $altName = $this->_createAltInternalOwnCloudNameForUsers($name); |
| 779 | 779 | } else { |
| 780 | 780 | $altName = $this->_createAltInternalOwnCloudNameForGroups($name); |
@@ -824,7 +824,7 @@ discard block |
||
| 824 | 824 | public function fetchListOfUsers($filter, $attr, $limit = null, $offset = null, $forceApplyAttributes = false) { |
| 825 | 825 | $ldapRecords = $this->searchUsers($filter, $attr, $limit, $offset); |
| 826 | 826 | $recordsToUpdate = $ldapRecords; |
| 827 | - if(!$forceApplyAttributes) { |
|
| 827 | + if (!$forceApplyAttributes) { |
|
| 828 | 828 | $isBackgroundJobModeAjax = $this->config |
| 829 | 829 | ->getAppValue('core', 'backgroundjobs_mode', 'ajax') === 'ajax'; |
| 830 | 830 | $recordsToUpdate = array_filter($ldapRecords, function($record) use ($isBackgroundJobModeAjax) { |
@@ -844,19 +844,19 @@ discard block |
||
| 844 | 844 | * and their values |
| 845 | 845 | * @param array $ldapRecords |
| 846 | 846 | */ |
| 847 | - public function batchApplyUserAttributes(array $ldapRecords){ |
|
| 847 | + public function batchApplyUserAttributes(array $ldapRecords) { |
|
| 848 | 848 | $displayNameAttribute = strtolower($this->connection->ldapUserDisplayName); |
| 849 | - foreach($ldapRecords as $userRecord) { |
|
| 850 | - if(!isset($userRecord[$displayNameAttribute])) { |
|
| 849 | + foreach ($ldapRecords as $userRecord) { |
|
| 850 | + if (!isset($userRecord[$displayNameAttribute])) { |
|
| 851 | 851 | // displayName is obligatory |
| 852 | 852 | continue; |
| 853 | 853 | } |
| 854 | - $ocName = $this->dn2ocname($userRecord['dn'][0], null, true); |
|
| 855 | - if($ocName === false) { |
|
| 854 | + $ocName = $this->dn2ocname($userRecord['dn'][0], null, true); |
|
| 855 | + if ($ocName === false) { |
|
| 856 | 856 | continue; |
| 857 | 857 | } |
| 858 | 858 | $user = $this->userManager->get($ocName); |
| 859 | - if($user instanceof OfflineUser) { |
|
| 859 | + if ($user instanceof OfflineUser) { |
|
| 860 | 860 | $user->unmark(); |
| 861 | 861 | $user = $this->userManager->get($ocName); |
| 862 | 862 | } |
@@ -888,8 +888,8 @@ discard block |
||
| 888 | 888 | * @return array |
| 889 | 889 | */ |
| 890 | 890 | private function fetchList($list, $manyAttributes) { |
| 891 | - if(is_array($list)) { |
|
| 892 | - if($manyAttributes) { |
|
| 891 | + if (is_array($list)) { |
|
| 892 | + if ($manyAttributes) { |
|
| 893 | 893 | return $list; |
| 894 | 894 | } else { |
| 895 | 895 | $list = array_reduce($list, function($carry, $item) { |
@@ -987,7 +987,7 @@ discard block |
||
| 987 | 987 | // php no longer supports call-time pass-by-reference |
| 988 | 988 | // thus cannot support controlPagedResultResponse as the third argument |
| 989 | 989 | // is a reference |
| 990 | - $doMethod = function () use ($command, &$arguments) { |
|
| 990 | + $doMethod = function() use ($command, &$arguments) { |
|
| 991 | 991 | if ($command == 'controlPagedResultResponse') { |
| 992 | 992 | throw new \InvalidArgumentException('Invoker does not support controlPagedResultResponse, call LDAP Wrapper directly instead.'); |
| 993 | 993 | } else { |
@@ -1005,7 +1005,7 @@ discard block |
||
| 1005 | 1005 | $this->connection->resetConnectionResource(); |
| 1006 | 1006 | $cr = $this->connection->getConnectionResource(); |
| 1007 | 1007 | |
| 1008 | - if(!$this->ldap->isResource($cr)) { |
|
| 1008 | + if (!$this->ldap->isResource($cr)) { |
|
| 1009 | 1009 | // Seems like we didn't find any resource. |
| 1010 | 1010 | \OCP\Util::writeLog('user_ldap', "Could not $command, because resource is missing.", \OCP\Util::DEBUG); |
| 1011 | 1011 | throw $e; |
@@ -1030,13 +1030,13 @@ discard block |
||
| 1030 | 1030 | * @throws ServerNotAvailableException |
| 1031 | 1031 | */ |
| 1032 | 1032 | private function executeSearch($filter, $base, &$attr = null, $limit = null, $offset = null) { |
| 1033 | - if(!is_null($attr) && !is_array($attr)) { |
|
| 1033 | + if (!is_null($attr) && !is_array($attr)) { |
|
| 1034 | 1034 | $attr = array(mb_strtolower($attr, 'UTF-8')); |
| 1035 | 1035 | } |
| 1036 | 1036 | |
| 1037 | 1037 | // See if we have a resource, in case not cancel with message |
| 1038 | 1038 | $cr = $this->connection->getConnectionResource(); |
| 1039 | - if(!$this->ldap->isResource($cr)) { |
|
| 1039 | + if (!$this->ldap->isResource($cr)) { |
|
| 1040 | 1040 | // Seems like we didn't find any resource. |
| 1041 | 1041 | // Return an empty array just like before. |
| 1042 | 1042 | \OCP\Util::writeLog('user_ldap', 'Could not search, because resource is missing.', \OCP\Util::DEBUG); |
@@ -1050,7 +1050,7 @@ discard block |
||
| 1050 | 1050 | $sr = $this->invokeLDAPMethod('search', $linkResources, $base, $filter, $attr); |
| 1051 | 1051 | // cannot use $cr anymore, might have changed in the previous call! |
| 1052 | 1052 | $error = $this->ldap->errno($this->connection->getConnectionResource()); |
| 1053 | - if(!is_array($sr) || $error !== 0) { |
|
| 1053 | + if (!is_array($sr) || $error !== 0) { |
|
| 1054 | 1054 | \OCP\Util::writeLog('user_ldap', 'Attempt for Paging? '.print_r($pagedSearchOK, true), \OCP\Util::ERROR); |
| 1055 | 1055 | return false; |
| 1056 | 1056 | } |
@@ -1073,26 +1073,26 @@ discard block |
||
| 1073 | 1073 | */ |
| 1074 | 1074 | private function processPagedSearchStatus($sr, $filter, $base, $iFoundItems, $limit, $offset, $pagedSearchOK, $skipHandling) { |
| 1075 | 1075 | $cookie = null; |
| 1076 | - if($pagedSearchOK) { |
|
| 1076 | + if ($pagedSearchOK) { |
|
| 1077 | 1077 | $cr = $this->connection->getConnectionResource(); |
| 1078 | - foreach($sr as $key => $res) { |
|
| 1079 | - if($this->ldap->controlPagedResultResponse($cr, $res, $cookie)) { |
|
| 1078 | + foreach ($sr as $key => $res) { |
|
| 1079 | + if ($this->ldap->controlPagedResultResponse($cr, $res, $cookie)) { |
|
| 1080 | 1080 | $this->setPagedResultCookie($base[$key], $filter, $limit, $offset, $cookie); |
| 1081 | 1081 | } |
| 1082 | 1082 | } |
| 1083 | 1083 | |
| 1084 | 1084 | //browsing through prior pages to get the cookie for the new one |
| 1085 | - if($skipHandling) { |
|
| 1085 | + if ($skipHandling) { |
|
| 1086 | 1086 | return false; |
| 1087 | 1087 | } |
| 1088 | 1088 | // if count is bigger, then the server does not support |
| 1089 | 1089 | // paged search. Instead, he did a normal search. We set a |
| 1090 | 1090 | // flag here, so the callee knows how to deal with it. |
| 1091 | - if($iFoundItems <= $limit) { |
|
| 1091 | + if ($iFoundItems <= $limit) { |
|
| 1092 | 1092 | $this->pagedSearchedSuccessful = true; |
| 1093 | 1093 | } |
| 1094 | 1094 | } else { |
| 1095 | - if(!is_null($limit)) { |
|
| 1095 | + if (!is_null($limit)) { |
|
| 1096 | 1096 | \OCP\Util::writeLog('user_ldap', 'Paged search was not available', \OCP\Util::INFO); |
| 1097 | 1097 | } |
| 1098 | 1098 | } |
@@ -1121,7 +1121,7 @@ discard block |
||
| 1121 | 1121 | \OCP\Util::writeLog('user_ldap', 'Count filter: '.print_r($filter, true), \OCP\Util::DEBUG); |
| 1122 | 1122 | |
| 1123 | 1123 | $limitPerPage = intval($this->connection->ldapPagingSize); |
| 1124 | - if(!is_null($limit) && $limit < $limitPerPage && $limit > 0) { |
|
| 1124 | + if (!is_null($limit) && $limit < $limitPerPage && $limit > 0) { |
|
| 1125 | 1125 | $limitPerPage = $limit; |
| 1126 | 1126 | } |
| 1127 | 1127 | |
@@ -1132,7 +1132,7 @@ discard block |
||
| 1132 | 1132 | do { |
| 1133 | 1133 | $search = $this->executeSearch($filter, $base, $attr, |
| 1134 | 1134 | $limitPerPage, $offset); |
| 1135 | - if($search === false) { |
|
| 1135 | + if ($search === false) { |
|
| 1136 | 1136 | return $counter > 0 ? $counter : false; |
| 1137 | 1137 | } |
| 1138 | 1138 | list($sr, $pagedSearchOK) = $search; |
@@ -1151,7 +1151,7 @@ discard block |
||
| 1151 | 1151 | * Continue now depends on $hasMorePages value |
| 1152 | 1152 | */ |
| 1153 | 1153 | $continue = $pagedSearchOK && $hasMorePages; |
| 1154 | - } while($continue && (is_null($limit) || $limit <= 0 || $limit > $counter)); |
|
| 1154 | + } while ($continue && (is_null($limit) || $limit <= 0 || $limit > $counter)); |
|
| 1155 | 1155 | |
| 1156 | 1156 | return $counter; |
| 1157 | 1157 | } |
@@ -1163,7 +1163,7 @@ discard block |
||
| 1163 | 1163 | private function countEntriesInSearchResults($searchResults) { |
| 1164 | 1164 | $counter = 0; |
| 1165 | 1165 | |
| 1166 | - foreach($searchResults as $res) { |
|
| 1166 | + foreach ($searchResults as $res) { |
|
| 1167 | 1167 | $count = intval($this->invokeLDAPMethod('countEntries', $this->connection->getConnectionResource(), $res)); |
| 1168 | 1168 | $counter += $count; |
| 1169 | 1169 | } |
@@ -1185,7 +1185,7 @@ discard block |
||
| 1185 | 1185 | */ |
| 1186 | 1186 | public function search($filter, $base, $attr = null, $limit = null, $offset = null, $skipHandling = false) { |
| 1187 | 1187 | $limitPerPage = intval($this->connection->ldapPagingSize); |
| 1188 | - if(!is_null($limit) && $limit < $limitPerPage && $limit > 0) { |
|
| 1188 | + if (!is_null($limit) && $limit < $limitPerPage && $limit > 0) { |
|
| 1189 | 1189 | $limitPerPage = $limit; |
| 1190 | 1190 | } |
| 1191 | 1191 | |
@@ -1199,13 +1199,13 @@ discard block |
||
| 1199 | 1199 | $savedoffset = $offset; |
| 1200 | 1200 | do { |
| 1201 | 1201 | $search = $this->executeSearch($filter, $base, $attr, $limitPerPage, $offset); |
| 1202 | - if($search === false) { |
|
| 1202 | + if ($search === false) { |
|
| 1203 | 1203 | return []; |
| 1204 | 1204 | } |
| 1205 | 1205 | list($sr, $pagedSearchOK) = $search; |
| 1206 | 1206 | $cr = $this->connection->getConnectionResource(); |
| 1207 | 1207 | |
| 1208 | - if($skipHandling) { |
|
| 1208 | + if ($skipHandling) { |
|
| 1209 | 1209 | //i.e. result do not need to be fetched, we just need the cookie |
| 1210 | 1210 | //thus pass 1 or any other value as $iFoundItems because it is not |
| 1211 | 1211 | //used |
@@ -1216,7 +1216,7 @@ discard block |
||
| 1216 | 1216 | } |
| 1217 | 1217 | |
| 1218 | 1218 | $iFoundItems = 0; |
| 1219 | - foreach($sr as $res) { |
|
| 1219 | + foreach ($sr as $res) { |
|
| 1220 | 1220 | $findings = array_merge($findings, $this->invokeLDAPMethod('getEntries', $cr, $res)); |
| 1221 | 1221 | $iFoundItems = max($iFoundItems, $findings['count']); |
| 1222 | 1222 | unset($findings['count']); |
@@ -1232,24 +1232,24 @@ discard block |
||
| 1232 | 1232 | |
| 1233 | 1233 | // if we're here, probably no connection resource is returned. |
| 1234 | 1234 | // to make Nextcloud behave nicely, we simply give back an empty array. |
| 1235 | - if(is_null($findings)) { |
|
| 1235 | + if (is_null($findings)) { |
|
| 1236 | 1236 | return array(); |
| 1237 | 1237 | } |
| 1238 | 1238 | |
| 1239 | - if(!is_null($attr)) { |
|
| 1239 | + if (!is_null($attr)) { |
|
| 1240 | 1240 | $selection = []; |
| 1241 | 1241 | $i = 0; |
| 1242 | - foreach($findings as $item) { |
|
| 1243 | - if(!is_array($item)) { |
|
| 1242 | + foreach ($findings as $item) { |
|
| 1243 | + if (!is_array($item)) { |
|
| 1244 | 1244 | continue; |
| 1245 | 1245 | } |
| 1246 | 1246 | $item = \OCP\Util::mb_array_change_key_case($item, MB_CASE_LOWER, 'UTF-8'); |
| 1247 | - foreach($attr as $key) { |
|
| 1248 | - if(isset($item[$key])) { |
|
| 1249 | - if(is_array($item[$key]) && isset($item[$key]['count'])) { |
|
| 1247 | + foreach ($attr as $key) { |
|
| 1248 | + if (isset($item[$key])) { |
|
| 1249 | + if (is_array($item[$key]) && isset($item[$key]['count'])) { |
|
| 1250 | 1250 | unset($item[$key]['count']); |
| 1251 | 1251 | } |
| 1252 | - if($key !== 'dn') { |
|
| 1252 | + if ($key !== 'dn') { |
|
| 1253 | 1253 | $selection[$i][$key] = $this->resemblesDN($key) ? |
| 1254 | 1254 | $this->helper->sanitizeDN($item[$key]) |
| 1255 | 1255 | : $key === 'objectguid' || $key === 'guid' ? |
@@ -1268,7 +1268,7 @@ discard block |
||
| 1268 | 1268 | //we slice the findings, when |
| 1269 | 1269 | //a) paged search unsuccessful, though attempted |
| 1270 | 1270 | //b) no paged search, but limit set |
| 1271 | - if((!$this->getPagedSearchResultState() |
|
| 1271 | + if ((!$this->getPagedSearchResultState() |
|
| 1272 | 1272 | && $pagedSearchOK) |
| 1273 | 1273 | || ( |
| 1274 | 1274 | !$pagedSearchOK |
@@ -1285,7 +1285,7 @@ discard block |
||
| 1285 | 1285 | * @return bool|mixed|string |
| 1286 | 1286 | */ |
| 1287 | 1287 | public function sanitizeUsername($name) { |
| 1288 | - if($this->connection->ldapIgnoreNamingRules) { |
|
| 1288 | + if ($this->connection->ldapIgnoreNamingRules) { |
|
| 1289 | 1289 | return $name; |
| 1290 | 1290 | } |
| 1291 | 1291 | |
@@ -1310,13 +1310,13 @@ discard block |
||
| 1310 | 1310 | */ |
| 1311 | 1311 | public function escapeFilterPart($input, $allowAsterisk = false) { |
| 1312 | 1312 | $asterisk = ''; |
| 1313 | - if($allowAsterisk && strlen($input) > 0 && $input[0] === '*') { |
|
| 1313 | + if ($allowAsterisk && strlen($input) > 0 && $input[0] === '*') { |
|
| 1314 | 1314 | $asterisk = '*'; |
| 1315 | 1315 | $input = mb_substr($input, 1, null, 'UTF-8'); |
| 1316 | 1316 | } |
| 1317 | 1317 | $search = array('*', '\\', '(', ')'); |
| 1318 | 1318 | $replace = array('\\*', '\\\\', '\\(', '\\)'); |
| 1319 | - return $asterisk . str_replace($search, $replace, $input); |
|
| 1319 | + return $asterisk.str_replace($search, $replace, $input); |
|
| 1320 | 1320 | } |
| 1321 | 1321 | |
| 1322 | 1322 | /** |
@@ -1346,13 +1346,13 @@ discard block |
||
| 1346 | 1346 | */ |
| 1347 | 1347 | private function combineFilter($filters, $operator) { |
| 1348 | 1348 | $combinedFilter = '('.$operator; |
| 1349 | - foreach($filters as $filter) { |
|
| 1349 | + foreach ($filters as $filter) { |
|
| 1350 | 1350 | if ($filter !== '' && $filter[0] !== '(') { |
| 1351 | 1351 | $filter = '('.$filter.')'; |
| 1352 | 1352 | } |
| 1353 | - $combinedFilter.=$filter; |
|
| 1353 | + $combinedFilter .= $filter; |
|
| 1354 | 1354 | } |
| 1355 | - $combinedFilter.=')'; |
|
| 1355 | + $combinedFilter .= ')'; |
|
| 1356 | 1356 | return $combinedFilter; |
| 1357 | 1357 | } |
| 1358 | 1358 | |
@@ -1388,17 +1388,17 @@ discard block |
||
| 1388 | 1388 | * @throws \Exception |
| 1389 | 1389 | */ |
| 1390 | 1390 | private function getAdvancedFilterPartForSearch($search, $searchAttributes) { |
| 1391 | - if(!is_array($searchAttributes) || count($searchAttributes) < 2) { |
|
| 1391 | + if (!is_array($searchAttributes) || count($searchAttributes) < 2) { |
|
| 1392 | 1392 | throw new \Exception('searchAttributes must be an array with at least two string'); |
| 1393 | 1393 | } |
| 1394 | 1394 | $searchWords = explode(' ', trim($search)); |
| 1395 | 1395 | $wordFilters = array(); |
| 1396 | - foreach($searchWords as $word) { |
|
| 1396 | + foreach ($searchWords as $word) { |
|
| 1397 | 1397 | $word = $this->prepareSearchTerm($word); |
| 1398 | 1398 | //every word needs to appear at least once |
| 1399 | 1399 | $wordMatchOneAttrFilters = array(); |
| 1400 | - foreach($searchAttributes as $attr) { |
|
| 1401 | - $wordMatchOneAttrFilters[] = $attr . '=' . $word; |
|
| 1400 | + foreach ($searchAttributes as $attr) { |
|
| 1401 | + $wordMatchOneAttrFilters[] = $attr.'='.$word; |
|
| 1402 | 1402 | } |
| 1403 | 1403 | $wordFilters[] = $this->combineFilterWithOr($wordMatchOneAttrFilters); |
| 1404 | 1404 | } |
@@ -1416,10 +1416,10 @@ discard block |
||
| 1416 | 1416 | private function getFilterPartForSearch($search, $searchAttributes, $fallbackAttribute) { |
| 1417 | 1417 | $filter = array(); |
| 1418 | 1418 | $haveMultiSearchAttributes = (is_array($searchAttributes) && count($searchAttributes) > 0); |
| 1419 | - if($haveMultiSearchAttributes && strpos(trim($search), ' ') !== false) { |
|
| 1419 | + if ($haveMultiSearchAttributes && strpos(trim($search), ' ') !== false) { |
|
| 1420 | 1420 | try { |
| 1421 | 1421 | return $this->getAdvancedFilterPartForSearch($search, $searchAttributes); |
| 1422 | - } catch(\Exception $e) { |
|
| 1422 | + } catch (\Exception $e) { |
|
| 1423 | 1423 | \OCP\Util::writeLog( |
| 1424 | 1424 | 'user_ldap', |
| 1425 | 1425 | 'Creating advanced filter for search failed, falling back to simple method.', |
@@ -1429,17 +1429,17 @@ discard block |
||
| 1429 | 1429 | } |
| 1430 | 1430 | |
| 1431 | 1431 | $search = $this->prepareSearchTerm($search); |
| 1432 | - if(!is_array($searchAttributes) || count($searchAttributes) === 0) { |
|
| 1432 | + if (!is_array($searchAttributes) || count($searchAttributes) === 0) { |
|
| 1433 | 1433 | if ($fallbackAttribute === '') { |
| 1434 | 1434 | return ''; |
| 1435 | 1435 | } |
| 1436 | - $filter[] = $fallbackAttribute . '=' . $search; |
|
| 1436 | + $filter[] = $fallbackAttribute.'='.$search; |
|
| 1437 | 1437 | } else { |
| 1438 | - foreach($searchAttributes as $attribute) { |
|
| 1439 | - $filter[] = $attribute . '=' . $search; |
|
| 1438 | + foreach ($searchAttributes as $attribute) { |
|
| 1439 | + $filter[] = $attribute.'='.$search; |
|
| 1440 | 1440 | } |
| 1441 | 1441 | } |
| 1442 | - if(count($filter) === 1) { |
|
| 1442 | + if (count($filter) === 1) { |
|
| 1443 | 1443 | return '('.$filter[0].')'; |
| 1444 | 1444 | } |
| 1445 | 1445 | return $this->combineFilterWithOr($filter); |
@@ -1460,7 +1460,7 @@ discard block |
||
| 1460 | 1460 | if ($term === '') { |
| 1461 | 1461 | $result = '*'; |
| 1462 | 1462 | } else if ($allowEnum !== 'no') { |
| 1463 | - $result = $term . '*'; |
|
| 1463 | + $result = $term.'*'; |
|
| 1464 | 1464 | } |
| 1465 | 1465 | return $result; |
| 1466 | 1466 | } |
@@ -1472,7 +1472,7 @@ discard block |
||
| 1472 | 1472 | public function getFilterForUserCount() { |
| 1473 | 1473 | $filter = $this->combineFilterWithAnd(array( |
| 1474 | 1474 | $this->connection->ldapUserFilter, |
| 1475 | - $this->connection->ldapUserDisplayName . '=*' |
|
| 1475 | + $this->connection->ldapUserDisplayName.'=*' |
|
| 1476 | 1476 | )); |
| 1477 | 1477 | |
| 1478 | 1478 | return $filter; |
@@ -1490,7 +1490,7 @@ discard block |
||
| 1490 | 1490 | 'ldapAgentName' => $name, |
| 1491 | 1491 | 'ldapAgentPassword' => $password |
| 1492 | 1492 | ); |
| 1493 | - if(!$testConnection->setConfiguration($credentials)) { |
|
| 1493 | + if (!$testConnection->setConfiguration($credentials)) { |
|
| 1494 | 1494 | return false; |
| 1495 | 1495 | } |
| 1496 | 1496 | return $testConnection->bind(); |
@@ -1512,30 +1512,30 @@ discard block |
||
| 1512 | 1512 | // Sacrebleu! The UUID attribute is unknown :( We need first an |
| 1513 | 1513 | // existing DN to be able to reliably detect it. |
| 1514 | 1514 | $result = $this->search($filter, $base, ['dn'], 1); |
| 1515 | - if(!isset($result[0]) || !isset($result[0]['dn'])) { |
|
| 1515 | + if (!isset($result[0]) || !isset($result[0]['dn'])) { |
|
| 1516 | 1516 | throw new \Exception('Cannot determine UUID attribute'); |
| 1517 | 1517 | } |
| 1518 | 1518 | $dn = $result[0]['dn'][0]; |
| 1519 | - if(!$this->detectUuidAttribute($dn, true)) { |
|
| 1519 | + if (!$this->detectUuidAttribute($dn, true)) { |
|
| 1520 | 1520 | throw new \Exception('Cannot determine UUID attribute'); |
| 1521 | 1521 | } |
| 1522 | 1522 | } else { |
| 1523 | 1523 | // The UUID attribute is either known or an override is given. |
| 1524 | 1524 | // By calling this method we ensure that $this->connection->$uuidAttr |
| 1525 | 1525 | // is definitely set |
| 1526 | - if(!$this->detectUuidAttribute('', true)) { |
|
| 1526 | + if (!$this->detectUuidAttribute('', true)) { |
|
| 1527 | 1527 | throw new \Exception('Cannot determine UUID attribute'); |
| 1528 | 1528 | } |
| 1529 | 1529 | } |
| 1530 | 1530 | |
| 1531 | 1531 | $uuidAttr = $this->connection->ldapUuidUserAttribute; |
| 1532 | - if($uuidAttr === 'guid' || $uuidAttr === 'objectguid') { |
|
| 1532 | + if ($uuidAttr === 'guid' || $uuidAttr === 'objectguid') { |
|
| 1533 | 1533 | $uuid = $this->formatGuid2ForFilterUser($uuid); |
| 1534 | 1534 | } |
| 1535 | 1535 | |
| 1536 | - $filter = $uuidAttr . '=' . $uuid; |
|
| 1536 | + $filter = $uuidAttr.'='.$uuid; |
|
| 1537 | 1537 | $result = $this->searchUsers($filter, ['dn'], 2); |
| 1538 | - if(is_array($result) && isset($result[0]) && isset($result[0]['dn']) && count($result) === 1) { |
|
| 1538 | + if (is_array($result) && isset($result[0]) && isset($result[0]['dn']) && count($result) === 1) { |
|
| 1539 | 1539 | // we put the count into account to make sure that this is |
| 1540 | 1540 | // really unique |
| 1541 | 1541 | return $result[0]['dn'][0]; |
@@ -1554,7 +1554,7 @@ discard block |
||
| 1554 | 1554 | * @return bool true on success, false otherwise |
| 1555 | 1555 | */ |
| 1556 | 1556 | private function detectUuidAttribute($dn, $isUser = true, $force = false, array $ldapRecord = null) { |
| 1557 | - if($isUser) { |
|
| 1557 | + if ($isUser) { |
|
| 1558 | 1558 | $uuidAttr = 'ldapUuidUserAttribute'; |
| 1559 | 1559 | $uuidOverride = $this->connection->ldapExpertUUIDUserAttr; |
| 1560 | 1560 | } else { |
@@ -1562,7 +1562,7 @@ discard block |
||
| 1562 | 1562 | $uuidOverride = $this->connection->ldapExpertUUIDGroupAttr; |
| 1563 | 1563 | } |
| 1564 | 1564 | |
| 1565 | - if(($this->connection->$uuidAttr !== 'auto') && !$force) { |
|
| 1565 | + if (($this->connection->$uuidAttr !== 'auto') && !$force) { |
|
| 1566 | 1566 | return true; |
| 1567 | 1567 | } |
| 1568 | 1568 | |
@@ -1571,10 +1571,10 @@ discard block |
||
| 1571 | 1571 | return true; |
| 1572 | 1572 | } |
| 1573 | 1573 | |
| 1574 | - foreach(self::UUID_ATTRIBUTES as $attribute) { |
|
| 1575 | - if($ldapRecord !== null) { |
|
| 1574 | + foreach (self::UUID_ATTRIBUTES as $attribute) { |
|
| 1575 | + if ($ldapRecord !== null) { |
|
| 1576 | 1576 | // we have the info from LDAP already, we don't need to talk to the server again |
| 1577 | - if(isset($ldapRecord[$attribute])) { |
|
| 1577 | + if (isset($ldapRecord[$attribute])) { |
|
| 1578 | 1578 | $this->connection->$uuidAttr = $attribute; |
| 1579 | 1579 | return true; |
| 1580 | 1580 | } else { |
@@ -1583,7 +1583,7 @@ discard block |
||
| 1583 | 1583 | } |
| 1584 | 1584 | |
| 1585 | 1585 | $value = $this->readAttribute($dn, $attribute); |
| 1586 | - if(is_array($value) && isset($value[0]) && !empty($value[0])) { |
|
| 1586 | + if (is_array($value) && isset($value[0]) && !empty($value[0])) { |
|
| 1587 | 1587 | \OCP\Util::writeLog('user_ldap', |
| 1588 | 1588 | 'Setting '.$attribute.' as '.$uuidAttr, |
| 1589 | 1589 | \OCP\Util::DEBUG); |
@@ -1605,7 +1605,7 @@ discard block |
||
| 1605 | 1605 | * @return bool|string |
| 1606 | 1606 | */ |
| 1607 | 1607 | public function getUUID($dn, $isUser = true, $ldapRecord = null) { |
| 1608 | - if($isUser) { |
|
| 1608 | + if ($isUser) { |
|
| 1609 | 1609 | $uuidAttr = 'ldapUuidUserAttribute'; |
| 1610 | 1610 | $uuidOverride = $this->connection->ldapExpertUUIDUserAttr; |
| 1611 | 1611 | } else { |
@@ -1614,10 +1614,10 @@ discard block |
||
| 1614 | 1614 | } |
| 1615 | 1615 | |
| 1616 | 1616 | $uuid = false; |
| 1617 | - if($this->detectUuidAttribute($dn, $isUser, false, $ldapRecord)) { |
|
| 1617 | + if ($this->detectUuidAttribute($dn, $isUser, false, $ldapRecord)) { |
|
| 1618 | 1618 | $attr = $this->connection->$uuidAttr; |
| 1619 | 1619 | $uuid = isset($ldapRecord[$attr]) ? $ldapRecord[$attr] : $this->readAttribute($dn, $attr); |
| 1620 | - if( !is_array($uuid) |
|
| 1620 | + if (!is_array($uuid) |
|
| 1621 | 1621 | && $uuidOverride !== '' |
| 1622 | 1622 | && $this->detectUuidAttribute($dn, $isUser, true, $ldapRecord)) |
| 1623 | 1623 | { |
@@ -1625,7 +1625,7 @@ discard block |
||
| 1625 | 1625 | ? $ldapRecord[$this->connection->$uuidAttr] |
| 1626 | 1626 | : $this->readAttribute($dn, $this->connection->$uuidAttr); |
| 1627 | 1627 | } |
| 1628 | - if(is_array($uuid) && isset($uuid[0]) && !empty($uuid[0])) { |
|
| 1628 | + if (is_array($uuid) && isset($uuid[0]) && !empty($uuid[0])) { |
|
| 1629 | 1629 | $uuid = $uuid[0]; |
| 1630 | 1630 | } |
| 1631 | 1631 | } |
@@ -1642,19 +1642,19 @@ discard block |
||
| 1642 | 1642 | private function convertObjectGUID2Str($oguid) { |
| 1643 | 1643 | $hex_guid = bin2hex($oguid); |
| 1644 | 1644 | $hex_guid_to_guid_str = ''; |
| 1645 | - for($k = 1; $k <= 4; ++$k) { |
|
| 1645 | + for ($k = 1; $k <= 4; ++$k) { |
|
| 1646 | 1646 | $hex_guid_to_guid_str .= substr($hex_guid, 8 - 2 * $k, 2); |
| 1647 | 1647 | } |
| 1648 | 1648 | $hex_guid_to_guid_str .= '-'; |
| 1649 | - for($k = 1; $k <= 2; ++$k) { |
|
| 1649 | + for ($k = 1; $k <= 2; ++$k) { |
|
| 1650 | 1650 | $hex_guid_to_guid_str .= substr($hex_guid, 12 - 2 * $k, 2); |
| 1651 | 1651 | } |
| 1652 | 1652 | $hex_guid_to_guid_str .= '-'; |
| 1653 | - for($k = 1; $k <= 2; ++$k) { |
|
| 1653 | + for ($k = 1; $k <= 2; ++$k) { |
|
| 1654 | 1654 | $hex_guid_to_guid_str .= substr($hex_guid, 16 - 2 * $k, 2); |
| 1655 | 1655 | } |
| 1656 | - $hex_guid_to_guid_str .= '-' . substr($hex_guid, 16, 4); |
|
| 1657 | - $hex_guid_to_guid_str .= '-' . substr($hex_guid, 20); |
|
| 1656 | + $hex_guid_to_guid_str .= '-'.substr($hex_guid, 16, 4); |
|
| 1657 | + $hex_guid_to_guid_str .= '-'.substr($hex_guid, 20); |
|
| 1658 | 1658 | |
| 1659 | 1659 | return strtoupper($hex_guid_to_guid_str); |
| 1660 | 1660 | } |
@@ -1671,11 +1671,11 @@ discard block |
||
| 1671 | 1671 | * @return string |
| 1672 | 1672 | */ |
| 1673 | 1673 | public function formatGuid2ForFilterUser($guid) { |
| 1674 | - if(!is_string($guid)) { |
|
| 1674 | + if (!is_string($guid)) { |
|
| 1675 | 1675 | throw new \InvalidArgumentException('String expected'); |
| 1676 | 1676 | } |
| 1677 | 1677 | $blocks = explode('-', $guid); |
| 1678 | - if(count($blocks) !== 5) { |
|
| 1678 | + if (count($blocks) !== 5) { |
|
| 1679 | 1679 | /* |
| 1680 | 1680 | * Why not throw an Exception instead? This method is a utility |
| 1681 | 1681 | * called only when trying to figure out whether a "missing" known |
@@ -1688,20 +1688,20 @@ discard block |
||
| 1688 | 1688 | * user. Instead we write a log message. |
| 1689 | 1689 | */ |
| 1690 | 1690 | \OC::$server->getLogger()->info( |
| 1691 | - 'Passed string does not resemble a valid GUID. Known UUID ' . |
|
| 1691 | + 'Passed string does not resemble a valid GUID. Known UUID '. |
|
| 1692 | 1692 | '({uuid}) probably does not match UUID configuration.', |
| 1693 | - [ 'app' => 'user_ldap', 'uuid' => $guid ] |
|
| 1693 | + ['app' => 'user_ldap', 'uuid' => $guid] |
|
| 1694 | 1694 | ); |
| 1695 | 1695 | return $guid; |
| 1696 | 1696 | } |
| 1697 | - for($i=0; $i < 3; $i++) { |
|
| 1697 | + for ($i = 0; $i < 3; $i++) { |
|
| 1698 | 1698 | $pairs = str_split($blocks[$i], 2); |
| 1699 | 1699 | $pairs = array_reverse($pairs); |
| 1700 | 1700 | $blocks[$i] = implode('', $pairs); |
| 1701 | 1701 | } |
| 1702 | - for($i=0; $i < 5; $i++) { |
|
| 1702 | + for ($i = 0; $i < 5; $i++) { |
|
| 1703 | 1703 | $pairs = str_split($blocks[$i], 2); |
| 1704 | - $blocks[$i] = '\\' . implode('\\', $pairs); |
|
| 1704 | + $blocks[$i] = '\\'.implode('\\', $pairs); |
|
| 1705 | 1705 | } |
| 1706 | 1706 | return implode('', $blocks); |
| 1707 | 1707 | } |
@@ -1715,12 +1715,12 @@ discard block |
||
| 1715 | 1715 | $domainDN = $this->getDomainDNFromDN($dn); |
| 1716 | 1716 | $cacheKey = 'getSID-'.$domainDN; |
| 1717 | 1717 | $sid = $this->connection->getFromCache($cacheKey); |
| 1718 | - if(!is_null($sid)) { |
|
| 1718 | + if (!is_null($sid)) { |
|
| 1719 | 1719 | return $sid; |
| 1720 | 1720 | } |
| 1721 | 1721 | |
| 1722 | 1722 | $objectSid = $this->readAttribute($domainDN, 'objectsid'); |
| 1723 | - if(!is_array($objectSid) || empty($objectSid)) { |
|
| 1723 | + if (!is_array($objectSid) || empty($objectSid)) { |
|
| 1724 | 1724 | $this->connection->writeToCache($cacheKey, false); |
| 1725 | 1725 | return false; |
| 1726 | 1726 | } |
@@ -1778,12 +1778,12 @@ discard block |
||
| 1778 | 1778 | $belongsToBase = false; |
| 1779 | 1779 | $bases = $this->helper->sanitizeDN($bases); |
| 1780 | 1780 | |
| 1781 | - foreach($bases as $base) { |
|
| 1781 | + foreach ($bases as $base) { |
|
| 1782 | 1782 | $belongsToBase = true; |
| 1783 | - if(mb_strripos($dn, $base, 0, 'UTF-8') !== (mb_strlen($dn, 'UTF-8')-mb_strlen($base, 'UTF-8'))) { |
|
| 1783 | + if (mb_strripos($dn, $base, 0, 'UTF-8') !== (mb_strlen($dn, 'UTF-8') - mb_strlen($base, 'UTF-8'))) { |
|
| 1784 | 1784 | $belongsToBase = false; |
| 1785 | 1785 | } |
| 1786 | - if($belongsToBase) { |
|
| 1786 | + if ($belongsToBase) { |
|
| 1787 | 1787 | break; |
| 1788 | 1788 | } |
| 1789 | 1789 | } |
@@ -1794,7 +1794,7 @@ discard block |
||
| 1794 | 1794 | * resets a running Paged Search operation |
| 1795 | 1795 | */ |
| 1796 | 1796 | private function abandonPagedSearch() { |
| 1797 | - if($this->connection->hasPagedResultSupport) { |
|
| 1797 | + if ($this->connection->hasPagedResultSupport) { |
|
| 1798 | 1798 | $cr = $this->connection->getConnectionResource(); |
| 1799 | 1799 | $this->invokeLDAPMethod('controlPagedResult', $cr, 0, false, $this->lastCookie); |
| 1800 | 1800 | $this->getPagedSearchResultState(); |
@@ -1812,16 +1812,16 @@ discard block |
||
| 1812 | 1812 | * @return string containing the key or empty if none is cached |
| 1813 | 1813 | */ |
| 1814 | 1814 | private function getPagedResultCookie($base, $filter, $limit, $offset) { |
| 1815 | - if($offset === 0) { |
|
| 1815 | + if ($offset === 0) { |
|
| 1816 | 1816 | return ''; |
| 1817 | 1817 | } |
| 1818 | 1818 | $offset -= $limit; |
| 1819 | 1819 | //we work with cache here |
| 1820 | - $cacheKey = 'lc' . crc32($base) . '-' . crc32($filter) . '-' . intval($limit) . '-' . intval($offset); |
|
| 1820 | + $cacheKey = 'lc'.crc32($base).'-'.crc32($filter).'-'.intval($limit).'-'.intval($offset); |
|
| 1821 | 1821 | $cookie = ''; |
| 1822 | - if(isset($this->cookies[$cacheKey])) { |
|
| 1822 | + if (isset($this->cookies[$cacheKey])) { |
|
| 1823 | 1823 | $cookie = $this->cookies[$cacheKey]; |
| 1824 | - if(is_null($cookie)) { |
|
| 1824 | + if (is_null($cookie)) { |
|
| 1825 | 1825 | $cookie = ''; |
| 1826 | 1826 | } |
| 1827 | 1827 | } |
@@ -1839,11 +1839,11 @@ discard block |
||
| 1839 | 1839 | * @return bool |
| 1840 | 1840 | */ |
| 1841 | 1841 | public function hasMoreResults() { |
| 1842 | - if(!$this->connection->hasPagedResultSupport) { |
|
| 1842 | + if (!$this->connection->hasPagedResultSupport) { |
|
| 1843 | 1843 | return false; |
| 1844 | 1844 | } |
| 1845 | 1845 | |
| 1846 | - if(empty($this->lastCookie) && $this->lastCookie !== '0') { |
|
| 1846 | + if (empty($this->lastCookie) && $this->lastCookie !== '0') { |
|
| 1847 | 1847 | // as in RFC 2696, when all results are returned, the cookie will |
| 1848 | 1848 | // be empty. |
| 1849 | 1849 | return false; |
@@ -1863,8 +1863,8 @@ discard block |
||
| 1863 | 1863 | */ |
| 1864 | 1864 | private function setPagedResultCookie($base, $filter, $limit, $offset, $cookie) { |
| 1865 | 1865 | // allow '0' for 389ds |
| 1866 | - if(!empty($cookie) || $cookie === '0') { |
|
| 1867 | - $cacheKey = 'lc' . crc32($base) . '-' . crc32($filter) . '-' .intval($limit) . '-' . intval($offset); |
|
| 1866 | + if (!empty($cookie) || $cookie === '0') { |
|
| 1867 | + $cacheKey = 'lc'.crc32($base).'-'.crc32($filter).'-'.intval($limit).'-'.intval($offset); |
|
| 1868 | 1868 | $this->cookies[$cacheKey] = $cookie; |
| 1869 | 1869 | $this->lastCookie = $cookie; |
| 1870 | 1870 | } |
@@ -1891,22 +1891,22 @@ discard block |
||
| 1891 | 1891 | */ |
| 1892 | 1892 | private function initPagedSearch($filter, $bases, $attr, $limit, $offset) { |
| 1893 | 1893 | $pagedSearchOK = false; |
| 1894 | - if($this->connection->hasPagedResultSupport && ($limit !== 0)) { |
|
| 1894 | + if ($this->connection->hasPagedResultSupport && ($limit !== 0)) { |
|
| 1895 | 1895 | $offset = intval($offset); //can be null |
| 1896 | 1896 | \OCP\Util::writeLog('user_ldap', |
| 1897 | 1897 | 'initializing paged search for Filter '.$filter.' base '.print_r($bases, true) |
| 1898 | - .' attr '.print_r($attr, true). ' limit ' .$limit.' offset '.$offset, |
|
| 1898 | + .' attr '.print_r($attr, true).' limit '.$limit.' offset '.$offset, |
|
| 1899 | 1899 | \OCP\Util::DEBUG); |
| 1900 | 1900 | //get the cookie from the search for the previous search, required by LDAP |
| 1901 | - foreach($bases as $base) { |
|
| 1901 | + foreach ($bases as $base) { |
|
| 1902 | 1902 | |
| 1903 | 1903 | $cookie = $this->getPagedResultCookie($base, $filter, $limit, $offset); |
| 1904 | - if(empty($cookie) && $cookie !== "0" && ($offset > 0)) { |
|
| 1904 | + if (empty($cookie) && $cookie !== "0" && ($offset > 0)) { |
|
| 1905 | 1905 | // no cookie known from a potential previous search. We need |
| 1906 | 1906 | // to start from 0 to come to the desired page. cookie value |
| 1907 | 1907 | // of '0' is valid, because 389ds |
| 1908 | 1908 | $reOffset = 0; |
| 1909 | - while($reOffset < $offset) { |
|
| 1909 | + while ($reOffset < $offset) { |
|
| 1910 | 1910 | $this->search($filter, array($base), $attr, $limit, $reOffset, true); |
| 1911 | 1911 | $reOffset += $limit; |
| 1912 | 1912 | } |
@@ -1914,17 +1914,17 @@ discard block |
||
| 1914 | 1914 | //still no cookie? obviously, the server does not like us. Let's skip paging efforts. |
| 1915 | 1915 | // '0' is valid, because 389ds |
| 1916 | 1916 | //TODO: remember this, probably does not change in the next request... |
| 1917 | - if(empty($cookie) && $cookie !== '0') { |
|
| 1917 | + if (empty($cookie) && $cookie !== '0') { |
|
| 1918 | 1918 | $cookie = null; |
| 1919 | 1919 | } |
| 1920 | 1920 | } |
| 1921 | - if(!is_null($cookie)) { |
|
| 1921 | + if (!is_null($cookie)) { |
|
| 1922 | 1922 | //since offset = 0, this is a new search. We abandon other searches that might be ongoing. |
| 1923 | 1923 | $this->abandonPagedSearch(); |
| 1924 | 1924 | $pagedSearchOK = $this->invokeLDAPMethod('controlPagedResult', |
| 1925 | 1925 | $this->connection->getConnectionResource(), $limit, |
| 1926 | 1926 | false, $cookie); |
| 1927 | - if(!$pagedSearchOK) { |
|
| 1927 | + if (!$pagedSearchOK) { |
|
| 1928 | 1928 | return false; |
| 1929 | 1929 | } |
| 1930 | 1930 | \OCP\Util::writeLog('user_ldap', 'Ready for a paged search', \OCP\Util::DEBUG); |
@@ -1941,7 +1941,7 @@ discard block |
||
| 1941 | 1941 | * So we added "&& !empty($this->lastCookie)" to this test to ignore pagination |
| 1942 | 1942 | * if we don't have a previous paged search. |
| 1943 | 1943 | */ |
| 1944 | - } else if($this->connection->hasPagedResultSupport && $limit === 0 && !empty($this->lastCookie)) { |
|
| 1944 | + } else if ($this->connection->hasPagedResultSupport && $limit === 0 && !empty($this->lastCookie)) { |
|
| 1945 | 1945 | // a search without limit was requested. However, if we do use |
| 1946 | 1946 | // Paged Search once, we always must do it. This requires us to |
| 1947 | 1947 | // initialize it with the configured page size. |