oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed ldap auth module bug

Browse source
This commit is contained in:
Martin Kamerbeek 2006-10-31 17:21:38 +00:00
parent 5408bc2de2
commit 8b706dc727
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
docs/changelog/7.x.x.txt
View file

@ -26,7 +26,8 @@
- fix: metadata (WebGUI Help). Removed mention of the RawHeadTags macro
from the Metadata help.
- WebGUI::Session::Stow now warns if set() is called when cache is disabled
- Fixed a bug in the LDAP auth module where LDAP links could not connect to
the LDAP server (Martin Kamerbeek / Procolix)
7.1.2
- Fixed a bug where logging in/out would cause a blank page display.

12
lib/WebGUI/Auth/LDAP.pm
View file

@ -82,7 +82,7 @@ sub _isValidLDAPUser {
else { # or... use a releative distinguished name instead
$connectDN = $search->entry(0)->get_value($connection->{ldapUserRDN});
}
# Remember the users DN so we can use it later.
$self->setConnectDN($connectDN);
$ldap->unbind;
@ -111,7 +111,7 @@ sub _isValidLDAPUser {
}
else { # Unable to bind with proxy user credentials or anonymously for our search
$error = $i18n->get(2,'AuthLDAP');
$self->session->errorHandler->error("Couldn't bind to LDAP server: ".$connection->{ldapURL});
$self->session->errorHandler->error("Couldn't bind to LDAP server: ".$connection->{ldapUrl});
}
}
else { # Could not create our LDAP object
@ -264,7 +264,7 @@ sub createAccountSave {
my $connection = $self->getLDAPConnection;
#Get connectDN from settings
my $uri = URI->new($connection->{ldapURL});
my $uri = URI->new($connection->{ldapUrl});
my $ldap = Net::LDAP->new($uri->host, (port=>$uri->port));
my $auth;
if($connection->{connectDn}) {
@ -298,7 +298,7 @@ sub createAccountSave {
my $properties;
$properties->{connectDN} = $connectDN;
$properties->{ldapUrl} = $connection->{ldapURL};
$properties->{ldapUrl} = $connection->{ldapUrl};
return $self->SUPER::createAccountSave($username,$properties,$password,$profile);
}
@ -354,7 +354,7 @@ sub editUserForm {
my $self = shift;
my $userData = $self->getParams;
my $connection = $self->getLDAPConnection;
my $ldapUrl = $self->session->form->process('authLDAP_ldapUrl') || $userData->{ldapUrl} || $connection->{ldapURL};
my $ldapUrl = $self->session->form->process('authLDAP_ldapUrl') || $userData->{ldapUrl} || $connection->{ldapUrl};
my $connectDN = $self->session->form->process('authLDAP_connectDN') || $userData->{connectDN};
my $ldapConnection = $self->session->form->process('authLDAP_ldapConnection') || $userData->{ldapConnection};
my $ldapLinks = $self->session->db->buildHashRef("select ldapLinkId,ldapUrl from ldapLink");
@ -497,7 +497,7 @@ sub login {
if ($autoRegistration && !$hasAuthenticated) {
# See if they are in LDAP and if so that they can bind with the password given.
if($self->_isValidLDAPUser()) {
# Create a WebGUI Account
if ($self->validUsername($username)) {
$self->SUPER::createAccountSave($username, {