summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
Diffstat (limited to 'apps')
-rw-r--r--apps/user_ldap/js/wizard/view.js6
-rw-r--r--apps/user_ldap/lib/Configuration.php7
-rw-r--r--apps/user_ldap/lib/Connection.php9
-rw-r--r--apps/user_ldap/lib/LDAP.php2
-rw-r--r--apps/user_ldap/lib/Wizard.php158
5 files changed, 106 insertions, 76 deletions
diff --git a/apps/user_ldap/js/wizard/view.js b/apps/user_ldap/js/wizard/view.js
index 5e8b70f3162..8a530c17e4f 100644
--- a/apps/user_ldap/js/wizard/view.js
+++ b/apps/user_ldap/js/wizard/view.js
@@ -86,7 +86,8 @@ OCA = OCA || {};
var agent = view.configModel.configuration.ldap_dn;
var pwd = view.configModel.configuration.ldap_agent_password;
- if((host && port && base) && ((!agent && !pwd) || (agent && pwd))) {
+ if(((host && port && base) || (host && base && host.indexOf('ldapi://') > -1 ))
+ && ((!agent && !pwd) || (agent && pwd))) {
view.enableTabs();
} else {
view.disableTabs();
@@ -107,7 +108,8 @@ OCA = OCA || {};
var userFilter = this.configModel.configuration.ldap_userlist_filter;
var loginFilter = this.configModel.configuration.ldap_login_filter;
- if(host && port && base && userFilter && loginFilter) {
+ if((host && port && base && userFilter && loginFilter) ||
+ (host && base && host.indexOf('ldapi://') > -1 && userFilter && loginFilter)) {
this.configModel.requestConfigurationTest();
} else {
this._updateStatusIndicator(this.STATUS_INCOMPLETE);
diff --git a/apps/user_ldap/lib/Configuration.php b/apps/user_ldap/lib/Configuration.php
index c16823d39ee..76766df7134 100644
--- a/apps/user_ldap/lib/Configuration.php
+++ b/apps/user_ldap/lib/Configuration.php
@@ -559,4 +559,11 @@ class Configuration {
}
return $defaultAttributes;
}
+
+ /**
+ * Returns TRUE if the ldapHost variable starts with 'ldapi://'
+ */
+ public function usesLdapi(): bool {
+ return (substr($this->config['ldapHost'], 0, strlen('ldapi://')) === 'ldapi://');
+ }
}
diff --git a/apps/user_ldap/lib/Connection.php b/apps/user_ldap/lib/Connection.php
index 89b58b7ebfd..60f9faa4d33 100644
--- a/apps/user_ldap/lib/Connection.php
+++ b/apps/user_ldap/lib/Connection.php
@@ -18,6 +18,7 @@
* @author root <root@localhost.localdomain>
* @author Victor Dubiniuk <dubiniuk@owncloud.com>
* @author Xuanwo <xuanwo@yunify.com>
+ * @author Vincent Van Houtte <vvh@aplusv.be>
*
* @license AGPL-3.0
*
@@ -454,8 +455,14 @@ class Connection extends LDAPUtility {
(string)$this->configPrefix .'): ';
//options that shall not be empty
- $options = ['ldapHost', 'ldapPort', 'ldapUserDisplayName',
+ $options = ['ldapHost', 'ldapUserDisplayName',
'ldapGroupDisplayName', 'ldapLoginFilter'];
+
+ //ldapPort should not be empty either unless ldapHost is pointing to a socket
+ if (!$this->configuration->usesLdapi()) {
+ $options[] = 'ldapPort';
+ }
+
foreach ($options as $key) {
$val = $this->configuration->$key;
if (empty($val)) {
diff --git a/apps/user_ldap/lib/LDAP.php b/apps/user_ldap/lib/LDAP.php
index 6a54f89880d..5730907b653 100644
--- a/apps/user_ldap/lib/LDAP.php
+++ b/apps/user_ldap/lib/LDAP.php
@@ -75,7 +75,7 @@ class LDAP implements ILDAPWrapper {
$host = 'ldap://' . $host;
$pos = 4;
}
- if (strpos($host, ':', $pos + 1) === false) {
+ if (strpos($host, ':', $pos + 1) === false && !empty($port)) {
//ldap_connect ignores port parameter when URLs are passed
$host .= ':' . $port;
}
diff --git a/apps/user_ldap/lib/Wizard.php b/apps/user_ldap/lib/Wizard.php
index 2ecdce610a7..3014ec8e8a7 100644
--- a/apps/user_ldap/lib/Wizard.php
+++ b/apps/user_ldap/lib/Wizard.php
@@ -19,6 +19,7 @@
* @author Tobias Perschon <tobias@perschon.at>
* @author Victor Dubiniuk <dubiniuk@owncloud.com>
* @author Xuanwo <xuanwo@yunify.com>
+ * @author Vincent Van Houtte <vvh@aplusv.be>
* @author Côme Chilliet <come.chilliet@nextcloud.com>
*
* @license AGPL-3.0
@@ -95,7 +96,10 @@ class Wizard extends LDAPUtility {
* @throws \Exception
*/
public function countEntries(string $filter, string $type): int {
- $reqs = ['ldapHost', 'ldapPort', 'ldapBase'];
+ $reqs = ['ldapHost', 'ldapBase'];
+ if (!$this->configuration->usesLdapi()) {
+ $reqs[] = 'ldapPort';
+ }
if ($type === 'users') {
$reqs[] = 'ldapUserFilter';
}
@@ -189,13 +193,13 @@ class Wizard extends LDAPUtility {
* counts users with a specified attribute
* @return int|false
*/
- public function countUsersWithAttribute(string $attr, bool $existsCheck = false) {
- if (!$this->checkRequirements(['ldapHost',
- 'ldapPort',
- 'ldapBase',
- 'ldapUserFilter',
- ])) {
- return false;
+ public function countUsersWithAttribute(string $attr, bool $existsCheck = false) {
+ $reqs = ['ldapHost', 'ldapBase', 'ldapUserFilter'];
+ if (!$this->configuration->usesLdapi()) {
+ $reqs[] = 'ldapPort';
+ }
+ if (!$this->checkRequirements($reqs)) {
+ return false;
}
$filter = $this->access->combineFilterWithAnd([
@@ -215,11 +219,11 @@ class Wizard extends LDAPUtility {
* @throws \Exception
*/
public function detectUserDisplayNameAttribute() {
- if (!$this->checkRequirements(['ldapHost',
- 'ldapPort',
- 'ldapBase',
- 'ldapUserFilter',
- ])) {
+ $reqs = ['ldapHost', 'ldapBase', 'ldapUserFilter'];
+ if (!$this->configuration->usesLdapi()) {
+ $reqs[] = 'ldapPort';
+ }
+ if (!$this->checkRequirements($reqs)) {
return false;
}
@@ -257,11 +261,11 @@ class Wizard extends LDAPUtility {
* @return WizardResult|bool
*/
public function detectEmailAttribute() {
- if (!$this->checkRequirements(['ldapHost',
- 'ldapPort',
- 'ldapBase',
- 'ldapUserFilter',
- ])) {
+ $reqs = ['ldapHost', 'ldapBase', 'ldapUserFilter'];
+ if (!$this->configuration->usesLdapi()) {
+ $reqs[] = 'ldapPort';
+ }
+ if (!$this->checkRequirements($reqs)) {
return false;
}
@@ -306,12 +310,12 @@ class Wizard extends LDAPUtility {
* @throws \Exception
*/
public function determineAttributes() {
- if (!$this->checkRequirements(['ldapHost',
- 'ldapPort',
- 'ldapBase',
- 'ldapUserFilter',
- ])) {
- return false;
+ $reqs = ['ldapHost', 'ldapBase', 'ldapUserFilter'];
+ if (!$this->configuration->usesLdapi()) {
+ $reqs[] = 'ldapPort';
+ }
+ if (!$this->checkRequirements($reqs)) {
+ return false;
}
$attributes = $this->getUserAttributes();
@@ -339,12 +343,12 @@ class Wizard extends LDAPUtility {
* @throws \Exception
*/
private function getUserAttributes() {
- if (!$this->checkRequirements(['ldapHost',
- 'ldapPort',
- 'ldapBase',
- 'ldapUserFilter',
- ])) {
- return false;
+ $reqs = ['ldapHost', 'ldapBase', 'ldapUserFilter'];
+ if (!$this->configuration->usesLdapi()) {
+ $reqs[] = 'ldapPort';
+ }
+ if (!$this->checkRequirements($reqs)) {
+ return false;
}
$cr = $this->getConnection();
if (!$cr) {
@@ -395,12 +399,13 @@ class Wizard extends LDAPUtility {
* @return WizardResult|false the instance's WizardResult instance
* @throws \Exception
*/
- private function determineGroups(string $dbKey, string $confKey, bool $testMemberOf = true) {
- if (!$this->checkRequirements(['ldapHost',
- 'ldapPort',
- 'ldapBase',
- ])) {
- return false;
+ private function determineGroups(string $dbKey, string $confKey, bool $testMemberOf = true) {
+ $reqs = ['ldapHost', 'ldapBase'];
+ if (!$this->configuration->usesLdapi()) {
+ $reqs[] = 'ldapPort';
+ }
+ if (!$this->checkRequirements($reqs)) {
+ return false;
}
$cr = $this->getConnection();
if (!$cr) {
@@ -476,11 +481,12 @@ class Wizard extends LDAPUtility {
* @return WizardResult|false
*/
public function determineGroupMemberAssoc() {
- if (!$this->checkRequirements(['ldapHost',
- 'ldapPort',
- 'ldapGroupFilter',
- ])) {
- return false;
+ $reqs = ['ldapHost', 'ldapGroupFilter'];
+ if (!$this->configuration->usesLdapi()) {
+ $reqs[] = 'ldapPort';
+ }
+ if (!$this->checkRequirements($reqs)) {
+ return false;
}
$attribute = $this->detectGroupMemberAssoc();
if ($attribute === false) {
@@ -498,10 +504,11 @@ class Wizard extends LDAPUtility {
* @throws \Exception
*/
public function determineGroupObjectClasses() {
- if (!$this->checkRequirements(['ldapHost',
- 'ldapPort',
- 'ldapBase',
- ])) {
+ $reqs = ['ldapHost', 'ldapBase'];
+ if (!$this->configuration->usesLdapi()) {
+ $reqs[] = 'ldapPort';
+ }
+ if (!$this->checkRequirements($reqs)) {
return false;
}
$cr = $this->getConnection();
@@ -525,11 +532,12 @@ class Wizard extends LDAPUtility {
* @throws \Exception
*/
public function determineUserObjectClasses() {
- if (!$this->checkRequirements(['ldapHost',
- 'ldapPort',
- 'ldapBase',
- ])) {
- return false;
+ $reqs = ['ldapHost', 'ldapBase'];
+ if (!$this->configuration->usesLdapi()) {
+ $reqs[] = 'ldapPort';
+ }
+ if (!$this->checkRequirements($reqs)) {
+ return false;
}
$cr = $this->getConnection();
if (!$cr) {
@@ -555,10 +563,11 @@ class Wizard extends LDAPUtility {
* @throws \Exception
*/
public function getGroupFilter() {
- if (!$this->checkRequirements(['ldapHost',
- 'ldapPort',
- 'ldapBase',
- ])) {
+ $reqs = ['ldapHost', 'ldapBase'];
+ if (!$this->configuration->usesLdapi()) {
+ $reqs[] = 'ldapPort';
+ }
+ if (!$this->checkRequirements($reqs)) {
return false;
}
//make sure the use display name is set
@@ -579,10 +588,11 @@ class Wizard extends LDAPUtility {
* @throws \Exception
*/
public function getUserListFilter() {
- if (!$this->checkRequirements(['ldapHost',
- 'ldapPort',
- 'ldapBase',
- ])) {
+ $reqs = ['ldapHost', 'ldapBase'];
+ if (!$this->configuration->usesLdapi()) {
+ $reqs[] = 'ldapPort';
+ }
+ if (!$this->checkRequirements($reqs)) {
return false;
}
//make sure the use display name is set
@@ -605,11 +615,11 @@ class Wizard extends LDAPUtility {
* @throws \Exception
*/
public function getUserLoginFilter() {
- if (!$this->checkRequirements(['ldapHost',
- 'ldapPort',
- 'ldapBase',
- 'ldapUserFilter',
- ])) {
+ $reqs = ['ldapHost', 'ldapBase', 'ldapUserFilter'];
+ if (!$this->configuration->usesLdapi()) {
+ $reqs[] = 'ldapPort';
+ }
+ if (!$this->checkRequirements($reqs)) {
return false;
}
@@ -626,12 +636,12 @@ class Wizard extends LDAPUtility {
* @return WizardResult|false
* @throws \Exception
*/
- public function testLoginName(string $loginName) {
- if (!$this->checkRequirements(['ldapHost',
- 'ldapPort',
- 'ldapBase',
- 'ldapLoginFilter',
- ])) {
+ public function testLoginName(string $loginName) {
+ $reqs = ['ldapHost', 'ldapBase', 'ldapUserFilter'];
+ if (!$this->configuration->usesLdapi()) {
+ $reqs[] = 'ldapPort';
+ }
+ if (!$this->checkRequirements($reqs)) {
return false;
}
@@ -717,9 +727,11 @@ class Wizard extends LDAPUtility {
* @return WizardResult|false WizardResult on success, false otherwise
*/
public function guessBaseDN() {
- if (!$this->checkRequirements(['ldapHost',
- 'ldapPort',
- ])) {
+ $reqs = ['ldapHost'];
+ if (!$this->configuration->usesLdapi()) {
+ $reqs[] = 'ldapPort';
+ }
+ if (!$this->checkRequirements($reqs)) {
return false;
}
@@ -1361,6 +1373,8 @@ class Wizard extends LDAPUtility {
$portSettings[] = ['port' => $port, 'tls' => true];
}
$portSettings[] = ['port' => $port, 'tls' => false];
+ } elseif ($this->configuration->usesLdapi()) {
+ $portSettings[] = ['port' => '', 'tls' => false];
}
//default ports
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-15 02:51:35 +0000