Manager: SSL parameters

This commit is contained in:
Clément Oudot 2010-03-15 15:07:19 +00:00
parent 8242602cd9
commit 825c8d05f0
2 changed files with 20 additions and 3 deletions

View File

@ -153,7 +153,7 @@ sub struct {
{ {
my $tmp = { my $tmp = {
ldap => ['ldapParams'], ldap => ['ldapParams'],
ssl => [qw(ldapParams SSLRequired)], ssl => [qw(ldapParams sslParams)],
openid => ['openIdParams'], openid => ['openIdParams'],
twitter => ['twitterParams'], twitter => ['twitterParams'],
}->{$mod}; }->{$mod};
@ -228,7 +228,12 @@ sub struct {
}, },
# SSL # SSL
SSLRequired => 'bool:/SSLRequired', sslParams => {
_nodes => [qw(SSLVar SSLLDAPField SSLRequire)],
SSLVar => 'text:/SSLVar',
SSLLDAPField => 'text:/SSLLDAPField',
SSLRequire => 'bool:/SSLRequire',
},
# OpenID # OpenID
openIdParams => { openIdParams => {
@ -796,7 +801,6 @@ sub testStruct {
singleIP => $boolean, singleIP => $boolean,
singleUserByIP => $boolean, singleUserByIP => $boolean,
Soap => $boolean, Soap => $boolean,
SSLRequired => $boolean,
storePassword => $boolean, storePassword => $boolean,
syslog => { syslog => {
test => qw/^(?:auth|authpriv|daemon|local\d|user)?$/, test => qw/^(?:auth|authpriv|daemon|local\d|user)?$/,
@ -882,6 +886,11 @@ sub testStruct {
samlIDPSSODescriptorManageNameIDServiceHTTP => $testNotDefined, samlIDPSSODescriptorManageNameIDServiceHTTP => $testNotDefined,
samlIDPSSODescriptorManageNameIDServiceSOAP => $testNotDefined, samlIDPSSODescriptorManageNameIDServiceSOAP => $testNotDefined,
# SSL
SSLVar => $testNotDefined,
SSLLDAPField => $testNotDefined,
SSLRequire => $boolean,
# OpenID # OpenID
openIdSecret => $testNotDefined, openIdSecret => $testNotDefined,

View File

@ -138,6 +138,10 @@ sub en {
SMTPServer => 'SMTP server', SMTPServer => 'SMTP server',
soap => 'SOAP', soap => 'SOAP',
Soap => 'Activation', Soap => 'Activation',
SSLLDAPField => 'LDAP attribute used in filter',
sslParams => 'SSL parameters',
SSLRequire => 'SSL Required',
SSLVar => 'Extracted certificate field',
storePassword => 'Store user password in session datas', storePassword => 'Store user password in session datas',
syntaxError => 'Syntax Error', syntaxError => 'Syntax Error',
syslog => 'Syslog facility', syslog => 'Syslog facility',
@ -311,6 +315,10 @@ sub fr {
SMTPServer => 'Serveur SMTP', SMTPServer => 'Serveur SMTP',
soap => 'SOAP', soap => 'SOAP',
Soap => 'Activation', Soap => 'Activation',
SSLLDAPField => 'Attribut LDAP pour le filtre',
sslParams => 'Paramètres SSL',
SSLRequire => 'SSL Requis',
SSLVar => 'Champ extrait du certificat',
storePassword => storePassword =>
"Stocke le mot-de-passe de l'utilisateur dans les données de session", "Stocke le mot-de-passe de l'utilisateur dans les données de session",
syntaxError => 'Erreur de syntaxe', syntaxError => 'Erreur de syntaxe',