From 232ab78860712384de0b9f4b5b0a064ad5c2d010 Mon Sep 17 00:00:00 2001
From: Xavier Guimard <xavier.guimard@laposte.net>
Date: Sun, 22 May 2016 12:22:59 +0000
Subject: [PATCH] Limit PE_* imports (#595)

---
 lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/AD.pm      | 3 ++-
 lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/Apache.pm  | 3 ++-
 lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/DBI.pm     | 2 +-
 lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/Demo.pm    | 2 +-
 lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/LDAP.pm    | 3 ++-
 .../lib/Lemonldap/NG/Portal/Auth/_WebForm.pm                | 3 ++-
 lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main.pm         | 2 +-
 .../lib/Lemonldap/NG/Portal/Main/Constants.pm               | 6 +++---
 lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Request.pm | 2 +-
 lemonldap-ng-portal/lib/Lemonldap/NG/Portal/UserDB/DBI.pm   | 2 +-
 lemonldap-ng-portal/lib/Lemonldap/NG/Portal/UserDB/Demo.pm  | 2 +-
 lemonldap-ng-portal/lib/Lemonldap/NG/Portal/UserDB/LDAP.pm  | 3 ++-
 12 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/AD.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/AD.pm
index cfcc6a66e..e434e42c2 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/AD.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/AD.pm
@@ -5,7 +5,8 @@ package Lemonldap::NG::Portal::Auth::AD;
 
 use strict;
 use Mouse;
-use Lemonldap::NG::Portal::Main::Constants;
+use Lemonldap::NG::Portal::Main::Constants
+  qw(PE_OK PE_PP_PASSWORD_EXPIRED PE_PP_CHANGE_AFTER_RESET);
 
 our $VERSION = '2.0.0';
 
diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/Apache.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/Apache.pm
index 6f2b42d7a..ac6c28dd0 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/Apache.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/Apache.pm
@@ -2,13 +2,14 @@ package Lemonldap::NG::Portal::Auth::Apache;
 
 use strict;
 use Mouse;
-use Lemonldap::NG::Portal::Main::Constants;
+use Lemonldap::NG::Portal::Main::Constants qw(PE_ERROR PE_OK);
 
 our $VERSION = '0.1';
 
 extends 'Lemonldap::NG::Portal::Auth::Base';
 
 sub init {
+    PE_ERROR;
     1;
 }
 
diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/DBI.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/DBI.pm
index 1542972af..b929dbbb1 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/DBI.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/DBI.pm
@@ -2,7 +2,7 @@ package Lemonldap::NG::Portal::Auth::DBI;
 
 use strict;
 use Mouse;
-use Lemonldap::NG::Portal::Main::Constants;
+use Lemonldap::NG::Portal::Main::Constants qw(PE_OK PE_BADCREDENTIALS);
 
 our $VERSION = '2.0.0';
 
diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/Demo.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/Demo.pm
index df3156ff2..a00d5c6fe 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/Demo.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/Demo.pm
@@ -7,7 +7,7 @@ package Lemonldap::NG::Portal::Auth::Demo;
 
 use strict;
 use Mouse;
-use Lemonldap::NG::Portal::Main::Constants;
+use Lemonldap::NG::Portal::Main::Constants qw(PE_OK PE_BADCREDENTIALS);
 
 extends qw(Lemonldap::NG::Portal::Auth::_WebForm);
 
diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/LDAP.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/LDAP.pm
index 487bff524..495d64246 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/LDAP.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/LDAP.pm
@@ -2,7 +2,8 @@ package Lemonldap::NG::Portal::Auth::LDAP;
 
 use strict;
 use Mouse;
-use Lemonldap::NG::Portal::Main::Constants;
+use Lemonldap::NG::Portal::Main::Constants
+  qw(PE_OK PE_LDAPCONNECTFAILED PE_PP_CHANGE_AFTER_RESET PE_PP_PASSWORD_EXPIRED);
 
 our $VERSION = '2.0.0';
 
diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/_WebForm.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/_WebForm.pm
index 13cb1ef6c..1bfa52404 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/_WebForm.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/_WebForm.pm
@@ -7,7 +7,8 @@ package Lemonldap::NG::Portal::Auth::_WebForm;
 
 use strict;
 use Mouse;
-use Lemonldap::NG::Portal::Main::Constants;
+use Lemonldap::NG::Portal::Main::Constants
+  qw(PE_OK PE_FIRSTACCESS PE_FORMEMPTY PE_PASSWORDFORMEMPTY PE_CAPTCHAEMPTY PE_CAPTCHAERROR);
 
 our $VERSION = '2.0.0';
 
diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main.pm
index 174c285a9..7a01f93c3 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main.pm
@@ -4,7 +4,7 @@ use strict;
 use Mouse;
 
 use Lemonldap::NG::Common::Conf::Constants;
-use Lemonldap::NG::Portal::Main::Constants;
+use Lemonldap::NG::Portal::Main::Constants ':all';
 use Lemonldap::NG::Portal::Main::Request;
 use Lemonldap::NG::Portal::Main::Plugins;
 use Lemonldap::NG::Portal::Main::Init;
diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Constants.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Constants.pm
index 7859c66ad..6b351d469 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Constants.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Constants.pm
@@ -122,7 +122,7 @@ use constant {
 };
 
 # EXPORTER PARAMETERS
-our @EXPORT = qw( PE_IMG_NOK PE_IMG_OK PE_INFO PE_REDIRECT PE_DONE PE_OK
+our @EXPORT_OK = qw( PE_IMG_NOK PE_IMG_OK PE_INFO PE_REDIRECT PE_DONE PE_OK
   PE_SESSIONEXPIRED PE_FORMEMPTY PE_WRONGMANAGERACCOUNT PE_USERNOTFOUND
   PE_BADCREDENTIALS PE_LDAPCONNECTFAILED PE_LDAPERROR PE_APACHESESSIONERROR
   PE_FIRSTACCESS PE_BADCERTIFICATE PE_PP_ACCOUNT_LOCKED PE_PP_PASSWORD_EXPIRED
@@ -153,8 +153,8 @@ our @EXPORT = qw( PE_IMG_NOK PE_IMG_OK PE_INFO PE_REDIRECT PE_DONE PE_OK
   PM_OIDC_SCOPE_PHONE PM_OIDC_SCOPE_OTHER PM_OIDC_CONFIRM_LOGOUT
   HANDLER
 );
-our %EXPORT_TAGS = ( 'all' => [ @EXPORT, 'import' ], );
+our %EXPORT_TAGS = ( 'all' => [ @EXPORT_OK, 'import' ], );
 
-our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
+our @EXPORT = qw(import PE_OK);
 
 1;
diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Request.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Request.pm
index 184495aa6..9231275e4 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Request.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Request.pm
@@ -23,7 +23,7 @@ package Lemonldap::NG::Portal::Main::Request;
 
 use strict;
 use Mouse;
-use Lemonldap::NG::Portal::Main::Constants;
+use Lemonldap::NG::Portal::Main::Constants ':all';
 
 extends 'Lemonldap::NG::Common::PSGI::Request';
 
diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/UserDB/DBI.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/UserDB/DBI.pm
index 62139f2a1..48c6d1f01 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/UserDB/DBI.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/UserDB/DBI.pm
@@ -2,7 +2,7 @@ package Lemonldap::NG::Portal::UserDB::DBI;
 
 use strict;
 use Mouse;
-use Lemonldap::NG::Portal::Main::Constants;
+use Lemonldap::NG::Portal::Main::Constants qw(PE_OK PE_ERROR PE_BADCREDENTIALS);
 
 extends 'Lemonldap::NG::Portal::Lib::DBI';
 
diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/UserDB/Demo.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/UserDB/Demo.pm
index fb0db43de..259bc5fbb 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/UserDB/Demo.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/UserDB/Demo.pm
@@ -7,7 +7,7 @@ package Lemonldap::NG::Portal::UserDB::Demo;
 
 use strict;
 use Mouse;
-use Lemonldap::NG::Portal::Main::Constants;
+use Lemonldap::NG::Portal::Main::Constants qw(PE_OK PE_USERNOTFOUND);
 
 extends 'Lemonldap::NG::Portal::Main::Module';
 
diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/UserDB/LDAP.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/UserDB/LDAP.pm
index 11e87afff..fb7b9d32c 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/UserDB/LDAP.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/UserDB/LDAP.pm
@@ -2,7 +2,8 @@ package Lemonldap::NG::Portal::UserDB::LDAP;
 
 use strict;
 use Mouse;
-use Lemonldap::NG::Portal::Main::Constants;
+use Lemonldap::NG::Portal::Main::Constants
+  qw(PE_OK PE_LDAPCONNECTFAILED PE_LDAPERROR PE_BADCREDENTIALS);
 use Lemonldap::NG::Portal::Lib::LDAP;
 
 extends 'Lemonldap::NG::Portal::Main::Module';