diff --git a/Core/Frameworks/Baikal/Core/Server.php b/Core/Frameworks/Baikal/Core/Server.php index e96fe39..b90b49e 100644 --- a/Core/Frameworks/Baikal/Core/Server.php +++ b/Core/Frameworks/Baikal/Core/Server.php @@ -133,8 +133,8 @@ if ($this->authType === 'Basic') { $authBackend = new \Baikal\Core\PDOBasicAuth($this->pdo, $this->authRealm); - } elseif ($this->authType === 'Apache') { - $authBackend = new \Sabre\DAV\Auth\Backend\Apache(); + } elseif ($this->authType === 'LDAP-UserBind') { + $authBackend = new \Baikal\Core\LDAPUserBindAuth($this->pdo, $this->authRealm); } else { $authBackend = new \Sabre\DAV\Auth\Backend\PDO($this->pdo); $authBackend->setRealm($this->authRealm); diff --git a/Core/Frameworks/Baikal/Model/Config/Standard.php b/Core/Frameworks/Baikal/Model/Config/Standard.php index 1ef5a51..32ec217 100644 --- a/Core/Frameworks/Baikal/Model/Config/Standard.php +++ b/Core/Frameworks/Baikal/Model/Config/Standard.php @@ -37,6 +37,26 @@ "card_enabled" => true, "cal_enabled" => true, "dav_auth_type" => "Digest", + "dav_ldap_uri" => "ldapi:///", + "dav_ldap_dn_template" => "uid=%n,dc=example,dc=com", + "dav_ldap_displayname_attr" => "cn", + "dav_ldap_email_attr" => "mail", + "dav_ldap_uri" => [ + "type" => "string", + "comment" => "URI to LDAP Server (for ldap-userbind auth); default ldapi:///" + ], + "dav_ldap_dn_template" => [ + "type" => "string", + "comment" => "User DN for bind; with replacments %n => username, %u => user part, %d => domain part of username" + ], + "dav_ldap_displayname_attr" => [ + "type" => "string", + "comment" => "LDAP-attribute for displayname; default cn" + ], + "dav_ldap_email_attr" => [ + "type" => "string", + "comment" => "LDAP-attribute for email; default mail" + ], "admin_passwordhash" => "", "failed_access_message" => "user %u authentication failure for Baikal", // While not editable as will change admin & any existing user passwords, @@ -79,7 +99,31 @@ $oMorpho->add(new \Formal\Element\Listbox([ "prop" => "dav_auth_type", "label" => "WebDAV authentication type", - "options" => ["Digest", "Basic", "Apache"], + "options" => ["Digest", "Basic", "LDAP-UserBind"] + ])); + + $oMorpho->add(new \Formal\Element\Text([ + "prop" => "dav_ldap_uri", + "label" => "LDAP URI" + ])); + + $oMorpho->add(new \Formal\Element\Text([ + "prop" => "dav_ldap_dn_template", + "label" => "LDAP DN template", + "popover" => [ + "title" => "posible placeholder", + "content" => "%n - username
%u - user part of username , when it is an email address)
%d - domain part", + ] + ])); + + $oMorpho->add(new \Formal\Element\Text([ + "prop" => "dav_ldap_displayname_attr", + "label" => "LDAP attribute for DisplayName" + ])); + + $oMorpho->add(new \Formal\Element\Text([ + "prop" => "dav_ldap_email_attr", + "label" => "LDAP attribute for eMail" ])); $oMorpho->add(new \Formal\Element\Password([