From 55ab4b5a5f1a5cb7d3998cdd84de3f56c4fe8322 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20OUDOT?= <clement@oodo.net>
Date: Thu, 25 Mar 2021 16:33:48 +0100
Subject: [PATCH 1/3] Fix CAS log message on service ticket validation error
 (#2494)

---
 lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/CAS.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 5f81da143..8f6c9c2f0 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/CAS.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/CAS.pm
@@ -7,7 +7,7 @@ use XML::Simple;
 use Lemonldap::NG::Common::UserAgent;
 use URI;
 
-our $VERSION = '2.0.8';
+our $VERSION = '2.0.12';
 
 # PROPERTIES
 
@@ -397,7 +397,7 @@ sub validateST {
 
     if ( defined $xml->{'cas:authenticationFailure'} ) {
         $self->logger->error( "Failed to validate Service Ticket $ticket: "
-              . $xml->{'cas:authenticationFailure'} );
+              . $xml->{'cas:authenticationFailure'}->{content} );
         return 0;
     }
 

From 098934682db0849852007aad3b29b6dd1a75c0b5 Mon Sep 17 00:00:00 2001
From: Christophe Maudoux <chrmdx@gmail.com>
Date: Fri, 26 Mar 2021 21:54:21 +0100
Subject: [PATCH 2/3] Fix warning (#2486)

---
 .../lib/Lemonldap/NG/Manager/Conf/Tests.pm               | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Tests.pm b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Tests.pm
index ad40bce8a..1fc7b4698 100644
--- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Tests.pm
+++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Tests.pm
@@ -954,8 +954,8 @@ sub tests {
                     $hasPwdBE ||= 1 unless $mods[2] eq 'Null';
                 }
                 return ( -1,
-                    'Password module is enabled without AuthChoice password backend' )
-                  unless $hasPwdBE;
+'Password module is enabled without AuthChoice password backend'
+                ) unless $hasPwdBE;
             }
             return 1;
         },
@@ -990,7 +990,10 @@ sub tests {
 
         # AuthChoice parameters must exist
         AuthChoiceParams => sub {
-            return 1 unless %{ $conf->{authChoiceModules} };
+            return 1
+              unless ( $conf->{authChoiceModules}
+                and %{ $conf->{authChoiceModules} }
+                and $conf->{authentication} eq 'Choice' );
             foreach (qw(AuthBasic FindUser)) {
                 if ( $conf->{"authChoice$_"} ) {
                     my $test  = $conf->{"authChoice$_"};

From c98e5ec763d84d21bf0404cdfa36251408295a4d Mon Sep 17 00:00:00 2001
From: Christophe Maudoux <chrmdx@gmail.com>
Date: Fri, 26 Mar 2021 22:10:46 +0100
Subject: [PATCH 3/3] Improve doc (#2381)

---
 doc/sources/admin/configvhost.rst | 5 +++--
 doc/sources/admin/portalmenu.rst  | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/doc/sources/admin/configvhost.rst b/doc/sources/admin/configvhost.rst
index 90e80ecf5..e00120629 100644
--- a/doc/sources/admin/configvhost.rst
+++ b/doc/sources/admin/configvhost.rst
@@ -505,7 +505,8 @@ Some options are available:
    rules,...)*
 -  **Access to trace**: can be used for overwriting REMOTE_CUSTOM with a custom function.
    Provide a comma separated parameters list with custom function path and args.
-   By example: My::accessToTrace, Doctor, Who
+   Args can be vars or session attributes, macros, ...
+   By example: My::accessToTrace, Doctor, Who, _whatToTrace
 -  **Type**: handler type (normal,
    :doc:`ServiceToken Handler<servertoserver>`,
    :doc:`DevOps Handler<devopshandler>`,...)
@@ -536,7 +537,7 @@ Some options are available:
           my $params  = $hash->{params};
           my $session = $hash->{session};
 
-          return "$custom alias $params->[0]_$params->[1]:$session->{groups}";
+          return "$custom alias $params->[0]_$params->[1]:$session->{groups}:$session->{$params->[2]}";
       }
 
       1;
diff --git a/doc/sources/admin/portalmenu.rst b/doc/sources/admin/portalmenu.rst
index 69931494f..0a653ebb5 100644
--- a/doc/sources/admin/portalmenu.rst
+++ b/doc/sources/admin/portalmenu.rst
@@ -38,7 +38,7 @@ Categories and applications
 ---------------------------
 
 :doc:`Configuring the virtual hosts<configvhost>` is not sufficient to
-display an application in the menu. Indeed, a virtual host can contain
+display an application in the menu. Indeed, a virtual host can serve
 several applications (http://vhost.example.com/appli1,
 http://vhost.example.com/appli2).