From 83b45db61466e28ebf1faade6c677dd19582add1 Mon Sep 17 00:00:00 2001 From: Yadd Date: Mon, 28 Jun 2021 15:36:29 +0200 Subject: [PATCH] Fix versions --- _example/conf/lmConf-1.json | 2 +- lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf.pm | 2 +- .../lib/Lemonldap/NG/Common/Conf/Backends/RDBI.pm | 2 +- .../lib/Lemonldap/NG/Common/Conf/Backends/_DBI.pm | 2 +- lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/RESTServer.pm | 2 +- lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/Serializer.pm | 2 +- lemonldap-ng-common/lib/Lemonldap/NG/Common/JWT.pm | 2 ++ lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Lib/OAuth2.pm | 2 +- lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Api/Common.pm | 2 +- .../lib/Lemonldap/NG/Manager/Api/Providers/OidcRp.pm | 2 +- lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/CTrees.pm | 2 +- lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Tree.pm | 2 +- lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf.pm | 2 +- lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Parser.pm | 2 +- lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Zero.pm | 2 +- lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Mail2F.pm | 2 +- lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Register/TOTP.pm | 2 +- lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Register/U2F.pm | 2 +- lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/U2F.pm | 2 +- lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/SAML.pm | 2 +- .../lib/Lemonldap/NG/Portal/Issuer/OpenIDConnect.pm | 2 +- lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/Choice.pm | 2 +- lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/LDAP.pm | 2 +- lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/OneTimeToken.pm | 2 +- .../lib/Lemonldap/NG/Portal/Lib/OpenIDConnect.pm | 2 +- lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/SAML.pm | 2 +- lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/SMTP.pm | 2 +- lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/U2F.pm | 2 +- lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/_tokenRule.pm | 2 +- lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Init.pm | 2 +- lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Issuer.pm | 2 +- lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Plugin.pm | 2 +- lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Process.pm | 2 +- .../lib/Lemonldap/NG/Portal/Plugins/BruteForceProtection.pm | 2 +- .../lib/Lemonldap/NG/Portal/Plugins/CertificateResetByMail.pm | 2 +- .../lib/Lemonldap/NG/Portal/Plugins/GrantSession.pm | 2 +- .../lib/Lemonldap/NG/Portal/Plugins/MailPasswordReset.pm | 2 +- lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/Register.pm | 2 +- .../lib/Lemonldap/NG/Portal/Plugins/SingleSession.pm | 2 +- .../lib/Lemonldap/NG/Portal/Plugins/StayConnected.pm | 2 +- .../site/htdocs/static/common/js/totpregistration.min.js | 2 +- .../site/htdocs/static/common/js/totpregistration.min.js.map | 2 +- 42 files changed, 43 insertions(+), 41 deletions(-) diff --git a/_example/conf/lmConf-1.json b/_example/conf/lmConf-1.json index f27208c9c..71b58e1a0 100644 --- a/_example/conf/lmConf-1.json +++ b/_example/conf/lmConf-1.json @@ -86,7 +86,7 @@ "authentication" : "Demo", "cfgAuthor" : "The LemonLDAP::NG team", "cfgNum" : 1, - "cfgVersion" : "2.0.9", + "cfgVersion" : "2.0.12", "cookieName" : "lemonldap", "demoExportedVars" : { "cn" : "cn", diff --git a/lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf.pm b/lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf.pm index 04b752703..d077d5b17 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.9'; +our $VERSION = '2.0.12'; our $msg = ''; our $iniObj; diff --git a/lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/Backends/RDBI.pm b/lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/Backends/RDBI.pm index d46fca79e..77b2959c3 100644 --- a/lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/Backends/RDBI.pm +++ b/lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/Backends/RDBI.pm @@ -5,7 +5,7 @@ use utf8; use Lemonldap::NG::Common::Conf::Serializer; use Lemonldap::NG::Common::Conf::Backends::_DBI; -our $VERSION = '2.0.0'; +our $VERSION = '2.0.12'; our @ISA = qw(Lemonldap::NG::Common::Conf::Backends::_DBI); sub store { diff --git a/lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/Backends/_DBI.pm b/lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/Backends/_DBI.pm index 900f8c263..180dd1729 100644 --- a/lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/Backends/_DBI.pm +++ b/lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/Backends/_DBI.pm @@ -5,7 +5,7 @@ use utf8; use DBI; use Lemonldap::NG::Common::Conf::Constants; #inherits -our $VERSION = '2.0.0'; +our $VERSION = '2.0.12'; our @ISA = qw(Lemonldap::NG::Common::Conf::Constants); our ( @EXPORT, %EXPORT_TAGS ); diff --git a/lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/RESTServer.pm b/lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/RESTServer.pm index 4a5bc4d07..413be34a9 100644 --- a/lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/RESTServer.pm +++ b/lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/RESTServer.pm @@ -6,7 +6,7 @@ use Mouse; use Lemonldap::NG::Common::Conf::Constants; use Lemonldap::NG::Common::Conf::ReConstants; -our $VERSION = '2.0.9'; +our $VERSION = '2.0.12'; extends 'Lemonldap::NG::Common::Conf::AccessLib'; diff --git a/lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/Serializer.pm b/lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/Serializer.pm index 8ca3e9422..989f586a1 100644 --- a/lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/Serializer.pm +++ b/lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/Serializer.pm @@ -6,7 +6,7 @@ use Encode; use JSON; use Lemonldap::NG::Common::Conf::Constants; -our $VERSION = '2.0.0'; +our $VERSION = '2.0.12'; BEGIN { *Lemonldap::NG::Common::Conf::normalize = \&normalize; diff --git a/lemonldap-ng-common/lib/Lemonldap/NG/Common/JWT.pm b/lemonldap-ng-common/lib/Lemonldap/NG/Common/JWT.pm index 24719415a..ae497ff08 100644 --- a/lemonldap-ng-common/lib/Lemonldap/NG/Common/JWT.pm +++ b/lemonldap-ng-common/lib/Lemonldap/NG/Common/JWT.pm @@ -8,6 +8,8 @@ our @EXPORT_OK = use JSON; use MIME::Base64 qw/encode_base64 decode_base64/; +our $VERSION = '2.0.12'; + # Gets the Access Token session ID embedded in a LLNG-emitted JWT sub getAccessTokenSessionId { my ($access_token) = @_; diff --git a/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Lib/OAuth2.pm b/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Lib/OAuth2.pm index a02cfa352..6101948a4 100644 --- a/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Lib/OAuth2.pm +++ b/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Lib/OAuth2.pm @@ -3,7 +3,7 @@ use Lemonldap::NG::Common::JWT qw(getAccessTokenSessionId); use strict; -our $VERSION = '2.0.8'; +our $VERSION = '2.0.12'; sub retrieveSession { my ( $class, $req, $id ) = @_; diff --git a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Api/Common.pm b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Api/Common.pm index b8d33a9a9..94c920451 100644 --- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Api/Common.pm +++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Api/Common.pm @@ -1,6 +1,6 @@ package Lemonldap::NG::Manager::Api::Common; -our $VERSION = '2.0.10'; +our $VERSION = '2.0.12'; package Lemonldap::NG::Manager::Api; diff --git a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Api/Providers/OidcRp.pm b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Api/Providers/OidcRp.pm index 1bc788ed9..35aa8b6ca 100644 --- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Api/Providers/OidcRp.pm +++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Api/Providers/OidcRp.pm @@ -1,6 +1,6 @@ package Lemonldap::NG::Manager::Api::Providers::OidcRp; -our $VERSION = '2.0.10'; +our $VERSION = '2.0.12'; package Lemonldap::NG::Manager::Api; diff --git a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/CTrees.pm b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/CTrees.pm index 659d96fba..ad1c5fbbe 100644 --- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/CTrees.pm +++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/CTrees.pm @@ -14,7 +14,7 @@ package Lemonldap::NG::Manager::Build::CTrees; -our $VERSION = '2.0.8'; +our $VERSION = '2.0.12'; sub cTrees { return { diff --git a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Tree.pm b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Tree.pm index defde1d27..8fef3380c 100644 --- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Tree.pm +++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Tree.pm @@ -17,7 +17,7 @@ package Lemonldap::NG::Manager::Build::Tree; -our $VERSION = '2.0.11'; +our $VERSION = '2.0.12'; # TODO: Missing: # * activeTimer diff --git a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf.pm b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf.pm index c9c97734c..6372c500b 100644 --- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf.pm +++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf.pm @@ -24,7 +24,7 @@ extends qw( Lemonldap::NG::Common::Conf::RESTServer ); -our $VERSION = '2.0.10'; +our $VERSION = '2.0.12'; ############################# # I. INITIALIZATION METHODS # 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 3f0d7e93f..edeeaeab3 100644 --- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Parser.pm +++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Parser.pm @@ -26,7 +26,7 @@ use JSON 'to_json'; use Lemonldap::NG::Common::Conf::ReConstants; use Lemonldap::NG::Manager::Attributes; -our $VERSION = '2.0.9'; +our $VERSION = '2.0.12'; extends 'Lemonldap::NG::Common::Conf::Compact'; diff --git a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Zero.pm b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Zero.pm index e3b031b04..406ff93b6 100644 --- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Zero.pm +++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Zero.pm @@ -2,7 +2,7 @@ package Lemonldap::NG::Manager::Conf::Zero; use strict; -our $VERSION = '2.0.9'; +our $VERSION = '2.0.12'; sub zeroConf { my ( $domain, $sessionDir, $persistentSessionDir, $notificationDir, $cacheDir ) = @_; diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Mail2F.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Mail2F.pm index 72677248e..2b9323044 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Mail2F.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Mail2F.pm @@ -11,7 +11,7 @@ use Lemonldap::NG::Portal::Main::Constants qw( PE_MUSTHAVEMAIL ); -our $VERSION = '2.0.10'; +our $VERSION = '2.0.12'; extends qw( Lemonldap::NG::Portal::Main::SecondFactor diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Register/TOTP.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Register/TOTP.pm index 3d72e82e4..86da63066 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Register/TOTP.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Register/TOTP.pm @@ -5,7 +5,7 @@ use strict; use Mouse; use JSON qw(from_json to_json); -our $VERSION = '2.0.10'; +our $VERSION = '2.0.12'; extends qw( Lemonldap::NG::Portal::Main::Plugin diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Register/U2F.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Register/U2F.pm index 46b581c50..b9169e66a 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Register/U2F.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Register/U2F.pm @@ -6,7 +6,7 @@ use Mouse; use JSON qw(from_json to_json); use MIME::Base64 qw(encode_base64url decode_base64url); -our $VERSION = '2.0.10'; +our $VERSION = '2.0.12'; extends qw( Lemonldap::NG::Portal::Main::Plugin diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/U2F.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/U2F.pm index bfb9bc661..00edc8bff 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/U2F.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/U2F.pm @@ -16,7 +16,7 @@ use Lemonldap::NG::Portal::Main::Constants qw( PE_BADCREDENTIALS ); -our $VERSION = '2.0.10'; +our $VERSION = '2.0.12'; extends qw( Lemonldap::NG::Portal::Main::SecondFactor diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/SAML.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/SAML.pm index 44f08b293..cf3c0c11d 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/SAML.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/SAML.pm @@ -24,7 +24,7 @@ use Lemonldap::NG::Portal::Main::Constants qw( PE_SENDRESPONSE ); -our $VERSION = '2.0.9'; +our $VERSION = '2.0.12'; extends qw( Lemonldap::NG::Portal::Main::Auth diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Issuer/OpenIDConnect.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Issuer/OpenIDConnect.pm index 20b6cfced..3fc561c50 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Issuer/OpenIDConnect.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Issuer/OpenIDConnect.pm @@ -20,7 +20,7 @@ use Lemonldap::NG::Portal::Main::Constants qw( ); use String::Random qw/random_string/; -our $VERSION = '2.0.11'; +our $VERSION = '2.0.12'; extends qw( Lemonldap::NG::Portal::Main::Issuer diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/Choice.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/Choice.pm index 215b0f54a..05fe26591 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/Choice.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/Choice.pm @@ -7,7 +7,7 @@ use Safe; extends 'Lemonldap::NG::Portal::Lib::Wrapper'; with 'Lemonldap::NG::Portal::Lib::OverConf'; -our $VERSION = '2.0.11'; +our $VERSION = '2.0.12'; has modules => ( is => 'rw', default => sub { {} } ); has rules => ( is => 'rw', default => sub { {} } ); diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/LDAP.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/LDAP.pm index 5ee0a5037..8258cab35 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/LDAP.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/LDAP.pm @@ -13,7 +13,7 @@ use Lemonldap::NG::Portal::Main::Constants qw( extends 'Lemonldap::NG::Common::Module'; -our $VERSION = '2.0.11'; +our $VERSION = '2.0.12'; # PROPERTIES diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/OneTimeToken.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/OneTimeToken.pm index ade5ca66c..fbbf6ce33 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/OneTimeToken.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/OneTimeToken.pm @@ -5,7 +5,7 @@ use Mouse; use JSON qw(from_json to_json); use Crypt::URandom; -our $VERSION = '2.0.6'; +our $VERSION = '2.0.12'; extends 'Lemonldap::NG::Common::Module'; 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 c6cfc3df1..01141aa53 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/OpenIDConnect.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/OpenIDConnect.pm @@ -22,7 +22,7 @@ use Mouse; use Lemonldap::NG::Portal::Main::Constants qw(PE_OK PE_REDIRECT); -our $VERSION = '2.0.11'; +our $VERSION = '2.0.12'; # OpenID Connect standard claims use constant PROFILE => [ 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 0da9781dc..941544e37 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/SAML.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/SAML.pm @@ -21,7 +21,7 @@ use Lemonldap::NG::Portal::Main::Constants qw( PE_SAML_SLO_ERROR ); -our $VERSION = '2.0.9'; +our $VERSION = '2.0.12'; # PROPERTIES diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/SMTP.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/SMTP.pm index 490712059..765619bfe 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/SMTP.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/SMTP.pm @@ -15,7 +15,7 @@ use Lemonldap::NG::Common::EmailTransport; use MIME::Base64; use Encode; -our $VERSION = '2.0.9'; +our $VERSION = '2.0.12'; our $transport; diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/U2F.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/U2F.pm index eea61c5dd..0f31d99df 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/U2F.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/U2F.pm @@ -3,7 +3,7 @@ package Lemonldap::NG::Portal::Lib::U2F; use strict; use Mouse; -our $VERSION = '2.0.0'; +our $VERSION = '2.0.12'; has origin => ( is => 'rw', ); diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/_tokenRule.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/_tokenRule.pm index 78179fb8a..ca2b660f7 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/_tokenRule.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/_tokenRule.pm @@ -3,7 +3,7 @@ package Lemonldap::NG::Portal::Lib::_tokenRule; use strict; use Mouse; -our $VERSION = '2.0.3'; +our $VERSION = '2.0.12'; has ottRule => ( is => 'rw', diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Init.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Init.pm index d4695d494..580037ea4 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Init.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Init.pm @@ -8,7 +8,7 @@ # of lemonldap-ng.ini) and underlying handler configuration package Lemonldap::NG::Portal::Main::Init; -our $VERSION = '2.0.10'; +our $VERSION = '2.0.12'; package Lemonldap::NG::Portal::Main; 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 55a489855..05eaca668 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Issuer.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Issuer.pm @@ -22,7 +22,7 @@ use Lemonldap::NG::Portal::Main::Constants qw( extends 'Lemonldap::NG::Portal::Main::Plugin'; -our $VERSION = '2.0.9'; +our $VERSION = '2.0.12'; # PROPERTIES 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 3053ea1fc..d5bd35963 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Plugin.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Plugin.pm @@ -11,7 +11,7 @@ use Lemonldap::NG::Portal::Main::Constants qw( PE_ERROR ); -our $VERSION = '2.0.10'; +our $VERSION = '2.0.12'; extends 'Lemonldap::NG::Common::Module'; diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Process.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Process.pm index 4a89c3644..fb06cdd90 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Process.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Process.pm @@ -1,6 +1,6 @@ package Lemonldap::NG::Portal::Main::Process; -our $VERSION = '2.0.10'; +our $VERSION = '2.0.12'; package Lemonldap::NG::Portal::Main; diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/BruteForceProtection.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/BruteForceProtection.pm index 551008ee8..eb671b69a 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/BruteForceProtection.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/BruteForceProtection.pm @@ -7,7 +7,7 @@ use Lemonldap::NG::Portal::Main::Constants qw( PE_WAIT ); -our $VERSION = '2.0.10'; +our $VERSION = '2.0.12'; extends 'Lemonldap::NG::Portal::Main::Plugin'; diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/CertificateResetByMail.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/CertificateResetByMail.pm index a9b93402c..0e0ff5f0c 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/CertificateResetByMail.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/CertificateResetByMail.pm @@ -31,7 +31,7 @@ use Lemonldap::NG::Portal::Main::Constants qw( PE_MAILCONFIRMATION_ALREADY_SENT ); -our $VERSION = '2.0.10'; +our $VERSION = '2.0.12'; extends qw( Lemonldap::NG::Portal::Lib::SMTP diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/GrantSession.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/GrantSession.pm index 102a38956..dd0fdf9db 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/GrantSession.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/GrantSession.pm @@ -8,7 +8,7 @@ use Lemonldap::NG::Portal::Main::Constants qw( PE_SESSIONNOTGRANTED ); -our $VERSION = '2.0.10'; +our $VERSION = '2.0.12'; extends 'Lemonldap::NG::Portal::Main::Plugin'; diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/MailPasswordReset.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/MailPasswordReset.pm index 63fc35d90..e26095883 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/MailPasswordReset.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/MailPasswordReset.pm @@ -32,7 +32,7 @@ use Lemonldap::NG::Portal::Main::Constants qw( PE_PP_INSUFFICIENT_PASSWORD_QUALITY ); -our $VERSION = '2.0.10'; +our $VERSION = '2.0.12'; extends qw( Lemonldap::NG::Portal::Lib::SMTP diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/Register.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/Register.pm index 3834a8b99..437b9e11a 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/Register.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/Register.pm @@ -22,7 +22,7 @@ use Lemonldap::NG::Portal::Main::Constants qw( PE_MAILCONFIRMATION_ALREADY_SENT ); -our $VERSION = '2.0.10'; +our $VERSION = '2.0.12'; extends qw( Lemonldap::NG::Portal::Lib::SMTP diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/SingleSession.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/SingleSession.pm index b5313c84d..e97235879 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/SingleSession.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/SingleSession.pm @@ -11,7 +11,7 @@ use Lemonldap::NG::Portal::Main::Constants qw( PE_TOKENEXPIRED ); -our $VERSION = '2.0.10'; +our $VERSION = '2.0.12'; extends qw( Lemonldap::NG::Portal::Main::Plugin diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/StayConnected.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/StayConnected.pm index 22f658a59..084834f31 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/StayConnected.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/StayConnected.pm @@ -9,7 +9,7 @@ use Lemonldap::NG::Portal::Main::Constants qw( PE_SENDRESPONSE ); -our $VERSION = '2.0.10'; +our $VERSION = '2.0.12'; extends 'Lemonldap::NG::Portal::Main::Plugin'; diff --git a/lemonldap-ng-portal/site/htdocs/static/common/js/totpregistration.min.js b/lemonldap-ng-portal/site/htdocs/static/common/js/totpregistration.min.js index c097b3b79..1a07b6a63 100644 --- a/lemonldap-ng-portal/site/htdocs/static/common/js/totpregistration.min.js +++ b/lemonldap-ng-portal/site/htdocs/static/common/js/totpregistration.min.js @@ -1 +1 @@ -(function(){var r,e,s,o,t;s=function(e,r){return $("#msg").attr("trspan",e),$("#msg").html(window.translate(e)),$("#color").removeClass("message-positive message-warning message-danger alert-success alert-warning alert-danger"),$("#color").addClass("message-"+r),"positive"===r&&(r="success"),$("#color").addClass("alert-"+r)},r=function(e,r,t){var o;if(console.log("Error",t),(o=JSON.parse(e.responseText))&&o.error)return o=o.error.replace(/.* /,""),console.log("Returned error",o),s(o,"warning")},o="",e=function(){return s("yourTotpKey","warning"),$.ajax({type:"POST",url:portal+"/2fregisters/totp/getkey",dataType:"json",error:r,success:function(e){var r,t;return e.error?(e.error.match(/totpExistingKey/)&&$("#divToHide").hide(),s(e.error,"warning")):e.portal&&e.user&&e.secret?($("#divToHide").show(),r="otpauth://totp/"+escape(e.portal)+":"+escape(e.user)+"?secret="+e.secret+"&issuer="+escape(e.portal),6!==e.digits&&(r+="&digits="+e.digits),30!==e.interval&&(r+="&period="+e.interval),new QRious({element:document.getElementById("qr"),value:r,size:150}),t=e.secret||"",$("#secret").text(t.toUpperCase().replace(/(.{4})/g,"$1 ").trim()),e.newkey?s("yourNewTotpKey","warning"):s("yourTotpKey","success"),o=e.token):s("PE24","danger")}})},t=function(){var e;return(e=$("#code").val())?$.ajax({type:"POST",url:portal+"/2fregisters/totp/verify",dataType:"json",data:{token:o,code:e,TOTPName:$("#TOTPName").val()},error:r,success:function(e){return e.error?e.error.match(/bad(Code|Name)/)?s(e.error,"warning"):s(e.error,"danger"):s("yourKeyIsRegistered","success")}}):(s("totpMissingCode","warning"),$("#code").focus())},$(document).ready(function(){return e(),$("#verify").on("click",function(){return t()})})}).call(this); \ No newline at end of file +!function(){var o=function(e,r){return $("#msg").attr("trspan",e),$("#msg").html(window.translate(e)),$("#color").removeClass("message-positive message-warning message-danger alert-success alert-warning alert-danger"),$("#color").addClass("message-"+r),"positive"===r&&(r="success"),$("#color").addClass("alert-"+r)},r=function(e,r,t){if(console.log("Error",t),(e=JSON.parse(e.responseText))&&e.error)return e=e.error.replace(/.* /,""),console.log("Returned error",e),o(e,"warning")},t="",e=function(){return o("yourTotpKey","warning"),$.ajax({type:"POST",url:portal+"/2fregisters/totp/getkey",dataType:"json",error:r,success:function(e){var r;return e.error?(e.error.match(/totpExistingKey/)&&$("#divToHide").hide(),o(e.error,"warning")):e.portal&&e.user&&e.secret?($("#divToHide").show(),r="otpauth://totp/"+escape(e.portal)+":"+escape(e.user)+"?secret="+e.secret+"&issuer="+escape(e.portal),6!==e.digits&&(r+="&digits="+e.digits),30!==e.interval&&(r+="&period="+e.interval),new QRious({element:document.getElementById("qr"),value:r,size:150}),r=e.secret||"",$("#secret").text(r.toUpperCase().replace(/(.{4})/g,"$1 ").trim()),e.newkey?o("yourNewTotpKey","warning"):o("yourTotpKey","success"),t=e.token):o("PE24","danger")}})},s=function(){var e=$("#code").val();return e?$.ajax({type:"POST",url:portal+"/2fregisters/totp/verify",dataType:"json",data:{token:t,code:e,TOTPName:$("#TOTPName").val()},error:r,success:function(e){return e.error?e.error.match(/bad(Code|Name)/)?o(e.error,"warning"):o(e.error,"danger"):o("yourKeyIsRegistered","success")}}):(o("totpMissingCode","warning"),$("#code").focus())};$(document).ready(function(){return e(),$("#verify").on("click",s)})}.call(this); \ No newline at end of file diff --git a/lemonldap-ng-portal/site/htdocs/static/common/js/totpregistration.min.js.map b/lemonldap-ng-portal/site/htdocs/static/common/js/totpregistration.min.js.map index a377a6b35..2d893f150 100644 --- a/lemonldap-ng-portal/site/htdocs/static/common/js/totpregistration.min.js.map +++ b/lemonldap-ng-portal/site/htdocs/static/common/js/totpregistration.min.js.map @@ -1 +1 @@ -{"version":3,"sources":["totpregistration.js"],"names":["displayError","getKey","setMsg","token","verify","msg","level","$","attr","html","window","translate","removeClass","addClass","j","status","err","res","console","log","JSON","parse","responseText","error","replace","ajax","type","url","portal","dataType","success","data","s","secret","match","hide","user","show","escape","digits","interval","QRious","element","document","getElementById","value","size","text","toUpperCase","trim","newkey","val","code","TOTPName","focus","ready","on","call","this"],"mappings":"CAMA,WACE,IAAIA,EAAcC,EAAQC,EAAQC,EAAOC,EAEzCF,EAAS,SAASG,EAAKC,GAQrB,OAPAC,EAAE,QAAQC,KAAK,SAAUH,GACzBE,EAAE,QAAQE,KAAKC,OAAOC,UAAUN,IAChCE,EAAE,UAAUK,YAAY,4FACxBL,EAAE,UAAUM,SAAS,WAAaP,GACpB,aAAVA,IACFA,EAAQ,WAEHC,EAAE,UAAUM,SAAS,SAAWP,IAGzCN,EAAe,SAASc,EAAGC,EAAQC,GACjC,IAAIC,EAGJ,GAFAC,QAAQC,IAAI,QAASH,IACrBC,EAAMG,KAAKC,MAAMP,EAAEQ,gBACRL,EAAIM,MAGb,OAFAN,EAAMA,EAAIM,MAAMC,QAAQ,MAAO,IAC/BN,QAAQC,IAAI,iBAAkBF,GACvBf,EAAOe,EAAK,YAIvBd,EAAQ,GAERF,EAAS,WAEP,OADAC,EAAO,cAAe,WACfK,EAAEkB,KAAK,CACZC,KAAM,OACNC,IAAKC,OAAS,2BACdC,SAAU,OACVN,MAAOvB,EACP8B,QAAS,SAASC,GAChB,IAAQC,EAAGC,EACX,OAAIF,EAAKR,OACHQ,EAAKR,MAAMW,MAAM,oBACnB3B,EAAE,cAAc4B,OAEXjC,EAAO6B,EAAKR,MAAO,YAEtBQ,EAAKH,QAAUG,EAAKK,MAAQL,EAAKE,QAGvC1B,EAAE,cAAc8B,OAChBL,EAAI,kBAAqBM,OAAOP,EAAKH,QAAW,IAAOU,OAAOP,EAAKK,MAAS,WAAaL,EAAKE,OAAS,WAAcK,OAAOP,EAAKH,QAC7G,IAAhBG,EAAKQ,SACPP,GAAK,WAAaD,EAAKQ,QAEH,KAAlBR,EAAKS,WACPR,GAAK,WAAaD,EAAKS,UAEpB,IAAIC,OAAO,CACdC,QAASC,SAASC,eAAe,MACjCC,MAAOb,EACPc,KAAM,MAERb,EAASF,EAAKE,QAAU,GACxB1B,EAAE,WAAWwC,KAAKd,EAAOe,cAAcxB,QAAQ,UAAW,OAAOyB,QAC7DlB,EAAKmB,OACPhD,EAAO,iBAAkB,WAEzBA,EAAO,cAAe,WAEjBC,EAAQ4B,EAAK5B,OAtBXD,EAAO,OAAQ,cA2B9BE,EAAS,WACP,IAAI+C,EAEJ,OADAA,EAAM5C,EAAE,SAAS4C,OAKR5C,EAAEkB,KAAK,CACZC,KAAM,OACNC,IAAKC,OAAS,2BACdC,SAAU,OACVE,KAAM,CACJ5B,MAAOA,EACPiD,KAAMD,EACNE,SAAU9C,EAAE,aAAa4C,OAE3B5B,MAAOvB,EACP8B,QAAS,SAASC,GAChB,OAAIA,EAAKR,MACHQ,EAAKR,MAAMW,MAAM,kBACZhC,EAAO6B,EAAKR,MAAO,WAEnBrB,EAAO6B,EAAKR,MAAO,UAGrBrB,EAAO,sBAAuB,eArB3CA,EAAO,kBAAmB,WACnBK,EAAE,SAAS+C,UA2BtB/C,EAAEoC,UAAUY,MAAM,WAEhB,OADAtD,IACOM,EAAE,WAAWiD,GAAG,QAAS,WAC9B,OAAOpD,UAIVqD,KAAKC"} \ No newline at end of file +{"version":3,"sources":["totpregistration.js"],"names":["setMsg","msg","level","$","attr","html","window","translate","removeClass","addClass","displayError","j","status","err","console","log","res","JSON","parse","responseText","error","replace","token","getKey","ajax","type","url","portal","dataType","success","data","secret","match","hide","user","show","s","escape","digits","interval","QRious","element","document","getElementById","value","size","text","toUpperCase","trim","newkey","verify","val","code","TOTPName","focus","ready","on","call","this"],"mappings":"CAMA,WACE,IAEAA,EAAS,SAASC,EAAKC,GAQrB,OAPAC,EAAE,QAAQC,KAAK,SAAUH,GACzBE,EAAE,QAAQE,KAAKC,OAAOC,UAAUN,IAChCE,EAAE,UAAUK,YAAY,4FACxBL,EAAE,UAAUM,SAAS,WAAaP,GACpB,aAAVA,IACFA,EAAQ,WAEHC,EAAE,UAAUM,SAAS,SAAWP,IAGzCQ,EAAe,SAASC,EAAGC,EAAQC,GAIjC,GAFAC,QAAQC,IAAI,QAASF,IACrBG,EAAMC,KAAKC,MAAMP,EAAEQ,gBACRH,EAAII,MAGb,OAFAJ,EAAMA,EAAII,MAAMC,QAAQ,MAAO,IAC/BP,QAAQC,IAAI,iBAAkBC,GACvBhB,EAAOgB,EAAK,YAIvBM,EAAQ,GAERC,EAAS,WAEP,OADAvB,EAAO,cAAe,WACfG,EAAEqB,KAAK,CACZC,KAAM,OACNC,IAAKC,OAAS,2BACdC,SAAU,OACVR,MAAOV,EACPmB,QAAS,SAASC,GAChB,IAAWC,EACX,OAAID,EAAKV,OACHU,EAAKV,MAAMY,MAAM,oBACnB7B,EAAE,cAAc8B,OAEXjC,EAAO8B,EAAKV,MAAO,YAEtBU,EAAKH,QAAUG,EAAKI,MAAQJ,EAAKC,QAGvC5B,EAAE,cAAcgC,OAChBC,EAAI,kBAAqBC,OAAOP,EAAKH,QAAW,IAAOU,OAAOP,EAAKI,MAAS,WAAaJ,EAAKC,OAAS,WAAcM,OAAOP,EAAKH,QAC7G,IAAhBG,EAAKQ,SACPF,GAAK,WAAaN,EAAKQ,QAEH,KAAlBR,EAAKS,WACPH,GAAK,WAAaN,EAAKS,UAEpB,IAAIC,OAAO,CACdC,QAASC,SAASC,eAAe,MACjCC,MAAOR,EACPS,KAAM,MAERd,EAASD,EAAKC,QAAU,GACxB5B,EAAE,WAAW2C,KAAKf,EAAOgB,cAAc1B,QAAQ,UAAW,OAAO2B,QAC7DlB,EAAKmB,OACPjD,EAAO,iBAAkB,WAEzBA,EAAO,cAAe,WAEjBsB,EAAQQ,EAAKR,OAtBXtB,EAAO,OAAQ,cA2B9BkD,EAAS,WACP,IACAC,EAAMhD,EAAE,SAASgD,MACjB,OAAKA,EAIIhD,EAAEqB,KAAK,CACZC,KAAM,OACNC,IAAKC,OAAS,2BACdC,SAAU,OACVE,KAAM,CACJR,MAAOA,EACP8B,KAAMD,EACNE,SAAUlD,EAAE,aAAagD,OAE3B/B,MAAOV,EACPmB,QAAS,SAASC,GAChB,OAAIA,EAAKV,MACHU,EAAKV,MAAMY,MAAM,kBACZhC,EAAO8B,EAAKV,MAAO,WAEnBpB,EAAO8B,EAAKV,MAAO,UAGrBpB,EAAO,sBAAuB,eArB3CA,EAAO,kBAAmB,WACnBG,EAAE,SAASmD,UA2BtBnD,EAAEuC,UAAUa,MAAM,WAEhB,OADAhC,IACOpB,EAAE,WAAWqD,GAAG,QACdN,MAIVO,KAAKC"} \ No newline at end of file