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

Modified LDAP connections to support ldaps and ldapi authentication. Additionally modified some of the labels and hoverhelp within the LDAPLink edit screen to better explain and make them less confusing.

Browse source
This commit is contained in:
Frank Dillon 2008-10-20 20:25:09 +00:00
parent 921ee1ab96
commit d7d9eb946f
4 changed files with 229 additions and 189 deletions
Download patch file Download diff file Expand all files Collapse all files

69
lib/WebGUI/LDAPLink.pm
View file

@ -56,14 +56,14 @@ cannot be established
sub bind {
my $self = shift;
my ($uri, $ldap, $auth, $result, $error);
my ($uri, $auth, $result, $error);
if (defined $self->{_connection}) {
return $self->{_connection};
}
my $ldapUrl = $self->{_ldapLink}->{ldapUrl};
my $connectDn = $self->{_ldapLink}->{connectDn};
my $ldapUrl = $self->{_ldapLink}->{ldapUrl};
my $connectDn = $self->{_ldapLink}->{connectDn};
my $identifier = $self->{_ldapLink}->{identifier};
if ($ldapUrl eq "") {
@ -71,25 +71,52 @@ sub bind {
return 0;
}
if ($uri = URI->new($ldapUrl)) {
unless ($ldap = Net::LDAP->new($uri->host, (port=>($uri->port || 389)))) {
$self->{_error} = 103;
return 0;
}
my $ldap = $self->connectToLDAP($ldapUrl);
return 0 unless ($ldap);
$auth = $ldap->bind(dn=>$connectDn, password=>$identifier);
if ($auth->code == 48 || $auth->code == 49) {
$self->{_error} = 104;
} elsif($auth->code > 0) {
$self->{_error} = $auth->code;
}
$self->{_uri } = $uri;
$self->{_connection} = $ldap;
} else {
$self->{_error} = 105;
return 0;
}
return $self->{_connection};
$auth = $ldap->bind(dn=>$connectDn, password=>$identifier);
if ($auth->code == 48 || $auth->code == 49) {
$self->{_error} = 104;
} elsif($auth->code > 0) {
$self->{_error} = $auth->code;
}
return $ldap;
}
#-------------------------------------------------------------------
=head2 connectToLDAP ( )
Attempts to bind to an LDAP server returning the Net::LDAP object if successful
=cut
sub connectToLDAP {
my $self = shift;
my $ldapUrl = shift || $self->getValue("ldapUrl");
my $uri = URI->new($ldapUrl);
unless ($uri) {
$self->{_error} = 105;
return undef;
}
$self->{_uri} = $uri;
my $ldap = Net::LDAP->new($uri->host,
port => $uri->port, #Port will default to 389 or 636
scheme => $uri->scheme
);
unless($ldap) {
$self->{_error} = 103;
return undef;
}
$self->{_connection} = $ldap;
return $ldap;
}
#-------------------------------------------------------------------