diff --git a/debian/liblemonldap-ng-common-perl.install b/debian/liblemonldap-ng-common-perl.install index 6444213c4..9e2da60b5 100644 --- a/debian/liblemonldap-ng-common-perl.install +++ b/debian/liblemonldap-ng-common-perl.install @@ -2,6 +2,7 @@ /etc/lemonldap-ng/for_etc_hosts /usr/share/man/man1/convertConfig.1p /usr/share/man/man1/convertSessions.1p +/usr/share/man/man1/importMetadata.1p /usr/share/man/man1/lemonldap-ng-cli.1p /usr/share/man/man1/lemonldap-ng-sessions.1p /usr/share/man/man3/Lemonldap::NG::Common* diff --git a/doc/sources/admin/documentation.rst b/doc/sources/admin/documentation.rst index b76f7c596..942e6e72e 100644 --- a/doc/sources/admin/documentation.rst +++ b/doc/sources/admin/documentation.rst @@ -31,7 +31,7 @@ Installation and configuration - `Version 2.0 `__ (stable) - `Version 1.9 `__ (oldstable) -- Archived versions (unmaintained by `LLNG Team `__ ) +- Archived versions (unmaintained by LLNG Team ) - `Version 1.4 `__ - `Version 1.3 `__ @@ -53,20 +53,22 @@ Debian Following Debian Policy, LLNG packages are never upgraded in published distributions. However, security patches are backported by maintenance teams *(except some inor ones)*. See `Security tracker `__ -=========== ======================== ======================================== ===================================================== ============================================================ =============================== ============================================================= -Debian dist LLNG version Secured Maintenance LTS Limit `Extended LTS `__ Limit -=========== ======================== ======================================== ===================================================== ============================================================ =============================== ============================================================= -*6* *Squeeze* *0.9.4.1* |maybe| No known vulnerability *None* *February 2016* *April 2019* -**7** Wheezy `1.1.2 `__ |maybe| No known vulnerability **None** [1]_ May 2018 Probably 2021 -**8** Jessie `1.3.3 `__ |clean| CVE-2019-19791 tagged as minor **None** [1]_ June 2020 Probably 2023 -**9** Stretch `1.9.7 `__ |clean| CVE-2019-19791 tagged as minor `Debian LTS Team `__ June 2022 -\ *Stretch-backports* `2.0.2 `__ |bad| CVE-2019-12046, CVE-2019-13031, CVE-2019-15941 *None* *June 2019* -\ Stretch-backports-sloppy `2.0.11 `__ |maybe| *Maybe none*, "best effort" [3]_ Until Debian 11 release [4]_ -**10** Buster `2.0.2 `__ |clean| CVE-2019-19791 tagged as minor `Debian Security Team `__ Probably July 2024 -\ Buster-backports `2.0.11 `__ |clean| `LLNG Team `, "best effort" [3]_ Until Debian 11 release [4]_ -\ Bullseye `2.0.11 `__ |clean| `Debian Security Team `__ Probably July 2026 -**Next** Testing Latest [5]_ |clean| `LLNG Team `__ -=========== ======================== ======================================== ===================================================== ============================================================ =============================== ============================================================= +=========== ========================== ======================================== ===================================================== ============================================================ =============================== ============================================================= +Debian dist LLNG version Secured Maintenance LTS Limit `Extended LTS `__ Limit +=========== ========================== ======================================== ===================================================== ============================================================ =============================== ============================================================= +*6* *Squeeze* *0.9.4.1* |maybe| No known vulnerability *None* *February 2016* *April 2019* +*7* *Wheezy* `1.1.2 `__ |maybe| No known vulnerability *None* *May 2018* *June 2020* +**8** Jessie `1.3.3 `__ |clean| CVE-2019-19791 tagged as minor **None** [1]_ June 2020 June 2022 +**9** Stretch `1.9.7 `__ |clean| CVE-2019-19791 tagged as minor `Debian LTS Team `__ June 2022 Probably 2024 +\ *Stretch-backports* `2.0.2 `__ |bad| CVE-2019-12046, CVE-2019-13031, CVE-2019-15941 *None* *June 2019* +\ *Stretch-backports-sloppy* `2.0.11 `__ |maybe| *None* *August 2021* +**10** Buster `2.0.2 `__ |clean| CVE-2019-19791 tagged as minor `Debian Security Team `__ June 2024 Probably 2026 +\ *Buster-backports* `2.0.11 `__ |clean| *None* *August 2021* +\ Buster-backports-sloppy `2.0.11 `__ |clean| LLNG Team, "best effort" [3]_ Until Debian 12 release [4]_ +**11** Bullseye `2.0.11 `__ |clean| `Debian Security Team `__ July 2026 Probably 2028 +\ Bullseye-backports `2.0.11 `__ |clean| LLNG Team, "best effort" [3]_ Until Debian 12 release [4]_ +**Next** Testing/Unstable Latest [5]_ |clean| LLNG Team +=========== ========================== ======================================== ===================================================== ============================================================ =============================== ============================================================= See `Debian Security Tracker `__ @@ -142,7 +144,7 @@ Other backports are not covered by Debian Security Policy .. [4] - around September 2021 + around July 2023 .. [5] few days after release diff --git a/doc/sources/admin/upgrade_2_0_x.rst b/doc/sources/admin/upgrade_2_0_x.rst index 93dd34621..ebf2f3df4 100644 --- a/doc/sources/admin/upgrade_2_0_x.rst +++ b/doc/sources/admin/upgrade_2_0_x.rst @@ -43,19 +43,52 @@ Security Portal templates changes ~~~~~~~~~~~~~~~~~~~~~~~~ -If you customized the HTML mail content, you must update them to use HTML::Template variables (this was changed to fix XSS injections). +Email templates +^^^^^^^^^^^^^^^ -For session variables, replace for example ``$cn`` by ````, and for other variables, replace for example ``$url`` by ````. +If you customized the HTML email templates, you must update them to use HTML::Template variables (this was changed to fix XSS injections). -Some changes have been made to include new plugins (FindUser and CheckDevOps), you need to report them only if you have a custom theme and you want to use these plugins +In the following files: ``mail_2fcode.tpl`` ``mail_certificateReset.tpl`` ``mail_footer.tpl`` ``mail_password.tpl`` ``mail_register_done.tpl`` ``mail_certificateConfirm.tpl`` ``mail_confirm.tpl`` ``mail_header.tpl`` ``mail_register_confirm.tpl`` +Replace the following variables: + + +.. list-table:: + :header-rows: 1 + + * - Old syntax + - New syntax + * - ``$code`` + - ```` + * - ``$url`` + - ```` + * - ``$login`` + - ```` + * - ``$password`` + - ```` + * - ``$firstname`` + - ```` + * - ``$lastname`` + - ```` + +Replace all other variables such as ``$cn`` by ````. + +Login form +^^^^^^^^^^ To benefit from the new feature allowing to show password on login form, adapt ``standardform.tpl`` (see `changes `__) To disable password store in browser when changing password (this was already possible for login form), adapt ``password.tpl`` (see `changes `__) To fix placeholder display in password field when password store is disabled in browser, adapt ``password.tpl`` (see `changes `__) -See also "Simplification of TOTP options" below. +TOTP +^^^^ +See also `Simplification of TOTP options`_ below. + +FindUser, CheckDevOps templates +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Some changes have been made to include new plugins (FindUser and CheckDevOps), you need to report them only if you have a custom theme and you want to use these plugins Client Credential sessions missing expiration time ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/fastcgi-server/man/llng-fastcgi-server.8p b/fastcgi-server/man/llng-fastcgi-server.8p index 3fbbb1b80..ab1f245b4 100644 --- a/fastcgi-server/man/llng-fastcgi-server.8p +++ b/fastcgi-server/man/llng-fastcgi-server.8p @@ -231,7 +231,7 @@ Use \s-1OW2\s0 system to report bug or ask for features: .SH "DOWNLOAD" .IX Header "DOWNLOAD" Lemonldap::NG is available at - + .SH "COPYRIGHT AND LICENSE" .IX Header "COPYRIGHT AND LICENSE" .IP "Copyright (C) 2008\-2016 by Xavier Guimard, " 4 diff --git a/fastcgi-server/sbin/llng-fastcgi-server b/fastcgi-server/sbin/llng-fastcgi-server index a9e96cbc1..bfd16e823 100644 --- a/fastcgi-server/sbin/llng-fastcgi-server +++ b/fastcgi-server/sbin/llng-fastcgi-server @@ -290,7 +290,7 @@ L =head1 DOWNLOAD Lemonldap::NG is available at -L +L =head1 COPYRIGHT AND LICENSE diff --git a/lemonldap-ng-common/META.json b/lemonldap-ng-common/META.json index 059017086..153b4c611 100644 --- a/lemonldap-ng-common/META.json +++ b/lemonldap-ng-common/META.json @@ -35,7 +35,7 @@ }, "runtime" : { "recommends" : { - "Apache::Session::Browseable" : "0", + "Apache::Session::Browseable" : "v1.3.9", "Convert::Base32" : "0", "Cookie::Baker::XS" : "0", "Crypt::URandom" : "0", diff --git a/lemonldap-ng-common/META.yml b/lemonldap-ng-common/META.yml index 4c0ed6d30..25f88abb2 100644 --- a/lemonldap-ng-common/META.yml +++ b/lemonldap-ng-common/META.yml @@ -21,7 +21,7 @@ no_index: - t - inc recommends: - Apache::Session::Browseable: '0' + Apache::Session::Browseable: v1.3.9 Convert::Base32: '0' Cookie::Baker::XS: '0' Crypt::URandom: '0' diff --git a/lemonldap-ng-common/Makefile.PL b/lemonldap-ng-common/Makefile.PL index e1c73a982..f605098b3 100644 --- a/lemonldap-ng-common/Makefile.PL +++ b/lemonldap-ng-common/Makefile.PL @@ -43,7 +43,7 @@ WriteMakefile( }, META_MERGE => { 'recommends' => { - 'Apache::Session::Browseable' => 0, + 'Apache::Session::Browseable' => '1.3.9', 'Convert::Base32' => 0, 'Cookie::Baker::XS' => 0, 'Crypt::URandom' => 0, @@ -106,5 +106,6 @@ WriteMakefile( 'scripts/convertSessions' => 'blib/man1/convertSessions.1p', 'scripts/lemonldap-ng-cli' => 'blib/man1/lemonldap-ng-cli.1p', 'scripts/lemonldap-ng-sessions' => 'blib/man1/lemonldap-ng-sessions.1p', + 'scripts/importMetadata' => 'blib/man1/importMetadata.1p', }, ); diff --git a/lemonldap-ng-common/lib/Lemonldap/NG/Common.pm b/lemonldap-ng-common/lib/Lemonldap/NG/Common.pm index 2c34aaa88..d7b824a69 100644 --- a/lemonldap-ng-common/lib/Lemonldap/NG/Common.pm +++ b/lemonldap-ng-common/lib/Lemonldap/NG/Common.pm @@ -38,7 +38,7 @@ L =head1 DOWNLOAD Lemonldap::NG is available at -L +L =head1 COPYRIGHT AND LICENSE diff --git a/lemonldap-ng-common/lib/Lemonldap/NG/Common/Apache/Session/REST.pm b/lemonldap-ng-common/lib/Lemonldap/NG/Common/Apache/Session/REST.pm index 4a319bc3d..2e78370bc 100644 --- a/lemonldap-ng-common/lib/Lemonldap/NG/Common/Apache/Session/REST.pm +++ b/lemonldap-ng-common/lib/Lemonldap/NG/Common/Apache/Session/REST.pm @@ -397,7 +397,7 @@ L =head1 DOWNLOAD Lemonldap::NG is available at -L +L =head1 COPYRIGHT AND LICENSE diff --git a/lemonldap-ng-common/lib/Lemonldap/NG/Common/Apache/Session/SOAP.pm b/lemonldap-ng-common/lib/Lemonldap/NG/Common/Apache/Session/SOAP.pm index 452b0a92a..8fe7bb855 100644 --- a/lemonldap-ng-common/lib/Lemonldap/NG/Common/Apache/Session/SOAP.pm +++ b/lemonldap-ng-common/lib/Lemonldap/NG/Common/Apache/Session/SOAP.pm @@ -418,7 +418,7 @@ L =head1 DOWNLOAD Lemonldap::NG is available at -L +L =head1 COPYRIGHT AND LICENSE diff --git a/lemonldap-ng-common/lib/Lemonldap/NG/Common/Apache/Session/Serialize/JSON.pm b/lemonldap-ng-common/lib/Lemonldap/NG/Common/Apache/Session/Serialize/JSON.pm index 8f0fa1f82..75079af6e 100644 --- a/lemonldap-ng-common/lib/Lemonldap/NG/Common/Apache/Session/Serialize/JSON.pm +++ b/lemonldap-ng-common/lib/Lemonldap/NG/Common/Apache/Session/Serialize/JSON.pm @@ -95,7 +95,7 @@ L =head1 DOWNLOAD Lemonldap::NG is available at -L +L =head1 COPYRIGHT AND LICENSE diff --git a/lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf.pm b/lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf.pm index 6fd0bba4f..dd8f2b26e 100644 --- a/lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf.pm +++ b/lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf.pm @@ -601,7 +601,7 @@ L =head1 DOWNLOAD Lemonldap::NG is available at -L +L =head1 COPYRIGHT AND LICENSE diff --git a/lemonldap-ng-common/lib/Lemonldap/NG/Common/PSGI.pm b/lemonldap-ng-common/lib/Lemonldap/NG/Common/PSGI.pm index 93cf6a8af..dcf7d8e43 100644 --- a/lemonldap-ng-common/lib/Lemonldap/NG/Common/PSGI.pm +++ b/lemonldap-ng-common/lib/Lemonldap/NG/Common/PSGI.pm @@ -536,7 +536,7 @@ L =head1 DOWNLOAD Lemonldap::NG is available at -L +L =head1 COPYRIGHT AND LICENSE diff --git a/lemonldap-ng-common/lib/Lemonldap/NG/Common/PSGI/Request.pm b/lemonldap-ng-common/lib/Lemonldap/NG/Common/PSGI/Request.pm index 85cc4631f..3dcf9b222 100644 --- a/lemonldap-ng-common/lib/Lemonldap/NG/Common/PSGI/Request.pm +++ b/lemonldap-ng-common/lib/Lemonldap/NG/Common/PSGI/Request.pm @@ -251,7 +251,7 @@ L =head1 DOWNLOAD Lemonldap::NG is available at -L +L =head1 COPYRIGHT AND LICENSE diff --git a/lemonldap-ng-common/lib/Lemonldap/NG/Common/PSGI/Router.pm b/lemonldap-ng-common/lib/Lemonldap/NG/Common/PSGI/Router.pm index e1a364a5c..5d5add3d0 100644 --- a/lemonldap-ng-common/lib/Lemonldap/NG/Common/PSGI/Router.pm +++ b/lemonldap-ng-common/lib/Lemonldap/NG/Common/PSGI/Router.pm @@ -369,7 +369,7 @@ L =head1 DOWNLOAD Lemonldap::NG is available at -L +L =head1 COPYRIGHT AND LICENSE diff --git a/lemonldap-ng-common/lib/Lemonldap/NG/Common/Util.pm b/lemonldap-ng-common/lib/Lemonldap/NG/Common/Util.pm index f916d8b9c..8bc31a552 100644 --- a/lemonldap-ng-common/lib/Lemonldap/NG/Common/Util.pm +++ b/lemonldap-ng-common/lib/Lemonldap/NG/Common/Util.pm @@ -92,7 +92,7 @@ L =head1 DOWNLOAD Lemonldap::NG is available at -L +L =head1 COPYRIGHT AND LICENSE diff --git a/lemonldap-ng-common/scripts/convertConfig b/lemonldap-ng-common/scripts/convertConfig index b182440d9..2ca87d784 100755 --- a/lemonldap-ng-common/scripts/convertConfig +++ b/lemonldap-ng-common/scripts/convertConfig @@ -188,7 +188,7 @@ L =head1 DOWNLOAD Lemonldap::NG is available at -L +L =head1 COPYRIGHT AND LICENSE diff --git a/lemonldap-ng-common/scripts/convertSessions b/lemonldap-ng-common/scripts/convertSessions index 66e1465a4..773f24ce7 100755 --- a/lemonldap-ng-common/scripts/convertSessions +++ b/lemonldap-ng-common/scripts/convertSessions @@ -278,5 +278,5 @@ L =head1 DOWNLOAD Lemonldap::NG is available at -L +L diff --git a/lemonldap-ng-common/scripts/importMetadata b/lemonldap-ng-common/scripts/importMetadata old mode 100644 new mode 100755 index c9c57952b..cab1f1641 --- a/lemonldap-ng-common/scripts/importMetadata +++ b/lemonldap-ng-common/scripts/importMetadata @@ -2,6 +2,7 @@ use strict; use Getopt::Long; +use Pod::Usage; use Lemonldap::NG::Common::Conf; use LWP::UserAgent; use MIME::Base64; @@ -30,31 +31,8 @@ my $result = GetOptions( 'dry-run|n' ); -#============================================================================== -# Help -#============================================================================== -if ( $opts{help} or !$opts{metadata} ) { - print STDERR -"\nScript to import SAML metadata bundle file into LL::NG configuration\n\n"; - print STDERR "Usage: $0 -m \n\n"; - print STDERR "Options:\n"; - print STDERR - "\t-i (--idpconfprefix): Prefix used to set IDP configuration key\n"; - print STDERR "\t-h (--help): print this message\n"; - print STDERR "\t-m (--metadata): URL of metadata document\n"; - print STDERR - "\t-s (--spconfprefix): Prefix used to set SP configuration key\n"; - print STDERR -"\t--ignore-sp: ignore SP maching this entityID (can be specified multiple times)\n"; - print STDERR -"\t--ignore-idp: ignore IdP matching this entityID (can be specified multiple times)\n"; - print STDERR "\t-a (--nagios) : output statistics in Nagios format\n"; - print STDERR "\t-n (--dry-run): print statistics but do not apply changes\n"; - print STDERR "\t-v (--verbose): increase verbosity of output\n"; - print STDERR -"\t-r (--remove): remove provider from LemonLDAP::NG if it does not appear in metadata\n"; - exit 1; -} +pod2usage(1) if $opts{help}; +pod2usage( -message => "Missing metadata URL (-m)", -exitval => 2) if !$opts{metadata}; #============================================================================== # Default values @@ -558,3 +536,105 @@ else { exit $exitCode; +__END__ +Script to import SAML metadata bundle file into LL::NG configuration\n\n"; +Usage: $0 -m \n\n"; +Options:\n"; + +=encoding UTF-8 + +=head1 NAME + +importMetadata - Script to import SAML federation metadata into LL::NG configuration + +=head1 SYNOPSIS + +importMetadata -m [options] + +Options: + + -m, --metadata URL of metadata document + -i, --idpconfprefix Prefix used to set IDP configuration key + -s, --spconfprefix Prefix used to set SP configuration key + --ignore-sp ignore SP maching this entityID (can be specified multiple times) + --ignore-idp ignore IdP matching this entityID (can be specified multiple times) + -a, --nagios output statistics in Nagios format + -r, --remove remove provider from LemonLDAP::NG if it does not appear in metadata + -n, --dry-run print statistics but do not apply changes + -v, --verbose increase verbosity of output + -h, --help print full documentation + +=head1 OPTIONS + +=over + +=item B<-m I>, B<--metadata=I> + +Specifies the of the metadata document to import + +=item B<-i I>, B<--idpconfprefix=I> + +Prefix each IDP found the metadata document with the when registring +them into LemonLDAP::NG + +=item B<-s I>, B<--spconfprefix=I> + +Prefix each SP found the metadata document with the when registring +them into LemonLDAP::NG + +=item B<--ignore-sp=I> + +Ignore the specified Service Provider . It will not be added, updated +or deleted from LemonLDAP::NG configuration + +=item B<--ignore-idp=I> + +Ignore the specified Identity Provider . It will not be added, +updated or deleted from LemonLDAP::NG configuration + +=item B<-a>, B<--nagios> + +After each run, print statistics about added/modified/deleted items in Nagios +format + +=item B<-r>, B<--remove> + +If this option is used, after a successful import, existing SP/IDPs who match +the configuration prefix will be removed from LemonLDAP::NG if they were not +present in the imported metadata + +=item B<-n>, B<--dry-run> + +This option prevents the modified configuration from being saved. It can be used for testing. + +=item B<-v>, B<--verbose> + +Increase verbosity during script execution + +=item B<-h>, B<--help> + +Displays the script's documentation + +=back + +=head1 SEE ALSO + +L + +=head1 AUTHORS + +=over + +=item Clement Oudot, Eclement@oodo.netE + +=back + +=head1 BUG REPORT + +Use OW2 system to report bug or ask for features: +L + +=head1 DOWNLOAD + +Lemonldap::NG is available at +L diff --git a/lemonldap-ng-handler/lib/Lemonldap/NG/Handler.pm b/lemonldap-ng-handler/lib/Lemonldap/NG/Handler.pm index af3d164d7..0bc644e9e 100644 --- a/lemonldap-ng-handler/lib/Lemonldap/NG/Handler.pm +++ b/lemonldap-ng-handler/lib/Lemonldap/NG/Handler.pm @@ -42,7 +42,7 @@ L =head1 DOWNLOAD Lemonldap::NG is available at -L +L =head1 COPYRIGHT AND LICENSE diff --git a/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/ApacheMP2/FCGIClient.pm b/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/ApacheMP2/FCGIClient.pm index 86e011756..702f5a010 100644 --- a/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/ApacheMP2/FCGIClient.pm +++ b/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/ApacheMP2/FCGIClient.pm @@ -160,7 +160,7 @@ L =head1 DOWNLOAD Lemonldap::NG is available at -L +L =head1 COPYRIGHT AND LICENSE diff --git a/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/PSGI.pm b/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/PSGI.pm index 1581bdb47..a457d7b7f 100644 --- a/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/PSGI.pm +++ b/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/PSGI.pm @@ -130,7 +130,7 @@ L =head1 DOWNLOAD Lemonldap::NG is available at -L +L =head1 COPYRIGHT AND LICENSE diff --git a/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/PSGI/Router.pm b/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/PSGI/Router.pm index bc74ce0dc..a8b8ec55b 100644 --- a/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/PSGI/Router.pm +++ b/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/PSGI/Router.pm @@ -137,7 +137,7 @@ L =head1 DOWNLOAD Lemonldap::NG is available at -L +L =head1 COPYRIGHT AND LICENSE diff --git a/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/PSGI/Try.pm b/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/PSGI/Try.pm index 540f3a5e0..19a729927 100644 --- a/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/PSGI/Try.pm +++ b/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/PSGI/Try.pm @@ -188,7 +188,7 @@ L =head1 DOWNLOAD Lemonldap::NG is available at -L +L =head1 COPYRIGHT AND LICENSE diff --git a/lemonldap-ng-handler/lib/Plack/Middleware/Auth/LemonldapNG.pm b/lemonldap-ng-handler/lib/Plack/Middleware/Auth/LemonldapNG.pm index a2834422b..74ccd0ea4 100644 --- a/lemonldap-ng-handler/lib/Plack/Middleware/Auth/LemonldapNG.pm +++ b/lemonldap-ng-handler/lib/Plack/Middleware/Auth/LemonldapNG.pm @@ -107,7 +107,7 @@ L =head1 DOWNLOAD Lemonldap::NG is available at -L +L =head1 COPYRIGHT AND LICENSE diff --git a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager.pm b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager.pm index a0dbb330d..91e255cb9 100644 --- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager.pm +++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager.pm @@ -369,7 +369,7 @@ see L before. =head1 DOWNLOAD Lemonldap::NG is available at -L +L =head1 COPYRIGHT AND LICENSE diff --git a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build.pm b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build.pm index 12e9585e2..eedec9537 100644 --- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build.pm +++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build.pm @@ -1006,7 +1006,7 @@ see L before. =head1 DOWNLOAD Lemonldap::NG is available at -L +L =head1 COPYRIGHT AND LICENSE diff --git a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Cli.pm b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Cli.pm index 1abcc1685..8d22b7424 100644 --- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Cli.pm +++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Cli.pm @@ -654,7 +654,7 @@ L =head1 DOWNLOAD Lemonldap::NG is available at -L +L =head1 COPYRIGHT AND LICENSE diff --git a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Parser.pm b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Parser.pm index edeeaeab3..a79d04d55 100644 --- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Parser.pm +++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Parser.pm @@ -1411,7 +1411,7 @@ ticket. =head1 DOWNLOAD Lemonldap::NG is available at -L +L =head1 COPYRIGHT AND LICENSE diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/ar.json b/lemonldap-ng-manager/site/htdocs/static/languages/ar.json index 7ebcf1f7c..1833c1b2e 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/ar.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/ar.json @@ -174,17 +174,17 @@ "certificateResetByMailStep1Body":"Reset mail content", "certificateResetByMailStep1Subject":"Reset mail subject", "certificateResetByMailStep2Body":"Confirmation mail content", -"certificateResetByMailStep2Subject":"Confirmation mail subject", +"certificateResetByMailStep2Subject":"تأكيد عنوان بريد", "certificateResetByMailURL":"Reset page URL", "certificateResetByMailValidityDelay":"Minimum duration before expiration", "cfgLog":"Summary", "cfgVersion":"عملية ضبط الإصدارات", -"checkDevOps":"Activation", +"checkDevOps":"تفعيل", "checkDevOpsDownload":"Download file", "checkState":"تفعيل", "checkStateSecret":"سر مشترك", "checkUser":"تفعيل", -"checkUserDisplay":"Display", +"checkUserDisplay":"عرض", "checkUserDisplayComputedSession":"Computed sessions", "checkUserDisplayEmptyHeaders":"Empty headers", "checkUserDisplayEmptyValues":"Empty values", @@ -239,7 +239,7 @@ "corsMax_Age":"Access-Control-Max-Age", "create":"أحدث", "crossOrigineResourceSharing":"Cross-Origin Resource Sharing", -"crowdsec":"Activation", +"crowdsec":"تفعيل", "crowdsecAction":"Action", "crowdsecKey":"API key", "crowdsecUrl":"Base URL of local API", @@ -290,10 +290,10 @@ "dbiPassword":"كلمة المرور ", "dbiPasswordMailCol":"اسم حقل البريد", "dbiSchema":"مخطط", -"dbiUserChain":"Chain", -"dbiUserPassword":"Password", +"dbiUserChain":"سلسلة", +"dbiUserPassword":"كلمة المرور", "dbiUserTable":"جدول المستخدم", -"dbiUserUser":"User", +"dbiUserUser":"المستخدم", "decryptValue":"Decrypt value", "decryptValueFunctions":"Decrypt functions", "decryptValueRule":"استخدام القاعدة", @@ -351,7 +351,7 @@ "facebookUserField":"Field containing user identifier", "failedLoginNumber":"عدد عمليات تسجيل الدخول الفاشلة المسجلة", "fileToUpload":"الملف الذي ستحمله", -"findUser":"Activation", +"findUser":"تفعيل", "findUserControl":"Parameters control", "findUserExcludingAttributes":"Excluding attributes", "findUserSearchingAttributes":"Searching attributes", @@ -366,7 +366,7 @@ "friendlyName":"اسم مألوف", "generalParameters":"المعاييرالعامة", "githubAuthnLevel":"مستوى إثبات الهوية", -"githubClientID":"Client ID", +"githubClientID":"معرف العميل", "githubClientSecret":"سرالعميل", "githubParams":"GitHub Parameters", "githubScope":"نطاق", diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/es.json b/lemonldap-ng-manager/site/htdocs/static/languages/es.json index 108428ced..77627770b 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/es.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/es.json @@ -179,7 +179,7 @@ "certificateResetByMailValidityDelay":"Duración mínima antes de la caducidad", "cfgLog":"Sumario", "cfgVersion":"Configuration version", -"checkDevOps":"Activation", +"checkDevOps":"Activación", "checkDevOpsDownload":"Download file", "checkState":"Activación", "checkStateSecret":"Secreto compartido", @@ -290,8 +290,8 @@ "dbiPassword":"Password", "dbiPasswordMailCol":"Nombre de campo de Correo", "dbiSchema":"Esquema", -"dbiUserChain":"Chain", -"dbiUserPassword":"Password", +"dbiUserChain":"Cadena", +"dbiUserPassword":"Contraseña", "dbiUserTable":"Tabla de usuario", "dbiUserUser":"User", "decryptValue":"Decrypt value", @@ -878,7 +878,7 @@ "restPasswordServer":"Password reset server", "restPwdConfirmUrl":"URL de confirmación de contraseña", "restPwdModifyUrl":"URL de cambio de contraseña", -"restServices":"REST services", +"restServices":"Servicio REST", "restSessionServer":"Session server", "restUserDBUrl":"URL de datos de usuario", "restore":"Restaurar", @@ -1079,7 +1079,7 @@ "slaveParams":"Parámetros esclavos", "slaveUserHeader":"Cabecera para login de usuario", "soapConfigServer":"Configuration server", -"soapServices":"SOAP services", +"soapServices":"Servicio SOAP", "soapSessionServer":"Session server", "specialRule":"Regla especial", "sslByAjax":"Usar solicitud Ajax", diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/it.json b/lemonldap-ng-manager/site/htdocs/static/languages/it.json index d3f3ccb2a..0189b8f07 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/it.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/it.json @@ -878,7 +878,7 @@ "restPasswordServer":"Password reset server", "restPwdConfirmUrl":"URL di conferma password", "restPwdModifyUrl":"URL di modifica password", -"restServices":"REST services", +"restServices":"Servizio REST", "restSessionServer":"Session server", "restUserDBUrl":"URL dei dati utente", "restore":"Ristabilire", diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/pl.json b/lemonldap-ng-manager/site/htdocs/static/languages/pl.json index 767d0b986..818560214 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/pl.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/pl.json @@ -290,8 +290,8 @@ "dbiPassword":"Hasło", "dbiPasswordMailCol":"Nazwa pola poczty", "dbiSchema":"Schemat", -"dbiUserChain":"Chain", -"dbiUserPassword":"Password", +"dbiUserChain":"Łańcuch", +"dbiUserPassword":"Hasło", "dbiUserTable":"Tabela użytkowników", "dbiUserUser":"User", "decryptValue":"Odszyfruj wartość", @@ -878,7 +878,7 @@ "restPasswordServer":"Password reset server", "restPwdConfirmUrl":"Adres URL potwierdzenia hasła", "restPwdModifyUrl":"URL zmiany hasła", -"restServices":"REST services", +"restServices":"Usługa REST", "restSessionServer":"Session server", "restUserDBUrl":"Adres URL danych użytkownika", "restore":"Przywróć", diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/vi.json b/lemonldap-ng-manager/site/htdocs/static/languages/vi.json index 1174bb118..2ade74f96 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/vi.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/vi.json @@ -878,7 +878,7 @@ "restPasswordServer":"Password reset server", "restPwdConfirmUrl":"URL xác nhận mật khẩu", "restPwdModifyUrl":"URL thay đổi mật khẩu", -"restServices":"REST services", +"restServices":"Dịch vụ REST", "restSessionServer":"Session server", "restUserDBUrl":"URL dữ liệu người dùng", "restore":"Khôi phục", diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/zh_TW.json b/lemonldap-ng-manager/site/htdocs/static/languages/zh_TW.json index b0ee5b87b..4eeee7afb 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/zh_TW.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/zh_TW.json @@ -290,10 +290,10 @@ "dbiPassword":"密碼", "dbiPasswordMailCol":"郵件欄位名稱", "dbiSchema":"結構", -"dbiUserChain":"Chain", -"dbiUserPassword":"Password", +"dbiUserChain":"鏈", +"dbiUserPassword":"密碼", "dbiUserTable":"使用者表格", -"dbiUserUser":"User", +"dbiUserUser":"使用者", "decryptValue":"解密值", "decryptValueFunctions":"解密函式", "decryptValueRule":"使用規則", diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal.pm index b95cdbf2b..84df29f64 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal.pm @@ -158,7 +158,7 @@ L =head1 DOWNLOAD Lemonldap::NG is available at -L +L =head1 COPYRIGHT AND LICENSE diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth.pod b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth.pod index b3c4d1a3f..1d1383c1e 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth.pod +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth.pod @@ -201,7 +201,7 @@ L =head1 DOWNLOAD Lemonldap::NG is available at -L +L =head1 COPYRIGHT AND LICENSE diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/CDC.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/CDC.pm index 40099aa00..0c68efacc 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/CDC.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/CDC.pm @@ -233,7 +233,7 @@ L =head1 DOWNLOAD Lemonldap::NG is available at -L +L =head1 COPYRIGHT AND LICENSE 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 f32fd3633..8f3b53407 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/CAS.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/CAS.pm @@ -649,7 +649,7 @@ L =head1 DOWNLOAD Lemonldap::NG is available at -L +L =head1 COPYRIGHT AND LICENSE diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/OpenID/Server.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/OpenID/Server.pm index cfa6fe278..98c72a240 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/OpenID/Server.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/OpenID/Server.pm @@ -210,7 +210,7 @@ L =head1 DOWNLOAD Lemonldap::NG is available at -L +L =head1 COPYRIGHT AND LICENSE 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 7b7f9e699..821b734bc 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/OpenIDConnect.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/OpenIDConnect.pm @@ -2283,7 +2283,7 @@ L =head1 DOWNLOAD Lemonldap::NG is available at -L +L =head1 COPYRIGHT AND LICENSE diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/SAML.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/SAML.pm index 941544e37..c5f53e964 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/SAML.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/SAML.pm @@ -3650,7 +3650,7 @@ L =head1 DOWNLOAD Lemonldap::NG is available at -L +L =head1 COPYRIGHT AND LICENSE diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Issuer.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Issuer.pm index 05eaca668..5b9a1bf8c 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Issuer.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Issuer.pm @@ -396,7 +396,7 @@ L =head1 DOWNLOAD Lemonldap::NG is available at -L +L =head1 COPYRIGHT AND LICENSE diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Plugin.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Plugin.pm index d5bd35963..61e694449 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Plugin.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Plugin.pm @@ -404,7 +404,7 @@ L =head1 DOWNLOAD Lemonldap::NG is available at -L +L =head1 COPYRIGHT AND LICENSE 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 1e2882e5a..f6b635e54 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Request.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Request.pm @@ -313,7 +313,7 @@ L =head1 DOWNLOAD Lemonldap::NG is available at -L +L =head1 COPYRIGHT AND LICENSE diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/SecondFactor.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/SecondFactor.pm index 524d7485f..982e604e9 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/SecondFactor.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/SecondFactor.pm @@ -322,7 +322,7 @@ L =head1 DOWNLOAD Lemonldap::NG is available at -L +L =head1 COPYRIGHT AND LICENSE diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/PublicPages.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/PublicPages.pm index 6383ee72c..35bdddb29 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/PublicPages.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/PublicPages.pm @@ -114,7 +114,7 @@ L =head1 DOWNLOAD Lemonldap::NG is available at -L +L =head1 COPYRIGHT AND LICENSE diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/UserDB.pod b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/UserDB.pod index bf8902945..4499a6adf 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/UserDB.pod +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/UserDB.pod @@ -170,7 +170,7 @@ L =head1 DOWNLOAD Lemonldap::NG is available at -L +L =head1 COPYRIGHT AND LICENSE diff --git a/lemonldap-ng-portal/site/cron/purgeCentralCache b/lemonldap-ng-portal/site/cron/purgeCentralCache index 7b476e9c2..665da37f9 100755 --- a/lemonldap-ng-portal/site/cron/purgeCentralCache +++ b/lemonldap-ng-portal/site/cron/purgeCentralCache @@ -144,8 +144,7 @@ for my $options (@backends) { next if ( $options->{backend} eq "Apache::Session::Memcached" ); my @t; if ( $options->{backend}->can('deleteIfLowerThan') ) { - next - if $options->{backend}->deleteIfLowerThan( + my ( $success, $rows ) = $options->{backend}->deleteIfLowerThan( $options, { not => { '_session_kind' => 'Persistent' }, @@ -158,7 +157,14 @@ for my $options (@backends) { ) } } - ); + ); + + if ($success) { + if ($rows) { + $nb_purged += $rows; + } + next; + } } # Get all expired sessions diff --git a/lemonldap-ng-portal/site/htdocs/static/languages/ar.json b/lemonldap-ng-portal/site/htdocs/static/languages/ar.json index ad81da844..cd0d68381 100644 --- a/lemonldap-ng-portal/site/htdocs/static/languages/ar.json +++ b/lemonldap-ng-portal/site/htdocs/static/languages/ar.json @@ -188,7 +188,7 @@ "lastFailedLogins":"عمليات تسجيل الدخول الأخيرة الغير الناجحة", "lastFailedLoginsCaptionLabel":"Last failed logins", "lastLogins":"آخر تسجيلات دخول", -"lastLoginsCaptionLabel":"Last logins", +"lastLoginsCaptionLabel":"آخر تسجيلات دخول", "lastName":"اسم العائلة", "linkValidUntil":"تحتوي هذه الرسالة على رابط لإعادة تعيين كلمة المرور، وهذا الرابط صالح حتى", "linkValidUntilCertif":"This message contains a link to reset your certificate, this link is valid until ", diff --git a/lemonldap-ng-portal/site/templates/bootstrap/captcha.tpl b/lemonldap-ng-portal/site/templates/bootstrap/captcha.tpl index 408aef804..cff170998 100644 --- a/lemonldap-ng-portal/site/templates/bootstrap/captcha.tpl +++ b/lemonldap-ng-portal/site/templates/bootstrap/captcha.tpl @@ -5,7 +5,7 @@
- common/icons/arrow_refresh.png" alt="Renew Captcha" title="Renew Captcha" class="img-thumbnail mb-3" /> + common/icons/arrow_refresh.png" alt="Renew Captcha" title="Renew Captcha" class="img-thumbnail mb-3" autocomplete="one-time-code" />
diff --git a/lemonldap-ng-portal/site/templates/bootstrap/certificateReset.tpl b/lemonldap-ng-portal/site/templates/bootstrap/certificateReset.tpl index f44ac7705..240330c6d 100644 --- a/lemonldap-ng-portal/site/templates/bootstrap/certificateReset.tpl +++ b/lemonldap-ng-portal/site/templates/bootstrap/certificateReset.tpl @@ -25,7 +25,7 @@
- " class="form-control" trplaceholder="mail" required /> + " class="form-control" trplaceholder="mail" required />
diff --git a/lemonldap-ng-portal/site/templates/bootstrap/checkdevops.tpl b/lemonldap-ng-portal/site/templates/bootstrap/checkdevops.tpl index e8a60724e..90f647791 100644 --- a/lemonldap-ng-portal/site/templates/bootstrap/checkdevops.tpl +++ b/lemonldap-ng-portal/site/templates/bootstrap/checkdevops.tpl @@ -33,7 +33,7 @@ " /> - " trplaceholder="URL / DNS" aria-required="true"/> + " trplaceholder="URL / DNS" aria-required="true" autocomplete="url" />
diff --git a/lemonldap-ng-portal/site/templates/bootstrap/checkuser.tpl b/lemonldap-ng-portal/site/templates/bootstrap/checkuser.tpl index 2b854ae7d..912fd9d4c 100644 --- a/lemonldap-ng-portal/site/templates/bootstrap/checkuser.tpl +++ b/lemonldap-ng-portal/site/templates/bootstrap/checkuser.tpl @@ -17,7 +17,7 @@
- " trplaceholder="URL / DNS" aria-required="true"/> + " trplaceholder="URL / DNS" aria-required="true" autocomplete="url" />