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

Use display (#183)

Browse Source
This commit is contained in:
Clément Oudot 2015-04-01 12:53:18 +00:00
parent 9936ade26b
commit 865551989b
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/SubAttributes.pm
View File

@ -65,6 +65,13 @@ has 'oidcOPMetaDataOptionsConfigurationURI' => (
documentation => "OIDC OP configuration endpoint",
);
has 'oidcOPMetaDataOptionsDisplay' => (
is => 'rw',
isa => 'Str|Undef',
default => undef,
documentation => "OIDC OP display",
);
has 'oidcOPMetaDataOptionsDisplayName' => (
is => 'rw',
isa => 'Str',

6
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_Struct.pm
View File

@ -287,10 +287,12 @@ sub cstruct {
},
oidcOPMetaDataOptionsProtocol => {
_nodes => [
qw(oidcOPMetaDataOptionsScope oidcOPMetaDataOptionsTokenEndpointAuthMethod oidcOPMetaDataOptionsCheckJWTSignature)
qw(oidcOPMetaDataOptionsScope oidcOPMetaDataOptionsDisplay oidcOPMetaDataOptionsTokenEndpointAuthMethod oidcOPMetaDataOptionsCheckJWTSignature)
],
oidcOPMetaDataOptionsScope =>
"text:/oidcOPMetaDataOptions/$k2/oidcOPMetaDataOptionsScope",
oidcOPMetaDataOptionsDisplay =>
"text:/oidcOPMetaDataOptions/$k2/oidcOPMetaDataOptionsDisplay",
oidcOPMetaDataOptionsTokenEndpointAuthMethod =>
"text:/oidcOPMetaDataOptions/$k2/oidcOPMetaDataOptionsTokenEndpointAuthMethod",
oidcOPMetaDataOptionsCheckJWTSignature =>
@ -317,7 +319,7 @@ sub cstruct {
oidcRPMetaDataNode => {
$k2 => {
_nodes =>
[ qw(oidcRPMetaDataExportedVars oidcRPMetaDataOptions) ],
[qw(oidcRPMetaDataExportedVars oidcRPMetaDataOptions)],
oidcRPMetaDataExportedVars => {
_nodes =>
["hash:/oidcRPMetaDataExportedVars/$k2:vars:btext"],

8
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/_OpenIDConnect.pm
View File

@ -233,6 +233,8 @@ sub buildAuthorizationCodeAuthnRequest {
my $nonceSession = $self->getOpenIDConnectSession();
$nonceSession->update( { '_utime' => time } );
my $nonce = $nonceSession->id;
my $display =
$self->{oidcOPMetaDataOptions}->{$op}->{oidcOPMetaDataOptionsDisplay};
$client_id = uri_escape($client_id);
$scope = uri_escape($scope);
@ -240,6 +242,7 @@ sub buildAuthorizationCodeAuthnRequest {
$redirect_uri = uri_escape($redirect_uri);
$state = uri_escape($state) if defined $state;
$nonce = uri_escape($nonce);
$display = uri_escape($display) if defined $display;
my $authn_uri = $authorize_uri;
$authn_uri .= ( $authorize_uri =~ /\?/ ? '&' : '?' );
@ -247,8 +250,9 @@ sub buildAuthorizationCodeAuthnRequest {
$authn_uri .= "&client_id=$client_id";
$authn_uri .= "&scope=$scope";
$authn_uri .= "&redirect_uri=$redirect_uri";
$authn_uri .= "&state=$state" if defined $state;
$authn_uri .= "&nonce=$nonce" if defined $nonce;
$authn_uri .= "&state=$state" if defined $state;
$authn_uri .= "&nonce=$nonce" if defined $nonce;
$authn_uri .= "&display=$display" if defined $display;
$self->lmLog(
"OpenIDConnect Authorization Code Flow Authn Request: $authn_uri",