Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added ldap authentification to Rdf auth adapter #98

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
+74 −11
Open

added ldap authentification to Rdf auth adapter #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 65 additions & 10 deletions library/Erfurt/Auth/Adapter/Rdf.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,17 +99,21 @@ public function authenticate()
OntoWiki::getInstance()->appendMessage( new OntoWiki_Message("cached"));
$this->_users[$this->_username] = $cachedVal;
} else {
*/$this->_users[$this->_username] = $this->_fetchDataForUser($this->_username);
*/
$this->_users[$this->_username] = $this->_fetchDataForUser($this->_username);
/*$cache->save($this->_users[$this->_username], $id, array('_fetchDataForUser'));
OntoWiki::getInstance()->appendMessage( new OntoWiki_Message("uncached"));
}*/

// if login is denied return failure auth result
if ($this->_users[$this->_username]['denyLogin'] === true) {
$authResult = new Zend_Auth_Result(Zend_Auth_Result::FAILURE, null, array('Login not allowed!'));
} else if ($this->_users[$this->_username]['userUri'] === false) {
// does user not exist?
$authResult = new Zend_Auth_Result(Zend_Auth_Result::FAILURE, null, array('Unknown user identifier.'));
} else if ($this->_users[$this->_username]['authenticateViaLdap'] === true) {

//this user is added to the model via ldap export and has to verify via ldapconn
$authResult = $this->authenticateViaLdap($this->_users[$this->_username]['ldifdn'],$this->_password);
} else {
// verify the password
if (!$this->_verifyPassword($this->_password, $this->_users[$this->_username]['userPassword'], 'sha1')
Expand All @@ -127,7 +131,7 @@ public function authenticate()

$authResult = new Zend_Auth_Result(Zend_Auth_Result::SUCCESS, $identityObject);
}
}
}
}

//Erfurt_App::getInstance()->getAc()->init();
Expand All @@ -150,11 +154,13 @@ private function _fetchDataForUser($username)
'userUri' => false,
'denyLogin' => false,
'userPassword' => '',
'userEmail' => ''
'userEmail' => '',
'authenticateViaLdap' => false,
'ldifdn' => ''
);

$uris = $this->_getUris();

require_once 'Erfurt/Sparql/SimpleQuery.php';
$sparqlQuery = new Erfurt_Sparql_SimpleQuery();
$sparqlQuery->setProloguePart('SELECT ?subject ?predicate ?object');
Expand All @@ -165,7 +171,6 @@ private function _fetchDataForUser($username)
$sparqlQuery->setWherePart($wherePart);

if ($result = $this->_sparql($sparqlQuery)) {

foreach ($result as $userStatement) {
// set user URI
if (($returnVal['userUri']) === false) {
Expand All @@ -185,12 +190,22 @@ private function _fetchDataForUser($username)
case $uris['user_mail']:
$returnVal['userEmail'] = $userStatement['object'];
break;
case $uris['authenticateViaLdap']:
//enable ldap authentication
if($userStatement['object'] == "1" || $userStatement['object'] == "true"){
$returnVal['authenticateViaLdap'] = true;
}
break;
case $uris['ldifdn']:
//save ldif dn
$returnVal['ldifdn'] = $userStatement['object'];
break;
default:
// ignore other statements
}
}
}

return $returnVal;
}

Expand All @@ -204,7 +219,6 @@ private function _fetchDataForUser($username)
public function fetchDataForAllUsers()
{
$uris = $this->_getUris();

require_once 'Erfurt/Sparql/SimpleQuery.php';
$userSparql = new Erfurt_Sparql_SimpleQuery();
$userSparql->setProloguePart('SELECT ?subject ?predicate ?object');
Expand Down Expand Up @@ -233,6 +247,16 @@ public function fetchDataForAllUsers()
// save e-mail
$this->_users[$statement['subject']]['userEmail'] = $statement['object'];
break;
case $uris['authenticateViaLdap']:
//enable ldap authentication
if($statement['object'] == "1" || $statement['object'] == "true"){
$this->_users[$statement['subject']]['authenticateViaLdap'] = true;
}
break;
case $uris['ldifdn']:
//save ldif dn
$this->_users[$statement['subject']]['ldifdn'] = $statement['object'];
break;
default:
// ignore other statements
}
Expand Down Expand Up @@ -292,7 +316,36 @@ private function _verifyPassword($password1, $password2, $cryptType = 'md5')
}
}
}

/**
* connect to ldap service to verify an ldap login
* @param string entered ldaprdn
* @param string entered password
*/
private function authenticateViaLdap($ldifdn, $password)
{
$config = $this->_getConfig();
$ldapServer = $config->ldap->host;
$protocolVersion = $config->ldap->protocolVersion;
$ldapconn = ldap_connect($ldapServer);
ldap_set_option($ldapconn, LDAP_OPT_PROTOCOL_VERSION, $protocolVersion);
if ($ldapconn) {
// binding to ldap server
$ldapbind = ldap_bind($ldapconn, $ldifdn, $password);
// verify binding
if ($ldapbind) {
$identity['uri'] = $this->_users[$this->_username]['userUri'];
$identity['email'] = $this->_users[$this->_username]['userEmail'];

require_once 'Erfurt/Auth/Identity.php';
$identityObject = new Erfurt_Auth_Identity($identity);

$authResult = new Zend_Auth_Result(Zend_Auth_Result::SUCCESS, $identityObject);
} else {
$authResult = new Zend_Auth_Result(Zend_Auth_Result::FAILURE, null, array("Wrong LDAP password entered!"));
}
}
return $authResult;
}
/**
* Queries the ac model.
*
Expand Down Expand Up @@ -415,7 +468,9 @@ private function _getUris()
'user_superadmin' => $config->ac->user->superAdmin,
'user_anonymous' => $config->ac->user->anonymousUser,
'action_deny' => $config->ac->action->deny,
'action_login' => $config->ac->action->login
'action_login' => $config->ac->action->login,
'ldifdn' => $config->ac->user->ldifdn,
'authenticateViaLdap' => $config->ac->user->authenticateViaLdap
);
}

Expand Down
10 changes: 9 additions & 1 deletion library/Erfurt/config/default.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,9 @@ ac.user.mail = "http://rdfs.org/sioc/ns#email"
ac.user.superAdmin = "http://ns.ontowiki.net/SysOnt/SuperAdmin"
ac.user.anonymousUser = "http://ns.ontowiki.net/SysOnt/Anonymous"
ac.user.recoveryHash = "http://ns.ontowiki.net/SysOnt/recoveryHash"

;; URIs for authentification via ldap
ac.user.ldifdn = "http://www.w3.org/2007/ont/ldif/dn"
ac.user.authenticateViaLdap = "http://ns.ontowiki.net/SysOnt/authenticateViaLdap"
;; Schema URIs which define properties and classes for grouping
ac.group.class = "http://rdfs.org/sioc/ns#Usergroup"
ac.group.membership = "http://rdfs.org/sioc/ns#has_member"
Expand Down Expand Up @@ -190,6 +192,12 @@ worker.enable = true
worker.backend = "Gearman"
worker.servers = "127.0.0.1:4730"

;;----------------------------------------------------------------------------;;
;; LDAP ;;
;;----------------------------------------------------------------------------;;
ldap.host = "localhost"
ldap.protocolVersion = 3

;;----------------------------------------------------------------------------;;
;; Extension ;;
;;----------------------------------------------------------------------------;;
Expand Down