[Rt-commit] rt branch, 4.4/external-auth, updated. rt-4.2.11-177-g381b5c1

[Todd Wade]

The branch, 4.4/external-auth has been updated
       via  381b5c114b50b9e71a93e05bdfcd423f808395b0 (commit)
      from  2dc8bc45751d82a77cfdda8832c537906661779c (commit)

Summary of changes:
 lib/RT.pm                           |  5 -----
 lib/RT/Config.pm                    | 10 ++++++++++
 t/externalauth/ldap.t               |  3 +--
 t/externalauth/ldap_escaping.t      |  3 +--
 t/externalauth/ldap_group.t         |  3 +--
 t/externalauth/ldap_privileged.t    |  3 +--
 t/externalauth/obfuscate-password.t |  2 +-
 t/externalauth/sessions.t           |  2 +-
 t/externalauth/sqlite.t             |  2 +-
 9 files changed, 17 insertions(+), 16 deletions(-)

- Log -----------------------------------------------------------------
commit 381b5c114b50b9e71a93e05bdfcd423f808395b0
Author: Todd Wade <todd at bestpractical.com>
Date:   Thu Oct 29 11:27:01 2015 -0400

    conditionally load RT::Authen::ExternalAuth

diff --git a/lib/RT.pm b/lib/RT.pm
index 49c527b..f0dbe37 100644
--- a/lib/RT.pm
+++ b/lib/RT.pm
@@ -477,11 +477,6 @@ sub InitClasses {
     require RT::Topics;
     require RT::Link;
     require RT::Links;
-    require RT::Authen::ExternalAuth;
-    require RT::Authen::ExternalAuth::LDAP;
-    require RT::Authen::ExternalAuth::DBI;
-    require RT::Authen::ExternalAuth::DBI::Cookie;
-    require RT::LDAPImport;
 
     _BuildTableAttributes();
 
diff --git a/lib/RT/Config.pm b/lib/RT/Config.pm
index 5117132..6c88de4 100644
--- a/lib/RT/Config.pm
+++ b/lib/RT/Config.pm
@@ -1040,6 +1040,16 @@ our %META;
         },
     },
 
+    ExternalAuth => {
+        PostLoadCheck => sub {
+            my $self = shift;
+            my $ExternalAuthEnabled = $self->Get('ExternalAuth');
+            if ( $ExternalAuthEnabled ) {
+                require RT::Authen::ExternalAuth;
+            }
+        }
+    },
+
     ExternalSettings => {
         Obfuscate => sub {
             # Ensure passwords are obfuscated on the System Configuration page
diff --git a/t/externalauth/ldap.t b/t/externalauth/ldap.t
index fafdf26..6933770 100644
--- a/t/externalauth/ldap.t
+++ b/t/externalauth/ldap.t
@@ -1,8 +1,7 @@
 use strict;
 use warnings;
 
-use RT::Test tests => undef;
-use Net::LDAP;
+use RT::Test tests => undef, config => 'Set($ExternalAuth, 1);';
 
 eval { require Net::LDAP::Server::Test; 1; } or do {
     plan skip_all => 'Unable to test without Net::LDAP::Server::Test';
diff --git a/t/externalauth/ldap_escaping.t b/t/externalauth/ldap_escaping.t
index 471521c..015dc29 100644
--- a/t/externalauth/ldap_escaping.t
+++ b/t/externalauth/ldap_escaping.t
@@ -1,8 +1,7 @@
 use strict;
 use warnings;
 
-use RT::Test tests => undef;
-use Net::LDAP;
+use RT::Test tests => undef, config => 'Set($ExternalAuth, 1);';
 
 eval { require Net::LDAP::Server::Test; 1; } or do {
     plan skip_all => 'Unable to test without Net::LDAP::Server::Test';
diff --git a/t/externalauth/ldap_group.t b/t/externalauth/ldap_group.t
index 7e0d837..b6f9df6 100644
--- a/t/externalauth/ldap_group.t
+++ b/t/externalauth/ldap_group.t
@@ -6,8 +6,7 @@ BEGIN {
     $ENV{RT_TEST_WEB_HANDLER} = 'inline';
 }
 
-use RT::Test tests => undef;
-use Net::LDAP;
+use RT::Test tests => undef, config => 'Set($ExternalAuth, 1);';
 
 eval { require Net::LDAP::Server::Test; 1; } or do {
     plan skip_all => 'Unable to test without Net::LDAP::Server::Test';
diff --git a/t/externalauth/ldap_privileged.t b/t/externalauth/ldap_privileged.t
index e5d0a36..6014170 100644
--- a/t/externalauth/ldap_privileged.t
+++ b/t/externalauth/ldap_privileged.t
@@ -1,8 +1,7 @@
 use strict;
 use warnings;
 
-use RT::Test tests => undef;
-use Net::LDAP;
+use RT::Test tests => undef, config => 'Set($ExternalAuth, 1);';
 
 eval { require Net::LDAP::Server::Test; 1; } or do {
     plan skip_all => 'Unable to test without Net::LDAP::Server::Test';
diff --git a/t/externalauth/obfuscate-password.t b/t/externalauth/obfuscate-password.t
index cbe8286..a57be5b 100644
--- a/t/externalauth/obfuscate-password.t
+++ b/t/externalauth/obfuscate-password.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use RT::Test tests => undef;
+use RT::Test tests => undef, config => 'Set($ExternalAuth, 1);';
 
 RT->Config->Set(
     ExternalSettings => {
diff --git a/t/externalauth/sessions.t b/t/externalauth/sessions.t
index 0097602..15470c6 100644
--- a/t/externalauth/sessions.t
+++ b/t/externalauth/sessions.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use RT::Test tests => undef;
+use RT::Test tests => undef, config => 'Set($ExternalAuth, 1);';
 
 setup_auth_source();
 
diff --git a/t/externalauth/sqlite.t b/t/externalauth/sqlite.t
index daee4c6..9b1f8ef 100644
--- a/t/externalauth/sqlite.t
+++ b/t/externalauth/sqlite.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use RT::Test tests => undef;
+use RT::Test tests => undef, config => 'Set($ExternalAuth, 1);';
 use DBI;
 use File::Temp;
 use Digest::MD5;

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