dani/lemonldap-ng
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'v2.0' into 2325

Browse Source
This commit is contained in:
Alexandre KARIM 2021-08-18 17:33:48 +02:00
commit 028addfbc6
66 changed files with 385 additions and 190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/liblemonldap-ng-common-perl.install vendored
View File

@ -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*

34
doc/sources/admin/documentation.rst
View File

@ -31,7 +31,7 @@ Installation and configuration
- `Version 2.0 </documentation/2.0/>`__ (stable)
- `Version 1.9 </documentation/1.9/>`__ (oldstable)
- Archived versions (unmaintained by `LLNG Team </team>`__ )
- Archived versions (unmaintained by LLNG Team )
- `Version 1.4 </documentation/1.4/>`__
- `Version 1.3 </documentation/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 <https://security-tracker.debian.org/tracker/source-package/lemonldap-ng>`__
=========== ======================== ======================================== ===================================================== ============================================================ =============================== =============================================================
Debian dist LLNG version Secured Maintenance LTS Limit `Extended LTS <https://wiki.debian.org/LTS/Extended>`__ Limit
=========== ======================== ======================================== ===================================================== ============================================================ =============================== =============================================================
*6* *Squeeze* *0.9.4.1* |maybe| No known vulnerability *None* *February 2016* *April 2019*
**7** Wheezy `1.1.2 </documentation/1.1/>`__ |maybe| No known vulnerability **None** [1]_ May 2018 Probably 2021
**8** Jessie `1.3.3 </documentation/1.3/>`__ |clean| CVE-2019-19791 tagged as minor **None** [1]_ June 2020 Probably 2023
**9** Stretch `1.9.7 </documentation/1.9/>`__ |clean| CVE-2019-19791 tagged as minor `Debian LTS Team <https://www.debian.org/lts/>`__ June 2022
\ *Stretch-backports* `2.0.2 </documentation/2.0/>`__ |bad| CVE-2019-12046, CVE-2019-13031, CVE-2019-15941 *None* *June 2019*
\ Stretch-backports-sloppy `2.0.11 </documentation/2.0/>`__ |maybe| *Maybe none*, "best effort" [3]_ Until Debian 11 release [4]_
**10** Buster `2.0.2 </documentation/2.0/>`__ |clean| CVE-2019-19791 tagged as minor `Debian Security Team <https://security-team.debian.org/>`__ Probably July 2024
\ Buster-backports `2.0.11 </documentation/2.0/>`__ |clean| `LLNG Team </team>`, "best effort" [3]_ Until Debian 11 release [4]_
\ Bullseye `2.0.11 </documentation/2.0/>`__ |clean| `Debian Security Team <https://security-team.debian.org/>`__ Probably July 2026
**Next** Testing Latest [5]_ |clean| `LLNG Team </team>`__
=========== ======================== ======================================== ===================================================== ============================================================ =============================== =============================================================
=========== ========================== ======================================== ===================================================== ============================================================ =============================== =============================================================
Debian dist LLNG version Secured Maintenance LTS Limit `Extended LTS <https://wiki.debian.org/LTS/Extended>`__ Limit
=========== ========================== ======================================== ===================================================== ============================================================ =============================== =============================================================
*6* *Squeeze* *0.9.4.1* |maybe| No known vulnerability *None* *February 2016* *April 2019*
*7* *Wheezy* `1.1.2 </documentation/1.1/>`__ |maybe| No known vulnerability *None* *May 2018* *June 2020*
**8** Jessie `1.3.3 </documentation/1.3/>`__ |clean| CVE-2019-19791 tagged as minor **None** [1]_ June 2020 June 2022
**9** Stretch `1.9.7 </documentation/1.9/>`__ |clean| CVE-2019-19791 tagged as minor `Debian LTS Team <https://www.debian.org/lts/>`__ June 2022 Probably 2024
\ *Stretch-backports* `2.0.2 </documentation/2.0/>`__ |bad| CVE-2019-12046, CVE-2019-13031, CVE-2019-15941 *None* *June 2019*
\ *Stretch-backports-sloppy* `2.0.11 </documentation/2.0/>`__ |maybe| *None* *August 2021*
**10** Buster `2.0.2 </documentation/2.0/>`__ |clean| CVE-2019-19791 tagged as minor `Debian Security Team <https://security-team.debian.org/>`__ June 2024 Probably 2026
\ *Buster-backports* `2.0.11 </documentation/2.0/>`__ |clean| *None* *August 2021*
\ Buster-backports-sloppy `2.0.11 </documentation/2.0/>`__ |clean| LLNG Team, "best effort" [3]_ Until Debian 12 release [4]_
**11** Bullseye `2.0.11 </documentation/2.0/>`__ |clean| `Debian Security Team <https://security-team.debian.org/>`__ July 2026 Probably 2028
\ Bullseye-backports `2.0.11 </documentation/2.0/>`__ |clean| LLNG Team, "best effort" [3]_ Until Debian 12 release [4]_
**Next** Testing/Unstable Latest [5]_ |clean| LLNG Team
=========== ========================== ======================================== ===================================================== ============================================================ =============================== =============================================================
See `Debian Security
Tracker <https://security-tracker.debian.org/tracker/source-package/lemonldap-ng>`__
@ -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

41
doc/sources/admin/upgrade_2_0_x.rst
View File

