parent
47a3a534a3
commit
824cd5fb89
|
@ -22,7 +22,7 @@ our $specialNodeHash = {
|
||||||
};
|
};
|
||||||
|
|
||||||
our $doubleHashKeys = 'issuerDBGetParameters';
|
our $doubleHashKeys = 'issuerDBGetParameters';
|
||||||
our $simpleHashKeys = '(?:(?:c(?:as(?:StorageOption|Attribute)|ustom(?:Plugins|Add)Param|heckUserHiddenHeader|ombModule)|l(?:o(?:calSessionStorageOption|goutService)|dapExportedVar|wp(?:Ssl)?Opt)|f(?:indUser(?:Exclud|Search)ingAttribute|acebookExportedVar)|re(?:moteGlobalStorageOption|st2f(?:Verify|Init)Arg|loadUrl)|g(?:r(?:antSessionRule|oup)|lobalStorageOption)|n(?:otificationStorageOption|ginxCustomHandler)|p(?:ersistentStorageOption|ortalSkinRule)|(?:(?:d(?:emo|bi)|webID)E|e)xportedVar|macro)s|o(?:idcS(?:ervice(?:DynamicRegistrationEx(?:portedVar|traClaim)s|MetaDataAuthnContext)|torageOptions)|penIdExportedVars)|a(?:(?:daptativeAuthenticationLevelR|ut(?:hChoiceMod|oSigninR))ules|pplicationList)|s(?:(?:amlStorageOption|laveExportedVar)s|essionDataToRemember|fExtra)|S(?:MTPTLSOpts|SLVarIf))';
|
our $simpleHashKeys = '(?:(?:c(?:as(?:StorageOption|Attribute)|ustom(?:Plugins|Add)Param|heckUserHiddenHeader|ombModule)|l(?:o(?:calSessionStorageOption|goutService)|dapExportedVar|wp(?:Ssl)?Opt)|f(?:indUser(?:Exclud|Search)ingAttribute|acebookExportedVar)|re(?:moteGlobalStorageOption|st2f(?:Verify|Init)Arg|loadUrl)|g(?:r(?:antSessionRule|oup)|lobalStorageOption)|n(?:otificationStorageOption|ginxCustomHandler)|p(?:ersistentStorageOption|ortalSkinRule)|(?:(?:d(?:emo|bi)|webID)E|e)xportedVar|macro)s|o(?:idc(?:S(?:ervice(?:DynamicRegistrationEx(?:portedVar|traClaim)s|MetaDataAuthnContext)|torageOptions)|OPMetaDataJ(?:SON|WKS))|penIdExportedVars)|a(?:(?:daptativeAuthenticationLevelR|ut(?:hChoiceMod|oSigninR))ules|pplicationList)|s(?:(?:amlStorageOption|laveExportedVar)s|essionDataToRemember|fExtra)|S(?:MTPTLSOpts|SLVarIf))';
|
||||||
our $specialNodeKeys = '(?:(?:(?:saml(?:ID|S)|oidc[OR])P|cas(?:App|Srv))MetaDataNode|virtualHost)s';
|
our $specialNodeKeys = '(?:(?:(?:saml(?:ID|S)|oidc[OR])P|cas(?:App|Srv))MetaDataNode|virtualHost)s';
|
||||||
our $casAppMetaDataNodeKeys = 'casAppMetaData(?:Options(?:(?:UserAttribut|Servic|Rul)e|AuthnLevel)|(?:ExportedVar|Macro)s)';
|
our $casAppMetaDataNodeKeys = 'casAppMetaData(?:Options(?:(?:UserAttribut|Servic|Rul)e|AuthnLevel)|(?:ExportedVar|Macro)s)';
|
||||||
our $casSrvMetaDataNodeKeys = 'casSrvMetaData(?:Options(?:ProxiedServices|DisplayName|SortNumber|Gateway|Renew|Icon|Url)|ExportedVars)';
|
our $casSrvMetaDataNodeKeys = 'casSrvMetaData(?:Options(?:ProxiedServices|DisplayName|SortNumber|Gateway|Renew|Icon|Url)|ExportedVars)';
|
||||||
|
|
|
@ -2148,9 +2148,15 @@ m[^(?:ldapi://[^/]*/?|\w[\w\-\.]*(?::\d{1,5})?|ldap(?:s|\+tls)?://\w[\w\-\.]*(?:
|
||||||
'type' => 'keyTextContainer'
|
'type' => 'keyTextContainer'
|
||||||
},
|
},
|
||||||
'oidcOPMetaDataJSON' => {
|
'oidcOPMetaDataJSON' => {
|
||||||
|
'keyTest' => sub {
|
||||||
|
1;
|
||||||
|
},
|
||||||
'type' => 'file'
|
'type' => 'file'
|
||||||
},
|
},
|
||||||
'oidcOPMetaDataJWKS' => {
|
'oidcOPMetaDataJWKS' => {
|
||||||
|
'keyTest' => sub {
|
||||||
|
1;
|
||||||
|
},
|
||||||
'type' => 'file'
|
'type' => 'file'
|
||||||
},
|
},
|
||||||
'oidcOPMetaDataNodes' => {
|
'oidcOPMetaDataNodes' => {
|
||||||
|
|
|
@ -694,9 +694,18 @@ sub scanTree {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($prefix) {
|
if ($prefix) {
|
||||||
push @cnodesKeys, $leaf;
|
push @cnodesKeys, $leaf;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# issue 2439
|
||||||
|
# FIXME: in future versions, oidcOPMetaDataJSON and samlIDPMetaDataXML shoud
|
||||||
|
# behave the same
|
||||||
|
if ( $leaf =~ /^oidcOPMetaData(?:JSON|JWKS)$/ ) {
|
||||||
|
push @simpleHashKeys, $leaf;
|
||||||
|
}
|
||||||
|
|
||||||
if ( $attr->{type} =~ /^(?:catAndAppList|\w+Container)$/ ) {
|
if ( $attr->{type} =~ /^(?:catAndAppList|\w+Container)$/ ) {
|
||||||
$jleaf->{cnodes} = $prefix . $leaf;
|
$jleaf->{cnodes} = $prefix . $leaf;
|
||||||
unless ( $prefix or $leaf =~ $reIgnoreKeys ) {
|
unless ( $prefix or $leaf =~ $reIgnoreKeys ) {
|
||||||
|
|
|
@ -4152,8 +4152,8 @@ m{^(?:ldapi://[^/]*/?|\w[\w\-\.]*(?::\d{1,5})?|ldap(?:s|\+tls)?://\w[\w\-\.]*(?:
|
||||||
oidcRPMetaDataOptions => { type => 'subContainer', },
|
oidcRPMetaDataOptions => { type => 'subContainer', },
|
||||||
|
|
||||||
# OpenID Connect providers
|
# OpenID Connect providers
|
||||||
oidcOPMetaDataJSON => { type => 'file', },
|
oidcOPMetaDataJSON => { type => 'file', keyTest => sub { 1 } },
|
||||||
oidcOPMetaDataJWKS => { type => 'file', },
|
oidcOPMetaDataJWKS => { type => 'file', keyTest => sub { 1 } },
|
||||||
oidcOPMetaDataExportedVars => {
|
oidcOPMetaDataExportedVars => {
|
||||||
type => 'keyTextContainer',
|
type => 'keyTextContainer',
|
||||||
default => {
|
default => {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user