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

Append an option to display sfManager link (#2185)

This commit is contained in:
Christophe Maudoux 2020-04-30 20:50:03 +02:00
parent ac9769ff69
commit 7014327232
15 changed files with 38 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -325,6 +325,7 @@ sub defaultValues {
'samlSPSSODescriptorWantAssertionsSigned' => 1,
'securedCookie' => 0,
'sfEngine' => '::2F::Engines::Default',
'sfManagerRule' => 1,
'sfRemovedMsgRule' => 0,
'sfRemovedNotifMsg' =>
'_removedSF_ expired second factor(s) has/have been removed!',

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

@ -3599,6 +3599,10 @@ qr/(?:(?:https?):\/\/(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.]
},
'type' => 'sfExtraContainer'
},
'sfManagerRule' => {
'default' => 1,
'type' => 'boolOrExpr'
},
'sfRemovedMsgRule' => {
'default' => 0,
'type' => 'boolOrExpr'

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

@ -2974,6 +2974,13 @@ sub attributes {
help => 'secondfactor.html',
documentation => 'Second factor required',
},
sfManagerRule => {
type => 'boolOrExpr',
default => 1,
help => 'secondfactor.html',
documentation =>
'Rule to display second factor Manager link',
},
sfRemovedMsgRule => {
type => 'boolOrExpr',
default => 0,

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

@ -901,6 +901,7 @@ sub tree {
'sfRemovedNotifMsg',
],
},
'sfManagerRule',
'sfRequired',
]
},

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

@ -837,6 +837,7 @@
"sessionTitle":"محتوى الجلسة",
"sfaTitle":"Second factors authentication",
"sfExtra":"Additional second factors",
"sfManagerRule":"Display Manager link",
"sfRequired":"Force 2FA registration at login",
"sfRemovedNotification":"Warn if an expired 2FA is removed",
"sfRemovedMsgRule":"تفعيل",

1
lemonldap-ng-manager/site/htdocs/static/languages/de.json
View File

@ -837,6 +837,7 @@
"sessionTitle":"Session content",
"sfaTitle":"Second factors authentication",
"sfExtra":"Additional second factors",
"sfManagerRule":"Display Manager link",
"sfRequired":"Force 2FA registration at login",
"sfRemovedNotification":"Warn if an expired 2FA is removed",
"sfRemovedMsgRule":"Activation",

1
lemonldap-ng-manager/site/htdocs/static/languages/en.json
View File

@ -837,6 +837,7 @@
"sessionTitle":"Session content",
"sfaTitle":"Second factors authentication",
"sfExtra":"Additional second factors",
"sfManagerRule":"Display Manager link",
"sfRequired":"Force 2FA registration at login",
"sfRemovedNotification":"Warn if an expired 2FA is removed",
"sfRemovedMsgRule":"Activation",

1
lemonldap-ng-manager/site/htdocs/static/languages/fr.json
View File

@ -837,6 +837,7 @@
"sessionTitle":"Contenu de la session",
"sfaTitle":"Seconds facteurs d'authentification",
"sfExtra":"Seconds facteurs additionnels",
"sfManagerRule":"Afficher le lien du Gestionnaire",
"sfRequired":"Exiger l'enrôlement d'un SF à l'authentification",
"sfRemovedNotification":"Avertir si un SF expiré est supprimé",
"sfRemovedMsgRule":"Activation",

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

@ -837,6 +837,7 @@
"sessionTitle":"Contenuto della sessione",
"sfaTitle":"Autenticazione a due fattori",
"sfExtra":"Additional second factors",
"sfManagerRule":"Display Manager link",
"sfRequired":"Force 2FA registration at login",
"sfRemovedNotification":"Warn if an expired 2FA is removed",
"sfRemovedMsgRule":"Attivazione",

1
lemonldap-ng-manager/site/htdocs/static/languages/tr.json
View File

@ -837,6 +837,7 @@
"sessionTitle":"Oturum içeriği",
"sfaTitle":"İki Faktörlü Kimlik Doğrulaması",
"sfExtra":"Ek ikinci faktörler",
"sfManagerRule":"Display Manager link",
"sfRequired":"Force 2FA registration at login",
"sfRemovedNotification":"Warn if an expired 2FA is removed",
"sfRemovedMsgRule":"Aktivasyon",

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

@ -837,6 +837,7 @@
"sessionTitle":"Nội dung phiên",
"sfaTitle":"Second factors authentication",
"sfExtra":"Additional second factors",
"sfManagerRule":"Display Manager link",
"sfRequired":"Force 2FA registration at login",
"sfRemovedNotification":"Warn if an expired 2FA is removed",
"sfRemovedMsgRule":"Kích hoạt",

1
lemonldap-ng-manager/site/htdocs/static/languages/zh.json
View File

@ -837,6 +837,7 @@
"sessionTitle":"Session content",
"sfaTitle":"Second factors authentication",
"sfExtra":"Additional second factors",
"sfManagerRule":"Display Manager link",
"sfRequired":"Force 2FA registration at login",
"sfRemovedNotification":"Warn if an expired 2FA is removed",
"sfRemovedMsgRule":"激活",

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

22
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Menu.pm
View File

@ -30,7 +30,8 @@ has menuModules => (
}
);
has specific => ( is => 'rw', default => sub { {} } );
has specific => ( is => 'rw', default => sub { {} } );
has sfManagerRule => ( is => 'rw', default => sub { 1 } );
has imgPath => (
is => 'rw',
@ -44,7 +45,13 @@ has imgPath => (
# INITIALIZATION
sub init {
1;
my ($self) = @_;
$self->sfManagerRule(
$self->p->buildRule( $self->conf->{sfManagerRule}, 'sfManagerRule' ) );
$self->sfManagerRule(1) unless $self->sfManagerRule;
return 1;
}
# RUNNING METHODS
@ -109,9 +116,10 @@ sub params {
$res{AUTH_ERROR_TYPE} =
$req->error_type( $res{AUTH_ERROR} = $req->menuError );
# Display menu 2fRegisters link only if at least a 2F device is registered
# Display menu 2fRegisters link only if at least a 2F device is registered and rule
$res{sfaManager} =
$self->p->_sfEngine->display2fRegisters( $req, $req->userData );
$self->p->_sfEngine->display2fRegisters( $req, $req->userData )
&& $self->sfManagerRule->( $req, $req->userData );
$self->logger->debug("Display 2fRegisters link") if $res{sfaManager};
# Display refresh my rights unless disabled
@ -285,11 +293,11 @@ sub _buildApplicationHash {
my $applications;
# Get application items
my $appname = $apphash->{options}->{name} || $appid;
my $appuri = $apphash->{options}->{uri} || "";
my $appname = $apphash->{options}->{name} || $appid;
my $appuri = $apphash->{options}->{uri} || "";
my $appdesc = $apphash->{options}->{description};
my $applogo = $apphash->{options}->{logo};
my $apptip = $apphash->{options}->{tooltip} || $appname;
my $apptip = $apphash->{options}->{tooltip} || $appname;
# Detect sub applications
my $subapphash;