@ -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 ``<TMPL_VAR NAME="session_cn" ESCAPE=HTML>``, and for other variables, replace for example ``$url`` by ``<TMPL_VAR NAME="url" ESCAPE=HTML>``.
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``
- ``<TMPL_VAR NAME="code" ESCAPE=HTML>``
* - ``$url``
- ``<TMPL_VAR NAME="url" ESCAPE=HTML>``
* - ``$login``
- ``<TMPL_VAR NAME="login" ESCAPE=HTML>``
* - ``$password``
- ``<TMPL_VAR NAME="password" ESCAPE=HTML>``
* - ``$firstname``
- ``<TMPL_VAR NAME="firstname" ESCAPE=HTML>``
* - ``$lastname``
- ``<TMPL_VAR NAME="lastname" ESCAPE=HTML>``
Replace all other variables such as ``$cn`` by ``<TMPL_VAR NAME="session_cn" ESCAPE=HTML>``.
Login form
^^^^^^^^^^
To benefit from the new feature allowing to show password on login form, adapt ``standardform.tpl`` (see `changes <https://gitlab.ow2.org/lemonldap-ng/lemonldap-ng/-/commit/bdeb1e70d98ddc89316b0912d9d5ee6d11d0bee5#fbbcec1fdc36cc042eeaa83274a32ef2231fe977_23_23>`__)
To disable password store in browser when changing password (this was already possible for login form), adapt ``password.tpl`` (see `changes <https://gitlab.ow2.org/lemonldap-ng/lemonldap-ng/-/commit/466b6a3241fff5013d27b3dd22982e5e26ed7dfb#0ae060b3d1e289f08f510c268ed72de5dcafe425_36_35>`__)
To fix placeholder display in password field when password store is disabled in browser, adapt ``password.tpl`` (see `changes <https://gitlab.ow2.org/lemonldap-ng/lemonldap-ng/-/commit/547d80985290495d33ed72a388e9ddf482980354#fbbcec1fdc36cc042eeaa83274a32ef2231fe977_21_20>`__)
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
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

2
fastcgi-server/man/llng-fastcgi-server.8p
View File

@ -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
<http://forge.objectweb.org/project/showfiles.php?group_id=274>
<https://lemonldap-ng.org/download>
.SH "COPYRIGHT AND LICENSE"
.IX Header "COPYRIGHT AND LICENSE"
.IP "Copyright (C) 2008\-2016 by Xavier Guimard, <x.guimard@free.fr>" 4

2
fastcgi-server/sbin/llng-fastcgi-server
View File

@ -290,7 +290,7 @@ L<https://gitlab.ow2.org/lemonldap-ng/lemonldap-ng/issues>
=head1 DOWNLOAD
Lemonldap::NG is available at
L<http://forge.objectweb.org/project/showfiles.php?group_id=274>
L<https://lemonldap-ng.org/download>
=head1 COPYRIGHT AND LICENSE

2
lemonldap-ng-common/META.json
View File

@ -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",

2
lemonldap-ng-common/META.yml
View File

@ -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'

3
lemonldap-ng-common/Makefile.PL
View File

@ -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',
},
);

2
lemonldap-ng-common/lib/Lemonldap/NG/Common.pm
View File

@ -38,7 +38,7 @@ L<https://gitlab.ow2.org/lemonldap-ng/lemonldap-ng/issues>
=head1 DOWNLOAD
Lemonldap::NG is available at
L<http://forge.objectweb.org/project/showfiles.php?group_id=274>
L<https://lemonldap-ng.org/download>
=head1 COPYRIGHT AND LICENSE

2
lemonldap-ng-common/lib/Lemonldap/NG/Common/Apache/Session/REST.pm
View File

@ -397,7 +397,7 @@ L<https://gitlab.ow2.org/lemonldap-ng/lemonldap-ng/issues>
=head1 DOWNLOAD
Lemonldap::NG is available at
L<http://forge.objectweb.org/project/showfiles.php?group_id=274>
L<https://lemonldap-ng.org/download>
=head1 COPYRIGHT AND LICENSE

2
lemonldap-ng-common/lib/Lemonldap/NG/Common/Apache/Session/SOAP.pm
View File

@ -418,7 +418,7 @@ L<https://gitlab.ow2.org/lemonldap-ng/lemonldap-ng/issues>
=head1 DOWNLOAD
Lemonldap::NG is available at
L<http://forge.objectweb.org/project/showfiles.php?group_id=274>
L<https://lemonldap-ng.org/download>
=head1 COPYRIGHT AND LICENSE

2
lemonldap-ng-common/lib/Lemonldap/NG/Common/Apache/Session/Serialize/JSON.pm
View File

@ -95,7 +95,7 @@ L<https://gitlab.ow2.org/lemonldap-ng/lemonldap-ng/issues>
=head1 DOWNLOAD
Lemonldap::NG is available at
L<http://forge.objectweb.org/project/showfiles.php?group_id=274>
L<https://lemonldap-ng.org/download>
=head1 COPYRIGHT AND LICENSE

2
lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf.pm
View File

@ -601,7 +601,7 @@ L<https://gitlab.ow2.org/lemonldap-ng/lemonldap-ng/issues>
=head1 DOWNLOAD
Lemonldap::NG is available at
L<http://forge.objectweb.org/project/showfiles.php?group_id=274>
L<https://lemonldap-ng.org/download>
=head1 COPYRIGHT AND LICENSE

2
lemonldap-ng-common/lib/Lemonldap/NG/Common/PSGI.pm
View File

@ -536,7 +536,7 @@ L<https://gitlab.ow2.org/lemonldap-ng/lemonldap-ng/issues>
=head1 DOWNLOAD
Lemonldap::NG is available at
L<http://forge.objectweb.org/project/showfiles.php?group_id=274>
L<https://lemonldap-ng.org/download>
=head1 COPYRIGHT AND LICENSE

2
lemonldap-ng-common/lib/Lemonldap/NG/Common/PSGI/Request.pm
View File

@ -251,7 +251,7 @@ L<https://gitlab.ow2.org/lemonldap-ng/lemonldap-ng/issues>
=head1 DOWNLOAD
Lemonldap::NG is available at
L<http://forge.objectweb.org/project/showfiles.php?group_id=274>
L<https://lemonldap-ng.org/download>
=head1 COPYRIGHT AND LICENSE

