From 9e6dc394e3ee16776447960674b7fac0c61d9955 Mon Sep 17 00:00:00 2001 From: Maxime Besson Date: Wed, 2 Sep 2020 19:11:18 +0200 Subject: [PATCH 1/5] Improve french translation of OIDC terms --- lemonldap-ng-manager/site/htdocs/static/languages/fr.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/fr.json b/lemonldap-ng-manager/site/htdocs/static/languages/fr.json index 09132df9d..20400c25a 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/fr.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/fr.json @@ -577,8 +577,8 @@ "oidcRPMetaDataOptionsTimeouts":"Expiration", "oidcRPMetaDataOptionsAllowOffline":"Autoriser l'accès hors ligne", "oidcOPMetaDataOptionsCheckJWTSignature":"Vérifier la signature des jetons", -"oidcOPMetaDataOptionsClientID":"Identifiant", -"oidcOPMetaDataOptionsClientSecret":"Mot de passe", +"oidcOPMetaDataOptionsClientID":"ID client", +"oidcOPMetaDataOptionsClientSecret":"Secret client", "oidcOPMetaDataOptionsConfiguration":"Configuration", "oidcOPMetaDataOptionsConfigurationURI":"URI de la configuration", "oidcOPMetaDataOptionsDisplay":"Affichage", @@ -609,8 +609,8 @@ "oidcRPMetaDataOptionsAllowPasswordGrant":"Autoriser le Password Grant OAuth2.0", "oidcRPMetaDataOptionsAuthorizationCodeExpiration":"Expiration des codes d'autorisation", "oidcRPMetaDataOptionsBypassConsent":"Contourner le consentement", -"oidcRPMetaDataOptionsClientID":"Identifiant", -"oidcRPMetaDataOptionsClientSecret":"Mot de passe", +"oidcRPMetaDataOptionsClientID":"ID client", +"oidcRPMetaDataOptionsClientSecret":"Secret client", "oidcRPMetaDataOptionsDisplay":"Affichage", "oidcRPMetaDataOptionsDisplayName":"Nom d'affichage", "oidcRPMetaDataOptionsIcon":"Logo", From c64c1a46b9abd5a00dff3498323c55f0dab6041b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20OUDOT?= Date: Thu, 3 Sep 2020 09:24:50 +0200 Subject: [PATCH 2/5] Fix typo in delete method call (#2305) --- lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf.pm b/lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf.pm index 24a4169ce..548053785 100644 --- a/lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf.pm +++ b/lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf.pm @@ -27,7 +27,7 @@ use Config::IniFiles; #inherits Lemonldap::NG::Common::Conf::Backends::SOAP #inherits Lemonldap::NG::Common::Conf::Backends::LDAP -our $VERSION = '2.0.8'; +our $VERSION = '2.0.9'; our $msg = ''; our $iniObj; @@ -480,7 +480,7 @@ sub delete { my ( $self, $c ) = @_; my @a = $self->available(); if ( grep( /^$c$/, @a ) ) { - return $self->_launch( 'delete', $self, $c ); + return $self->_launch( 'delete', $c ); } else { return 0; From 09f3e7721e36541cc294eb71b626293e3e86abc4 Mon Sep 17 00:00:00 2001 From: Maxime Besson Date: Thu, 3 Sep 2020 12:24:31 +0200 Subject: [PATCH 3/5] doc: fix hgroup usage examples --- doc/sources/admin/rules_examples.rst | 2 +- doc/sources/admin/sfextra.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/sources/admin/rules_examples.rst b/doc/sources/admin/rules_examples.rst index 6a46b7390..fdde3d6b1 100644 --- a/doc/sources/admin/rules_examples.rst +++ b/doc/sources/admin/rules_examples.rst @@ -34,7 +34,7 @@ attribute you see there can be used in a rule! $groups =~ /\b(?:admins|su)\b/ # admins OR su $groups =~ /\badmin_[1-3a]\b/ # admin_1 OR admin_2 OR admin_3 OR admin_a - defined $hGroups{'administrators'} + defined $hGroups->{'administrators'} # 2.0.8 and higher only inGroup('administrators') diff --git a/doc/sources/admin/sfextra.rst b/doc/sources/admin/sfextra.rst index 236defdd8..732305c21 100644 --- a/doc/sources/admin/sfextra.rst +++ b/doc/sources/admin/sfextra.rst @@ -38,7 +38,7 @@ You can find the configuration for this feature in - ``$homeMail`` : this second factor will only trigger if the ``$homeMail`` session key exists - - ``defined $hGroups{'admin'}`` : this second factor will only + - ``defined $hGroups->{'admin'}`` : this second factor will only trigger if the user is in the ``admin`` group After adding your second factors, don't forget to add overload From ffb7c7430de7a7f3e4e3c654acc9fa915bc95f62 Mon Sep 17 00:00:00 2001 From: Maxime Besson Date: Thu, 3 Sep 2020 15:59:18 +0200 Subject: [PATCH 4/5] Fix encoding workaround in recursive group search (#2306) --- lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/Net/LDAP.pm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/Net/LDAP.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/Net/LDAP.pm index 1cb0aa14c..df1c194f3 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/Net/LDAP.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/Net/LDAP.pm @@ -679,6 +679,9 @@ sub searchGroups { # Launch group search if ($group_value) { + if ( $self->{conf}->{ldapGroupDecodeSearchedValue} ) { + utf8::decode($group_value); + } if ( $dupcheck->{$group_value} ) { $self->{portal}->logger->debug( From b9e9ff1f3fce9a4dbd40ecef3bc5ab9ad4e014b5 Mon Sep 17 00:00:00 2001 From: Xavier Guimard Date: Fri, 4 Sep 2020 06:23:35 +0200 Subject: [PATCH 5/5] Make autopkgtest happy --- lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Api/Misc.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Api/Misc.pm b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Api/Misc.pm index e7a1d4313..5c7cca907 100644 --- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Api/Misc.pm +++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Api/Misc.pm @@ -1,9 +1,11 @@ # Miscenalleous endpoints package Lemonldap::NG::Manager::Api::Misc; -our $VERSION = '2.0.8'; +our $VERSION = '2.0.9'; package Lemonldap::NG::Manager::Api; + +use Mouse; extends 'Lemonldap::NG::Manager::Api::Common'; # Health-check endpoint