dani/lemonldap-ng
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Apply patch on Manager in trunk (#1088)

Browse Source
This commit is contained in:
Clément Oudot 2016-10-04 09:07:55 +00:00
parent a880f22c57
commit fdf74d2f3a
9 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/DefaultValues.pm
View File

@ -255,6 +255,7 @@ sub defaultValues {
'samlIDPMetaDataOptionsForceUTF8' => 0,
'samlIDPMetaDataOptionsIsPassive' => 0,
'samlIDPMetaDataOptionsNameIDFormat' => '',
'samlIDPMetaDataOptionsRelayStateURL' => 0,
'samlIDPMetaDataOptionsRequestedAuthnContext' => '',
'samlIDPMetaDataOptionsResolutionRule' => '',
'samlIDPMetaDataOptionsSignSLOMessage' => -1,

4
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm
View File

@ -2190,6 +2190,10 @@ qr/(?:(?:https?):\/\/(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.]
],
'type' => 'select'
},
'samlIDPMetaDataOptionsRelayStateURL' => {
'default' => 0,
'type' => 'bool'
},
'samlIDPMetaDataOptionsRequestedAuthnContext' => {
'default' => '',
'select' => [

4
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Attributes.pm
View File

@ -1530,6 +1530,10 @@ sub attributes {
type => 'bool',
default => 0,
},
samlIDPMetaDataOptionsRelayStateURL => {
type => 'bool',
default => 0,
},
# SP keys
samlSPMetaDataExportedAttributes => {

1
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/CTrees.pm
View File

@ -44,6 +44,7 @@ sub cTrees {
'samlIDPMetaDataOptionsAllowProxiedAuthn',
'samlIDPMetaDataOptionsAllowLoginFromIDP',
'samlIDPMetaDataOptionsRequestedAuthnContext',
'samlIDPMetaDataOptionsRelayStateURL',
],
},
{

2
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Constants.pm
View File

@ -26,7 +26,7 @@ our $simpleHashKeys = '(?:(?:g(?:r(?:antSessionRule|oup)|lobalStorageOption|oogl
our $specialNodeKeys = '(?:(?:saml(?:ID|S)|oidc[OR])PMetaDataNode|virtualHost)s';
our $oidcOPMetaDataNodeKeys = 'oidcOPMetaData(?:Options(?:C(?:lient(?:Secret|ID)|heckJWTSignature|onfigurationURI)|TokenEndpointAuthMethod|(?:JWKSTimeou|Promp)t|I(?:DTokenMaxAge|con)|S(?:toreIDToken|cope)|U(?:iLocales|seNonce)|Display(?:Name)?|AcrValues|MaxAge)|ExportedVars|J(?:SON|WKS))';
our $oidcRPMetaDataNodeKeys = 'oidcRPMetaData(?:Options(?:I(?:DToken(?:Expiration|SignAlg)|con)|(?:RedirectUri|ExtraClaim)s|AccessTokenExpiration|Client(?:Secret|ID)|BypassConsent|DisplayName|UserIDAttr)|ExportedVars)';
our $samlIDPMetaDataNodeKeys = 'samlIDPMetaData(?:Options(?:(?:Check(?:S[LS]OMessageSignatur|Audienc|Tim)|EncryptionMod|IsPassiv)e|A(?:llow(?:LoginFromIDP|ProxiedAuthn)|daptSessionUtime)|S(?:ignS[LS]OMessage|toreSAMLToken|[LS]OBinding)|Re(?:questedAuthnContext|solutionRule)|Force(?:Authn|UTF8)|NameIDFormat)|ExportedAttributes|XML)';
our $samlIDPMetaDataNodeKeys = 'samlIDPMetaData(?:Options(?:(?:Check(?:S[LS]OMessageSignatur|Audienc|Tim)|EncryptionMod|IsPassiv)e|A(?:llow(?:LoginFromIDP|ProxiedAuthn)|daptSessionUtime)|Re(?:questedAuthnContext|solutionRule|layStateURL)|S(?:ignS[LS]OMessage|toreSAMLToken|[LS]OBinding)|Force(?:Authn|UTF8)|NameIDFormat)|ExportedAttributes|XML)';
our $samlSPMetaDataNodeKeys = 'samlSPMetaData(?:Options(?:N(?:ameID(?:SessionKey|Format)|otOnOrAfterTimeout)|S(?:essionNotOnOrAfterTimeout|ignS[LS]OMessage)|(?:CheckS[LS]OMessageSignatur|OneTimeUs)e|En(?:ableIDPInitiatedURL|cryptionMode)|ForceUTF8)|ExportedAttributes|XML)';
our $virtualHostKeys = '(?:vhost(?:(?:Aliase|Http)s|Maintenance|Port)|(?:exportedHeader|locationRule)s|post)';

7
lemonldap-ng-manager/site/static/js/conftree.js
View File

@ -493,6 +493,13 @@ function templates(tpl,key) {
],
"title" : "samlIDPMetaDataOptionsRequestedAuthnContext",
"type" : "select"
},
{
"default" : 0,
"get" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsRelayStateURL",
"id" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsRelayStateURL",
"title" : "samlIDPMetaDataOptionsRelayStateURL",
"type" : "bool"
}
],
"help" : "authsaml.html#options",

2
lemonldap-ng-manager/site/static/js/conftree.min.js vendored
View File

File diff suppressed because one or more lines are too long

1
lemonldap-ng-manager/site/static/languages/en.json
View File

@ -700,6 +700,7 @@
"samlIDPMetaDataOptionsBinding": "Binding",
"samlIDPMetaDataOptionsSecurity": "Security",
"samlIDPMetaDataOptionsStoreSAMLToken": "Store SAML Token",
"samlIDPMetaDataOptionsRelayStateURL": "Allow URL as RelayState",
"samlSPMetaDataNodes": "SAML service providers",
"samlSPMetaDataXML": "Metadata",
"samlSPMetaDataExportedAttributes": "Exported attributes",

1
lemonldap-ng-manager/site/static/languages/fr.json
View File

@ -700,6 +700,7 @@
"samlIDPMetaDataOptionsBinding": "Méthode",
"samlIDPMetaDataOptionsSecurity": "Sécurité",
"samlIDPMetaDataOptionsStoreSAMLToken": "Conserver le jeton SAML",
"samlIDPMetaDataOptionsRelayStateURL": "Pemettre une URL dans le RelayState",
"samlSPMetaDataNodes": "Fournisseurs de service SAML",
"samlSPMetaDataXML": "Metadonnées",
"samlSPMetaDataExportedAttributes": "Attributs exportés",