2
lemonldap-ng-common/lib/Lemonldap/NG/Common/PSGI/Router.pm
View File

@ -369,7 +369,7 @@ L<https://gitlab.ow2.org/lemonldap-ng/lemonldap-ng/issues>
=head1 DOWNLOAD
Lemonldap::NG is available at
L<http://forge.objectweb.org/project/showfiles.php?group_id=274>
L<https://lemonldap-ng.org/download>
=head1 COPYRIGHT AND LICENSE

2
lemonldap-ng-common/lib/Lemonldap/NG/Common/Util.pm
View File

@ -92,7 +92,7 @@ L<https://gitlab.ow2.org/lemonldap-ng/lemonldap-ng/issues>
=head1 DOWNLOAD
Lemonldap::NG is available at
L<http://forge.objectweb.org/project/showfiles.php?group_id=274>
L<https://lemonldap-ng.org/download>
=head1 COPYRIGHT AND LICENSE

2
lemonldap-ng-common/scripts/convertConfig
View File

@ -188,7 +188,7 @@ L<https://gitlab.ow2.org/lemonldap-ng/lemonldap-ng/issues>
=head1 DOWNLOAD
Lemonldap::NG is available at
L<http://forge.objectweb.org/project/showfiles.php?group_id=274>
L<https://lemonldap-ng.org/download>
=head1 COPYRIGHT AND LICENSE

2
lemonldap-ng-common/scripts/convertSessions
View File

@ -278,5 +278,5 @@ L<https://gitlab.ow2.org/lemonldap-ng/lemonldap-ng/issues>
=head1 DOWNLOAD
Lemonldap::NG is available at
L<http://forge.objectweb.org/project/showfiles.php?group_id=274>
L<https://lemonldap-ng.org/download>

130
lemonldap-ng-common/scripts/importMetadata Normal file → Executable file
View File

