Merge branch 'fix-oidc-consent-2fa-2142' into 'v2.0'
Fix #2142 See merge request lemonldap-ng/lemonldap-ng!135
This commit is contained in:
commit
9464bd2503
|
@ -85,6 +85,7 @@ sub display {
|
|||
MSG => $req->info,
|
||||
HIDDEN_INPUTS => $self->buildHiddenForm($req),
|
||||
ACTIVE_TIMER => $req->data->{activeTimer},
|
||||
FORM_ACTION => $req->data->{confirmFormAction} || "#",
|
||||
FORM_METHOD => $self->conf->{confirmFormMethod},
|
||||
CHOICE_PARAM => $self->conf->{authChoiceParam},
|
||||
CHOICE_VALUE => $req->data->{_authChoice},
|
||||
|
|
|
@ -12,6 +12,7 @@ use Mouse;
|
|||
use MIME::Base64;
|
||||
use IO::String;
|
||||
use URI::Escape;
|
||||
use URI;
|
||||
use Lemonldap::NG::Common::FormEncode;
|
||||
use Lemonldap::NG::Portal::Main::Constants qw(
|
||||
PE_OK
|
||||
|
@ -148,6 +149,10 @@ sub _forAuthUser {
|
|||
$self->restoreRequest( $req, $r );
|
||||
@path = @{ $req->pdata->{ $self->ipath . 'Path' } }
|
||||
if ( $req->pdata->{ $self->ipath . 'Path' } );
|
||||
|
||||
# In case a confirm form is shown, we need it to POST on the
|
||||
# current Path
|
||||
$req->data->{confirmFormAction} = URI->new($req->uri)->path;
|
||||
}
|
||||
|
||||
# Clean pdata: keepPdata has been set, so pdata must be cleaned here
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
<div id="logincontent" class="container">
|
||||
|
||||
<form id="form" action="#" method="<TMPL_VAR NAME="FORM_METHOD">" class="confirm" role="form">
|
||||
<form id="form" action="<TMPL_VAR NAME="FORM_ACTION">" method="<TMPL_VAR NAME="FORM_METHOD">" class="confirm" role="form">
|
||||
|
||||
<TMPL_VAR NAME="HIDDEN_INPUTS">
|
||||
<TMPL_IF NAME="AUTH_URL">
|
||||
|
|
426
lemonldap-ng-portal/t/32-OIDC-Code-Flow-with-2F.t
Normal file
426
lemonldap-ng-portal/t/32-OIDC-Code-Flow-with-2F.t
Normal file
|
@ -0,0 +1,426 @@
|
|||
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';
|
||||
require 't/oidc-lib.pm';
|
||||
}
|
||||
|
||||
my $debug = 'error';
|
||||
my ( $op, $rp, $res );
|
||||
|
||||
my $access_token;
|
||||
|
||||
LWP::Protocol::PSGI->register(
|
||||
sub {
|
||||
my $req = Plack::Request->new(@_);
|
||||
ok( $req->uri =~ m#http://auth.((?:o|r)p).com(.*)#, ' REST request' );
|
||||
my $host = $1;
|
||||
my $url = $2;
|
||||
my ( $res, $client );
|
||||
count(1);
|
||||
if ( $host eq 'op' ) {
|
||||
pass(" Request from RP to OP, endpoint $url");
|
||||
$client = $op;
|
||||
}
|
||||
elsif ( $host eq 'rp' ) {
|
||||
pass(' Request from OP to RP');
|
||||
$client = $rp;
|
||||
}
|
||||
else {
|
||||
fail(' Aborting REST request (external)');
|
||||
return [ 500, [], [] ];
|
||||
}
|
||||
if ( $req->method =~ /^post$/i ) {
|
||||
my $s = $req->content;
|
||||
ok(
|
||||
$res = $client->_post(
|
||||
$url, IO::String->new($s),
|
||||
length => length($s),
|
||||
type => $req->header('Content-Type'),
|
||||
),
|
||||
' Execute request'
|
||||
);
|
||||
}
|
||||
else {
|
||||
ok(
|
||||
$res = $client->_get(
|
||||
$url,
|
||||
custom => {
|
||||
HTTP_AUTHORIZATION => $req->header('Authorization'),
|
||||
}
|
||||
),
|
||||
' Execute request'
|
||||
);
|
||||
}
|
||||
ok( $res->[0] == 200, ' Response is 200' );
|
||||
ok( getHeader( $res, 'Content-Type' ) =~ m#^application/json#,
|
||||
' Content is JSON' )
|
||||
or explain( $res->[1], 'Content-Type => application/json' );
|
||||
count(4);
|
||||
if ( $res->[2]->[0] =~ /"access_token":"(.*?)"/ ) {
|
||||
$access_token = $1;
|
||||
pass "Found access_token $access_token";
|
||||
count(1);
|
||||
}
|
||||
return $res;
|
||||
}
|
||||
);
|
||||
|
||||
# Initialization
|
||||
ok( $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];
|
||||
count(3);
|
||||
|
||||
switch ('rp');
|
||||
&Lemonldap::NG::Handler::Main::cfgNum( 0, 0 );
|
||||
ok( $rp = rp( $jwks, $metadata ), 'RP portal' );
|
||||
count(1);
|
||||
|
||||
# Query RP for auth
|
||||
ok( $res = $rp->_get( '/', accept => 'text/html' ), 'Unauth SP request' );
|
||||
count(1);
|
||||
my ( $url, $query ) =
|
||||
expectRedirection( $res, qr#http://auth.op.com(/oauth2/authorize)\?(.*)$# );
|
||||
|
||||
# Push request to OP
|
||||
switch ('op');
|
||||
ok( $res = $op->_get( $url, query => $query, accept => 'text/html' ),
|
||||
"Push request to OP, endpoint $url" );
|
||||
count(1);
|
||||
expectOK($res);
|
||||
my $pdata = expectCookie( $res, 'lemonldappdata' );
|
||||
|
||||
# Try to authenticate to OP
|
||||
$query = "user=french&password=french&$query";
|
||||
ok(
|
||||
$res = $op->_post(
|
||||
$url,
|
||||
IO::String->new($query),
|
||||
accept => 'text/html',
|
||||
length => length($query),
|
||||
cookie => "lemonldappdata=$pdata",
|
||||
),
|
||||
"Post authentication, endpoint $url"
|
||||
);
|
||||
count(1);
|
||||
|
||||
$pdata = expectCookie( $res, 'lemonldappdata' );
|
||||
|
||||
( my $host, $url, $query ) =
|
||||
expectForm( $res, undef, '/ext2fcheck?skin=bootstrap', 'token', 'code',
|
||||
'checkLogins' );
|
||||
|
||||
ok(
|
||||
$res->[2]->[0] =~
|
||||
qr%<input name="code" value="" type="text" class="form-control" id="extcode" trplaceholder="code" autocomplete="off" />%,
|
||||
'Found EXTCODE input'
|
||||
) or print STDERR Dumper( $res->[2]->[0] );
|
||||
count(1);
|
||||
|
||||
$query =~ s/code=/code=123456/;
|
||||
|
||||
ok(
|
||||
$res = $op->_post(
|
||||
'/ext2fcheck',
|
||||
IO::String->new($query),
|
||||
length => length($query),
|
||||
accept => 'text/html',
|
||||
cookie => "lemonldappdata=$pdata",
|
||||
),
|
||||
'Post code'
|
||||
);
|
||||
count(1);
|
||||
|
||||
my $idpId = expectCookie($res);
|
||||
$pdata = expectCookie( $res, 'lemonldappdata' );
|
||||
($url) = expectRedirection( $res, qr#http://auth.op.com(/?/oauth2)# );
|
||||
|
||||
ok(
|
||||
$res = $op->_get(
|
||||
"$url",
|
||||
accept => 'text/html',
|
||||
cookie => "lemonldap=$idpId; lemonldappdata=$pdata",
|
||||
),
|
||||
"Follow redirection to Oauth2 issuer"
|
||||
);
|
||||
count(1);
|
||||
|
||||
$pdata = expectCookie( $res, 'lemonldappdata' );
|
||||
is( $pdata, '', "Pdata was cleared" );
|
||||
count(1);
|
||||
|
||||
( $host, my $tmp );
|
||||
( $host, $url, $query ) =
|
||||
expectForm( $res, undef, qr#/oauth2/authorize.*#, 'confirm' );
|
||||
|
||||
ok(
|
||||
$res = $op->_post(
|
||||
'/oauth2/authorize',
|
||||
IO::String->new($query),
|
||||
accept => 'text/html',
|
||||
cookie => "lemonldap=$idpId",
|
||||
length => length($query),
|
||||
),
|
||||
"Post confirmation, endpoint $url"
|
||||
);
|
||||
count(1);
|
||||
|
||||
($query) = expectRedirection( $res, qr#^http://auth.rp.com/?\?(.*)$# );
|
||||
|
||||
# Push OP response to RP
|
||||
switch ('rp');
|
||||
|
||||
ok( $res = $rp->_get( '/', query => $query, accept => 'text/html' ),
|
||||
'Call openidconnectcallback on RP' );
|
||||
count(1);
|
||||
my $spId = expectCookie($res);
|
||||
|
||||
switch ('op');
|
||||
ok(
|
||||
$res = $op->_get( '/oauth2/checksession.html', accept => 'text.html' ),
|
||||
'Check session, endpoint /oauth2/checksession.html'
|
||||
);
|
||||
count(1);
|
||||
expectOK($res);
|
||||
ok( getHeader( $res, 'Content-Security-Policy' ) !~ /frame-ancestors/,
|
||||
' Frame can be embedded' )
|
||||
or explain( $res->[1],
|
||||
'Content-Security-Policy does not contain a frame-ancestors' );
|
||||
count(1);
|
||||
|
||||
# Verify UTF-8
|
||||
ok(
|
||||
$res = $op->_get(
|
||||
'/oauth2/userinfo', query => 'access_token=' . $access_token,
|
||||
),
|
||||
'Get userinfo'
|
||||
);
|
||||
$res = expectJSON($res);
|
||||
ok( $res->{name} eq 'Frédéric Accents', 'UTF-8 values' )
|
||||
or explain( $res, 'name => Frédéric Accents' );
|
||||
count(2);
|
||||
|
||||
ok( $res = $op->_get("/sessions/global/$spId"), 'Get UTF-8' );
|
||||
$res = expectJSON($res);
|
||||
ok( $res->{cn} eq 'Frédéric Accents', 'UTF-8 values' )
|
||||
or explain( $res, 'cn => Frédéric Accents' );
|
||||
count(2);
|
||||
|
||||
switch ('rp');
|
||||
ok( $res = $rp->_get("/sessions/global/$spId"), 'Get UTF-8' );
|
||||
$res = expectJSON($res);
|
||||
ok( $res->{cn} eq 'Frédéric Accents', 'UTF-8 values' )
|
||||
or explain( $res, 'cn => Frédéric Accents' );
|
||||
count(2);
|
||||
|
||||
# Logout initiated by RP
|
||||
ok(
|
||||
$res = $rp->_get(
|
||||
'/',
|
||||
query => 'logout',
|
||||
cookie => "lemonldap=$spId",
|
||||
accept => 'text/html'
|
||||
),
|
||||
'Query RP for logout'
|
||||
);
|
||||
count(1);
|
||||
( $url, $query ) = expectRedirection( $res,
|
||||
qr#http://auth.op.com(/oauth2/logout)\?(post_logout_redirect_uri=.+)$# );
|
||||
|
||||
# Push logout to OP
|
||||
switch ('op');
|
||||
|
||||
ok(
|
||||
$res = $op->_get(
|
||||
$url,
|
||||
query => $query,
|
||||
cookie => "lemonldap=$idpId",
|
||||
accept => 'text/html'
|
||||
),
|
||||
"Push logout request to OP, endpoint $url"
|
||||
);
|
||||
count(1);
|
||||
|
||||
( $host, $tmp, $query ) = expectForm( $res, '#', undef, 'confirm' );
|
||||
|
||||
ok(
|
||||
$res = $op->_post(
|
||||
$url, IO::String->new($query),
|
||||
length => length($query),
|
||||
cookie => "lemonldap=$idpId",
|
||||
accept => 'text/html',
|
||||
),
|
||||
"Confirm logout, endpoint $url"
|
||||
);
|
||||
count(1);
|
||||
|
||||
( $url, $query ) = expectRedirection( $res, qr#.# );
|
||||
|
||||
my $removedCookie = expectCookie($res);
|
||||
is( $removedCookie, 0, "SSO cookie removed" );
|
||||
count(1);
|
||||
|
||||
# Test logout endpoint without session
|
||||
ok(
|
||||
$res = $op->_get(
|
||||
'/oauth2/logout',
|
||||
accept => 'text/html',
|
||||
query => 'post_logout_redirect_uri=http://auth.rp.com/?logout=1'
|
||||
),
|
||||
'logout endpoint with redirect, endpoint /oauth2/logout'
|
||||
);
|
||||
count(1);
|
||||
expectRedirection( $res, 'http://auth.rp.com/?logout=1' );
|
||||
|
||||
ok( $res = $op->_get('/oauth2/logout'),
|
||||
'logout endpoint, endpoint /oauth2/logout' );
|
||||
count(1);
|
||||
expectReject($res);
|
||||
|
||||
# Test if logout is done
|
||||
ok(
|
||||
$res = $op->_get(
|
||||
'/', cookie => "lemonldap=$idpId",
|
||||
),
|
||||
'Test if user is reject on IdP'
|
||||
);
|
||||
count(1);
|
||||
expectReject($res);
|
||||
|
||||
switch ('rp');
|
||||
ok(
|
||||
$res = $rp->_get(
|
||||
'/',
|
||||
accept => 'text/html',
|
||||
cookie => "lemonldap=$spId"
|
||||
),
|
||||
'Test if user is reject on SP'
|
||||
);
|
||||
count(1);
|
||||
( $url, $query ) =
|
||||
expectRedirection( $res, qr#^http://auth.op.com(/oauth2/authorize)\?(.*)$# );
|
||||
|
||||
clean_sessions();
|
||||
done_testing( count() );
|
||||
|
||||
sub op {
|
||||
return LLNG::Manager::Test->new( {
|
||||
ini => {
|
||||
logLevel => $debug,
|
||||
domain => 'idp.com',
|
||||
portal => 'http://auth.op.com/',
|
||||
authentication => 'Demo',
|
||||
userDB => 'Same',
|
||||
issuerDBOpenIDConnectActivation => 1,
|
||||
ext2fActivation => 1,
|
||||
ext2fCodeActivation => '123456',
|
||||
ext2FSendCommand => 't/sendOTP.pl -uid dwho',
|
||||
ext2FValidateCommand => 't/vrfyOTP.pl -uid dwho -code $code',
|
||||
restSessionServer => 1,
|
||||
oidcRPMetaDataExportedVars => {
|
||||
rp => {
|
||||
email => "mail",
|
||||
family_name => "cn",
|
||||
name => "cn"
|
||||
}
|
||||
},
|
||||
oidcServiceMetaDataAuthorizeURI => "authorize",
|
||||
oidcServiceMetaDataCheckSessionURI => "checksession.html",
|
||||
oidcServiceMetaDataJWKSURI => "jwks",
|
||||
oidcServiceMetaDataEndSessionURI => "logout",
|
||||
oidcServiceMetaDataRegistrationURI => "register",
|
||||
oidcServiceMetaDataTokenURI => "token",
|
||||
oidcServiceMetaDataUserInfoURI => "userinfo",
|
||||
oidcServiceAllowHybridFlow => 1,
|
||||
oidcServiceAllowImplicitFlow => 1,
|
||||
oidcServiceAllowDynamicRegistration => 1,
|
||||
oidcServiceAllowAuthorizationCodeFlow => 1,
|
||||
oidcRPMetaDataOptions => {
|
||||
rp => {
|
||||
oidcRPMetaDataOptionsDisplayName => "RP",
|
||||
oidcRPMetaDataOptionsIDTokenExpiration => 3600,
|
||||
oidcRPMetaDataOptionsClientID => "rpid",
|
||||
oidcRPMetaDataOptionsIDTokenSignAlg => "HS512",
|
||||
oidcRPMetaDataOptionsBypassConsent => 0,
|
||||
oidcRPMetaDataOptionsClientSecret => "rpsecret",
|
||||
oidcRPMetaDataOptionsUserIDAttr => "",
|
||||
oidcRPMetaDataOptionsAccessTokenExpiration => 3600,
|
||||
oidcRPMetaDataOptionsPostLogoutRedirectUris =>
|
||||
"http://auth.rp.com/?logout=1"
|
||||
}
|
||||
},
|
||||
oidcOPMetaDataOptions => {},
|
||||
oidcOPMetaDataJSON => {},
|
||||
oidcOPMetaDataJWKS => {},
|
||||
oidcServiceMetaDataAuthnContext => {
|
||||
'loa-4' => 4,
|
||||
'loa-1' => 1,
|
||||
'loa-5' => 5,
|
||||
'loa-2' => 2,
|
||||
'loa-3' => 3
|
||||
},
|
||||
oidcServicePrivateKeySig => oidc_key_op_private_sig,
|
||||
oidcServicePublicKeySig => oidc_key_op_public_sig,
|
||||
}
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
sub rp {
|
||||
my ( $jwks, $metadata ) = @_;
|
||||
return LLNG::Manager::Test->new( {
|
||||
ini => {
|
||||
logLevel => $debug,
|
||||
domain => 'rp.com',
|
||||
portal => 'http://auth.rp.com/',
|
||||
authentication => 'OpenIDConnect',
|
||||
userDB => 'Same',
|
||||
restSessionServer => 1,
|
||||
oidcOPMetaDataExportedVars => {
|
||||
op => {
|
||||
cn => "name",
|
||||
uid => "sub",
|
||||
sn => "family_name",
|
||||
mail => "email"
|
||||
}
|
||||
},
|
||||
oidcOPMetaDataOptions => {
|
||||
op => {
|
||||
oidcOPMetaDataOptionsCheckJWTSignature => 1,
|
||||
oidcOPMetaDataOptionsJWKSTimeout => 0,
|
||||
oidcOPMetaDataOptionsClientSecret => "rpsecret",
|
||||
oidcOPMetaDataOptionsScope => "openid profile",
|
||||
oidcOPMetaDataOptionsStoreIDToken => 0,
|
||||
oidcOPMetaDataOptionsMaxAge => 30,
|
||||
oidcOPMetaDataOptionsDisplay => "",
|
||||
oidcOPMetaDataOptionsClientID => "rpid",
|
||||
oidcOPMetaDataOptionsConfigurationURI =>
|
||||
"https://auth.op.com/.well-known/openid-configuration"
|
||||
}
|
||||
},
|
||||
oidcOPMetaDataJWKS => {
|
||||
op => $jwks,
|
||||
},
|
||||
oidcOPMetaDataJSON => {
|
||||
op => $metadata,
|
||||
}
|
||||
}
|
||||
}
|
||||
);
|
||||
}
|
|
@ -193,10 +193,14 @@ SKIP: {
|
|||
),
|
||||
'Follow internal redirection from SAML-SP to OIDC-OP'
|
||||
);
|
||||
( $host, $tmp, $query ) = expectForm( $res, '#', undef, 'confirm' );
|
||||
|
||||
$spPdata = expectCookie( $res, 'lemonldappdata' );
|
||||
|
||||
( $host, $tmp, $query ) =
|
||||
expectForm( $res, undef, qr#^/oauth2/authorize#, 'confirm' );
|
||||
ok(
|
||||
$res = $sp->_get(
|
||||
$url,
|
||||
'/oauth2/authorize',
|
||||
query => $query,
|
||||
accept => 'text/html',
|
||||
cookie => "lemonldap=$spId;$spPdata"
|
||||
|
|
|
@ -176,10 +176,14 @@ SKIP: {
|
|||
),
|
||||
'Follow internal redirection from SAML-SP to OIDC-OP'
|
||||
);
|
||||
( $host, $tmp, $query ) = expectForm( $res, '#', undef, 'confirm' );
|
||||
|
||||
( $host, $url, $query ) =
|
||||
expectForm( $res, undef, qr#/oauth2/authorize#, 'confirm' );
|
||||
$spPdata = 'lemonldappdata=' . expectCookie( $res, 'lemonldappdata' );
|
||||
|
||||
ok(
|
||||
$res = $sp->_get(
|
||||
$url,
|
||||
'/oauth2/authorize',
|
||||
query => $query,
|
||||
accept => 'text/html',
|
||||
cookie => "lemonldap=$spId;$spPdata"
|
||||
|
|
|
@ -179,10 +179,13 @@ SKIP: {
|
|||
),
|
||||
'Follow internal redirection from SAML-SP to OIDC-OP'
|
||||
);
|
||||
( $host, $tmp, $query ) = expectForm( $res, '#', undef, 'confirm' );
|
||||
|
||||
$spPdata = 'lemonldappdata=' . expectCookie( $res, 'lemonldappdata' );
|
||||
( $host, $tmp, $query ) =
|
||||
expectForm( $res, undef, qr#^/oauth2/authorize#, 'confirm' );
|
||||
ok(
|
||||
$res = $sp->_get(
|
||||
$url,
|
||||
'/oauth2/authorize',
|
||||
query => $query,
|
||||
accept => 'text/html',
|
||||
cookie => "lemonldap=$spId;$spPdata"
|
||||
|
|
Loading…
Reference in New Issue
Block a user