This commit is contained in:
Xavier Guimard 2018-03-13 17:55:36 +01:00
parent b24503b636
commit 75fb07a627
2 changed files with 47 additions and 17 deletions

View File

@ -227,7 +227,7 @@ sub attributes {
}, },
localStorageOptions => { localStorageOptions => {
type => 'keyTextContainer', type => 'keyTextContainer',
documentation => 'Local cache', documentation => 'Local cache parameters',
flags => 'hmp', flags => 'hmp',
}, },
cfgNum => { cfgNum => {
@ -824,7 +824,7 @@ sub attributes {
localSessionStorage => { localSessionStorage => {
type => 'PerlModule', type => 'PerlModule',
default => 'Cache::FileCache', default => 'Cache::FileCache',
documentation => 'Sessions cache module', documentation => 'Local sessions cache module',
}, },
localSessionStorageOptions => { localSessionStorageOptions => {
type => 'keyTextContainer', type => 'keyTextContainer',
@ -1411,8 +1411,12 @@ sub attributes {
}, },
# CAS IDP # CAS IDP
casAttr => { type => 'text', }, casAttr =>
casAttributes => { type => 'keyTextContainer', }, { type => 'text', documentation => 'Pivot attribute for CAS', },
casAttributes => {
type => 'keyTextContainer',
documentation => 'CAS exported attributes',
},
casAccessControlPolicy => { casAccessControlPolicy => {
type => 'select', type => 'select',
select => [ select => [
@ -1423,9 +1427,13 @@ sub attributes {
default => 'none', default => 'none',
documentation => 'CAS access control policy', documentation => 'CAS access control policy',
}, },
casStorage => { type => 'PerlModule', }, casStorage => {
type => 'PerlModule',
documentation => 'Apache::Session module to store CAS user data',
},
casStorageOptions => { casStorageOptions => {
type => 'keyTextContainer', type => 'keyTextContainer',
documentation => 'Apache::Session module parameters',
}, },
issuerDBCASActivation => { issuerDBCASActivation => {
default => 0, default => 0,
@ -1444,7 +1452,10 @@ sub attributes {
}, },
# Partners # Partners
casAppMetaDataOptions => { type => 'subContainer', }, casAppMetaDataOptions => {
type => 'subContainer',
documentation => 'Root of CAS app options',
},
casAppMetaDataExportedVars => { casAppMetaDataExportedVars => {
type => 'keyTextContainer', type => 'keyTextContainer',
default => { cn => 'cn', mail => 'mail', uid => 'uid', }, default => { cn => 'cn', mail => 'mail', uid => 'uid', },
@ -1605,8 +1616,14 @@ sub attributes {
type => 'bool', type => 'bool',
documentation => 'SAML force metadata UTF8 conversion', documentation => 'SAML force metadata UTF8 conversion',
}, },
samlStorage => { type => 'PerlModule', }, samlStorage => {
samlStorageOptions => { type => 'keyTextContainer', }, type => 'PerlModule',
documentation => 'Apache::Session module to store SAML user data',
},
samlStorageOptions => {
type => 'keyTextContainer',
documentation => 'Apache::Session module parameters',
},
samlAuthnContextMapPassword => { samlAuthnContextMapPassword => {
type => 'int', type => 'int',
default => 2, default => 2,
@ -2231,9 +2248,12 @@ m{^(?:ldapi://[^/]*/?|\w[\w\-\.]*(?::\d{1,5})?|ldap(?:s|\+tls)?://\w[\w\-\.]*(?:
default => 'find', default => 'find',
documentation => '"deref" param of Net::LDAP::search()', documentation => '"deref" param of Net::LDAP::search()',
}, },
mailLDAPFilter => { type => 'text', }, mailLDAPFilter =>
LDAPFilter => { type => 'text', }, { type => 'text', documentation => 'LDAP filter for mail search' },
AuthLDAPFilter => { type => 'text', }, LDAPFilter =>
{ type => 'text', documentation => 'Default LDAP filter' },
AuthLDAPFilter =>
{ type => 'text', documentation => 'LDAP filter for auth search' },
ldapGroupRecursive => { ldapGroupRecursive => {
default => 0, default => 0,
type => 'bool', type => 'bool',
@ -2312,7 +2332,10 @@ m{^(?:ldapi://[^/]*/?|\w[\w\-\.]*(?::\d{1,5})?|ldap(?:s|\+tls)?://\w[\w\-\.]*(?:
default => { cn => 'cn', mail => 'mail', uid => 'uid', }, default => { cn => 'cn', mail => 'mail', uid => 'uid', },
documentation => 'CAS exported variables', documentation => 'CAS exported variables',
}, },
casSrvMetaDataOptions => { type => 'subContainer', }, casSrvMetaDataOptions => {
type => 'subContainer',
documentation => 'Root of CAS server options',
},
casSrvMetaDataOptionsGateway => { type => 'bool', }, casSrvMetaDataOptionsGateway => { type => 'bool', },
casSrvMetaDataOptionsProxiedServices => { casSrvMetaDataOptionsProxiedServices => {
type => 'keyTextContainer', type => 'keyTextContainer',
@ -2385,7 +2408,7 @@ m{^(?:ldapi://[^/]*/?|\w[\w\-\.]*(?::\d{1,5})?|ldap(?:s|\+tls)?://\w[\w\-\.]*(?:
ns => ns =>
'http://auth.example.com/Lemonldap/NG/Common/PSGI/SOAPService', 'http://auth.example.com/Lemonldap/NG/Common/PSGI/SOAPService',
}, },
documentation => 'Demo exported variables', documentation => 'Apache::Session module parameters',
}, },
# Proxy # Proxy
@ -2649,6 +2672,7 @@ m{^(?:ldapi://[^/]*/?|\w[\w\-\.]*(?::\d{1,5})?|ldap(?:s|\+tls)?://\w[\w\-\.]*(?:
{ k => 'Custom', v => 'customModule' }, { k => 'Custom', v => 'customModule' },
] ]
], ],
documentation => 'Hash list of Choice strings',
}, },
# Combination # Combination
@ -2831,8 +2855,14 @@ m{^(?:ldapi://[^/]*/?|\w[\w\-\.]*(?::\d{1,5})?|ldap(?:s|\+tls)?://\w[\w\-\.]*(?:
default => 0, default => 0,
documentation => 'OpenID Connect allow hybrid flow', documentation => 'OpenID Connect allow hybrid flow',
}, },
oidcStorage => { type => 'PerlModule', }, oidcStorage => {
oidcStorageOptions => { type => 'keyTextContainer', }, type => 'PerlModule',
documentation => 'Apache::Session module to store OIDC user data',
},
oidcStorageOptions => {
type => 'keyTextContainer',
documentation => 'Apache::Session module parameters',
},
# OpenID Connect metadata nodes # OpenID Connect metadata nodes
oidcOPMetaDataNodes => { oidcOPMetaDataNodes => {

View File

@ -7,7 +7,7 @@ require './lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Attributes.pm';
require './lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/ReConstants.pm'; require './lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/ReConstants.pm';
my $rmg = my $rmg =
"^(?:(?:$Lemonldap::NG::Common::Conf::ReConstants::virtualHostKeys)|(?:$Lemonldap::NG::Common::Conf::ReConstants::casAppMetaDataNodeKeys)|(?:$Lemonldap::NG::Common::Conf::ReConstants::casSrvMetaDataNodeKeys)|(?:$Lemonldap::NG::Common::Conf::ReConstants::oidcOPMetaDataNodeKeys)|(?:$Lemonldap::NG::Common::Conf::ReConstants::oidcRPMetaDataNodeKeys)|(?:$Lemonldap::NG::Common::Conf::ReConstants::samlIDPMetaDataNodeKeys)|(?:$Lemonldap::NG::Common::Conf::ReConstants::samlSPMetaDataNodeKeys)|(?:$Lemonldap::NG::Common::Conf::ReConstants::specialNodeKeys)|(.*Options))\$"; "^(?:(?:$Lemonldap::NG::Common::Conf::ReConstants::virtualHostKeys)|(?:$Lemonldap::NG::Common::Conf::ReConstants::casAppMetaDataNodeKeys)|(?:$Lemonldap::NG::Common::Conf::ReConstants::casSrvMetaDataNodeKeys)|(?:$Lemonldap::NG::Common::Conf::ReConstants::oidcOPMetaDataNodeKeys)|(?:$Lemonldap::NG::Common::Conf::ReConstants::oidcRPMetaDataNodeKeys)|(?:$Lemonldap::NG::Common::Conf::ReConstants::samlIDPMetaDataNodeKeys)|(?:$Lemonldap::NG::Common::Conf::ReConstants::samlSPMetaDataNodeKeys)|(?:$Lemonldap::NG::Common::Conf::ReConstants::specialNodeKeys))\$";
$rmg = qr/$rmg/; $rmg = qr/$rmg/;
my $ignore = qr/^(?:virtualHosts)$/; my $ignore = qr/^(?:virtualHosts)$/;