@ -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 <metadata file URL>\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 <metadata file URL>\n\n";
Options:\n";
=encoding UTF-8
=head1 NAME
importMetadata - Script to import SAML federation metadata into LL::NG configuration
=head1 SYNOPSIS
importMetadata -m <metadata URL> [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<URL>>, B<--metadata=I<URL>>
Specifies the <URL> of the metadata document to import
=item B<-i I<PREFIX>>, B<--idpconfprefix=I<PREFIX>>
Prefix each IDP found the metadata document with the <PREFIX> when registring
them into LemonLDAP::NG
=item B<-s I<PREFIX>>, B<--spconfprefix=I<PREFIX>>
Prefix each SP found the metadata document with the <PREFIX> when registring
them into LemonLDAP::NG
=item B<--ignore-sp=I<ENTITYID>>
Ignore the specified Service Provider <ENTITYID>. It will not be added, updated
or deleted from LemonLDAP::NG configuration
=item B<--ignore-idp=I<ENTITYID>>
Ignore the specified Identity Provider <ENTITYID>. 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<http://lemonldap-ng.org/>
=head1 AUTHORS
=over
=item Clement Oudot, E<lt>clement@oodo.netE<gt>
=back
=head1 BUG REPORT
Use OW2 system to report bug or ask for features:
L<https://gitlab.ow2.org/lemonldap-ng/lemonldap-ng/issues>
=head1 DOWNLOAD
Lemonldap::NG is available at
L<https://lemonldap-ng.org/download>

199
lemonldap-ng-common/scripts/lemonldap-ng-cli
View File

@ -4,13 +4,14 @@ use warnings;
use strict;
use POSIX;
use Getopt::Long qw(:config pass_through);
use Pod::Usage;
our $opt_user = '__APACHEUSER__';
our $opt_group = '__APACHEGROUP__';
GetOptions(
"user=s" => \$opt_user,
"group=s" => \$opt_group
) or die("Error in command line arguments\n");
) or pod2usage("Error in command line arguments");
my $action;
@ -28,7 +29,7 @@ for ( my $i = 0 ; $i < @ARGV ; $i++ ) {
last;
}
$action ||= "help";
$action ||= "usage";
if ( $action =~
/^(?:[gs]et|del|(?:add|del)Key|(?:add|del)PostVars|save|restore|rollback)$/
@ -44,45 +45,10 @@ elsif ( $action =~ /^(?:info|update-cache|test-email)$/ ) {
Lemonldap::NG::Common::Cli->run(@ARGV);
}
else {
help();
pod2usage(1) if $action eq "help";
pod2usage(2) if $action eq "usage";
}
sub help {
print STDERR qq{Usage: $0 <options> action <parameters>
Available actions:
- help : print this
- info : get currentconfiguration info
- update-cache : force configuration cache to be updated
- test-email <destination> : send a test email
- get <key> : get values of parameters
- set <key> <value> : set parameter(s) value(s)
- del <key> : delete parameters
- addKey <key> <subkey> <value> : add or set a subkey in a parameter
- delKey <key> <subkey> : delete subkey of a parameter
- addPostVars <host> <uri> <key> <value> : add post vars for form replay
- delPostVars <host> <uri> <key> : delete post vars for form replay
- save : export configuration to STDOUT
- restore - : import configuration from STDIN
- restore <file> : import configuration from file
- rollback : restore previous configuration
Options:
- yes <0|1> : accept confirmation prompt automatically
- log <msg> : set configuration log message
- safe <0|1> : fail in case the requested configuration is invalid
- force <0|1> : allow overwrite of existing config number
- cfgNum <num> : set new configuration number (requires -force 1)
- sep <char> : separator of hierarchical values (by default: /)
- iniFile <file> : path to an alternate lemonldap-ng.ini file
Additional options:
- --user=<user> : change user running the script
- --group=<group> : change group running the script
See Lemonldap::NG::Manager::Cli(3) for more
};
}
__END__
=head1 NAME
@ -91,8 +57,51 @@ __END__
lemonldap-ng-cli - Command-line manager for Lemonldap::NG web-SSO system.
=head1 DESCRIPTION
lemonldap-ng-cli is a command line interface to interact with Lemonldap::NG
configuration. It can be used to read or update configuration variables
programmatically, or perform global operations on the configuration.
=head1 SYNOPSIS
Usage: lemonldap-ng-cli [options] ACTION [parameters ...]
Available actions:
help : print the full documentation
info : get currentconfiguration info
update-cache : force configuration cache to be updated
test-email DESTINATION : send a test email
get KEY : get values of parameters
set KEY VALUE : set parameter(s) value(s)
del KEY : delete parameters
addKey KEY SUBKEY VALUE : add or set a subkey in a parameter
delKey KEY SUBKEY : delete subkey of a parameter
addPostVars HOST URI KEY VALUE : add post vars for form replay
delPostVars HOST URI KEY : delete post vars for form replay
save : export configuration to STDOUT
restore - : import configuration from STDIN
restore FILE : import configuration from file
rollback : restore previous configuration
Options:
-yes 0|1 : accept confirmation prompt automatically
-log msg : set configuration log message
-safe 0|1 : fail in case the requested configuration is invalid
-force 0|1 : allow overwrite of existing config number
-cfgNum NUM : set new configuration number (requires -force 1)
-sep CHAR : separator of hierarchical values (by default: /)
-iniFile FILE : path to an alternate lemonldap-ng.ini file
Additional options:
--user=USER : change user running the script
--group=GROUP : change group running the script
=head1 EXAMPLES
Get information about current configuration
$ lemonldap-ng-cli info
@ -136,68 +145,130 @@ Set some values
# without asking for confirmation
$ lemonldap-ng-cli -yes 1 set portal http://auth.e.com/ domain e.com
=head1 DESCRIPTION
lemonldap-ng-cli is a command line interface to interact with Lemonldap::NG
configuration. Commands are described in L<Lemonldap::NG::Manager::Cli>
and L<Lemonldap::NG::Common::Cli>
=head2 Available commands
=head1 ARGUMENTS
=over
=item info
=item B<info>
=item update-cache
Print configuration metadata, such as number, author, date and log
=item test-email
=item B<update-cache>
=item save
Update the local configuration cache, this command only affects the server on which it is run
=item restore
=item B<test-email I<DESTINATION>>
=item get
Sends a test email to the specified I<DESTINATION>, this lets you check your SMTP settings
=item set
=item B<get I<KEY> [ I<KEY> ... ]>
=item addKey
Print the specified I<KEY> from configuration. Multiple keys may be given
=item delKey
=item B<set I<KEY> I<VALUE> [I<KEY> I<VALUE> ...]>
Set the specified I<KEY> to the specified I<VALUE>. Multiple key-value pairs may be given.
The configuration number is increased once all given key-value pairs have been processesed.
=item B<delete I<KEY> [ I<KEY> ... ]>
Delete the specified I<KEY> from configuration. Multiple keys can be given.
The configuration number is increased once all keys have been deleted.
=item B<addKey I<KEY> I<SUBKEY> I<VALUE> [I<KEY> I<SUBKEY> I<VALUE> ...]>
This action can be used to set a sub-key inside a composite configuration key
(such as globalStorageOptions, locationRules, etc.)
Multiple key-subkey-value triplets may be given.
The configuration number is increased once all given triplets have been processesed.
=item B<delKey I<KEY> I<SUBKEY> [I<KEY> I<SUBKEY> ...]>
This action can be used to delete a sub-key from a composite configuration key
(such as globalStorageOptions, locationRules, etc.)
Multiple key-subkey pairs may be given.
The configuration number is increased once all given pairs have been processesed.
=item B<addPostVars I<HOST> I<URI> I<KEY> I<VALUE>>
This action lets you add a new POST var in a form replay configuration.
=item B<delPostVars I<HOST> I<URI> I<KEY>>
This action lets you delete a new POST var in a form replay configuration.
=item B<save>
Dump the entire LemonLDAP::NG configuration to standard output, in JSON format.
The resulting dump can be imported into the manager's interface, or restored
with the B<restore> command.
=item B<restore I<FILE>>
Replace the existing configuration with the content of the provided
JSON-formatted I<FILE>. If I<FILE> is the I<-> string, configuration will be
read from standard input.
=item B<rollback>
This command can be used to cancel the latest configuration change. The
previous configuration is fetched from configuration history and saved under a
new configuration number.
This action is meant to be a convenient wrapper around B<save> and B<restore>,
and does not handle rolling back to an arbitrary version. Rolling back to an
arbitrary version can be done manually with B<save> and B<restore>
=back
=head2 Available options
=head1 OPTIONS
=over
=item -yes
=item B<-yes I<0|1>>
Confirm modification automatically (default: 0)
Skip confirmation prompt (default: 0)
=item -log
=item B<-log I<MESSAGE>>
Allows you to set the log message that will be displayed in the manager
=item -safe
=item B<-safe I<0|1>>
The configuration change will be aborted if it contains errors (default: 0)
=item -force
=item B<-force I<0|1>>
Allows you to force overwriting an existing configuration (default: 0)
Allows you to force overwriting an existing configuration number (default: 0)
=item -cfgNum
=item B<-cfgNum I<NUMBER>>
Choose a particular configuration number (default: latest)
=item -sep
=item B<-sep I<CHARACTER>>
Allows you to define hierarchical separator
=item -iniFile
=item B<-iniFile I<FILE>>
Allows you to set an alternative ini file
=item B<-u I<USER>, --user=I<USER>>
Run the script under the I<USER> system user identity
=item B<-g I<GROUP>, --group=I<GROUP>>
Run the script under the I<GROUP> system group identity
=back
=head1 SEE ALSO

2
lemonldap-ng-handler/lib/Lemonldap/NG/Handler.pm
View File

@ -42,7 +42,7 @@ L<https://gitlab.ow2.org/lemonldap-ng/lemonldap-ng/issues>
=head1 DOWNLOAD
Lemonldap::NG is available at
L<http://forge.objectweb.org/project/showfiles.php?group_id=274>
L<https://lemonldap-ng.org/download>
=head1 COPYRIGHT AND LICENSE

2
lemonldap-ng-handler/lib/Lemonldap/NG/Handler/ApacheMP2/FCGIClient.pm
View File

@ -160,7 +160,7 @@ L<https://gitlab.ow2.org/lemonldap-ng/lemonldap-ng/issues>
=head1 DOWNLOAD
Lemonldap::NG is available at
L<http://forge.objectweb.org/project/showfiles.php?group_id=274>
L<https://lemonldap-ng.org/download>
=head1 COPYRIGHT AND LICENSE

2
lemonldap-ng-handler/lib/Lemonldap/NG/Handler/PSGI.pm
View File

@ -130,7 +130,7 @@ L<https://gitlab.ow2.org/lemonldap-ng/lemonldap-ng/issues>
=head1 DOWNLOAD
Lemonldap::NG is available at
L<http://forge.objectweb.org/project/showfiles.php?group_id=274>
L<https://lemonldap-ng.org/download>
=head1 COPYRIGHT AND LICENSE

2
lemonldap-ng-handler/lib/Lemonldap/NG/Handler/PSGI/Router.pm
View File

@ -137,7 +137,7 @@ L<https://gitlab.ow2.org/lemonldap-ng/lemonldap-ng/issues>
=head1 DOWNLOAD
Lemonldap::NG is available at
L<http://forge.objectweb.org/project/showfiles.php?group_id=274>
L<https://lemonldap-ng.org/download>
=head1 COPYRIGHT AND LICENSE

2
lemonldap-ng-handler/lib/Lemonldap/NG/Handler/PSGI/Try.pm
View File

@ -188,7 +188,7 @@ L<https://gitlab.ow2.org/lemonldap-ng/lemonldap-ng/issues>
=head1 DOWNLOAD
Lemonldap::NG is available at
L<http://forge.objectweb.org/project/showfiles.php?group_id=274>
L<https://lemonldap-ng.org/download>
=head1 COPYRIGHT AND LICENSE

2
lemonldap-ng-handler/lib/Plack/Middleware/Auth/LemonldapNG.pm
View File

@ -107,7 +107,7 @@ L<https://gitlab.ow2.org/lemonldap-ng/lemonldap-ng/issues>
=head1 DOWNLOAD
Lemonldap::NG is available at
L<http://forge.objectweb.org/project/showfiles.php?group_id=274>
L<https://lemonldap-ng.org/download>
=head1 COPYRIGHT AND LICENSE

2
lemonldap-ng-manager/lib/Lemonldap/NG/Manager.pm
View File

@ -369,7 +369,7 @@ see L<Lemonldap::NG::Manager::Conf::Parser> before.
=head1 DOWNLOAD
Lemonldap::NG is available at
L<http://forge.objectweb.org/project/showfiles.php?group_id=274>
L<https://lemonldap-ng.org/download>
=head1 COPYRIGHT AND LICENSE

2
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build.pm
View File

@ -1006,7 +1006,7 @@ see L<Lemonldap::NG::Manager::Conf::Parser> before.
=head1 DOWNLOAD
Lemonldap::NG is available at
L<http://forge.objectweb.org/project/showfiles.php?group_id=274>
L<https://lemonldap-ng.org/download>
=head1 COPYRIGHT AND LICENSE

2
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Cli.pm
View File

@ -654,7 +654,7 @@ L<https://gitlab.ow2.org/lemonldap-ng/lemonldap-ng/issues>
=head1 DOWNLOAD
Lemonldap::NG is available at
L<http://forge.objectweb.org/project/showfiles.php?group_id=274>
L<https://lemonldap-ng.org/download>
=head1 COPYRIGHT AND LICENSE

2
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Parser.pm
View File

@ -1411,7 +1411,7 @@ ticket.
=head1 DOWNLOAD
Lemonldap::NG is available at
L<http://forge.objectweb.org/project/showfiles.php?group_id=274>
L<https://lemonldap-ng.org/download>
=head1 COPYRIGHT AND LICENSE

18
lemonldap-ng-manager/site/htdocs/static/languages/ar.json
View File

@ -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":"نطاق",

10
lemonldap-ng-manager/site/htdocs/static/languages/es.json
View File

@ -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",
@ -881,7 +881,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",
@ -1082,7 +1082,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",

2
lemonldap-ng-manager/site/htdocs/static/languages/it.json
View File

@ -881,7 +881,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",

6
lemonldap-ng-manager/site/htdocs/static/languages/pl.json
View File

@ -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ść",
@ -881,7 +881,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óć",

2
lemonldap-ng-manager/site/htdocs/static/languages/vi.json
View File

@ -881,7 +881,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",

6
lemonldap-ng-manager/site/htdocs/static/languages/zh_TW.json
View File

@ -290,10 +290,10 @@
"dbiPassword":"密碼",
"dbiPasswordMailCol":"郵件欄位名稱",
"dbiSchema":"結構",
"dbiUserChain":"Chain",
"dbiUserPassword":"Password",
"dbiUserChain":"鏈",
"dbiUserPassword":"密碼",
"dbiUserTable":"使用者表格",
"dbiUserUser":"User",
"dbiUserUser":"使用者",
"decryptValue":"解密值",
"decryptValueFunctions":"解密函式",
"decryptValueRule":"使用規則",

2
lemonldap-ng-portal/lib/Lemonldap/NG/Portal.pm
View File

@ -158,7 +158,7 @@ L<https://gitlab.ow2.org/lemonldap-ng/lemonldap-ng/issues>
=head1 DOWNLOAD
Lemonldap::NG is available at
L<http://forge.objectweb.org/project/showfiles.php?group_id=274>
L<https://lemonldap-ng.org/download>
=head1 COPYRIGHT AND LICENSE

2
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth.pod
View File

@ -201,7 +201,7 @@ L<https://gitlab.ow2.org/lemonldap-ng/lemonldap-ng/issues>
=head1 DOWNLOAD
Lemonldap::NG is available at
L<http://forge.objectweb.org/project/showfiles.php?group_id=274>
L<https://lemonldap-ng.org/download>
=head1 COPYRIGHT AND LICENSE

2
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/CDC.pm
View File

@ -233,7 +233,7 @@ L<https://gitlab.ow2.org/lemonldap-ng/lemonldap-ng/issues>
=head1 DOWNLOAD
Lemonldap::NG is available at
L<http://forge.objectweb.org/project/showfiles.php?group_id=274>
L<https://lemonldap-ng.org/download>
=head1 COPYRIGHT AND LICENSE

2
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/CAS.pm
View File

@ -649,7 +649,7 @@ L<https://gitlab.ow2.org/lemonldap-ng/lemonldap-ng/issues>
=head1 DOWNLOAD
Lemonldap::NG is available at
L<http://forge.objectweb.org/project/showfiles.php?group_id=274>
L<https://lemonldap-ng.org/download>
=head1 COPYRIGHT AND LICENSE

2
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/OpenID/Server.pm
View File

@ -210,7 +210,7 @@ L<https://gitlab.ow2.org/lemonldap-ng/lemonldap-ng/issues>
=head1 DOWNLOAD
Lemonldap::NG is available at
L<http://forge.objectweb.org/project/showfiles.php?group_id=274>
L<https://lemonldap-ng.org/download>
=head1 COPYRIGHT AND LICENSE

2
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/OpenIDConnect.pm
View File

@ -2283,7 +2283,7 @@ L<https://gitlab.ow2.org/lemonldap-ng/lemonldap-ng/issues>
=head1 DOWNLOAD
Lemonldap::NG is available at
L<http://forge.objectweb.org/project/showfiles.php?group_id=274>
L<https://lemonldap-ng.org/download>
=head1 COPYRIGHT AND LICENSE

2
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/SAML.pm
View File

@ -3650,7 +3650,7 @@ L<https://gitlab.ow2.org/lemonldap-ng/lemonldap-ng/issues>
=head1 DOWNLOAD
Lemonldap::NG is available at
L<http://forge.objectweb.org/project/showfiles.php?group_id=274>
L<https://lemonldap-ng.org/download>
=head1 COPYRIGHT AND LICENSE

2
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Issuer.pm
View File

@ -396,7 +396,7 @@ L<https://gitlab.ow2.org/lemonldap-ng/lemonldap-ng/issues>
=head1 DOWNLOAD
Lemonldap::NG is available at
L<http://forge.objectweb.org/project/showfiles.php?group_id=274>
L<https://lemonldap-ng.org/download>
=head1 COPYRIGHT AND LICENSE

2
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Plugin.pm
View File

@ -404,7 +404,7 @@ L<https://gitlab.ow2.org/lemonldap-ng/lemonldap-ng/issues>
=head1 DOWNLOAD
Lemonldap::NG is available at
L<http://forge.objectweb.org/project/showfiles.php?group_id=274>
L<https://lemonldap-ng.org/download>
=head1 COPYRIGHT AND LICENSE

2
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Request.pm
View File

@ -313,7 +313,7 @@ L<https://gitlab.ow2.org/lemonldap-ng/lemonldap-ng/issues>
=head1 DOWNLOAD
Lemonldap::NG is available at
L<http://forge.objectweb.org/project/showfiles.php?group_id=274>
L<https://lemonldap-ng.org/download>
=head1 COPYRIGHT AND LICENSE

2
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/SecondFactor.pm
View File

@ -322,7 +322,7 @@ L<https://gitlab.ow2.org/lemonldap-ng/lemonldap-ng/issues>
=head1 DOWNLOAD
Lemonldap::NG is available at
L<http://forge.objectweb.org/project/showfiles.php?group_id=274>
L<https://lemonldap-ng.org/download>
=head1 COPYRIGHT AND LICENSE

2
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/PublicPages.pm
View File

@ -114,7 +114,7 @@ L<https://gitlab.ow2.org/lemonldap-ng/lemonldap-ng/issues>
=head1 DOWNLOAD
Lemonldap::NG is available at
L<http://forge.objectweb.org/project/showfiles.php?group_id=274>
L<https://lemonldap-ng.org/download>
=head1 COPYRIGHT AND LICENSE

2
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/UserDB.pod
View File

@ -170,7 +170,7 @@ L<https://gitlab.ow2.org/lemonldap-ng/lemonldap-ng/issues>
=head1 DOWNLOAD
Lemonldap::NG is available at
L<http://forge.objectweb.org/project/showfiles.php?group_id=274>
L<https://lemonldap-ng.org/download>
=head1 COPYRIGHT AND LICENSE

12
lemonldap-ng-portal/site/cron/purgeCentralCache
View File

@ -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

2
lemonldap-ng-portal/site/htdocs/static/languages/ar.json
View File

@ -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 ",

2
lemonldap-ng-portal/site/templates/bootstrap/captcha.tpl
View File

@ -5,7 +5,7 @@
<!-- //endif -->
<div class="form-group">
<img class="renewcaptchaclick" src="<TMPL_VAR NAME="STATIC_PREFIX">common/icons/arrow_refresh.png" alt="Renew Captcha" title="Renew Captcha" class="img-thumbnail mb-3" />
<img class="renewcaptchaclick" src="<TMPL_VAR NAME="STATIC_PREFIX">common/icons/arrow_refresh.png" alt="Renew Captcha" title="Renew Captcha" class="img-thumbnail mb-3" autocomplete="one-time-code" />
<img id="captcha" src="<TMPL_VAR NAME=CAPTCHA_SRC>" class="img-thumbnail" />
</div>
<div class="input-group mb-3">

2
lemonldap-ng-portal/site/templates/bootstrap/certificateReset.tpl
View File

@ -25,7 +25,7 @@
<div class="input-group-prepend">
<span class="input-group-text"><label for="mailfield" class="mb-0"><i class="fa fa-envelope"></i></label></span>
</div>
<input id="mailfield" name="mail" type="text" value="<TMPL_VAR NAME="MAIL">" class="form-control" trplaceholder="mail" required />
<input id="mailfield" name="mail" type="text" value="<TMPL_VAR NAME="MAIL">" class="form-control" trplaceholder="mail" required />
</div>
<TMPL_IF NAME=CAPTCHA_SRC>

2
lemonldap-ng-portal/site/templates/bootstrap/checkdevops.tpl
View File

@ -33,7 +33,7 @@
<input type="hidden" name="token" value="<TMPL_VAR NAME="TOKEN">" />
</TMPL_IF>
<TMPL_IF NAME="DOWNLOAD">
<input id="urlfield" name="url" type="text" class="form-control" value="<TMPL_VAR NAME="URL">" trplaceholder="URL / DNS" aria-required="true"/>
<input id="urlfield" name="url" type="text" class="form-control" value="<TMPL_VAR NAME="URL">" trplaceholder="URL / DNS" aria-required="true" autocomplete="url" />
<pre><textarea id="checkDevOpsFile" name="checkDevOpsFile" class="form-control rounded-1" rows="6" trplaceholder="pasteHere"><TMPL_VAR NAME="FILE"></textarea></pre>
<TMPL_ELSE>
<pre><textarea id="checkDevOpsFile" name="checkDevOpsFile" class="form-control rounded-1" rows="6" trplaceholder="pasteHere" required><TMPL_VAR NAME="FILE"></textarea></pre>

2
lemonldap-ng-portal/site/templates/bootstrap/checkuser.tpl
View File

@ -17,7 +17,7 @@
<div class="input-group-prepend">
<span class="input-group-text"><label for="urlfield" class="mb-0"><i class="fa fa-link"></i></label></span>
</div>
<input id="urlfield" name="url" type="text" class="form-control" value="<TMPL_VAR NAME="URL">" trplaceholder="URL / DNS" aria-required="true"/>
<input id="urlfield" name="url" type="text" class="form-control" value="<TMPL_VAR NAME="URL">" trplaceholder="URL / DNS" aria-required="true" autocomplete="url" />
</div>
<button type="submit" class="btn btn-success">
<span class="fa fa-search"></span>

2
lemonldap-ng-portal/site/templates/bootstrap/gpgform.tpl
View File

@ -5,7 +5,7 @@
<div class="input-group-prepend">
<span class="input-group-text"><label for="userfield" class="mb-0"><i class="fa fa-user"></i></label></span>
</div>
<input id="userfield" name="user" type="text" class="form-control" value="<TMPL_VAR NAME="LOGIN">" trplaceholder="mail" required aria-required="true"/>
<input id="userfield" name="user" type="text" class="form-control" value="<TMPL_VAR NAME="LOGIN">" trplaceholder="mail" required aria-required="true" />
</div>
<div class="input-group mb-3">

6
lemonldap-ng-portal/site/templates/bootstrap/register.tpl
View File

@ -23,21 +23,21 @@
<div class="input-group-prepend">
<span class="input-group-text"><label for="firstnamefield" class="mb-0"><i class="fa fa-user"></i></label></span>
</div>
<input id="firstnamefield" name="firstname" type="text" value="<TMPL_VAR NAME="FIRSTNAME">" class="form-control" trplaceholder="firstName" required aria-required="true"/>
<input id="firstnamefield" name="firstname" type="text" value="<TMPL_VAR NAME="FIRSTNAME">" class="form-control" trplaceholder="firstName" required aria-required="true" autocomplete="given-name" />
</div>
<div class="input-group mb-3">
<div class="input-group-prepend">
<span class="input-group-text"><label for="lastnamefield" class="mb-0"><i class="fa fa-user"></i></label></span>
</div>
<input id="lastnamefield" name="lastname" type="text" value="<TMPL_VAR NAME="LASTNAME">" class="form-control" trplaceholder="lastName" required aria-required="true"/>
<input id="lastnamefield" name="lastname" type="text" value="<TMPL_VAR NAME="LASTNAME">" class="form-control" autocomplete="family-name" trplaceholder="lastName" required aria-required="true"/>
</div>
<div class="input-group mb-3">
<div class="input-group-prepend">
<span class="input-group-text"><label for="mailfield" class="mb-0"><i class="fa fa-envelope"></i></label></span>
</div>
<input id="mailfield" name="mail" type="text" value="<TMPL_VAR NAME="MAIL">" class="form-control" trplaceholder="mail" required aria-required="true"/>
<input id="mailfield" name="mail" type="text" value="<TMPL_VAR NAME="MAIL">" class="form-control" trplaceholder="mail" required aria-required="true" />
</div>
<TMPL_IF NAME=CAPTCHA_SRC>

2
lemonldap-ng-portal/t/28-AuthChoice-with-captcha.t
View File

@ -41,7 +41,7 @@ SKIP: {
' Captcha image inserted' );
ok(
$res->[2]->[0] =~
m#<img class="renewcaptchaclick" src="/static/common/icons/arrow_refresh.png" alt="Renew Captcha" title="Renew Captcha" class="img-thumbnail mb-3" />#,
m#<img class="renewcaptchaclick" src="/static/common/icons/arrow_refresh.png"#,
' Renew Captcha button found'
) or explain( $res->[2]->[0], 'Renew captcha button not found' );
ok( $res->[2]->[0] =~ /captcha\.(?:min\.)?js/, 'Get captcha javascript' );

2
lemonldap-ng-portal/t/41-Captcha.t
View File

@ -134,7 +134,7 @@ m%<input[^>]*name="password"%,
' New captcha image inserted' );
ok(
$res->[2]->[0] =~
m#<img class="renewcaptchaclick" src="/static/common/icons/arrow_refresh.png" alt="Renew Captcha" title="Renew Captcha" class="img-thumbnail mb-3" />#,
m#<img class="renewcaptchaclick" src="/static/common/icons/arrow_refresh.png" alt="Renew Captcha" title="Renew Captcha" class="img-thumbnail mb-3" autocomplete="one-time-code" />#,
' Renew Captcha button found'
) or explain( $res->[2]->[0], 'Renew captcha button not found' );
ok( $res->[2]->[0] =~ /captcha\.(?:min\.)?js/, 'Get captcha javascript' );

