135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

require the Net::LDAP module for all installs

Browse Source
This commit is contained in:
Oliver Gorwits
2014-02-22 12:10:30 +00:00
parent 2ed22d5d08
commit 8f5ee82cf7
4 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Netdisco/Changes
View File

@@ -14,6 +14,7 @@
* Add a "waiting" message to the netmap whilst the data loads * Add a "waiting" message to the netmap whilst the data loads
* Add a spinner to all waiting messages * Add a spinner to all waiting messages
* Try to make the Job Queue page a little faster * Try to make the Job Queue page a little faster
* Require the Net::LDAP module for all installs
[BUG FIXES] [BUG FIXES]

1
Netdisco/Makefile.PL
View File

@@ -30,6 +30,7 @@ requires 'Moo' => 1.001000;
requires 'MCE' => 1.408; requires 'MCE' => 1.408;
requires 'Net::Domain' => 1.23; requires 'Net::Domain' => 1.23;
requires 'Net::DNS' => 0.72; requires 'Net::DNS' => 0.72;
requires 'Net::LDAP' => 0;
requires 'Net::MAC' => 2.103622; requires 'Net::MAC' => 2.103622;
requires 'Net::NBName' => 0.26; requires 'Net::NBName' => 0.26;
requires 'NetAddr::IP' => 4.068; requires 'NetAddr::IP' => 4.068;

3
Netdisco/lib/App/Netdisco/Manual/Configuration.pod
View File

@@ -129,8 +129,7 @@ to Netdisco in the C<X-REMOTE_USER> HTTP Header. For example with Apache:
Value: Settings Tree. Default: None. Value: Settings Tree. Default: None.
If set, and a user has the C<ldap> flag also set on their account, then LDAP If set, and a user has the C<ldap> flag also set on their account, then LDAP
authentication will be used for their login. You I<must> install the authentication will be used for their login.
L<Net::LDAP> Perl module in order to use this feature. For example:
ldap: ldap:
servers: servers:

4
Netdisco/lib/App/Netdisco/Web/Auth/Provider/DBIC.pm
View File

@@ -12,6 +12,7 @@ use Dancer ':syntax';
use Dancer::Plugin::DBIC; use Dancer::Plugin::DBIC;
use Dancer::Plugin::Passphrase; use Dancer::Plugin::Passphrase;
use Digest::MD5; use Digest::MD5;
use Net::LDAP;
sub authenticate_user { sub authenticate_user {
my ($self, $username, $password) = @_; my ($self, $username, $password) = @_;
@@ -99,9 +100,6 @@ sub match_with_local_pass {
sub match_with_ldap { sub match_with_ldap {
my($self, $pass, $user) = @_; my($self, $pass, $user) = @_;
eval 'require Net::LDAP';
if ($@) {error $@; return}
return unless setting('ldap') and ref {} eq ref setting('ldap'); return unless setting('ldap') and ref {} eq ref setting('ldap');
my $conf = setting('ldap'); my $conf = setting('ldap');