diff --git a/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_Struct.pm b/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_Struct.pm index 3de16d27a..0650a2083 100644 --- a/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_Struct.pm +++ b/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_Struct.pm @@ -483,10 +483,11 @@ sub struct { # Radius radiusParams => { - _nodes => [ qw(radiusSecret radiusServer) ], - _help => 'authRadius', - radiusSecret => 'text:/radiusSecret', - radiusServer => 'text:/radiusServer', + _nodes => [qw(radiusAuthnLevel radiusSecret radiusServer)], + _help => 'authRadius', + radiusAuthnLevel => 'int:/radiusAuthnLevel', + radiusSecret => 'text:/radiusSecret', + radiusServer => 'text:/radiusServer', }, # Remote @@ -1733,8 +1734,9 @@ sub testStruct { }, # Radius - radiusSecret => $testNotDefined, - radiusServer => $testNotDefined, + radiusAuthnLevel => $integer, + radiusSecret => $testNotDefined, + radiusServer => $testNotDefined, # Remote remotePortal => $testNotDefined, @@ -1897,6 +1899,7 @@ sub defaultConf { portalDisplayResetPassword => '1', portalAntiFrame => '1', protection => 'none', + radiusAuthnLevel => '3', remoteGlobalStorage => 'Lemonldap::NG::Common::Apache::Session::SOAP', securedCookie => '0', secureTokenMemcachedServers => '127.0.0.1:11211', diff --git a/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_i18n.pm b/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_i18n.pm index befa5d638..7d731e15f 100644 --- a/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_i18n.pm +++ b/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_i18n.pm @@ -270,9 +270,10 @@ sub en { post => 'Form replay', proxyParams => 'Proxy parameters', purgeNotification => 'Delete notification definitely', - radiusParams => 'RADIUS parameters', - radiusSecret => 'RADIUS secret', - radiusServer => 'RADIUS server hostname', + radiusAuthnLevel => 'Authentication level', + radiusParams => 'Radius parameters', + radiusSecret => 'Shared secret', + radiusServer => 'Server hostname', randomPasswordRegexp => 'Regexp for password generation', redirection => 'Handler redirections', remoteCookieName => 'Cookie name', @@ -712,9 +713,10 @@ sub fr { post => 'Rejeu de formulaires', proxyParams => 'Paramètres Proxy', purgeNotification => 'Supprimer définitivement la notification', - radiusParams => 'Paramètres RADIUS', - radiusSecret => 'Secret partagé avec le serveur RADIUS', - radiusServer => 'Nom d\'hôte du serveur RADIUS', + radiusAuthnLevel => "Niveau d'authentification", + radiusParams => 'Paramètres Radius', + radiusSecret => 'Secret partagé', + radiusServer => "Nom d'hôte du serveur", randomPasswordRegexp => 'Expression regulière pour la génération des mots de passe', redirection => 'Redirections du Handler', diff --git a/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Simple.pm b/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Simple.pm index d3c908e85..df3831ee7 100644 --- a/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Simple.pm +++ b/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Simple.pm @@ -617,7 +617,8 @@ sub setDefaultValues { $self->{twitterAuthnLevel} = 1 unless defined $self->{twitterAuthnLevel}; $self->{apacheAuthnLevel} = 4 unless defined $self->{apacheAuthnLevel}; - $self->{nullAuthnLevel} = 2 unless defined $self->{nullAuthnLevel}; + $self->{nullAuthnLevel} = 0 unless defined $self->{nullAuthnLevel}; + $self->{radiusAuthnLevel} = 3 unless defined $self->{radiusAuthnLevel}; # Other $self->{logoutServices} ||= {};