[Bps-public-commit] rt-authen-externalauth branch, master, updated. 0.09_01-4-g974fb20

[Thomas Sibley]

The branch, master has been updated
       via  974fb200d673681b5b8491c4f29c8be3930a6a90 (commit)
       via  c8cacc5d0856ad516611a1bfaa21d508d3946ef2 (commit)
       via  662cc3daefb6346014acc7fe56d93bb9badbf57a (commit)
       via  c2c296a208767df74cbfccedd520468093a07b2a (commit)
      from  5eeb5b9c14dd3be7dca57c32abe73ee570e1d90a (commit)

Summary of changes:
 ChangeLog                          |    3 +++
 META.yml                           |    2 +-
 lib/RT/Authen/ExternalAuth.pm      |    2 +-
 lib/RT/Authen/ExternalAuth/LDAP.pm |   11 +++++++++--
 4 files changed, 14 insertions(+), 4 deletions(-)

- Log -----------------------------------------------------------------
commit c2c296a208767df74cbfccedd520468093a07b2a
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Thu Jan 26 13:33:16 2012 -0500

    Log when we fallback to the user's DN in the LDAP group membership check

diff --git a/lib/RT/Authen/ExternalAuth/LDAP.pm b/lib/RT/Authen/ExternalAuth/LDAP.pm
index 2a4b1c3..8290e7a 100644
--- a/lib/RT/Authen/ExternalAuth/LDAP.pm
+++ b/lib/RT/Authen/ExternalAuth/LDAP.pm
@@ -102,7 +102,10 @@ sub GetAuth {
                             : $ldap_entry->get_value($group_attr_val);
 
         # Fallback to the DN if the user record doesn't have a value
-        $group_val = $ldap_dn unless defined $group_val;
+        unless (defined $group_val) {
+            $group_val = $ldap_dn;
+            $RT::Logger->debug("Attribute '$group_attr_val' has no value; falling back to '$group_val'");
+        }
 
         $filter = Net::LDAP::Filter->new("(${group_attr}=" . escape_filter_value($group_val) . ")");
         

commit 662cc3daefb6346014acc7fe56d93bb9badbf57a
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Thu Jan 26 13:38:23 2012 -0500

    Log the result of the group membership check if it returned too few or many results

diff --git a/lib/RT/Authen/ExternalAuth/LDAP.pm b/lib/RT/Authen/ExternalAuth/LDAP.pm
index 8290e7a..89630b6 100644
--- a/lib/RT/Authen/ExternalAuth/LDAP.pm
+++ b/lib/RT/Authen/ExternalAuth/LDAP.pm
@@ -136,6 +136,10 @@ sub GetAuth {
         }
 
         unless ($ldap_msg->count == 1) {
+            $RT::Logger->debug(
+                "LDAP group membership check returned",
+                $ldap_msg->count, "results"
+            );
             $RT::Logger->info(  $service,
                                 "AUTH FAILED:", 
                                 $username);

commit c8cacc5d0856ad516611a1bfaa21d508d3946ef2
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Thu Jan 26 13:41:45 2012 -0500

    Log the correct base for the LDAP group membership search

diff --git a/lib/RT/Authen/ExternalAuth/LDAP.pm b/lib/RT/Authen/ExternalAuth/LDAP.pm
index 89630b6..ed335e0 100644
--- a/lib/RT/Authen/ExternalAuth/LDAP.pm
+++ b/lib/RT/Authen/ExternalAuth/LDAP.pm
@@ -111,7 +111,7 @@ sub GetAuth {
         
         $RT::Logger->debug( "LDAP Search === ",
                             "Base:",
-                            $base,
+                            $group,
                             "== Filter:", 
                             $filter->as_string,
                             "== Attrs:", 

commit 974fb200d673681b5b8491c4f29c8be3930a6a90
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Thu Jan 26 13:46:30 2012 -0500

    Bump version

diff --git a/ChangeLog b/ChangeLog
index e4ed345..e1f100b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+0.09_02 2012-01-26	Thomas Sibley
+	* Improved logging inside the LDAP group membership check
+
 0.09_01 2012-01-23	Thomas Sibley
 	* Improved logic when dealing with Disabled/disabling users
 	* Configurable group membership attribute values
diff --git a/META.yml b/META.yml
index bdc7861..e1c9721 100644
--- a/META.yml
+++ b/META.yml
@@ -33,4 +33,4 @@ requires:
   Net::SSLeay: 0
 resources:
   license: http://opensource.org/licenses/gpl-license.php
-version: 0.09_01
+version: 0.09_02
diff --git a/lib/RT/Authen/ExternalAuth.pm b/lib/RT/Authen/ExternalAuth.pm
index 57d19d9..a0f0830 100644
--- a/lib/RT/Authen/ExternalAuth.pm
+++ b/lib/RT/Authen/ExternalAuth.pm
@@ -1,6 +1,6 @@
 package RT::Authen::ExternalAuth;
 
-our $VERSION = '0.09_01';
+our $VERSION = '0.09_02';
 
 =head1 NAME
 

-----------------------------------------------------------------------