wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

attributes['username'] is required

Browse Source
This commit is contained in:
Craig Andrews 2009-11-18 15:40:27 -05:00
parent 9ed70a5b11
commit 297f320e6f
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/LdapAuthentication/LdapAuthenticationPlugin.php
View File

@ -189,7 +189,6 @@ class LdapAuthenticationPlugin extends AuthenticationPlugin
} }
$filter = Net_LDAP2_Filter::create($this->attributes['username'], 'equals', $username); $filter = Net_LDAP2_Filter::create($this->attributes['username'], 'equals', $username);
$options = array( $options = array(
'scope' => 'sub',
'attributes' => $attributes 'attributes' => $attributes
); );
$search = $ldap->search(null,$filter,$options); $search = $ldap->search(null,$filter,$options);

9
plugins/LdapAuthorization/LdapAuthorizationPlugin.php
View File

@ -50,6 +50,7 @@ class LdapAuthorizationPlugin extends AuthorizationPlugin
public $uniqueMember_attribute = null; public $uniqueMember_attribute = null;
public $roles_to_groups = null; public $roles_to_groups = null;
public $login_group = null; public $login_group = null;
public $attributes = array();
function onInitializePlugin(){ function onInitializePlugin(){
parent::onInitializePlugin(); parent::onInitializePlugin();
@ -68,6 +69,9 @@ class LdapAuthorizationPlugin extends AuthorizationPlugin
if(!isset($this->roles_to_groups)){ if(!isset($this->roles_to_groups)){
throw new Exception("roles_to_groups must be set."); throw new Exception("roles_to_groups must be set.");
} }
if(!isset($this->attributes['username'])){
throw new Exception("username attribute must be set.");
}
} }
//---interface implementation---// //---interface implementation---//
@ -86,7 +90,7 @@ class LdapAuthorizationPlugin extends AuthorizationPlugin
} }
} }
}else{ }else{
if($this->isMemberOfGroup($entry->dn(),login_group)){ if($this->isMemberOfGroup($entry->dn(),$this->login_group)){
return true; return true;
} }
} }
@ -143,7 +147,7 @@ class LdapAuthorizationPlugin extends AuthorizationPlugin
} }
} }
function ldap_get_config(){ function ldap_get_config(){
$config = array(); $config = array();
$keys = array('host','port','version','starttls','binddn','bindpw','basedn','options','filter','scope'); $keys = array('host','port','version','starttls','binddn','bindpw','basedn','options','filter','scope');
foreach($keys as $key){ foreach($keys as $key){
@ -187,7 +191,6 @@ class LdapAuthorizationPlugin extends AuthorizationPlugin
} }
$filter = Net_LDAP2_Filter::create($this->attributes['username'], 'equals', $username); $filter = Net_LDAP2_Filter::create($this->attributes['username'], 'equals', $username);
$options = array( $options = array(
'scope' => 'sub',
'attributes' => $attributes 'attributes' => $attributes
); );
$search = $ldap->search(null,$filter,$options); $search = $ldap->search(null,$filter,$options);

9
plugins/LdapAuthorization/README
View File

@ -45,6 +45,9 @@ filter: Default search filter.
scope: Default search scope. scope: Default search scope.
See http://pear.php.net/manual/en/package.networking.net-ldap2.connecting.php See http://pear.php.net/manual/en/package.networking.net-ldap2.connecting.php
attributes: an array that relates StatusNet user attributes to LDAP ones
username*: LDAP attribute value entered when authenticating to StatusNet
* required * required
default values are in (parenthesis) default values are in (parenthesis)
@ -72,7 +75,7 @@ addPlugin('ldapAuthentication', array(
addPlugin('ldapAuthorization', array( addPlugin('ldapAuthorization', array(
'provider_name'=>'Example', 'provider_name'=>'Example',
'authoritative'=>false, 'authoritative'=>false,
'uniqueMember_attribute'=>'uniqueMember', 'uniqueMember_attribute'=>'member',
'roles_to_groups'=> array( 'roles_to_groups'=> array(
'moderator'=>'CN=SN-Moderators,OU=Users,OU=StatusNet,OU=US,DC=americas,DC=global,DC=loc', 'moderator'=>'CN=SN-Moderators,OU=Users,OU=StatusNet,OU=US,DC=americas,DC=global,DC=loc',
'administrator'=> array('CN=System-Adminstrators,OU=Users,OU=StatusNet,OU=US,DC=americas,DC=global,DC=loc', 'administrator'=> array('CN=System-Adminstrators,OU=Users,OU=StatusNet,OU=US,DC=americas,DC=global,DC=loc',
@ -81,6 +84,8 @@ addPlugin('ldapAuthorization', array(
'binddn'=>'username', 'binddn'=>'username',
'bindpw'=>'password', 'bindpw'=>'password',
'basedn'=>'OU=Users,OU=StatusNet,OU=US,DC=americas,DC=global,DC=loc', 'basedn'=>'OU=Users,OU=StatusNet,OU=US,DC=americas,DC=global,DC=loc',
'host'=>array('server1', 'server2') 'host'=>array('server1', 'server2'),
'attributes'=>array(
'username'=>'sAMAccountName')
)); ));