diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/tr.json b/lemonldap-ng-manager/site/htdocs/static/languages/tr.json index 8ecc7f5f6..aa0f1133a 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/tr.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/tr.json @@ -556,6 +556,7 @@ "oidcRPMetaDataOptionsPublic":"Açık istemci", "oidcRPMetaDataOptionsRequirePKCE":"PKCE gerektir", "oidcRPMetaDataOptionsRule":"Erişim kuralı", +"oidcRPMetaDataMacros":"Makrolar", "oidcOPMetaDataOptionsScope":"Kapsam", "oidcOPMetaDataOptionsStoreIDToken":"ID Jetonu Sakla", "oidcOPMetaDataOptionsTokenEndpointAuthMethod":"Jeton uç noktası doğrulama metodu", diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Issuer/OpenIDConnect.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Issuer/OpenIDConnect.pm index a1ab136c1..af82ed91c 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Issuer/OpenIDConnect.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Issuer/OpenIDConnect.pm @@ -781,7 +781,7 @@ sub run { # No access_token # Claims must be set in id_token my $claims = - $self->buildUserInfoResponseFromId( + $self->buildUserInfoResponseFromId( $req, $oidc_request->{'scope'}, $rp, $req->id ); @@ -926,7 +926,8 @@ sub run { # No access_token # Claims must be set in id_token - my $claims = $self->buildUserInfoResponseFromId( + my $claims = + $self->buildUserInfoResponseFromId( $req, $oidc_request->{'scope'}, $rp, $req->id ); @@ -1261,9 +1262,10 @@ sub token { $id_token_payload_hash->{'at_hash'} = $at_hash if $at_hash; if ( $self->force_id_claims($rp) ) { - my $claims = - $self->buildUserInfoResponseFromId( $codeSession->data->{'scope'}, - $rp, $codeSession->data->{user_session_id} ); + my $claims = $self->buildUserInfoResponseFromId( + $req, $codeSession->data->{'scope'}, + $rp, $codeSession->data->{user_session_id} + ); foreach ( keys %$claims ) { $id_token_payload_hash->{$_} = $claims->{$_} @@ -1481,7 +1483,8 @@ sub token { # If we forced sending claims in ID token if ( $self->force_id_claims($rp) ) { my $claims = - $self->buildUserInfoResponse( $refreshSession->data->{scope}, + $self->buildUserInfoResponse( $req, + $refreshSession->data->{scope}, $rp, $session ); foreach ( keys %$claims ) { @@ -1594,7 +1597,7 @@ sub userInfo { } my $userinfo_response = - $self->buildUserInfoResponse( $scope, $rp, $session ); + $self->buildUserInfoResponse( $req, $scope, $rp, $session ); unless ($userinfo_response) { return $self->returnBearerError( 'invalid_request', 'Invalid request', 401 ); diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/OpenIDConnect.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/OpenIDConnect.pm index 901a65a60..f9414cb75 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/OpenIDConnect.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/OpenIDConnect.pm @@ -37,6 +37,7 @@ has oidcOPList => ( is => 'rw', default => sub { {} }, ); has oidcRPList => ( is => 'rw', default => sub { {} }, ); has rpAttributes => ( is => 'rw', default => sub { {} }, ); has spRules => ( is => 'rw', default => sub { {} } ); +has spMacros => ( is => 'rw', default => sub { {} } ); # return LWP::UserAgent object has ua => ( @@ -132,6 +133,22 @@ sub loadRPs { } $self->spRules->{$rp} = $rule; } + + # Load per-RP macros + my $macros = $self->conf->{oidcRPMetaDataMacros}->{$rp}; + for my $macroAttr ( keys %{$macros} ) { + my $macroRule = $macros->{$macroAttr}; + if ( length $macroRule ) { + $macroRule = $self->p->HANDLER->substitute($macroRule); + unless ( $macroRule = $self->p->HANDLER->buildSub($macroRule) ) + { + $self->error( 'OIDC RP macro error: ' + . $self->p->HANDLER->tsv->{jail}->error ); + return 0; + } + $self->spMacros->{$rp}->{$macroAttr} = $macroRule; + } + } } return 1; } @@ -1299,11 +1316,11 @@ sub getAttributesListFromClaim { # @param user_session_id User session identifier # @return hashref UserInfo data sub buildUserInfoResponseFromId { - my ( $self, $scope, $rp, $user_session_id ) = @_; + my ( $self, $req, $scope, $rp, $user_session_id ) = @_; my $session = $self->p->getApacheSession($user_session_id); return undef unless ($session); - return buildUserInfoResponse( $self, $scope, $rp, $session ); + return buildUserInfoResponse( $self, $req, $scope, $rp, $session ); } # Return Hash of UserInfo data @@ -1312,7 +1329,7 @@ sub buildUserInfoResponseFromId { # @param session SSO or offline session # @return hashref UserInfo data sub buildUserInfoResponse { - my ( $self, $scope, $rp, $session ) = @_; + my ( $self, $req, $scope, $rp, $session ) = @_; my $userinfo_response = {}; my $user_id_attribute = @@ -1335,7 +1352,19 @@ sub buildUserInfoResponse { my $session_key = $self->conf->{oidcRPMetaDataExportedVars}->{$rp}->{$attribute}; if ($session_key) { - my $session_value = $session->data->{$session_key}; + + my $session_value; + + # Lookup attribute in macros first + if ( $self->spMacros->{$rp}->{$session_key} ) { + $session_value = $self->spMacros->{$rp}->{$session_key} + ->( $req, $session->data ); + + # If not found, search in session + } + else { + $session_value = $session->data->{$session_key}; + } # Address is a JSON object if ( $claim eq "address" ) { diff --git a/lemonldap-ng-portal/t/32-OIDC-Macro.t b/lemonldap-ng-portal/t/32-OIDC-Macro.t new file mode 100644 index 000000000..1c55d99c6 --- /dev/null +++ b/lemonldap-ng-portal/t/32-OIDC-Macro.t @@ -0,0 +1,192 @@ +use lib 'inc'; +use Test::More; +use strict; +use IO::String; +use LWP::UserAgent; +use LWP::Protocol::PSGI; +use MIME::Base64; + +BEGIN { + require 't/test-lib.pm'; +} + +my $debug = 'error'; +my $res; +my $url; + +# Initialization +ok( my $op = op(), 'OP portal' ); + +ok( $res = $op->_get('/oauth2/jwks'), 'Get JWKS, endpoint /oauth2/jwks' ); +expectOK($res); +my $jwks = $res->[2]->[0]; + +ok( + $res = $op->_get('/.well-known/openid-configuration'), + 'Get metadata, endpoint /.well-known/openid-configuration' +); +expectOK($res); +my $metadata = $res->[2]->[0]; + +my $query = +"response_type=code&scope=openid%20profile%20email&client_id=rpid&state=af0ifjsldkj&redirect_uri=http%3A%2F%2Frp.com%2F"; + +# Push request to OP +ok( + $res = + $op->_get( "/oauth2/authorize", query => $query, accept => 'text/html' ), + "Start Authorization Code flow" +); +expectOK($res); + +# Try to authenticate to OP +$query = "user=french&password=french&$query"; +ok( + $res = $op->_post( + "/oauth2/authorize", + IO::String->new($query), + accept => 'text/html', + length => length($query), + ), + "Post authentication, endpoint $url" +); +my $idpId = expectCookie($res); +my ($code) = expectRedirection( $res, qr#http://rp.com/\?code=([^&]+)# ); + +# Get access token +$query = +"grant_type=authorization_code&code=$code&redirect_uri=http%3A%2F%2Frp.com%2F"; + +ok( + $res = $op->_post( + "/oauth2/token", + IO::String->new($query), + accept => 'text/html', + length => length($query), + custom => { + HTTP_AUTHORIZATION => "Basic " . encode_base64("rpid:rpsecret"), + }, + ), + "Post token" +); + +my $tokenresp = JSON::from_json( $res->[2]->[0] ); +ok( my $access_token = $tokenresp->{access_token}, 'Found access token' ); + +# Get Userinfo +ok( + $res = $op->_get( + "/oauth2/userinfo", + accept => 'text/html', + custom => { + HTTP_AUTHORIZATION => "Bearer " . $access_token, + }, + ), + "Post token" +); + +my $userinfo = JSON::from_json( $res->[2]->[0] ); +is( $userinfo->{family_name}, 'Accents', 'Correct macro value' ); + +clean_sessions(); +done_testing(); + +sub op { + return LLNG::Manager::Test->new( { + ini => { + logLevel => $debug, + domain => 'idp.com', + portal => 'http://auth.op.com', + authentication => 'Demo', + userDB => 'Same', + issuerDBOpenIDConnectActivation => 1, + issuerDBOpenIDConnectRule => '$uid eq "french"', + oidcRPMetaDataExportedVars => { + rp => { + email => "mail", + family_name => "extract_sn", + name => "cn" + } + }, + oidcServiceMetaDataIssuer => "http://auth.op.com", + oidcServiceMetaDataAuthorizeURI => "authorize", + oidcServiceMetaDataCheckSessionURI => "checksession.html", + oidcServiceMetaDataJWKSURI => "jwks", + oidcServiceMetaDataEndSessionURI => "logout", + oidcServiceMetaDataRegistrationURI => "register", + oidcServiceMetaDataTokenURI => "token", + oidcServiceMetaDataUserInfoURI => "userinfo", + oidcServiceAllowHybridFlow => 1, + oidcServiceAllowImplicitFlow => 1, + oidcServiceAllowDynamicRegistration => 1, + oidcServiceAllowAuthorizationCodeFlow => 1, + oidcRPMetaDataMacros => { + rp => { + extract_sn => '(split(/\s/, $cn))[1]', + } + }, + oidcRPMetaDataOptions => { + rp => { + oidcRPMetaDataOptionsDisplayName => "RP", + oidcRPMetaDataOptionsIDTokenExpiration => 3600, + oidcRPMetaDataOptionsClientID => "rpid", + oidcRPMetaDataOptionsIDTokenSignAlg => "HS512", + oidcRPMetaDataOptionsBypassConsent => 1, + oidcRPMetaDataOptionsClientSecret => "rpsecret", + oidcRPMetaDataOptionsUserIDAttr => "", + oidcRPMetaDataOptionsAccessTokenExpiration => 3600, + } + }, + oidcOPMetaDataOptions => {}, + oidcOPMetaDataJSON => {}, + oidcOPMetaDataJWKS => {}, + oidcServiceMetaDataAuthnContext => { + 'loa-4' => 4, + 'loa-1' => 1, + 'loa-5' => 5, + 'loa-2' => 2, + 'loa-3' => 3 + }, + oidcServicePrivateKeySig => "-----BEGIN RSA PRIVATE KEY----- +MIIEowIBAAKCAQEAs2jsmIoFuWzMkilJaA8//5/T30cnuzX9GImXUrFR2k9EKTMt +GMHCdKlWOl3BV+BTAU9TLz7Jzd/iJ5GJ6B8TrH1PHFmHpy8/qE/S5OhinIpIi7eb +ABqnoVcwDdCa8ugzq8k8SWxhRNXfVIlwz4NH1caJ8lmiERFj7IvNKqEhzAk0pyDr +8hubveTC39xREujKlsqutpPAFPJ3f2ybVsdykX5rx0h5SslG3jVWYhZ/SOb2aIzO +r0RMjhQmsYRwbpt3anjlBZ98aOzg7GAkbO8093X5VVk9vaPRg0zxJQ0Do0YLyzkR +isSAIFb0tdKuDnjRGK6y/N2j6At2HjkxntbtGQIDAQABAoIBADYq6LxJd977LWy3 +0HT9nboFPIf+SM2qSEc/S5Po+6ipJBA4ZlZCMf7dHa6znet1TDpqA9iQ4YcqIHMH +6xZNQ7hhgSAzG9TrXBHqP+djDlrrGWotvjuy0IfS9ixFnnLWjrtAH9afRWLuG+a/ +NHNC1M6DiiTE0TzL/lpt/zzut3CNmWzH+t19X6UsxUg95AzooEeewEYkv25eumWD +mfQZfCtSlIw1sp/QwxeJa/6LJw7KcPZ1wXUm1BN0b9eiKt9Cmni1MS7elgpZlgGt +xtfGTZtNLQ7bgDiM8MHzUfPBhbceNSIx2BeCuOCs/7eaqgpyYHBbAbuBQex2H61l +Lcc3Tz0CgYEA4Kx/avpCPxnvsJ+nHVQm5d/WERuDxk4vH1DNuCYBvXTdVCGADf6a +F5No1JcTH3nPTyPWazOyGdT9LcsEJicLyD8vCM6hBFstG4XjqcAuqG/9DRsElpHQ +yi1zc5DNP7Vxmiz9wII0Mjy0abYKtxnXh9YK4a9g6wrcTpvShhIcIb8CgYEAzGzG +lorVCfX9jXULIznnR/uuP5aSnTEsn0xJeqTlbW0RFWLdj8aIL1peirh1X89HroB9 +GeTNqEJXD+3CVL2cx+BRggMDUmEz4hR59meZCDGUyT5fex4LIsceb/ESUl2jo6Sw +HXwWbN67rQ55N4oiOcOppsGxzOHkl5HdExKidycCgYEAr5Qev2tz+fw65LzfzHvH +Kj4S/KuT/5V6He731cFd+sEpdmX3vPgLVAFPG1Q1DZQT/rTzDDQKK0XX1cGiLG63 +NnaqOye/jbfzOF8Z277kt51NFMDYhRLPKDD82IOA4xjY/rPKWndmcxwdob8yAIWh +efY76sMz6ntCT+xWSZA9i+ECgYBWMZM2TIlxLsBfEbfFfZewOUWKWEGvd9l5vV/K +D5cRIYivfMUw5yPq2267jPUolayCvniBH4E7beVpuPVUZ7KgcEvNxtlytbt7muil +5Z6X3tf+VodJ0Swe2NhTmNEB26uwxzLe68BE3VFCsbSYn2y48HAq+MawPZr18bHG +ZfgMxwKBgHHRg6HYqF5Pegzk1746uH2G+OoCovk5ylGGYzcH2ghWTK4agCHfBcDt +EYqYAev/l82wi+OZ5O8U+qjFUpT1CVeUJdDs0o5u19v0UJjunU1cwh9jsxBZAWLy +PAGd6SWf4S3uQCTw6dLeMna25YIlPh5qPA6I/pAahe8e3nSu2ckl +-----END RSA PRIVATE KEY----- +", + oidcServicePublicKeySig => "-----BEGIN PUBLIC KEY----- +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs2jsmIoFuWzMkilJaA8/ +/5/T30cnuzX9GImXUrFR2k9EKTMtGMHCdKlWOl3BV+BTAU9TLz7Jzd/iJ5GJ6B8T +rH1PHFmHpy8/qE/S5OhinIpIi7ebABqnoVcwDdCa8ugzq8k8SWxhRNXfVIlwz4NH +1caJ8lmiERFj7IvNKqEhzAk0pyDr8hubveTC39xREujKlsqutpPAFPJ3f2ybVsdy +kX5rx0h5SslG3jVWYhZ/SOb2aIzOr0RMjhQmsYRwbpt3anjlBZ98aOzg7GAkbO80 +93X5VVk9vaPRg0zxJQ0Do0YLyzkRisSAIFb0tdKuDnjRGK6y/N2j6At2Hjkxntbt +GQIDAQAB +-----END PUBLIC KEY----- +", + } + } + ); +} +