Merge branch 'master' of git://anongit.kde.org/owncloud
This commit is contained in:
commit
2772c66259
|
@ -0,0 +1,39 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ownCloud - user_ldap
|
||||||
|
*
|
||||||
|
* @author Dominik Schmidt
|
||||||
|
* @copyright 2011 Dominik Schmidt dev@dominik-schmidt.de
|
||||||
|
*
|
||||||
|
* This library is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
|
||||||
|
* License as published by the Free Software Foundation; either
|
||||||
|
* version 3 of the License, or any later version.
|
||||||
|
*
|
||||||
|
* This library is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public
|
||||||
|
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
require_once('apps/user_ldap/user_ldap.php');
|
||||||
|
|
||||||
|
// define LDAP_DEFAULT_PORT
|
||||||
|
define("OC_USER_BACKEND_LDAP_DEFAULT_PORT", 389);
|
||||||
|
|
||||||
|
// register user backend
|
||||||
|
OC_USER::useBackend( "LDAP" );
|
||||||
|
|
||||||
|
// add settings page to navigation
|
||||||
|
$entry = array(
|
||||||
|
'id' => "user_ldap_settings",
|
||||||
|
'order'=>1,
|
||||||
|
'href' => OC_HELPER::linkTo( "user_ldap", "settings.php" ),
|
||||||
|
'name' => 'LDAP'
|
||||||
|
);
|
||||||
|
OC_APP::addNavigationSubEntry( "core_users", $entry);
|
|
@ -0,0 +1,10 @@
|
||||||
|
<?xml version="1.0"?>
|
||||||
|
<info>
|
||||||
|
<id>user_ldap</id>
|
||||||
|
<name>LDAP user backend</name>
|
||||||
|
<description>Authenticate Users by LDAP</description>
|
||||||
|
<version>0.1</version>
|
||||||
|
<licence>AGPL</licence>
|
||||||
|
<author>Dominik Schmidt</author>
|
||||||
|
<require>2</require>
|
||||||
|
</info>
|
|
@ -0,0 +1,52 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ownCloud - user_ldap
|
||||||
|
*
|
||||||
|
* @author Dominik Schmidt
|
||||||
|
* @copyright 2011 Dominik Schmidt dev@dominik-schmidt.de
|
||||||
|
*
|
||||||
|
* This library is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
|
||||||
|
* License as published by the Free Software Foundation; either
|
||||||
|
* version 3 of the License, or any later version.
|
||||||
|
*
|
||||||
|
* This library is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public
|
||||||
|
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
require_once('../../lib/base.php');
|
||||||
|
require( 'template.php' );
|
||||||
|
|
||||||
|
if( !OC_USER::isLoggedIn() || !OC_GROUP::inGroup( OC_USER::getUser(), 'admin' )){
|
||||||
|
header( "Location: ".OC_HELPER::linkTo( "index.php" ));
|
||||||
|
exit();
|
||||||
|
}
|
||||||
|
|
||||||
|
$params = array('ldap_host', 'ldap_port', 'ldap_dn', 'ldap_password', 'ldap_base', 'ldap_filter');
|
||||||
|
|
||||||
|
foreach($params as $param){
|
||||||
|
if(isset($_POST[$param])){
|
||||||
|
OC_APPCONFIG::setValue('user_ldap', $param, $_POST[$param]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
OC_APP::setActiveNavigationEntry( "user_ldap_settings" );
|
||||||
|
|
||||||
|
|
||||||
|
// fill template
|
||||||
|
$tmpl = new OC_TEMPLATE( 'user_ldap', 'settings', 'admin' );
|
||||||
|
foreach($params as $param){
|
||||||
|
$value = OC_APPCONFIG::getValue('user_ldap', $param,'');
|
||||||
|
$tmpl->assign($param, $value);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ldap_port has a default value
|
||||||
|
$tmpl->assign( 'ldap_port', OC_APPCONFIG::getValue('user_ldap', 'ldap_port', OC_USER_BACKEND_LDAP_DEFAULT_PORT));
|
||||||
|
|
||||||
|
$tmpl->printPage();
|
|
@ -0,0 +1,27 @@
|
||||||
|
<form id="ldap" action='#' method='post'>
|
||||||
|
<fieldset>
|
||||||
|
<legend>LDAP</legend>
|
||||||
|
<div>
|
||||||
|
<div>
|
||||||
|
<span>Host: *</span><span><input type="text" name="ldap_host" width="200" value="<?php echo $_['ldap_host']; ?>"></span>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<span>Port: *</span><span><input type="text" name="ldap_port" width="200" value="<?php echo $_['ldap_port']; ?>"></span>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<span>DN:<input type="text" name="ldap_dn" width="200" value="<?php echo $_['ldap_dn']; ?>"></span>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<span>Password:<input type="password" name="ldap_password" width="200" value="<?php echo $_['ldap_password']; ?>"></span>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<span>Base: *<input type="text" name="ldap_base" width="200" value="<?php echo $_['ldap_base']; ?>"></span>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<span>Filter * (use %uid placeholder):<input type="text" name="ldap_filter" width="200" value="<?php echo $_['ldap_filter']; ?>"></span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<input type='submit' value='Save'/>
|
||||||
|
<br/> * required
|
||||||
|
</fieldset>
|
||||||
|
</form>
|
|
@ -0,0 +1,99 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ownCloud
|
||||||
|
*
|
||||||
|
* @author Dominik Schmidt
|
||||||
|
* @copyright 2011 Dominik Schmidt dev@dominik-schmidt.de
|
||||||
|
*
|
||||||
|
* This library is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
|
||||||
|
* License as published by the Free Software Foundation; either
|
||||||
|
* version 3 of the License, or any later version.
|
||||||
|
*
|
||||||
|
* This library is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public
|
||||||
|
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
require_once('User/backend.php');
|
||||||
|
|
||||||
|
class OC_USER_LDAP extends OC_USER_BACKEND {
|
||||||
|
|
||||||
|
protected $ds;
|
||||||
|
|
||||||
|
// cached settings
|
||||||
|
protected $ldap_host;
|
||||||
|
protected $ldap_port;
|
||||||
|
protected $ldap_dn;
|
||||||
|
protected $ldap_password;
|
||||||
|
protected $ldap_base;
|
||||||
|
protected $ldap_filter;
|
||||||
|
|
||||||
|
function __construct() {
|
||||||
|
$this->ldap_host = OC_APPCONFIG::getValue('user_ldap', 'ldap_host','');
|
||||||
|
$this->ldap_port = OC_APPCONFIG::getValue('user_ldap', 'ldap_port', OC_USER_BACKEND_LDAP_DEFAULT_PORT );
|
||||||
|
$this->ldap_dn = OC_APPCONFIG::getValue('user_ldap', 'ldap_dn','');
|
||||||
|
$this->ldap_password = OC_APPCONFIG::getValue('user_ldap', 'ldap_password','');
|
||||||
|
$this->ldap_base = OC_APPCONFIG::getValue('user_ldap', 'ldap_base','');
|
||||||
|
$this->ldap_filter = OC_APPCONFIG::getValue('user_ldap', 'ldap_filter','');
|
||||||
|
}
|
||||||
|
|
||||||
|
function __destruct() {
|
||||||
|
// close the connection
|
||||||
|
if( $this->ds )
|
||||||
|
ldap_unbind($this->ds);
|
||||||
|
}
|
||||||
|
|
||||||
|
private function getDs() {
|
||||||
|
if(!$this->ds) {
|
||||||
|
$this->ds = ldap_connect( $this->ldap_host, $this->ldap_port );
|
||||||
|
}
|
||||||
|
|
||||||
|
// login
|
||||||
|
if(!empty($this->ldap_dn)) {
|
||||||
|
$ldap_login = @ldap_bind( $this->ds, $this->ldap_dn, $this->ldap_password );
|
||||||
|
if(!$ldap_login)
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this->ds;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function getDn( $uid ) {
|
||||||
|
// connect to server
|
||||||
|
$ds = $this->getDs();
|
||||||
|
if( !$ds )
|
||||||
|
return false;
|
||||||
|
|
||||||
|
// get dn
|
||||||
|
$filter = str_replace("%uid", $uid, $this->ldap_filter);
|
||||||
|
$sr = ldap_search( $this->getDs(), $this->ldap_base, $filter );
|
||||||
|
$entries = ldap_get_entries( $this->getDs(), $sr );
|
||||||
|
|
||||||
|
if( $entries["count"] == 0 )
|
||||||
|
return false;
|
||||||
|
|
||||||
|
return $entries[0]["dn"];
|
||||||
|
}
|
||||||
|
public function checkPassword( $uid, $password ) {
|
||||||
|
$dn = $this->getDn( $uid );
|
||||||
|
if( !$dn )
|
||||||
|
return false;
|
||||||
|
|
||||||
|
return @ldap_bind( $this->getDs(), $dn, $password );
|
||||||
|
}
|
||||||
|
|
||||||
|
public function userExists( $uid ) {
|
||||||
|
$dn = getDn($uid);
|
||||||
|
return !empty($dn);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
?>
|
Loading…
Reference in New Issue