More translations in errors

This commit is contained in:
Xavier Guimard 2016-03-09 06:06:46 +00:00
parent 3dc93bd0aa
commit 580d5a4bcc
4 changed files with 133 additions and 90 deletions

View File

@ -70,9 +70,9 @@ qr/^(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-
'test' => qr/^.*$/ 'test' => qr/^.*$/
}, },
'keyTextContainer' => { 'keyTextContainer' => {
'keyMsgFail' => 'Bad key name', 'keyMsgFail' => '__badKeyName__',
'keyTest' => qr/^\w[\w\.\-]*$/, 'keyTest' => qr/^\w[\w\.\-]*$/,
'msgFail' => 'Empty value non accorded', 'msgFail' => '__emptyValueNotAllowed__',
'test' => qr/./ 'test' => qr/./
}, },
'lmAttrOrMacro' => { 'lmAttrOrMacro' => {
@ -280,8 +280,9 @@ sub attributes {
'type' => 'catAndAppList' 'type' => 'catAndAppList'
}, },
'authChoiceModules' => { 'authChoiceModules' => {
'keyTest' => qr/^(\d*)?[a-zA-Z0-9_]+$/, 'keyMsgFail' => '__badChoiceKey__',
'select' => [ 'keyTest' => qr/^(\d*)?[a-zA-Z0-9_]+$/,
'select' => [
[ [
{ {
'k' => 'Apache', 'k' => 'Apache',
@ -619,8 +620,9 @@ sub attributes {
'type' => 'text' 'type' => 'text'
}, },
'CAS_proxiedServices' => { 'CAS_proxiedServices' => {
'keyTest' => qr/^\w+$/, 'keyMsgFail' => '__badCasProxyId__',
'type' => 'keyTextContainer' 'keyTest' => qr/^\w+$/,
'type' => 'keyTextContainer'
}, },
'CAS_renew' => { 'CAS_renew' => {
'type' => 'bool' 'type' => 'bool'
@ -739,11 +741,12 @@ qr/(?:(?:https?):\/\/(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.]
'type' => 'text' 'type' => 'text'
}, },
'dbiExportedVars' => { 'dbiExportedVars' => {
'default' => {}, 'default' => {},
'keyTest' => qr/^!?[a-zA-Z][a-zA-Z0-9_-]*$/, 'keyMsgFail' => '__badVariableName__',
'msgFail' => '__badValue__', 'keyTest' => qr/^!?[a-zA-Z][a-zA-Z0-9_-]*$/,
'test' => qr/^[a-zA-Z][a-zA-Z0-9_:\-]*$/, 'msgFail' => '__badValue__',
'type' => 'keyTextContainer' 'test' => qr/^[a-zA-Z][a-zA-Z0-9_:\-]*$/,
'type' => 'keyTextContainer'
}, },
'dbiPasswordMailCol' => { 'dbiPasswordMailCol' => {
'type' => 'text' 'type' => 'text'
@ -766,10 +769,11 @@ qr/(?:(?:https?):\/\/(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.]
'mail' => 'mail', 'mail' => 'mail',
'uid' => 'uid' 'uid' => 'uid'
}, },
'keyTest' => qr/^!?[a-zA-Z][a-zA-Z0-9_-]*$/, 'keyMsgFail' => '__badVariableName__',
'msgFail' => '__badValue__', 'keyTest' => qr/^!?[a-zA-Z][a-zA-Z0-9_-]*$/,
'test' => qr/^[a-zA-Z][a-zA-Z0-9_:\-]*$/, 'msgFail' => '__badValue__',
'type' => 'keyTextContainer' 'test' => qr/^[a-zA-Z][a-zA-Z0-9_:\-]*$/,
'type' => 'keyTextContainer'
}, },
'domain' => { 'domain' => {
'default' => 'example.com', 'default' => 'example.com',
@ -782,6 +786,7 @@ qr/^(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-zA-
'type' => 'text' 'type' => 'text'
}, },
'exportedHeaders' => { 'exportedHeaders' => {
'keyMsgFail' => '__badHostname__',
'keyTest' => 'keyTest' =>
qr/^(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-zA-Z0-9]*[a-zA-Z0-9]|[a-zA-Z])[.]?)$/, qr/^(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-zA-Z0-9]*[a-zA-Z0-9]|[a-zA-Z])[.]?)$/,
'test' => { 'test' => {
@ -816,10 +821,11 @@ qr/^(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-zA-Z0-
'default' => { 'default' => {
'UA' => 'HTTP_USER_AGENT' 'UA' => 'HTTP_USER_AGENT'
}, },
'keyTest' => qr/^!?[_a-zA-Z][a-zA-Z0-9_]*$/, 'keyMsgFail' => '__badVariableName__',
'msgFail' => '__badValue__', 'keyTest' => qr/^!?[_a-zA-Z][a-zA-Z0-9_]*$/,
'test' => qr/^[_a-zA-Z][a-zA-Z0-9_:\-]*$/, 'msgFail' => '__badValue__',
'type' => 'keyTextContainer' 'test' => qr/^[_a-zA-Z][a-zA-Z0-9_:\-]*$/,
'type' => 'keyTextContainer'
}, },
'facebookAppId' => { 'facebookAppId' => {
'type' => 'text' 'type' => 'text'
@ -832,11 +838,12 @@ qr/^(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-zA-Z0-
'type' => 'int' 'type' => 'int'
}, },
'facebookExportedVars' => { 'facebookExportedVars' => {
'default' => {}, 'default' => {},
'keyTest' => qr/^!?[a-zA-Z][a-zA-Z0-9_-]*$/, 'keyMsgFail' => '__badVariableName__',
'msgFail' => '__badValue__', 'keyTest' => qr/^!?[a-zA-Z][a-zA-Z0-9_-]*$/,
'test' => qr/^[a-zA-Z][a-zA-Z0-9_:\-]*$/, 'msgFail' => '__badValue__',
'type' => 'keyTextContainer' 'test' => qr/^[a-zA-Z][a-zA-Z0-9_:\-]*$/,
'type' => 'keyTextContainer'
}, },
'failedLoginNumber' => { 'failedLoginNumber' => {
'default' => 5, 'default' => 5,
@ -860,11 +867,12 @@ qr/^(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-zA-Z0-
'type' => 'int' 'type' => 'int'
}, },
'googleExportedVars' => { 'googleExportedVars' => {
'default' => {}, 'default' => {},
'keyTest' => qr/^!?[a-zA-Z][a-zA-Z0-9_-]*$/, 'keyMsgFail' => '__badVariableName__',
'msgFail' => '__badValue__', 'keyTest' => qr/^!?[a-zA-Z][a-zA-Z0-9_-]*$/,
'test' => qr/^[a-zA-Z][a-zA-Z0-9_:\-]*$/, 'msgFail' => '__badValue__',
'type' => 'keyTextContainer' 'test' => qr/^[a-zA-Z][a-zA-Z0-9_:\-]*$/,
'type' => 'keyTextContainer'
}, },
'grantSessionRules' => { 'grantSessionRules' => {
'keyTest' => sub { 'keyTest' => sub {
@ -1025,10 +1033,11 @@ qr/^(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-zA-Z0-
'mail' => 'mail', 'mail' => 'mail',
'uid' => 'uid' 'uid' => 'uid'
}, },
'keyTest' => qr/^!?[a-zA-Z][a-zA-Z0-9_-]*$/, 'keyMsgFail' => '__badVariableName__',
'msgFail' => '__badValue__', 'keyTest' => qr/^!?[a-zA-Z][a-zA-Z0-9_-]*$/,
'test' => qr/^[a-zA-Z][a-zA-Z0-9_:\-]*$/, 'msgFail' => '__badValue__',
'type' => 'keyTextContainer' 'test' => qr/^[a-zA-Z][a-zA-Z0-9_:\-]*$/,
'type' => 'keyTextContainer'
}, },
'LDAPFilter' => { 'LDAPFilter' => {
'type' => 'text' 'type' => 'text'
@ -1113,7 +1122,7 @@ qr/^(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-zA-Z0-
my $l = shift(); my $l = shift();
my @s = split( /[\s,]+/, $l, 0 ); my @s = split( /[\s,]+/, $l, 0 );
foreach my $s (@s) { foreach my $s (@s) {
return 0, qq[Bad ldap uri "$s"] return 0, qq[__badLdapUri__: "$s"]
unless $s =~ unless $s =~
m[^(?:ldapi://[^/]*/?|\w[\w\-\.]*(?::\d{1,5})?|ldap(?:s|\+tls)?://\w[\w\-\.]*(?::\d{1,5})?/?.*)$]o; m[^(?:ldapi://[^/]*/?|\w[\w\-\.]*(?::\d{1,5})?|ldap(?:s|\+tls)?://\w[\w\-\.]*(?::\d{1,5})?/?.*)$]o;
} }
@ -1155,6 +1164,7 @@ m[^(?:ldapi://[^/]*/?|\w[\w\-\.]*(?::\d{1,5})?|ldap(?:s|\+tls)?://\w[\w\-\.]*(?:
'default' => { 'default' => {
'default' => 'deny' 'default' => 'deny'
}, },
'keyMsgFail' => '__badHostname__',
'keyTest' => 'keyTest' =>
qr/^(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-zA-Z0-9]*[a-zA-Z0-9]|[a-zA-Z])[.]?)$/, qr/^(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-zA-Z0-9]*[a-zA-Z0-9]|[a-zA-Z])[.]?)$/,
'test' => { 'test' => {
@ -1208,9 +1218,10 @@ qr/^(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-zA-Z0-
'type' => 'keyTextContainer' 'type' => 'keyTextContainer'
}, },
'macros' => { 'macros' => {
'default' => {}, 'default' => {},
'keyTest' => qr/^[_a-zA-Z][a-zA-Z0-9_]*$/, 'keyMsgFail' => '__badMacroName__',
'test' => sub { 'keyTest' => qr/^[_a-zA-Z][a-zA-Z0-9_]*$/,
'test' => sub {
my ( $val, $conf ) = @_; my ( $val, $conf ) = @_;
my $s = ''; my $s = '';
my (@cf) = ( my (@cf) = (
@ -1621,11 +1632,12 @@ qr/^(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-zA-Z0-
'type' => 'int' 'type' => 'int'
}, },
'openIdExportedVars' => { 'openIdExportedVars' => {
'default' => {}, 'default' => {},
'keyTest' => qr/^!?[a-zA-Z][a-zA-Z0-9_-]*$/, 'keyMsgFail' => '__badVariableName__',
'msgFail' => '__badValue__', 'keyTest' => qr/^!?[a-zA-Z][a-zA-Z0-9_-]*$/,
'test' => qr/^[a-zA-Z][a-zA-Z0-9_:\-]*$/, 'msgFail' => '__badValue__',
'type' => 'keyTextContainer' 'test' => qr/^[a-zA-Z][a-zA-Z0-9_:\-]*$/,
'type' => 'keyTextContainer'
}, },
'openIdIDPList' => { 'openIdIDPList' => {
'default' => '0;', 'default' => '0;',
@ -1825,7 +1837,8 @@ qr/^(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-zA-Z0-
'type' => 'portalskinbackground' 'type' => 'portalskinbackground'
}, },
'portalSkinRules' => { 'portalSkinRules' => {
'keyTest' => sub { 'keyMsgFail' => '__badSkinRule__',
'keyTest' => sub {
my ( $val, $conf ) = @_; my ( $val, $conf ) = @_;
my $s = ''; my $s = '';
my (@cf) = ( my (@cf) = (
@ -1856,6 +1869,7 @@ qr/^(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-zA-Z0-
'type' => 'text' 'type' => 'text'
}, },
'post' => { 'post' => {
'keyMsgFail' => '__badHostname__',
'keyTest' => 'keyTest' =>
qr/^(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-zA-Z0-9]*[a-zA-Z0-9]|[a-zA-Z])[.]?)$/, qr/^(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-zA-Z0-9]*[a-zA-Z0-9]|[a-zA-Z])[.]?)$/,
'test' => sub { 'test' => sub {
@ -2009,18 +2023,20 @@ qr/(?:(?:https?):\/\/(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.]
'type' => 'text' 'type' => 'text'
}, },
'samlIDPMetaDataExportedAttributes' => { 'samlIDPMetaDataExportedAttributes' => {
'default' => {}, 'default' => {},
'keyTest' => qr/^[a-zA-Z](?:[a-zA-Z0-9_\-\.]*\w)?$/, 'keyMsgFail' => '__badMetadataName__',
'msgFail' => '__badValue__', 'keyTest' => qr/^[a-zA-Z](?:[a-zA-Z0-9_\-\.]*\w)?$/,
'test' => qr/\w/, 'msgFail' => '__badValue__',
'type' => 'samlAttributeContainer' 'test' => qr/\w/,
'type' => 'samlAttributeContainer'
}, },
'samlIDPMetaDataNodes' => { 'samlIDPMetaDataNodes' => {
'type' => 'samlIDPMetaDataNodeContainer' 'type' => 'samlIDPMetaDataNodeContainer'
}, },
'samlIDPMetaDataOptions' => { 'samlIDPMetaDataOptions' => {
'keyTest' => qr/^[a-zA-Z](?:[a-zA-Z0-9_\-\.]*\w)?$/, 'keyMsgFail' => '__badMetadataName__',
'type' => 'keyTextContainer' 'keyTest' => qr/^[a-zA-Z](?:[a-zA-Z0-9_\-\.]*\w)?$/,
'type' => 'keyTextContainer'
}, },
'samlIDPMetaDataOptionsAdaptSessionUtime' => { 'samlIDPMetaDataOptionsAdaptSessionUtime' => {
'default' => 0, 'default' => 0,
@ -2304,18 +2320,20 @@ qr/(?:(?:https?):\/\/(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.]
'type' => 'bool' 'type' => 'bool'
}, },
'samlSPMetaDataExportedAttributes' => { 'samlSPMetaDataExportedAttributes' => {
'default' => {}, 'default' => {},
'keyTest' => qr/^[a-zA-Z](?:[a-zA-Z0-9_\-\.]*\w)?$/, 'keyMsgFail' => '__badMetadataName__',
'msgFail' => '__badValue__', 'keyTest' => qr/^[a-zA-Z](?:[a-zA-Z0-9_\-\.]*\w)?$/,
'test' => qr/\w/, 'msgFail' => '__badValue__',
'type' => 'samlAttributeContainer' 'test' => qr/\w/,
'type' => 'samlAttributeContainer'
}, },
'samlSPMetaDataNodes' => { 'samlSPMetaDataNodes' => {
'type' => 'samlSPMetaDataNodeContainer' 'type' => 'samlSPMetaDataNodeContainer'
}, },
'samlSPMetaDataOptions' => { 'samlSPMetaDataOptions' => {
'keyTest' => qr/^[a-zA-Z](?:[a-zA-Z0-9_\-\.]*\w)?$/, 'keyMsgFail' => '__badMetadataName__',
'type' => 'keyTextContainer' 'keyTest' => qr/^[a-zA-Z](?:[a-zA-Z0-9_\-\.]*\w)?$/,
'type' => 'keyTextContainer'
}, },
'samlSPMetaDataOptionsCheckSLOMessageSignature' => { 'samlSPMetaDataOptionsCheckSLOMessageSignature' => {
'default' => 0, 'default' => 0,
@ -2514,8 +2532,9 @@ qr/(?:(?:https?):\/\/(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.]
'type' => 'pcre' 'type' => 'pcre'
}, },
'sessionDataToRemember' => { 'sessionDataToRemember' => {
'keyTest' => qr/^[_a-zA-Z][a-zA-Z0-9_]*$/, 'keyMsgFail' => '__invalidSessionData__',
'type' => 'keyTextContainer' 'keyTest' => qr/^[_a-zA-Z][a-zA-Z0-9_]*$/,
'type' => 'keyTextContainer'
}, },
'singleIP' => { 'singleIP' => {
'default' => 0, 'default' => 0,
@ -2538,11 +2557,12 @@ qr/(?:(?:https?):\/\/(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.]
'type' => 'int' 'type' => 'int'
}, },
'slaveExportedVars' => { 'slaveExportedVars' => {
'default' => {}, 'default' => {},
'keyTest' => qr/^!?[a-zA-Z][a-zA-Z0-9_-]*$/, 'keyMsgFail' => '__badVariableName__',
'msgFail' => '__badValue__', 'keyTest' => qr/^!?[a-zA-Z][a-zA-Z0-9_-]*$/,
'test' => qr/^[a-zA-Z][a-zA-Z0-9_:\-]*$/, 'msgFail' => '__badValue__',
'type' => 'keyTextContainer' 'test' => qr/^[a-zA-Z][a-zA-Z0-9_:\-]*$/,
'type' => 'keyTextContainer'
}, },
'slaveHeaderContent' => { 'slaveHeaderContent' => {
'type' => 'text' 'type' => 'text'
@ -2758,11 +2778,12 @@ qr/(?:(?:https?):\/\/(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.]
'type' => 'int' 'type' => 'int'
}, },
'webIDExportedVars' => { 'webIDExportedVars' => {
'default' => {}, 'default' => {},
'keyTest' => qr/^!?[a-zA-Z][a-zA-Z0-9_-]*$/, 'keyMsgFail' => '__badVariableName__',
'msgFail' => '__badValue__', 'keyTest' => qr/^!?[a-zA-Z][a-zA-Z0-9_-]*$/,
'test' => qr/^[a-zA-Z][a-zA-Z0-9_:\-]*$/, 'msgFail' => '__badValue__',
'type' => 'keyTextContainer' 'test' => qr/^[a-zA-Z][a-zA-Z0-9_:\-]*$/,
'type' => 'keyTextContainer'
}, },
'webIDWhitelist' => { 'webIDWhitelist' => {
'type' => 'text' 'type' => 'text'

View File

@ -103,9 +103,9 @@ sub types {
}, },
keyTextContainer => { keyTextContainer => {
test => qr/./, test => qr/./,
msgFail => 'Empty value non accorded', msgFail => '__emptyValueNotAllowed__',
keyTest => qr/^\w[\w\.\-]*$/, keyTest => qr/^\w[\w\.\-]*$/,
keyMsgFail => 'Bad key name', keyMsgFail => '__badKeyName__',
}, },
subContainer => { subContainer => {
keyTest => qr/\w/, keyTest => qr/\w/,
@ -405,7 +405,7 @@ sub attributes {
type => 'keyTextContainer', type => 'keyTextContainer',
help => 'portalcustom.html', help => 'portalcustom.html',
keyTest => $perlExpr, keyTest => $perlExpr,
keyMsgFail => 'Bad skin rule', keyMsgFail => '__badSkinRule__',
test => qr/^\w+$/, test => qr/^\w+$/,
msgFail => '__badValue__', msgFail => '__badValue__',
}, },
@ -656,7 +656,7 @@ sub attributes {
type => 'keyTextContainer', type => 'keyTextContainer',
help => 'exportedvars.html', help => 'exportedvars.html',
keyTest => qr/^!?[_a-zA-Z][a-zA-Z0-9_]*$/, keyTest => qr/^!?[_a-zA-Z][a-zA-Z0-9_]*$/,
keyMsgFail => 'Bad variable name', keyMsgFail => '__badVariableName__',
test => qr/^[_a-zA-Z][a-zA-Z0-9_:\-]*$/, test => qr/^[_a-zA-Z][a-zA-Z0-9_:\-]*$/,
msgFail => '__badValue__', msgFail => '__badValue__',
default => { 'UA' => 'HTTP_USER_AGENT' }, default => { 'UA' => 'HTTP_USER_AGENT' },
@ -675,7 +675,7 @@ sub attributes {
help => help =>
'exportedvars.html#extend_variables_using_macros_and_groups', 'exportedvars.html#extend_variables_using_macros_and_groups',
keyTest => qr/^[_a-zA-Z][a-zA-Z0-9_]*$/, keyTest => qr/^[_a-zA-Z][a-zA-Z0-9_]*$/,
keyMsgFail => 'Bad macro name', keyMsgFail => '__badMacroName__',
test => $perlExpr, test => $perlExpr,
default => {}, default => {},
documentation => 'Macros', documentation => 'Macros',
@ -720,7 +720,7 @@ sub attributes {
sessionDataToRemember => { sessionDataToRemember => {
type => 'keyTextContainer', type => 'keyTextContainer',
keyTest => qr/^[_a-zA-Z][a-zA-Z0-9_]*$/, keyTest => qr/^[_a-zA-Z][a-zA-Z0-9_]*$/,
keyMsgFail => 'Invalid session data', keyMsgFail => '__invalidSessionData__',
}, },
# SAML issuer # SAML issuer
@ -1350,7 +1350,7 @@ sub attributes {
type => 'samlAttributeContainer', type => 'samlAttributeContainer',
help => 'authsaml.html#exported_attributes', help => 'authsaml.html#exported_attributes',
keyTest => qr/^[a-zA-Z](?:[a-zA-Z0-9_\-\.]*\w)?$/, keyTest => qr/^[a-zA-Z](?:[a-zA-Z0-9_\-\.]*\w)?$/,
keyMsgFail => 'Bad metadata name', keyMsgFail => '__badMetadataName__',
test => qr/\w/, test => qr/\w/,
msgFail => '__badValue__', msgFail => '__badValue__',
default => {}, default => {},
@ -1361,7 +1361,7 @@ sub attributes {
samlIDPMetaDataOptions => { samlIDPMetaDataOptions => {
type => 'keyTextContainer', type => 'keyTextContainer',
keyTest => qr/^[a-zA-Z](?:[a-zA-Z0-9_\-\.]*\w)?$/, keyTest => qr/^[a-zA-Z](?:[a-zA-Z0-9_\-\.]*\w)?$/,
keyMsgFail => 'Bad metadata name', keyMsgFail => '__badMetadataName__',
}, },
samlIDPMetaDataOptionsNameIDFormat => { samlIDPMetaDataOptionsNameIDFormat => {
type => 'select', type => 'select',
@ -1467,7 +1467,7 @@ sub attributes {
type => 'samlAttributeContainer', type => 'samlAttributeContainer',
help => 'idpsaml.html#exported_attributes', help => 'idpsaml.html#exported_attributes',
keyTest => qr/^[a-zA-Z](?:[a-zA-Z0-9_\-\.]*\w)?$/, keyTest => qr/^[a-zA-Z](?:[a-zA-Z0-9_\-\.]*\w)?$/,
keyMsgFail => 'Bad metadata name', keyMsgFail => '__badMetadataName__',
test => qr/\w/, test => qr/\w/,
msgFail => '__badValue__', msgFail => '__badValue__',
default => {}, default => {},
@ -1478,7 +1478,7 @@ sub attributes {
samlSPMetaDataOptions => { samlSPMetaDataOptions => {
type => 'keyTextContainer', type => 'keyTextContainer',
keyTest => qr/^[a-zA-Z](?:[a-zA-Z0-9_\-\.]*\w)?$/, keyTest => qr/^[a-zA-Z](?:[a-zA-Z0-9_\-\.]*\w)?$/,
keyMsgFail => 'Bad metadata name', keyMsgFail => '__badMetadataName__',
}, },
samlSPSSODescriptorAuthnRequestsSigned => { samlSPSSODescriptorAuthnRequestsSigned => {
default => 1, default => 1,
@ -1662,7 +1662,7 @@ sub attributes {
demoExportedVars => { demoExportedVars => {
type => 'keyTextContainer', type => 'keyTextContainer',
keyTest => qr/^!?[a-zA-Z][a-zA-Z0-9_-]*$/, keyTest => qr/^!?[a-zA-Z][a-zA-Z0-9_-]*$/,
keyMsgFail => 'Bad variable name', keyMsgFail => '__badVariableName__',
test => qr/^[a-zA-Z][a-zA-Z0-9_:\-]*$/, test => qr/^[a-zA-Z][a-zA-Z0-9_:\-]*$/,
msgFail => '__badValue__', msgFail => '__badValue__',
default => { cn => 'cn', mail => 'mail', uid => 'uid', }, default => { cn => 'cn', mail => 'mail', uid => 'uid', },
@ -1711,7 +1711,7 @@ sub attributes {
ldapExportedVars => { ldapExportedVars => {
type => 'keyTextContainer', type => 'keyTextContainer',
keyTest => qr/^!?[a-zA-Z][a-zA-Z0-9_-]*$/, keyTest => qr/^!?[a-zA-Z][a-zA-Z0-9_-]*$/,
keyMsgFail => 'Bad variable name', keyMsgFail => '__badVariableName__',
test => qr/^[a-zA-Z][a-zA-Z0-9_:\-]*$/, test => qr/^[a-zA-Z][a-zA-Z0-9_:\-]*$/,
msgFail => '__badValue__', msgFail => '__badValue__',
default => { cn => 'cn', mail => 'mail', uid => 'uid', }, default => { cn => 'cn', mail => 'mail', uid => 'uid', },
@ -1730,7 +1730,7 @@ sub attributes {
foreach my $s (@s) { foreach my $s (@s) {
$s =~ $s =~
m{^(?:ldapi://[^/]*/?|\w[\w\-\.]*(?::\d{1,5})?|ldap(?:s|\+tls)?://\w[\w\-\.]*(?::\d{1,5})?/?.*)$}o m{^(?:ldapi://[^/]*/?|\w[\w\-\.]*(?::\d{1,5})?|ldap(?:s|\+tls)?://\w[\w\-\.]*(?::\d{1,5})?/?.*)$}o
or return ( 0, "Bad ldap uri \"$s\"" ); or return ( 0, "__badLdapUri__: \"$s\"" );
} }
return 1; return 1;
}, },
@ -1861,7 +1861,7 @@ m{^(?:ldapi://[^/]*/?|\w[\w\-\.]*(?::\d{1,5})?|ldap(?:s|\+tls)?://\w[\w\-\.]*(?:
CAS_proxiedServices => { CAS_proxiedServices => {
type => 'keyTextContainer', type => 'keyTextContainer',
keyTest => qr/^\w+$/, keyTest => qr/^\w+$/,
keyMsgFail => 'Bad CAS proxied service identifier', keyMsgFail => '__badCasProxyId__',
}, },
# Radius # Radius
@ -1905,7 +1905,7 @@ m{^(?:ldapi://[^/]*/?|\w[\w\-\.]*(?::\d{1,5})?|ldap(?:s|\+tls)?://\w[\w\-\.]*(?:
openIdExportedVars => { openIdExportedVars => {
type => 'keyTextContainer', type => 'keyTextContainer',
keyTest => qr/^!?[a-zA-Z][a-zA-Z0-9_-]*$/, keyTest => qr/^!?[a-zA-Z][a-zA-Z0-9_-]*$/,
keyMsgFail => 'Bad variable name', keyMsgFail => '__badVariableName__',
test => qr/^[a-zA-Z][a-zA-Z0-9_:\-]*$/, test => qr/^[a-zA-Z][a-zA-Z0-9_:\-]*$/,
msgFail => '__badValue__', msgFail => '__badValue__',
default => {}, default => {},
@ -1922,7 +1922,7 @@ m{^(?:ldapi://[^/]*/?|\w[\w\-\.]*(?::\d{1,5})?|ldap(?:s|\+tls)?://\w[\w\-\.]*(?:
googleExportedVars => { googleExportedVars => {
type => 'keyTextContainer', type => 'keyTextContainer',
keyTest => qr/^!?[a-zA-Z][a-zA-Z0-9_-]*$/, keyTest => qr/^!?[a-zA-Z][a-zA-Z0-9_-]*$/,
keyMsgFail => 'Bad variable name', keyMsgFail => '__badVariableName__',
test => qr/^[a-zA-Z][a-zA-Z0-9_:\-]*$/, test => qr/^[a-zA-Z][a-zA-Z0-9_:\-]*$/,
msgFail => '__badValue__', msgFail => '__badValue__',
default => {}, default => {},
@ -1940,7 +1940,7 @@ m{^(?:ldapi://[^/]*/?|\w[\w\-\.]*(?::\d{1,5})?|ldap(?:s|\+tls)?://\w[\w\-\.]*(?:
facebookExportedVars => { facebookExportedVars => {
type => 'keyTextContainer', type => 'keyTextContainer',
keyTest => qr/^!?[a-zA-Z][a-zA-Z0-9_-]*$/, keyTest => qr/^!?[a-zA-Z][a-zA-Z0-9_-]*$/,
keyMsgFail => 'Bad variable name', keyMsgFail => '__badVariableName__',
test => qr/^[a-zA-Z][a-zA-Z0-9_:\-]*$/, test => qr/^[a-zA-Z][a-zA-Z0-9_:\-]*$/,
msgFail => '__badValue__', msgFail => '__badValue__',
default => {}, default => {},
@ -1967,7 +1967,7 @@ m{^(?:ldapi://[^/]*/?|\w[\w\-\.]*(?::\d{1,5})?|ldap(?:s|\+tls)?://\w[\w\-\.]*(?:
webIDExportedVars => { webIDExportedVars => {
type => 'keyTextContainer', type => 'keyTextContainer',
keyTest => qr/^!?[a-zA-Z][a-zA-Z0-9_-]*$/, keyTest => qr/^!?[a-zA-Z][a-zA-Z0-9_-]*$/,
keyMsgFail => 'Bad variable name', keyMsgFail => '__badVariableName__',
test => qr/^[a-zA-Z][a-zA-Z0-9_:\-]*$/, test => qr/^[a-zA-Z][a-zA-Z0-9_:\-]*$/,
msgFail => '__badValue__', msgFail => '__badValue__',
default => {}, default => {},
@ -1997,7 +1997,7 @@ m{^(?:ldapi://[^/]*/?|\w[\w\-\.]*(?::\d{1,5})?|ldap(?:s|\+tls)?://\w[\w\-\.]*(?:
dbiExportedVars => { dbiExportedVars => {
type => 'keyTextContainer', type => 'keyTextContainer',
keyTest => qr/^!?[a-zA-Z][a-zA-Z0-9_-]*$/, keyTest => qr/^!?[a-zA-Z][a-zA-Z0-9_-]*$/,
keyMsgFail => 'Bad variable name', keyMsgFail => '__badVariableName__',
test => qr/^[a-zA-Z][a-zA-Z0-9_:\-]*$/, test => qr/^[a-zA-Z][a-zA-Z0-9_:\-]*$/,
msgFail => '__badValue__', msgFail => '__badValue__',
default => {}, default => {},
@ -2028,7 +2028,7 @@ m{^(?:ldapi://[^/]*/?|\w[\w\-\.]*(?::\d{1,5})?|ldap(?:s|\+tls)?://\w[\w\-\.]*(?:
slaveExportedVars => { slaveExportedVars => {
type => 'keyTextContainer', type => 'keyTextContainer',
keyTest => qr/^!?[a-zA-Z][a-zA-Z0-9_-]*$/, keyTest => qr/^!?[a-zA-Z][a-zA-Z0-9_-]*$/,
keyMsgFail => 'Bad variable name', keyMsgFail => '__badVariableName__',
test => qr/^[a-zA-Z][a-zA-Z0-9_:\-]*$/, test => qr/^[a-zA-Z][a-zA-Z0-9_:\-]*$/,
msgFail => '__badValue__', msgFail => '__badValue__',
default => {}, default => {},
@ -2051,7 +2051,7 @@ m{^(?:ldapi://[^/]*/?|\w[\w\-\.]*(?::\d{1,5})?|ldap(?:s|\+tls)?://\w[\w\-\.]*(?:
authChoiceModules => { authChoiceModules => {
type => 'authChoiceContainer', type => 'authChoiceContainer',
keyTest => qr/^(\d*)?[a-zA-Z0-9_]+$/, keyTest => qr/^(\d*)?[a-zA-Z0-9_]+$/,
keyMsgFail => 'Bad choice key', keyMsgFail => '__badChoiceKey__',
test => sub { 1 }, test => sub { 1 },
select => [ select => [
[ [

View File

@ -55,19 +55,28 @@
"authParams": "Authentication parameters", "authParams": "Authentication parameters",
"auto": "Automatic", "auto": "Automatic",
"backtoportal": "Back to portal", "backtoportal": "Back to portal",
"badCasProxyId": "Bad CAS proxied service identifier",
"badChoiceKey": "Bad key name in Choice menu",
"badCookieName": "Bad cookie name", "badCookieName": "Bad cookie name",
"badCustomFuncName": "Bad custom function name", "badCustomFuncName": "Bad custom function name",
"badDomainName": "Bad domain name", "badDomainName": "Bad domain name",
"badEncoding": "Bad encoding", "badEncoding": "Bad encoding",
"badExpression": "Bad expression", "badExpression": "Bad expression",
"badHeaderName": "Bad header name",
"badHostname": "Bad hostname", "badHostname": "Bad hostname",
"badLdapUri": "Bad LDAP URI",
"badKeyName": "Bad key name",
"badIPv4Address": "Bad IPv4 address", "badIPv4Address": "Bad IPv4 address",
"badMacroName": "Bad macro name",
"badMetadataName": "Bad metadata name",
"badPemEncoding": "Bad PEM encoding", "badPemEncoding": "Bad PEM encoding",
"badPerlPackageName": "Bad Perl package name", "badPerlPackageName": "Bad Perl package name",
"badRegexp": "Bad regular expression", "badRegexp": "Bad regular expression",
"badRequest": "Bad request", "badRequest": "Bad request",
"badSkinRule": "Bad skin rule",
"badUrl": "Bad URL", "badUrl": "Bad URL",
"badValue": "Bad value", "badValue": "Bad value",
"badVariableName": "Bad variable name",
"blackList": "Black list", "blackList": "Black list",
"browse": "Browse", "browse": "Browse",
"browserIdAuthnLevel": "Authentication level", "browserIdAuthnLevel": "Authentication level",
@ -169,6 +178,7 @@
"edit": "Edit", "edit": "Edit",
"editContent": "Edit content", "editContent": "Edit content",
"emptyConf": "Empty configuration", "emptyConf": "Empty configuration",
"emptyValueNotAllowed": "Empty value not allowed",
"enabled": "Enabled", "enabled": "Enabled",
"enterPassword": "Enter password (optional)", "enterPassword": "Enter password (optional)",
"error": "Error", "error": "Error",
@ -208,6 +218,7 @@
"https": "HTTPS", "https": "HTTPS",
"incompleteForm": "Required fields are missing", "incompleteForm": "Required fields are missing",
"index": "Index", "index": "Index",
"invalidSessionData": "Invalid session data",
"internalReference": "Internal reference", "internalReference": "Internal reference",
"ipAddr": "IP address", "ipAddr": "IP address",
"ipAddresses": "IP addresses", "ipAddresses": "IP addresses",

View File

@ -55,19 +55,28 @@
"authParams": "Paramètres d'authentification", "authParams": "Paramètres d'authentification",
"auto": "Automatique", "auto": "Automatique",
"backtoportal": "Retour au portail", "backtoportal": "Retour au portail",
"badCasProxyId": "Mauvais identifiant de service proxy CAS",
"badChoiceKey": "Mauvais nom de clef dans le menu Choice",
"badCookieName": "Mauvais nom de cookie", "badCookieName": "Mauvais nom de cookie",
"badCustomFuncName": "Mauvais nom de fonction personnalisée", "badCustomFuncName": "Mauvais nom de fonction personnalisée",
"badDomainName": "Mauvais nom de domaine", "badDomainName": "Mauvais nom de domaine",
"badEncoding": "Mauvais encodage", "badEncoding": "Mauvais encodage",
"badExpression": "Mauvaise expression", "badExpression": "Mauvaise expression",
"badHeaderName": "Mauvais nom d'en-tête",
"badHostname": "Mauvais nom d'hôte", "badHostname": "Mauvais nom d'hôte",
"badLdapUri": "Mauvaise URI LDAP",
"badKeyName": "Mauvais nom de clef",
"badIPv4Address": "Mauvaise adresse IPv4", "badIPv4Address": "Mauvaise adresse IPv4",
"badMacroName": "Mauvais nom de macro",
"badMetadataName": "Mauvais nom de métadonnée",
"badPemEncoding": "Encodage PEM incorrect", "badPemEncoding": "Encodage PEM incorrect",
"badPerlPackageName": "Mauvais nom de paquet Perl", "badPerlPackageName": "Mauvais nom de paquet Perl",
"badRegexp": "Mauvaise expression rationnelle", "badRegexp": "Mauvaise expression rationnelle",
"badRequest": "Mauvaise requête", "badRequest": "Mauvaise requête",
"badSkinRule": "Mauvaise règle",
"badUrl": "Mauvaise URL", "badUrl": "Mauvaise URL",
"badValue": "Mauvaise valeur", "badValue": "Mauvaise valeur",
"badVariableName": "Mauvais nom de variable",
"blackList": "Liste noire", "blackList": "Liste noire",
"browse": "Naviguer", "browse": "Naviguer",
"browserIdAuthnLevel": "Niveau d'authentification", "browserIdAuthnLevel": "Niveau d'authentification",
@ -169,6 +178,7 @@
"edit": "Éditer", "edit": "Éditer",
"editContent": "Éditer le contenu", "editContent": "Éditer le contenu",
"emptyConf": "Configuration vide", "emptyConf": "Configuration vide",
"emptyValueNotAllowed": "Valeur nulle non accordé",
"enabled": "Activé", "enabled": "Activé",
"enterPassword": "Entrer le mot de passe (optionnel)", "enterPassword": "Entrer le mot de passe (optionnel)",
"error": "Erreur", "error": "Erreur",
@ -208,6 +218,7 @@
"https": "HTTPS", "https": "HTTPS",
"incompleteForm": "Des champs requis manquent", "incompleteForm": "Des champs requis manquent",
"index": "Index", "index": "Index",
"invalidSessionData": "Donnée de session invalide",
"internalReference": "Référence interne ", "internalReference": "Référence interne ",
"ipAddr": "Adresse IP", "ipAddr": "Adresse IP",
"ipAddresses": "Adresses IP", "ipAddresses": "Adresses IP",