2
lemonldap-ng-portal/t/42-Register-Demo-with-captcha.t
View File

@ -62,7 +62,7 @@ s/^.*token=([^&]+).*$/token=$1&firstname=who&lastname=doctor&mail=dwho%40badwolf
) or print STDERR Dumper( $res->[2]->[0] );
ok(
$res->[2]->[0] =~
m#<img class="renewcaptchaclick" src="/static/common/icons/arrow_refresh.png" alt="Renew Captcha" title="Renew Captcha" class="img-thumbnail mb-3" />#,
m#<img class="renewcaptchaclick" src="/static/common/icons/arrow_refresh.png"#,
' Renew Captcha button found'
) or explain( $res->[2]->[0], 'Renew captcha button not found' );
ok( $res->[2]->[0] =~ /captcha\.(?:min\.)?js/, 'Get captcha javascript' );

2
lemonldap-ng-portal/t/43-MailPasswordReset-with-captcha.t
View File

@ -69,7 +69,7 @@ m%<a class="btn btn-secondary" href="http://auth.example.com/resetpwd\?skin=boot
) or print STDERR Dumper( $res->[2]->[0] );
ok(
$res->[2]->[0] =~
m#<img class="renewcaptchaclick" src="/static/common/icons/arrow_refresh.png" alt="Renew Captcha" title="Renew Captcha" class="img-thumbnail mb-3" />#,
m#<img class="renewcaptchaclick" src="/static/common/icons/arrow_refresh.png"#,
' Renew Captcha button found'
) or explain( $res->[2]->[0], 'Renew captcha button not found' );
ok( $res->[2]->[0] =~ /captcha\.(?:min\.)?js/, 'Get captcha javascript' );

