diff --git a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Attributes.pm b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Attributes.pm index 6aded4fe2..72a4719b5 100644 --- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Attributes.pm +++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Attributes.pm @@ -1128,6 +1128,10 @@ sub attributes { documentation => 'Authentication level for users authentified by External second factor' }, + ext2fLogo => { + type => 'text', + documentation => 'Custom logo for External 2F', + }, # REST External second factor rest2fActivation => { @@ -1164,6 +1168,10 @@ sub attributes { documentation => 'Authentication level for users authentified by REST second factor' }, + rest2fLogo => { + type => 'text', + documentation => 'Custom logo for REST 2F', + }, # Single session notifyDeleted => { 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 08b9e9bc9..8d977481f 100644 --- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Tree.pm +++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Tree.pm @@ -676,6 +676,7 @@ sub tree { nodes => [ 'ext2fActivation', 'ext2FSendCommand', 'ext2FValidateCommand', 'ext2fAuthnLevel', + 'ext2fLogo', ] }, { @@ -686,6 +687,7 @@ sub tree { 'rest2fActivation', 'rest2fInitUrl', 'rest2fInitArgs', 'rest2fVerifyUrl', 'rest2fVerifyArgs', 'rest2fAuthnLevel', + 'rest2fLogo', ] }, ] diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/ar.json b/lemonldap-ng-manager/site/htdocs/static/languages/ar.json index 76d2e1c24..a2b02715c 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/ar.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/ar.json @@ -234,6 +234,7 @@ "external2f":" العامل الثاني الخارجي", "ext2fActivation":"تفعيل", "ext2fAuthnLevel":"مستوى إثبات الهوية", +"ext2fLogo":"Logo", "ext2FSendCommand":"إرسال الأمر", "ext2FValidateCommand":"التحقق من صحة الأمر", "facebookAppId":"هوية تطبيق فاسيبوك", @@ -639,6 +640,7 @@ "rest2fAuthnLevel":"Authentication level", "rest2fInitArgs":"Init Arguments", "rest2fInitUrl":"Init URL", +"rest2fLogo":"Logo", "rest2fVerifyArgs":"Verify Arguments", "rest2fVerifyUrl":"Verify URL", "restParams":"معايير ريست", diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/en.json b/lemonldap-ng-manager/site/htdocs/static/languages/en.json index d8e0bc247..8c78790eb 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/en.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/en.json @@ -234,6 +234,7 @@ "external2f":"External 2nd factor", "ext2fActivation":"Activation", "ext2fAuthnLevel":"Authentication level", +"ext2fLogo":"Logo", "ext2FSendCommand":"Send comand", "ext2FValidateCommand":"Validation command", "facebookAppId":"Facebook application ID", @@ -639,6 +640,7 @@ "rest2fAuthnLevel":"Authentication level", "rest2fInitArgs":"Init Arguments", "rest2fInitUrl":"Init URL", +"rest2fLogo":"Logo", "rest2fVerifyArgs":"Verify Arguments", "rest2fVerifyUrl":"Verify URL", "restParams":"REST parameters", diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/fr.json b/lemonldap-ng-manager/site/htdocs/static/languages/fr.json index df72e4b38..52156749a 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/fr.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/fr.json @@ -234,6 +234,7 @@ "external2f":"2nd facteur externe", "ext2fActivation":"Activation", "ext2fAuthnLevel":"Niveau de l'authentification", +"ext2fLogo":"Logo", "ext2FSendCommand":"Commande pour l'envoi", "ext2FValidateCommand":"Commande pour la validation", "facebookAppId":"ID de l'application Facebook", @@ -639,6 +640,7 @@ "rest2fAuthnLevel":"Niveau d'authentification", "rest2fInitArgs":"Arguments d'initialisation", "rest2fInitUrl":"URL d'initialisation", +"rest2fLogo":"Logo", "rest2fVerifyArgs":"Arguments de vérification", "rest2fVerifyUrl":"URL de vérification", "restParams":"Paramètres REST", diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/it.json b/lemonldap-ng-manager/site/htdocs/static/languages/it.json index 58ba5cfd8..0d3521e9d 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/it.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/it.json @@ -234,6 +234,7 @@ "external2f":"2° fattore esterno", "ext2fActivation":"Attivazione", "ext2fAuthnLevel":"Livello di autenticazione", +"ext2fLogo":"Logo", "ext2FSendCommand":"Invia comando", "ext2FValidateCommand":"Comando di convalida", "facebookAppId":"ID dell'applicazione Facebook", @@ -639,6 +640,7 @@ "rest2fAuthnLevel":"Authentication level", "rest2fInitArgs":"Init Arguments", "rest2fInitUrl":"Init URL", +"rest2fLogo":"Logo", "rest2fVerifyArgs":"Verify Arguments", "rest2fVerifyUrl":"Verify URL", "restParams":"Parametri REST", diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/vi.json b/lemonldap-ng-manager/site/htdocs/static/languages/vi.json index 6ec4568fa..9b159a395 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/vi.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/vi.json @@ -234,6 +234,7 @@ "external2f":"Yếu tố thứ 2 bên ngoài ", "ext2fActivation":"Kích hoạt", "ext2fAuthnLevel":"Mức xác thực", +"ext2fLogo":"Logo", "ext2FSendCommand":"Gửi lệnh", "ext2FValidateCommand":"Xác nhận lệnh", "facebookAppId":"ID ứng dụng Facebook ", @@ -639,6 +640,7 @@ "rest2fAuthnLevel":"Authentication level", "rest2fInitArgs":"Init Arguments", "rest2fInitUrl":"Init URL", +"rest2fLogo":"Logo", "rest2fVerifyArgs":"Verify Arguments", "rest2fVerifyUrl":"Verify URL", "restParams":"Tham số REST", diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Ext2F.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Ext2F.pm index 4cd83ec54..175d107fa 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Ext2F.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Ext2F.pm @@ -26,6 +26,7 @@ sub init { return 0; } } + $self->logo( $self->conf->{ext2fLogo} ) if ( $self->conf->{ext2fLogo} ); return $self->SUPER::init(); } diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/REST.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/REST.pm index d84cc20b7..3185e6a91 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/REST.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/REST.pm @@ -29,6 +29,7 @@ sub init { $self->logger->error('Missing REST verification URL'); return 0; } + $self->logo( $self->conf->{rest2fLogo} ) if ( $self->conf->{rest2fLogo} ); foreach my $k ( keys %{ $self->conf->{rest2fInitArgs} } ) { my $attr = $self->conf->{rest2fInitArgs}->{$k}; $attr =~ s/^$//;