Apply modification for oidcRPMetaDataOptionsExtraClaims to trunk (#1105)
This commit is contained in:
parent
31cfbf8101
commit
c48ee9d3e3
|
@ -171,6 +171,7 @@ sub defaultValues {
|
|||
},
|
||||
'oidcRPMetaDataOptionsAccessTokenExpiration' => 3600,
|
||||
'oidcRPMetaDataOptionsBypassConsent' => 0,
|
||||
'oidcRPMetaDataOptionsExtraClaims' => {},
|
||||
'oidcRPMetaDataOptionsIDTokenExpiration' => 3600,
|
||||
'oidcRPMetaDataOptionsIDTokenSignAlg' => 'HS512',
|
||||
'oidcRPStateTimeout' => 600,
|
||||
|
|
|
@ -1544,7 +1544,8 @@ qr/^(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-zA-Z0-
|
|||
'type' => 'text'
|
||||
},
|
||||
'oidcRPMetaDataOptionsExtraClaims' => {
|
||||
'type' => 'keyTextContainer'
|
||||
'default' => {},
|
||||
'type' => 'keyTextContainer'
|
||||
},
|
||||
'oidcRPMetaDataOptionsIcon' => {
|
||||
'type' => 'text'
|
||||
|
|
|
@ -152,9 +152,9 @@ sub run {
|
|||
my $sessionTypes = join( "', '", @sessionTypes );
|
||||
|
||||
open F, ">", $self->managerConstantsFile or die($!);
|
||||
my $exportedVars =
|
||||
'$'
|
||||
. join( 'Keys $', 'simpleHash', 'doubleHash', 'specialNode', sort keys %cnodesRe )
|
||||
my $exportedVars = '$'
|
||||
. join( 'Keys $',
|
||||
'simpleHash', 'doubleHash', 'specialNode', sort keys %cnodesRe )
|
||||
. 'Keys $specialNodeHash @sessionTypes $authParameters $issuerParameters $samlServiceParameters $oidcServiceParameters';
|
||||
print F <<EOF;
|
||||
# This file is generated by $module. Don't modify it by hand
|
||||
|
@ -175,7 +175,7 @@ our \$specialNodeHash = {
|
|||
samlIDPMetaDataNodes => [qw(samlIDPMetaDataXML samlIDPMetaDataExportedAttributes samlIDPMetaDataOptions)],
|
||||
samlSPMetaDataNodes => [qw(samlSPMetaDataXML samlSPMetaDataExportedAttributes samlSPMetaDataOptions)],
|
||||
oidcOPMetaDataNodes => [qw(oidcOPMetaDataJSON oidcOPMetaDataJWKS oidcOPMetaDataOptions oidcOPMetaDataExportedVars)],
|
||||
oidcRPMetaDataNodes => [qw(oidcRPMetaDataOptions oidcRPMetaDataExportedVars)],
|
||||
oidcRPMetaDataNodes => [qw(oidcRPMetaDataOptions oidcRPMetaDataExportedVars oidcRPMetaDataOptionsExtraClaims)],
|
||||
};
|
||||
|
||||
our \@sessionTypes = ( '$sessionTypes' );
|
||||
|
|
|
@ -2419,8 +2419,9 @@ m{^(?:ldapi://[^/]*/?|\w[\w\-\.]*(?::\d{1,5})?|ldap(?:s|\+tls)?://\w[\w\-\.]*(?:
|
|||
{ type => 'int', default => 3600 },
|
||||
oidcRPMetaDataOptionsAccessTokenExpiration =>
|
||||
{ type => 'int', default => 3600 },
|
||||
oidcRPMetaDataOptionsRedirectUris => { type => 'text', },
|
||||
oidcRPMetaDataOptionsExtraClaims => { type => 'keyTextContainer', },
|
||||
oidcRPMetaDataOptionsRedirectUris => { type => 'text', },
|
||||
oidcRPMetaDataOptionsExtraClaims =>
|
||||
{ type => 'keyTextContainer', default => {} },
|
||||
oidcRPMetaDataOptionsBypassConsent => { type => 'bool', default => 0 },
|
||||
|
||||
};
|
||||
|
|
|
@ -196,9 +196,9 @@ sub cTrees {
|
|||
'oidcRPMetaDataOptionsAccessTokenExpiration',
|
||||
'oidcRPMetaDataOptionsRedirectUris',
|
||||
'oidcRPMetaDataOptionsBypassConsent',
|
||||
'oidcRPMetaDataOptionsExtraClaims'
|
||||
]
|
||||
},
|
||||
'oidcRPMetaDataOptionsExtraClaims',
|
||||
],
|
||||
};
|
||||
}
|
||||
|
|
|
@ -16,7 +16,7 @@ our $specialNodeHash = {
|
|||
samlIDPMetaDataNodes => [qw(samlIDPMetaDataXML samlIDPMetaDataExportedAttributes samlIDPMetaDataOptions)],
|
||||
samlSPMetaDataNodes => [qw(samlSPMetaDataXML samlSPMetaDataExportedAttributes samlSPMetaDataOptions)],
|
||||
oidcOPMetaDataNodes => [qw(oidcOPMetaDataJSON oidcOPMetaDataJWKS oidcOPMetaDataOptions oidcOPMetaDataExportedVars)],
|
||||
oidcRPMetaDataNodes => [qw(oidcRPMetaDataOptions oidcRPMetaDataExportedVars)],
|
||||
oidcRPMetaDataNodes => [qw(oidcRPMetaDataOptions oidcRPMetaDataExportedVars oidcRPMetaDataOptionsExtraClaims)],
|
||||
};
|
||||
|
||||
our @sessionTypes = ( 'captcha', 'remoteGlobal', 'cas', 'global', 'localSession', 'persistent', 'saml', 'oidc' );
|
||||
|
|
|
@ -350,16 +350,17 @@ function templates(tpl,key) {
|
|||
"id" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsBypassConsent",
|
||||
"title" : "oidcRPMetaDataOptionsBypassConsent",
|
||||
"type" : "bool"
|
||||
},
|
||||
{
|
||||
"cnodes" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsExtraClaims",
|
||||
"id" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsExtraClaims",
|
||||
"title" : "oidcRPMetaDataOptionsExtraClaims",
|
||||
"type" : "keyTextContainer"
|
||||
}
|
||||
],
|
||||
"id" : "oidcRPMetaDataOptions",
|
||||
"title" : "oidcRPMetaDataOptions"
|
||||
},
|
||||
{
|
||||
"cnodes" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsExtraClaims",
|
||||
"default" : [],
|
||||
"id" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsExtraClaims",
|
||||
"title" : "oidcRPMetaDataOptionsExtraClaims",
|
||||
"type" : "keyTextContainer"
|
||||
}
|
||||
]
|
||||
;
|
||||
|
|
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue
Block a user