diff --git a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Tests.pm b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Tests.pm index cd74c1acf..d90f37648 100644 --- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Tests.pm +++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Tests.pm @@ -776,6 +776,14 @@ sub tests { return 1; }, + # Notification system required with removed SF notification + sfRemovedNotification => sub { + return 1 unless ( $conf->{sfRemovedMsgRule} ); + return ( -1, +'Notification system must be enabled to display a notification if a SF is removed' + ) if ( $conf->{sfRemovedUseNotif} and not $conf->{notification} ); + return 1; + }, }; } diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/ar.json b/lemonldap-ng-manager/site/htdocs/static/languages/ar.json index ce120c1a8..91a5492c1 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/ar.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/ar.json @@ -827,7 +827,7 @@ "sfaTitle":"Second Factors Authentication", "sfExtra":"Additional second factors", "sfRequired":"Require 2FA", -"sfRemovedNotification":"Display a message if an expired SF is removed", +"sfRemovedNotification":"Warn if an expired SF is removed", "sfRemovedMsgRule":"تفعيل", "sfRemovedUseNotif":"Use Notifications plugin", "sfRemovedNotifMsg":"Notification message", diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/de.json b/lemonldap-ng-manager/site/htdocs/static/languages/de.json index 1027d4d2d..947fddab8 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/de.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/de.json @@ -827,7 +827,7 @@ "sfaTitle":"Second Factors Authentication", "sfExtra":"Additional second factors", "sfRequired":"Require 2FA", -"sfRemovedNotification":"Display a message if an expired SF is removed", +"sfRemovedNotification":"Warn if an expired SF is removed", "sfRemovedMsgRule":"Activation", "sfRemovedUseNotif":"Use Notifications plugin", "sfRemovedNotifMsg":"Notification message", diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/en.json b/lemonldap-ng-manager/site/htdocs/static/languages/en.json index ebd8404eb..f20443331 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/en.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/en.json @@ -827,7 +827,7 @@ "sfaTitle":"Second Factors Authentication", "sfExtra":"Additional second factors", "sfRequired":"Require 2FA", -"sfRemovedNotification":"Display a message if an expired SF is removed", +"sfRemovedNotification":"Warn if an expired SF is removed", "sfRemovedMsgRule":"Activation", "sfRemovedUseNotif":"Use Notifications plugin", "sfRemovedNotifMsg":"Notification message", diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/fr.json b/lemonldap-ng-manager/site/htdocs/static/languages/fr.json index 1877bba07..c0d3382bd 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/fr.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/fr.json @@ -827,7 +827,7 @@ "sfaTitle":"Seconds Facteurs d'Authentification", "sfExtra":"Seconds facteurs additionnels", "sfRequired":"Exiger 2FA", -"sfRemovedNotification":"Afficher un message si un SF expiré a été supprimé", +"sfRemovedNotification":"Avertir si un SF expiré a été supprimé", "sfRemovedMsgRule":"Activation", "sfRemovedUseNotif":"Utiliser les notifications", "sfRemovedNotifMsg":"Message de la notification", diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/it.json b/lemonldap-ng-manager/site/htdocs/static/languages/it.json index f990627e6..895c5440f 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/it.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/it.json @@ -827,7 +827,7 @@ "sfaTitle":"Autenticazione a due fattori", "sfExtra":"Additional second factors", "sfRequired":"Richiedi 2FA", -"sfRemovedNotification":"Display a message if an expired SF is removed", +"sfRemovedNotification":"Warn if an expired SF is removed", "sfRemovedMsgRule":"Attivazione", "sfRemovedUseNotif":"Use Notifications plugin", "sfRemovedNotifMsg":"Notification message", diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/tr.json b/lemonldap-ng-manager/site/htdocs/static/languages/tr.json index 8a9b5e6ae..b0c15ca3d 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/tr.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/tr.json @@ -827,7 +827,7 @@ "sfaTitle":"İki Faktörlü Kimlik Doğrulaması", "sfExtra":"Ek ikinci faktörler", "sfRequired":"2FA gerektir", -"sfRemovedNotification":"Süresi dolan bir SF kaldırıldığında bir mesaj göster", +"sfRemovedNotification":"Warn if an expired SF is removed", "sfRemovedMsgRule":"Aktivasyon", "sfRemovedUseNotif":"Bildirimler eklentisini kullan", "sfRemovedNotifMsg":"Bildirim mesajı", diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/vi.json b/lemonldap-ng-manager/site/htdocs/static/languages/vi.json index 9e7a42282..ad9789f30 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/vi.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/vi.json @@ -827,7 +827,7 @@ "sfaTitle":"Second Factors Authentication", "sfExtra":"Additional second factors", "sfRequired":"Require 2FA", -"sfRemovedNotification":"Display a message if an expired SF is removed", +"sfRemovedNotification":"Warn if an expired SF is removed", "sfRemovedMsgRule":"Kích hoạt", "sfRemovedUseNotif":"Use Notifications plugin", "sfRemovedNotifMsg":"Notification message", diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/zh.json b/lemonldap-ng-manager/site/htdocs/static/languages/zh.json index 3cc1fe536..90e6112be 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/zh.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/zh.json @@ -827,7 +827,7 @@ "sfaTitle":"Second Factors Authentication", "sfExtra":"Additional second factors", "sfRequired":"Require 2FA", -"sfRemovedNotification":"Display a message if an expired SF is removed", +"sfRemovedNotification":"Warn if an expired SF is removed", "sfRemovedMsgRule":"激活", "sfRemovedUseNotif":"Use Notifications plugin", "sfRemovedNotifMsg":"Notification message", diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Engines/Default.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Engines/Default.pm index 092450e16..83a403c72 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Engines/Default.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Engines/Default.pm @@ -241,9 +241,10 @@ sub run { # Display message if required if ( $self->sfMsgRule->( $req, $req->sessionInfo ) ) { - my $uid = $req->user; - my $date = strftime "%Y-%m-%d", localtime; - my $ref = $self->conf->{sfRemovedNotifRef} || 'RemoveSF'; + my $uid = $req->user; + my $date = strftime "%Y-%m-%d", localtime; + my $ref = $self->conf->{sfRemovedNotifRef} || 'RemoveSF'; + $ref .= '-' . time(); my $title = $self->conf->{sfRemovedNotifTitle} || 'Second factor notification'; my $msg = $self->conf->{sfRemovedNotifMsg} @@ -255,8 +256,11 @@ sub run { ? { trspan => "expired2Fremoved, $removed" } : { trspan => "oneExpired2Fremoved" }; + my $notifEngine = $self->p->loadedModules->{ + 'Lemonldap::NG::Portal::Plugins::Notifications'}; + my $res = - $self->conf->{sfRemovedUseNotif} + ( $self->conf->{sfRemovedUseNotif} && $notifEngine ) ? $self->createNotification( $req, $uid, $date, $ref, $title, $msg ) : $self->displayTemplate( $req, 'simpleInfo', $params ); 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 3d2885803..e594ad834 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Plugin.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Plugin.pm @@ -78,6 +78,7 @@ sub createNotification { my $notifEngine = $self->p->loadedModules->{ 'Lemonldap::NG::Portal::Plugins::Notifications'}; + $self->logger->debug("Loading Notifications plugin..."); return PE_ERROR unless $notifEngine; # Prepare notification diff --git a/lemonldap-ng-portal/site/templates/bootstrap/menu.tpl b/lemonldap-ng-portal/site/templates/bootstrap/menu.tpl index c2d3911e0..785f6470c 100644 --- a/lemonldap-ng-portal/site/templates/bootstrap/menu.tpl +++ b/lemonldap-ng-portal/site/templates/bootstrap/menu.tpl @@ -72,10 +72,10 @@ sfaManager - -
  • - common/icons/switchcontext_.png" width="20" height="20" alt="ContentSwitching" /> - ">contextSwitching_ + +
  • + common/icons/notifsExplorer.png" width="20" height="20" alt="NotificationsExplorer" /> + notificationsExplorer
    • @@ -84,10 +84,10 @@ decryptCipheredValue - -
  • - common/icons/notifsExplorer.png" width="20" height="20" alt="NotificationsExplorer" /> - notificationsExplorer + +
  • + common/icons/switchcontext_.png" width="20" height="20" alt="ContentSwitching" /> + ">contextSwitching_
  • diff --git a/lemonldap-ng-portal/t/67-CheckUser-with-Impersonation-and-Macros.t b/lemonldap-ng-portal/t/67-CheckUser-with-Impersonation-and-Macros.t index 4283777e9..c47f2b6e8 100644 --- a/lemonldap-ng-portal/t/67-CheckUser-with-Impersonation-and-Macros.t +++ b/lemonldap-ng-portal/t/67-CheckUser-with-Impersonation-and-Macros.t @@ -174,7 +174,7 @@ m%
    [2]->[0] =~ m%Macro_1%, 'Found uid' ) or explain( $res->[2]->[0], 'Attribute Value uid' ); -ok( my $nbr = ( $res->[2]->[0] =~ s%Macro_1%%g ), +ok( $nbr = ( $res->[2]->[0] =~ s%Macro_1%%g ), 'Found two well computed macros' ) or explain( $res->[2]->[0], 'Macros not well computed' ); ok( $res->[2]->[0] =~ m%
    authGroup
    %, 'Found group "authGroup"' ) diff --git a/lemonldap-ng-portal/t/68-ContextSwitching-with-TOTP-and-Notification.t b/lemonldap-ng-portal/t/68-ContextSwitching-with-TOTP-and-Notification.t index f63430312..dae421e40 100644 --- a/lemonldap-ng-portal/t/68-ContextSwitching-with-TOTP-and-Notification.t +++ b/lemonldap-ng-portal/t/68-ContextSwitching-with-TOTP-and-Notification.t @@ -159,7 +159,7 @@ count(4); ok( $code = Lemonldap::NG::Common::TOTP::_code( undef, $keyR, 0, 30, 6 ), 'Code' ); ok( $code =~ /^\d{6}$/, 'Code contains 6 digits' ); -my $s = "code=$code&token=$token"; +$s = "code=$code&token=$token"; ok( $res = $client->_post( '/2fregisters/totp/verify', diff --git a/lemonldap-ng-portal/t/70-2F-TOTP-with-TTL-and-JSON.t b/lemonldap-ng-portal/t/70-2F-TOTP-with-TTL-and-JSON.t index d068e1a4f..b36bf7184 100644 --- a/lemonldap-ng-portal/t/70-2F-TOTP-with-TTL-and-JSON.t +++ b/lemonldap-ng-portal/t/70-2F-TOTP-with-TTL-and-JSON.t @@ -3,8 +3,7 @@ use strict; use IO::String; require 't/test-lib.pm'; -my $maintests = 20; -my $file = '20190616_dwho_Tm90aWZpY2F0aW9uX1NG.json'; +my $maintests = 21; SKIP: { eval { require Convert::Base32 }; @@ -21,6 +20,7 @@ SKIP: { totp2fTTL => 120, sfRemovedMsgRule => '$uid eq "dwho"', sfRemovedUseNotif => 1, + sfRemovedNotifRef => 'RemoveTOTP', portalMainLogo => 'common/logos/logo_llng_old.png', notification => 1, notificationStorage => 'File', @@ -146,9 +146,11 @@ SKIP: { expectOK($res); ok( $res->[2]->[0] =~ - qr%%, +qr%%, 'Notification reference found' ) or print STDERR Dumper( $res->[2]->[0] ); + ok( time() + 300 <= $1 && $1 <= time() + 305, 'Right reference found' ) + or print STDERR Dumper( $res->[2]->[0] ); ok( $res->[2]->[0] =~ qr%

    1 expired second factor\(s\) has/have been removed!

    %, @@ -158,7 +160,7 @@ qr%

    1 expired second factor\(s\) has/have been removed!

    % $client->logout($id); } count($maintests); -system 'rm -f t/*_dwho_UmVtb3ZlU0Y=.json'; +system 'rm -f t/*_dwho_*.json'; clean_sessions(); done_testing( count() ); diff --git a/lemonldap-ng-portal/t/70-2F-TOTP-with-TTL-and-XML.t b/lemonldap-ng-portal/t/70-2F-TOTP-with-TTL-and-XML.t index a8ce32144..927a08d0e 100644 --- a/lemonldap-ng-portal/t/70-2F-TOTP-with-TTL-and-XML.t +++ b/lemonldap-ng-portal/t/70-2F-TOTP-with-TTL-and-XML.t @@ -3,8 +3,7 @@ use strict; use IO::String; require 't/test-lib.pm'; -my $maintests = 20; -my $file = '20190616_dwho_Tm90aWZpY2F0aW9uX1NG.json'; +my $maintests = 21; SKIP: { eval { @@ -25,6 +24,7 @@ SKIP: { totp2fTTL => 120, sfRemovedMsgRule => '$uid eq "dwho"', sfRemovedUseNotif => 1, + sfRemovedNotifRef => 'RemoveTOTP', portalMainLogo => 'common/logos/logo_llng_old.png', notification => 1, notificationStorage => 'File', @@ -150,9 +150,11 @@ SKIP: { expectOK($res); ok( $res->[2]->[0] =~ - qr%%, +qr%%, 'Notification reference found' ) or print STDERR Dumper( $res->[2]->[0] ); + ok( time() + 300 <= $1 && $1 <= time() + 305, 'Right reference found' ) + or print STDERR Dumper( $res->[2]->[0] ); ok( $res->[2]->[0] =~ qr%

    1 expired second factor\(s\) has/have been removed!

    %, @@ -162,7 +164,7 @@ qr%

    1 expired second factor\(s\) has/have been removed!

    % $client->logout($id); } count($maintests); -system 'rm -f t/*_dwho_UmVtb3ZlU0Y=.xml'; +system 'rm -f t/*_dwho_*.xml'; clean_sessions(); done_testing( count() );