Add IDP resolution rule in Manager (#1076)
This commit is contained in:
parent
8f80bf5dee
commit
e141c2482a
|
@ -253,6 +253,7 @@ sub defaultValues {
|
||||||
'samlIDPMetaDataOptionsIsPassive' => 0,
|
'samlIDPMetaDataOptionsIsPassive' => 0,
|
||||||
'samlIDPMetaDataOptionsNameIDFormat' => '',
|
'samlIDPMetaDataOptionsNameIDFormat' => '',
|
||||||
'samlIDPMetaDataOptionsRequestedAuthnContext' => '',
|
'samlIDPMetaDataOptionsRequestedAuthnContext' => '',
|
||||||
|
'samlIDPMetaDataOptionsResolutionRule' => '',
|
||||||
'samlIDPMetaDataOptionsSignSLOMessage' => -1,
|
'samlIDPMetaDataOptionsSignSLOMessage' => -1,
|
||||||
'samlIDPMetaDataOptionsSignSSOMessage' => -1,
|
'samlIDPMetaDataOptionsSignSSOMessage' => -1,
|
||||||
'samlIDPMetaDataOptionsSLOBinding' => '',
|
'samlIDPMetaDataOptionsSLOBinding' => '',
|
||||||
|
|
|
@ -2204,6 +2204,10 @@ qr/(?:(?:https?):\/\/(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.]
|
||||||
],
|
],
|
||||||
'type' => 'select'
|
'type' => 'select'
|
||||||
},
|
},
|
||||||
|
'samlIDPMetaDataOptionsResolutionRule' => {
|
||||||
|
'default' => '',
|
||||||
|
'type' => 'longtext'
|
||||||
|
},
|
||||||
'samlIDPMetaDataOptionsSignSLOMessage' => {
|
'samlIDPMetaDataOptionsSignSLOMessage' => {
|
||||||
'default' => -1,
|
'default' => -1,
|
||||||
'type' => 'trool'
|
'type' => 'trool'
|
||||||
|
|
|
@ -1516,6 +1516,10 @@ sub attributes {
|
||||||
type => 'bool',
|
type => 'bool',
|
||||||
default => 1,
|
default => 1,
|
||||||
},
|
},
|
||||||
|
samlIDPMetaDataOptionsResolutionRule => {
|
||||||
|
type => 'longtext',
|
||||||
|
default => '',
|
||||||
|
},
|
||||||
|
|
||||||
# SP keys
|
# SP keys
|
||||||
samlSPMetaDataExportedAttributes => {
|
samlSPMetaDataExportedAttributes => {
|
||||||
|
|
|
@ -37,6 +37,7 @@ sub cTrees {
|
||||||
help => 'authsaml.html#options',
|
help => 'authsaml.html#options',
|
||||||
form => 'simpleInputContainer',
|
form => 'simpleInputContainer',
|
||||||
nodes => [
|
nodes => [
|
||||||
|
'samlIDPMetaDataOptionsResolutionRule',
|
||||||
'samlIDPMetaDataOptionsNameIDFormat',
|
'samlIDPMetaDataOptionsNameIDFormat',
|
||||||
'samlIDPMetaDataOptionsForceAuthn',
|
'samlIDPMetaDataOptionsForceAuthn',
|
||||||
'samlIDPMetaDataOptionsIsPassive',
|
'samlIDPMetaDataOptionsIsPassive',
|
||||||
|
|
|
@ -26,7 +26,7 @@ our $simpleHashKeys = '(?:(?:g(?:r(?:antSessionRule|oup)|lobalStorageOption|oogl
|
||||||
our $specialNodeKeys = '(?:(?:saml(?:ID|S)|oidc[OR])PMetaDataNode|virtualHost)s';
|
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)|U(?:iLocales|seNonce)|Display(?:Name)?|(?:MaxAg|Scop)e|AcrValues)|ExportedVars|J(?:SON|WKS))';
|
our $oidcOPMetaDataNodeKeys = 'oidcOPMetaData(?:Options(?:C(?:lient(?:Secret|ID)|heckJWTSignature|onfigurationURI)|TokenEndpointAuthMethod|(?:JWKSTimeou|Promp)t|I(?:DTokenMaxAge|con)|U(?:iLocales|seNonce)|Display(?:Name)?|(?:MaxAg|Scop)e|AcrValues)|ExportedVars|J(?:SON|WKS))';
|
||||||
our $oidcRPMetaDataNodeKeys = 'oidcRPMetaData(?:Options(?:I(?:DToken(?:Expiration|SignAlg)|con)|(?:RedirectUri|ExtraClaim)s|AccessTokenExpiration|Client(?:Secret|ID)|DisplayName|UserIDAttr)|ExportedVars)';
|
our $oidcRPMetaDataNodeKeys = 'oidcRPMetaData(?:Options(?:I(?:DToken(?:Expiration|SignAlg)|con)|(?:RedirectUri|ExtraClaim)s|AccessTokenExpiration|Client(?:Secret|ID)|DisplayName|UserIDAttr)|ExportedVars)';
|
||||||
our $samlIDPMetaDataNodeKeys = 'samlIDPMetaData(?:Options(?:A(?:llow(?:LoginFromIDP|ProxiedAuthn)|daptSessionUtime)|Check(?:S[LS]OMessageSignature|Conditions)|(?:RequestedAuthnContex|NameIDForma)t|S(?:ignS[LS]OMessage|[LS]OBinding)|(?:EncryptionMod|IsPassiv)e|Force(?:Authn|UTF8))|ExportedAttributes|XML)';
|
our $samlIDPMetaDataNodeKeys = 'samlIDPMetaData(?:Options(?:A(?:llow(?:LoginFromIDP|ProxiedAuthn)|daptSessionUtime)|Check(?:S[LS]OMessageSignature|Conditions)|Re(?:questedAuthnContext|solutionRule)|S(?:ignS[LS]OMessage|[LS]OBinding)|(?:EncryptionMod|IsPassiv)e|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 $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)';
|
our $virtualHostKeys = '(?:vhost(?:(?:Aliase|Http)s|Maintenance|Port)|(?:exportedHeader|locationRule)s|post)';
|
||||||
|
|
||||||
|
|
|
@ -367,6 +367,13 @@ function templates(tpl,key) {
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"_nodes" : [
|
"_nodes" : [
|
||||||
|
{
|
||||||
|
"default" : "",
|
||||||
|
"get" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsResolutionRule",
|
||||||
|
"id" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsResolutionRule",
|
||||||
|
"title" : "samlIDPMetaDataOptionsResolutionRule",
|
||||||
|
"type" : "longtext"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"default" : "",
|
"default" : "",
|
||||||
"get" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsNameIDFormat",
|
"get" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsNameIDFormat",
|
||||||
|
|
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue
Block a user