resolve merge conflicts from rebase
This commit is contained in:
parent
0b90cc0b4b
commit
6acd01d9f2
|
@ -60,8 +60,8 @@ class Configuration {
|
||||||
'ldapQuotaDefault' => null,
|
'ldapQuotaDefault' => null,
|
||||||
'ldapEmailAttribute' => null,
|
'ldapEmailAttribute' => null,
|
||||||
'ldapCacheTTL' => null,
|
'ldapCacheTTL' => null,
|
||||||
'ldapUuidAttribute' => 'auto',
|
'ldapUuidUserAttribute' => 'auto',
|
||||||
'ldapOverrideUuidAttribute' => null,
|
'ldapUuidGroupAttribute' => 'auto',
|
||||||
'ldapOverrideMainServer' => false,
|
'ldapOverrideMainServer' => false,
|
||||||
'ldapConfigurationActive' => false,
|
'ldapConfigurationActive' => false,
|
||||||
'ldapAttributesForUserSearch' => null,
|
'ldapAttributesForUserSearch' => null,
|
||||||
|
@ -70,7 +70,8 @@ class Configuration {
|
||||||
'hasPagedResultSupport' => false,
|
'hasPagedResultSupport' => false,
|
||||||
'hasMemberOfFilterSupport' => false,
|
'hasMemberOfFilterSupport' => false,
|
||||||
'ldapExpertUsernameAttr' => null,
|
'ldapExpertUsernameAttr' => null,
|
||||||
'ldapExpertUUIDAttr' => null,
|
'ldapExpertUUIDUserAttr' => null,
|
||||||
|
'ldapExpertUUIDGroupAttr' => null,
|
||||||
);
|
);
|
||||||
|
|
||||||
public function __construct($configPrefix, $autoread = true) {
|
public function __construct($configPrefix, $autoread = true) {
|
||||||
|
@ -214,9 +215,9 @@ class Configuration {
|
||||||
break;
|
break;
|
||||||
//following options are not stored but detected, skip them
|
//following options are not stored but detected, skip them
|
||||||
case 'ldapIgnoreNamingRules':
|
case 'ldapIgnoreNamingRules':
|
||||||
case 'ldapOverrideUuidAttribute':
|
|
||||||
case 'hasPagedResultSupport':
|
case 'hasPagedResultSupport':
|
||||||
case 'ldapUuidAttribute':
|
case 'ldapUuidUserAttribute':
|
||||||
|
case 'ldapUuidGroupAttribute':
|
||||||
continue 2;
|
continue 2;
|
||||||
}
|
}
|
||||||
if(is_null($value)) {
|
if(is_null($value)) {
|
||||||
|
@ -315,15 +316,16 @@ class Configuration {
|
||||||
'ldap_email_attr' => '',
|
'ldap_email_attr' => '',
|
||||||
'ldap_group_member_assoc_attribute' => 'uniqueMember',
|
'ldap_group_member_assoc_attribute' => 'uniqueMember',
|
||||||
'ldap_cache_ttl' => 600,
|
'ldap_cache_ttl' => 600,
|
||||||
'ldap_uuid_attribute' => 'auto',
|
'ldap_uuid_user_attribute' => 'auto',
|
||||||
'ldap_override_uuid_attribute' => 0,
|
'ldap_uuid_group_attribute' => 'auto',
|
||||||
'home_folder_naming_rule' => '',
|
'home_folder_naming_rule' => '',
|
||||||
'ldap_turn_off_cert_check' => 0,
|
'ldap_turn_off_cert_check' => 0,
|
||||||
'ldap_configuration_active' => 0,
|
'ldap_configuration_active' => 0,
|
||||||
'ldap_attributes_for_user_search' => '',
|
'ldap_attributes_for_user_search' => '',
|
||||||
'ldap_attributes_for_group_search' => '',
|
'ldap_attributes_for_group_search' => '',
|
||||||
'ldap_expert_username_attr' => '',
|
'ldap_expert_username_attr' => '',
|
||||||
'ldap_expert_uuid_attr' => '',
|
'ldap_expert_uuid_user_attr' => '',
|
||||||
|
'ldap_expert_uuid_group_attr' => '',
|
||||||
'has_memberof_filter_support' => 0,
|
'has_memberof_filter_support' => 0,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
@ -369,7 +371,8 @@ class Configuration {
|
||||||
'ldap_attributes_for_user_search' => 'ldapAttributesForUserSearch',
|
'ldap_attributes_for_user_search' => 'ldapAttributesForUserSearch',
|
||||||
'ldap_attributes_for_group_search' => 'ldapAttributesForGroupSearch',
|
'ldap_attributes_for_group_search' => 'ldapAttributesForGroupSearch',
|
||||||
'ldap_expert_username_attr' => 'ldapExpertUsernameAttr',
|
'ldap_expert_username_attr' => 'ldapExpertUsernameAttr',
|
||||||
'ldap_expert_uuid_attr' => 'ldapExpertUUIDAttr',
|
'ldap_expert_uuid_user_attr' => 'ldapExpertUUIUserDAttr',
|
||||||
|
'ldap_expert_uuid_group_attr' => 'ldapExpertUUIDGroupAttr',
|
||||||
'has_memberof_filter_support' => 'hasMemberOfFilterSupport',
|
'has_memberof_filter_support' => 'hasMemberOfFilterSupport',
|
||||||
);
|
);
|
||||||
return $array;
|
return $array;
|
||||||
|
|
|
@ -38,8 +38,6 @@ class Connection extends LDAPUtility {
|
||||||
|
|
||||||
//settings handler
|
//settings handler
|
||||||
protected $configuration;
|
protected $configuration;
|
||||||
'ldapUuidGroupAttribute' => 'auto',
|
|
||||||
'ldapExpertUUIDGroupAttr' => null,
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Constructor
|
* @brief Constructor
|
||||||
|
@ -189,17 +187,11 @@ class Connection extends LDAPUtility {
|
||||||
private function readConfiguration($force = false) {
|
private function readConfiguration($force = false) {
|
||||||
if((!$this->configured || $force) && !is_null($this->configID)) {
|
if((!$this->configured || $force) && !is_null($this->configID)) {
|
||||||
$this->configuration->readConfiguration();
|
$this->configuration->readConfiguration();
|
||||||
$this->config['ldapUuidGroupAttribute']
|
|
||||||
= $this->$v('ldap_uuid_group_attribute');
|
|
||||||
$this->config['ldapExpertUUIDGroupAttr']
|
|
||||||
= $this->$v('ldap_expert_uuid_group_attr');
|
|
||||||
|
|
||||||
$this->configured = $this->validateConfiguration();
|
$this->configured = $this->validateConfiguration();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
'ldap_expert_uuid_group_attr' => 'ldapExpertUUIDGroupAttr',
|
|
||||||
* @brief set LDAP configuration with values delivered by an array, not read from configuration
|
* @brief set LDAP configuration with values delivered by an array, not read from configuration
|
||||||
* @param $config array that holds the config parameters in an associated array
|
* @param $config array that holds the config parameters in an associated array
|
||||||
* @param &$setParameters optional; array where the set fields will be given to
|
* @param &$setParameters optional; array where the set fields will be given to
|
||||||
|
@ -224,7 +216,6 @@ class Connection extends LDAPUtility {
|
||||||
*/
|
*/
|
||||||
public function saveConfiguration() {
|
public function saveConfiguration() {
|
||||||
$this->configuration->saveConfiguration();
|
$this->configuration->saveConfiguration();
|
||||||
case 'ldapUuidGroupAttribute':
|
|
||||||
$this->clearCache();
|
$this->clearCache();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -262,11 +253,6 @@ class Connection extends LDAPUtility {
|
||||||
return $result;
|
return $result;
|
||||||
}
|
}
|
||||||
|
|
||||||
//TODO remove if not necessary
|
|
||||||
// public function getDefaults() {
|
|
||||||
// return $this->configuration->getDefaults();
|
|
||||||
// }
|
|
||||||
|
|
||||||
private function doSoftValidation() {
|
private function doSoftValidation() {
|
||||||
//if User or Group Base are not set, take over Base DN setting
|
//if User or Group Base are not set, take over Base DN setting
|
||||||
foreach(array('ldapBaseUsers', 'ldapBaseGroups') as $keyBase) {
|
foreach(array('ldapBaseUsers', 'ldapBaseGroups') as $keyBase) {
|
||||||
|
@ -289,27 +275,29 @@ class Connection extends LDAPUtility {
|
||||||
\OCP\Util::INFO);
|
\OCP\Util::INFO);
|
||||||
}
|
}
|
||||||
|
|
||||||
$uuidOverride = $this->configuration->ldapExpertUUIDAttr;
|
foreach(array('ldapExpertUUIDUserAttr' => 'ldapUuidUserAttribute',
|
||||||
if(!empty($uuidOverride)) {
|
'ldapExpertUUIDGroupAttr' => 'ldapUuidGroupAttribute')
|
||||||
$this->configuration->ldapUuidAttribute = $uuidOverride;
|
as $expertSetting => $effectiveSetting) {
|
||||||
} else {
|
$uuidOverride = $this->configuration->$expertSetting;
|
||||||
$uuidAttributes = array('auto', 'entryuuid', 'nsuniqueid',
|
if(!empty($uuidOverride)) {
|
||||||
'objectguid', 'guid');
|
$this->configuration->$effectiveSetting = $uuidOverride;
|
||||||
if(!in_array($this->configuration->ldapUuidAttribute,
|
} else {
|
||||||
$uuidAttributes)
|
$uuidAttributes = array('auto', 'entryuuid', 'nsuniqueid',
|
||||||
&& (!is_null($this->configID))) {
|
'objectguid', 'guid');
|
||||||
$this->configuration->ldapUuidAttribute = 'auto';
|
if(!in_array($this->configuration->$effectiveSetting,
|
||||||
$this->configuration->saveConfiguration();
|
$uuidAttributes)
|
||||||
'auto');
|
&& (!is_null($this->configID))) {
|
||||||
\OCP\Util::writeLog('user_ldap',
|
$this->configuration->$effectiveSetting = 'auto';
|
||||||
'Illegal value for the UUID Attribute, '.
|
$this->configuration->saveConfiguration();
|
||||||
'reset to autodetect.',
|
\OCP\Util::writeLog('user_ldap',
|
||||||
\OCP\Util::INFO);
|
'Illegal value for the '.
|
||||||
|
$effectiveSetting.', '.'reset to '.
|
||||||
|
'autodetect.', \OCP\Util::INFO);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
$backupPort = $this->configuration->ldapBackupPort;
|
$backupPort = $this->configuration->ldapBackupPort;
|
||||||
if(empty($backupPort)) {
|
if(empty($backupPort)) {
|
||||||
$this->configuration->backupPort = $this->configuration->ldapPort;
|
$this->configuration->backupPort = $this->configuration->ldapPort;
|
||||||
|
@ -405,9 +393,6 @@ class Connection extends LDAPUtility {
|
||||||
$configurationOK = false;
|
$configurationOK = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
|
||||||
if(!empty($this->config['ldapExpertUUIDGroupAttr'])) {
|
|
||||||
$this->config['ldapUuidGroupAttribute'] = $this->config['ldapExpertUUIDGroupAttr'];
|
|
||||||
return $configurationOK;
|
return $configurationOK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -423,8 +408,6 @@ class Connection extends LDAPUtility {
|
||||||
//second step: critical checks. If left empty or filled wrong, set as
|
//second step: critical checks. If left empty or filled wrong, set as
|
||||||
//unconfigured and give a warning.
|
//unconfigured and give a warning.
|
||||||
return $this->doCriticalValidation();
|
return $this->doCriticalValidation();
|
||||||
'ldap_uuid_group_attribute' => 'auto',
|
|
||||||
'ldap_expert_uuid_group_attr' => '',
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue