aboutsummaryrefslogtreecommitdiffstats
path: root/apps/user_ldap/lib/Wizard.php
diff options
context:
space:
mode:
Diffstat (limited to 'apps/user_ldap/lib/Wizard.php')
-rw-r--r--apps/user_ldap/lib/Wizard.php58
1 files changed, 28 insertions, 30 deletions
diff --git a/apps/user_ldap/lib/Wizard.php b/apps/user_ldap/lib/Wizard.php
index 3720b509068..15a9f9cb212 100644
--- a/apps/user_ldap/lib/Wizard.php
+++ b/apps/user_ldap/lib/Wizard.php
@@ -11,13 +11,13 @@ namespace OCA\User_LDAP;
use OC\ServerNotAvailableException;
use OCP\IL10N;
use OCP\L10N\IFactory as IL10NFactory;
+use OCP\Server;
+use OCP\Util;
use Psr\Log\LoggerInterface;
class Wizard extends LDAPUtility {
protected static ?IL10N $l = null;
- protected Access $access;
protected ?\LDAP\Connection $cr = null;
- protected Configuration $configuration;
protected WizardResult $result;
protected LoggerInterface $logger;
@@ -35,18 +35,16 @@ class Wizard extends LDAPUtility {
public const LDAP_NW_TIMEOUT = 4;
public function __construct(
- Configuration $configuration,
+ protected Configuration $configuration,
ILDAPWrapper $ldap,
- Access $access
+ protected Access $access,
) {
parent::__construct($ldap);
- $this->configuration = $configuration;
if (is_null(static::$l)) {
- static::$l = \OC::$server->get(IL10NFactory::class)->get('user_ldap');
+ static::$l = Server::get(IL10NFactory::class)->get('user_ldap');
}
- $this->access = $access;
$this->result = new WizardResult();
- $this->logger = \OC::$server->get(LoggerInterface::class);
+ $this->logger = Server::get(LoggerInterface::class);
}
public function __destruct() {
@@ -262,8 +260,8 @@ class Wizard extends LDAPUtility {
$this->applyFind('ldap_email_attr', $winner);
if ($writeLog) {
$this->logger->info(
- 'The mail attribute has automatically been reset, '.
- 'because the original value did not return any results.',
+ 'The mail attribute has automatically been reset, '
+ . 'because the original value did not return any results.',
['app' => 'user_ldap']
);
}
@@ -402,7 +400,7 @@ class Wizard extends LDAPUtility {
$filterParts = [];
foreach ($obclasses as $obclass) {
- $filterParts[] = 'objectclass='.$obclass;
+ $filterParts[] = 'objectclass=' . $obclass;
}
//we filter for everything
//- that looks like a group and
@@ -647,7 +645,7 @@ class Wizard extends LDAPUtility {
$p = $setting['port'];
$t = $setting['tls'];
$this->logger->debug(
- 'Wiz: trying port '. $p . ', TLS '. $t,
+ 'Wiz: trying port ' . $p . ', TLS ' . $t,
['app' => 'user_ldap']
);
//connectAndBind may throw Exception, it needs to be caught by the
@@ -712,7 +710,7 @@ class Wizard extends LDAPUtility {
//this did not help :(
//Let's see whether we can parse the Host URL and convert the domain to
//a base DN
- $helper = \OC::$server->get(Helper::class);
+ $helper = Server::get(Helper::class);
$domain = $helper->getDomainFromURL($this->configuration->ldapHost);
if (!$domain) {
return false;
@@ -755,7 +753,7 @@ class Wizard extends LDAPUtility {
//removes Port from Host
if (is_array($hostInfo) && isset($hostInfo['port'])) {
$port = $hostInfo['port'];
- $host = str_replace(':'.$port, '', $host);
+ $host = str_replace(':' . $port, '', $host);
$this->applyFind('ldap_host', $host);
$this->applyFind('ldap_port', (string)$port);
}
@@ -824,7 +822,7 @@ class Wizard extends LDAPUtility {
$errorNo = $this->ldap->errno($cr);
$errorMsg = $this->ldap->error($cr);
$this->logger->info(
- 'Wiz: Could not search base '.$base.' Error '.$errorNo.': '.$errorMsg,
+ 'Wiz: Could not search base ' . $base . ' Error ' . $errorNo . ': ' . $errorMsg,
['app' => 'user_ldap']
);
return false;
@@ -858,8 +856,8 @@ class Wizard extends LDAPUtility {
/**
* creates an LDAP Filter from given configuration
* @param int $filterType int, for which use case the filter shall be created
- * can be any of self::LFILTER_USER_LIST, self::LFILTER_LOGIN or
- * self::LFILTER_GROUP_LIST
+ * can be any of self::LFILTER_USER_LIST, self::LFILTER_LOGIN or
+ * self::LFILTER_GROUP_LIST
* @throws \Exception
*/
private function composeLdapFilter(int $filterType): string {
@@ -902,7 +900,7 @@ class Wizard extends LDAPUtility {
$filterPart = '(memberof=' . ldap_escape($dn, '', LDAP_ESCAPE_FILTER) . ')';
if (isset($attrs['primaryGroupToken'])) {
$pgt = $attrs['primaryGroupToken'][0];
- $primaryFilterPart = '(primaryGroupID=' . ldap_escape($pgt, '', LDAP_ESCAPE_FILTER) .')';
+ $primaryFilterPart = '(primaryGroupID=' . ldap_escape($pgt, '', LDAP_ESCAPE_FILTER) . ')';
$filterPart = '(|' . $filterPart . $primaryFilterPart . ')';
}
$filter .= $filterPart;
@@ -1002,12 +1000,12 @@ class Wizard extends LDAPUtility {
$filterLogin .= ')';
}
- $filter = '(&'.$ulf.$filterLogin.')';
+ $filter = '(&' . $ulf . $filterLogin . ')';
break;
}
$this->logger->debug(
- 'Wiz: Final filter '.$filter,
+ 'Wiz: Final filter ' . $filter,
['app' => 'user_ldap']
);
@@ -1069,7 +1067,7 @@ class Wizard extends LDAPUtility {
if ($login === true) {
$this->logger->debug(
- 'Wiz: Bind successful to Port '. $port . ' TLS ' . (int)$tls,
+ 'Wiz: Bind successful to Port ' . $port . ' TLS ' . (int)$tls,
['app' => 'user_ldap']
);
return true;
@@ -1114,9 +1112,9 @@ class Wizard extends LDAPUtility {
* @param string[] $filters array, the filters that shall be used in the search
* @param string $attr the attribute of which a list of values shall be returned
* @param int $dnReadLimit the amount of how many DNs should be analyzed.
- * The lower, the faster
+ * The lower, the faster
* @param string $maxF string. if not null, this variable will have the filter that
- * yields most result entries
+ * yields most result entries
* @return array|false an array with the values on success, false otherwise
*/
public function cumulativeSearchOnAttribute(array $filters, string $attr, int $dnReadLimit = 3, ?string &$maxF = null) {
@@ -1190,9 +1188,9 @@ class Wizard extends LDAPUtility {
* @param string $attr the attribute to look for
* @param string $dbkey the dbkey of the setting the feature is connected to
* @param string $confkey the confkey counterpart for the $dbkey as used in the
- * Configuration class
+ * Configuration class
* @param bool $po whether the objectClass with most result entries
- * shall be pre-selected via the result
+ * shall be pre-selected via the result
* @return array list of found items.
* @throws \Exception
*/
@@ -1203,7 +1201,7 @@ class Wizard extends LDAPUtility {
}
$p = 'objectclass=';
foreach ($objectclasses as $key => $value) {
- $objectclasses[$key] = $p.$value;
+ $objectclasses[$key] = $p . $value;
}
$maxEntryObjC = '';
@@ -1211,8 +1209,8 @@ class Wizard extends LDAPUtility {
//When looking for objectclasses, testing few entries is sufficient,
$dig = 3;
- $availableFeatures =
- $this->cumulativeSearchOnAttribute($objectclasses, $attr,
+ $availableFeatures
+ = $this->cumulativeSearchOnAttribute($objectclasses, $attr,
$dig, $maxEntryObjC);
if (is_array($availableFeatures)
&& count($availableFeatures) > 0) {
@@ -1244,7 +1242,7 @@ class Wizard extends LDAPUtility {
* @param string $attribute the attribute values to look for
* @param array &$known new values will be appended here
* @return int state on of the class constants LRESULT_PROCESSED_OK,
- * LRESULT_PROCESSED_INVALID or LRESULT_PROCESSED_SKIP
+ * LRESULT_PROCESSED_INVALID or LRESULT_PROCESSED_SKIP
*/
private function getAttributeValuesFromEntry(array $result, string $attribute, array &$known): int {
if (!isset($result['count'])
@@ -1253,7 +1251,7 @@ class Wizard extends LDAPUtility {
}
// strtolower on all keys for proper comparison
- $result = \OCP\Util::mb_array_change_key_case($result);
+ $result = Util::mb_array_change_key_case($result);
$attribute = strtolower($attribute);
if (isset($result[$attribute])) {
foreach ($result[$attribute] as $key => $val) {
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-15 22:20:23 +0000