4
lemonldap-ng-portal/t/67-CheckUser-with-Impersonation-and-Macros.t
View File

@ -124,7 +124,7 @@ count(1);
expectForm( $res, undef, '/checkuser', 'user', 'url' );
ok(
$res->[2]->[0] =~
m%<input id="urlfield" name="url" type="text" class="form-control" value="http://test1.example.com" trplaceholder="URL / DNS"%,
m%<input id="urlfield" name="url" type="text" class="form-control" value="http://test1.example.com" trplaceholder="URL / DNS" aria-required="true" autocomplete="url" />%,
'Found HTTP url'
) or explain( $res->[2]->[0], 'HTTP url' );
ok(
@ -224,7 +224,7 @@ ok(
expectForm( $res, undef, '/checkuser', 'user', 'url' );
ok(
$res->[2]->[0] =~
m%<input id="urlfield" name="url" type="text" class="form-control" value="https://test2.example.com" trplaceholder="URL / DNS"%,
m%<input id="urlfield" name="url" type="text" class="form-control" value="https://test2.example.com" trplaceholder="URL / DNS" aria-required="true" autocomplete="url" />%,
'Found HTTPS url'
) or explain( $res->[2]->[0], 'HTTP url' );
count(2);

2
lemonldap-ng-portal/t/68-FindUser-with-Demo-and-captcha.t
View File

@ -48,7 +48,7 @@ SKIP: {
' Captcha image inserted' );
ok(
$res->[2]->[0] =~
m#<img class="renewcaptchaclick" src="/static/common/icons/arrow_refresh.png" alt="Renew Captcha" title="Renew Captcha" class="img-thumbnail mb-3" />#,
m#<img class="renewcaptchaclick" src="/static/common/icons/arrow_refresh.png"#,
' Renew Captcha button found'
) or explain( $res->[2]->[0], 'Renew captcha button not found' );
ok( $res->[2]->[0] =~ /captcha\.(?:min\.)?js/, 'Get captcha javascript' );

1
rpm/lemonldap-ng.spec
View File

@ -676,6 +676,7 @@ fi
%{lm_bindir}/lemonldap-ng-cli
%{lm_bindir}/llngDeleteSession
%{_mandir}/man1/lemonldap-ng-cli*
%{_mandir}/man1/importMetadata*
%files portal
%{lm_sharedir}/portal

2
scripts/copyright-updater.pl
View File

@ -89,7 +89,7 @@ L<https://gitlab.ow2.org/lemonldap-ng/lemonldap-ng/issues>
=head1 DOWNLOAD
Lemonldap::NG is available at
L<http://forge.objectweb.org/project/showfiles.php?group_id=274>
L<https://lemonldap-ng.org/download>
=head1 COPYRIGHT AND LICENSE