From 0d491e96f426164c252db45b77aff5c052beb77d Mon Sep 17 00:00:00 2001
From: Xavier Guimard <x.guimard@free.fr>
Date: Sat, 11 Nov 2017 13:51:48 +0100
Subject: [PATCH] Use same name for SP rules (#1330)

---
 lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Issuer/CAS.pm     | 2 +-
 .../lib/Lemonldap/NG/Portal/Issuer/OpenIDConnect.pm           | 2 +-
 lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/CAS.pm        | 4 ++--
 .../lib/Lemonldap/NG/Portal/Lib/OpenIDConnect.pm              | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Issuer/CAS.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Issuer/CAS.pm
index 6ba653587..08b9f69ef 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Issuer/CAS.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Issuer/CAS.pm
@@ -119,7 +119,7 @@ sub run {
                 $self->userLogger->error('CAS service not configured');
                 return PE_CAS_SERVICE_NOT_ALLOWED;
             }
-            if ( my $rule = $self->appRules->{$app} ) {
+            if ( my $rule = $self->spRules->{$app} ) {
                 if ( $rule->( $req, $req->sessionInfo ) ) {
                     $self->logger->debug("CAS service $service access allowed");
                 }
diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Issuer/OpenIDConnect.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Issuer/OpenIDConnect.pm
index a6ce8d16b..39cf93642 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Issuer/OpenIDConnect.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Issuer/OpenIDConnect.pm
@@ -198,7 +198,7 @@ sub run {
             }
 
             # Check if this RP is authorizated
-            if ( my $rule = $self->rpRules->{$rp} ) {
+            if ( my $rule = $self->spRules->{$rp} ) {
                 unless ( $rule->( $req, $req->sessionInfo ) ) {
                     $self->userLogger->warn( 'User '
                           . $req->sessionInfo->{ $self->conf->{whatToTrace} }
diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/CAS.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/CAS.pm
index 34b0a2348..a02e413df 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/CAS.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/CAS.pm
@@ -25,7 +25,7 @@ has ua => (
 
 has casSrvList => ( is => 'rw', default => sub { {} }, );
 has casAppList => ( is => 'rw', default => sub { {} }, );
-has appRules   => ( is => 'rw', default => sub { {} }, );
+has spRules    => ( is => 'rw', default => sub { {} }, );
 
 # RUNNING METHODS
 
@@ -65,7 +65,7 @@ sub loadApp {
                       . $self->p->HANDLER->tsv->{jail}->error );
                 return 0;
             }
-            $self->appRules->{$_} = $rule;
+            $self->spRules->{$_} = $rule;
         }
     }
     return 1;
diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/OpenIDConnect.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/OpenIDConnect.pm
index 3c314442b..d5d5be477 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/OpenIDConnect.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/OpenIDConnect.pm
@@ -36,7 +36,7 @@ use constant PHONE => [qw/phone_number phone_number_verified/];
 has oidcOPList   => ( is => 'rw', default => sub { {} }, );
 has oidcRPList   => ( is => 'rw', default => sub { {} }, );
 has rpAttributes => ( is => 'rw', default => sub { {} }, );
-has rpRules      => ( is => 'rw', default => sub { {} } );
+has spRules      => ( is => 'rw', default => sub { {} } );
 
 # return LWP::UserAgent object
 has ua => (
@@ -128,7 +128,7 @@ sub loadRPs {
                       . $self->p->HANDLER->tsv->{jail}->error );
                 return 0;
             }
-            $self->rpRules->{$rp} = $rule;
+            $self->spRules->{$rp} = $rule;
         }
     }
     return 1;
-- 
GitLab