new( {
contextSwitchingIdRule => 1,
totp2fSelfRegistration => 1,
totp2fActivation => 1,
+ totp2fAuthnLevel => 8,
contextSwitchingStopWithLogout => 0,
+ checkUser => 1,
notification => 1,
notificationStorage => 'File',
notificationStorageOptions => { dirName => $main::tmpDir },
@@ -147,15 +149,14 @@ ok(
eval { $res = JSON::from_json( $res->[2]->[0] ) };
ok( not($@), 'Content is JSON' )
or explain( $res->[2]->[0], 'JSON content' );
-my ( $key, $token );
-ok( $key = $res->{secret}, 'Found secret' );
+my $keyR;
+ok( $keyR = $res->{secret}, 'Found secret' );
ok( $token = $res->{token}, 'Found token' );
-$key = Convert::Base32::decode_base32($key);
+$keyR = Convert::Base32::decode_base32($keyR);
count(4);
# Post code
-my $code;
-ok( $code = Lemonldap::NG::Common::TOTP::_code( undef, $key, 0, 30, 6 ),
+ok( $code = Lemonldap::NG::Common::TOTP::_code( undef, $keyR, 0, 30, 6 ),
'Code' );
ok( $code =~ /^\d{6}$/, 'Code contains 6 digits' );
my $s = "code=$code&token=$token";
@@ -220,6 +221,26 @@ ok( $res->[2]->[0] =~ m%%,
or explain( $res->[2]->[0], 'trspan="contextSwitching_OFF"' );
count(6);
+# CheckUser form
+ok(
+ $res = $client->_get(
+ '/checkuser',
+ cookie => "lemonldap=$id",
+ accept => 'text/html'
+ ),
+ 'CheckUser form',
+);
+
+( $host, $url, $query ) =
+ expectForm( $res, undef, '/checkuser', 'user', 'url' );
+ok( $res->[2]->[0] =~ m%%, 'Found trspan="checkUser"' )
+ or explain( $res->[2]->[0], 'trspan="checkUser"' );
+ok( $res->[2]->[0] =~ m%
authMode | %, 'Found macro authMode' )
+ or explain( $res->[2]->[0], 'Macro Key authMode' );
+ok( $res->[2]->[0] =~ m%DEMO | %, 'Found DEMO' )
+ or explain( $res->[2]->[0], 'Macro Value DEMO' );
+count(4);
+
# Stop ContextSwitching
# ------------------------
ok(
@@ -336,10 +357,90 @@ ok(
),
'Auth query'
);
-ok( $res->[2]->[0] =~ m%%,
- 'TOTP code required' )
+
+ok( $res->[2]->[0] =~ m%%, 'TOTP code required' )
or explain( $res->[2]->[0], 'trspan="enterTotpCode"' );
count(2);
+( $host, $url, $query ) = expectForm( $res, undef, '/totp2fcheck', 'token' );
+ok( $code = Lemonldap::NG::Common::TOTP::_code( undef, $key, 0, 30, 6 ),
+ 'LLNG Code' );
+$query =~ s/code=/code=$code/;
+ok(
+ $res = $client->_post(
+ '/totp2fcheck',
+ IO::String->new($query),
+ length => length($query),
+ ),
+ 'Post code'
+);
+count(2);
+$id = expectCookie($res);
+
+# CheckUser form
+ok(
+ $res = $client->_get(
+ '/checkuser',
+ cookie => "lemonldap=$id",
+ accept => 'text/html'
+ ),
+ 'CheckUser form',
+);
+
+( $host, $url, $query ) =
+ expectForm( $res, undef, '/checkuser', 'user', 'url' );
+ok( $res->[2]->[0] =~ m%%, 'Found trspan="checkUser"' )
+ or explain( $res->[2]->[0], 'trspan="checkUser"' );
+ok( $res->[2]->[0] =~ m%authMode | %, 'Found macro authMode' )
+ or explain( $res->[2]->[0], 'Macro Key authMode' );
+ok( $res->[2]->[0] =~ m%TOTP | %, 'Found TOTP' )
+ or explain( $res->[2]->[0], 'Macro Value TOTP' );
+count(4);
+
+# Request not connected user
+$query =~ s/user=dwho/user=davros/;
+ok(
+ $res = $client->_post(
+ '/checkuser',
+ IO::String->new($query),
+ cookie => "lemonldap=$id",
+ length => length($query),
+ accept => 'text/html',
+ ),
+ 'POST checkuser'
+);
+
+( $host, $url, $query ) =
+ expectForm( $res, undef, '/checkuser', 'user', 'url' );
+ok( $res->[2]->[0] =~ m%%, 'Found trspan="checkUserComputeSession"' )
+ or explain( $res->[2]->[0], 'trspan="checkUserComputeSession"' );
+ok( $res->[2]->[0] =~ m%authMode | %, 'Found macro authMode' )
+ or explain( $res->[2]->[0], 'Macro Key authMode' );
+ok( $res->[2]->[0] =~ m%TOTP | %, 'Found TOTP' )
+ or explain( $res->[2]->[0], 'Macro Value TOTP' );
+count(4);
+
+# Request connected user
+$query =~ s/user=davros/user=msmith/;
+ok(
+ $res = $client->_post(
+ '/checkuser',
+ IO::String->new($query),
+ cookie => "lemonldap=$id",
+ length => length($query),
+ accept => 'text/html',
+ ),
+ 'POST checkuser'
+);
+
+( $host, $url, $query ) =
+ expectForm( $res, undef, '/checkuser', 'user', 'url' );
+ok( $res->[2]->[0] =~ m%%, 'Found trspan="checkUser"' )
+ or explain( $res->[2]->[0], 'trspan="checkUser"' );
+ok( $res->[2]->[0] =~ m%authMode | %, 'Found macro authMode' )
+ or explain( $res->[2]->[0], 'Macro Key authMode' );
+ok( $res->[2]->[0] =~ m%DEMO | %, 'Found DEMO' )
+ or explain( $res->[2]->[0], 'Macro Value DEMO' );
+count(4);
clean_sessions();
diff --git a/lemonldap-ng-portal/t/72-2F-REST-with-History.t b/lemonldap-ng-portal/t/72-2F-REST-with-History.t
index ff0b13e47..e85bd69cf 100644
--- a/lemonldap-ng-portal/t/72-2F-REST-with-History.t
+++ b/lemonldap-ng-portal/t/72-2F-REST-with-History.t
@@ -5,20 +5,22 @@ use IO::String;
use LWP::UserAgent;
use LWP::Protocol::PSGI;
use Plack::Request;
+use JSON qw/from_json/;
require 't/test-lib.pm';
-my $maintests = 6;
+my $maintests = 7;
LWP::Protocol::PSGI->register(
sub {
my $req = Plack::Request->new(@_);
if ( $req->path_info eq '/init' ) {
- ok( $req->content eq '{"name":"dwho"}', ' Init req gives dwho' )
- or explain( $req->content, '{"name":"dwho"}' );
+ my $json = from_json( $req->content );
+ is( $json->{name}, "dwho", ' Init req gives dwho' );
}
elsif ( $req->path_info eq '/vrfy' ) {
- ok( $req->content eq '{"code":"1234"}', ' Code is 1234' )
- or explain( $req->content, '{"code":"1234"}' );
+ my $json = from_json( $req->content );
+ is( $json->{name}, "dwho", ' Verify req contains name' );
+ is( $json->{code}, "1234", ' Verify req contains code' );
}
else {
fail( ' Bad REST call ' . $req->path_info );
@@ -38,7 +40,7 @@ my $client = LLNG::Manager::Test->new( {
rest2fInitUrl => 'http://auth.example.com/init',
rest2fInitArgs => { name => 'uid' },
rest2fVerifyUrl => 'http://auth.example.com/vrfy',
- rest2fVerifyArgs => { code => 'code' },
+ rest2fVerifyArgs => { name => 'uid', code => 'code' },
loginHistoryEnabled => 1,
authentication => 'Demo',
userDB => 'Same',
diff --git a/lemonldap-ng-portal/t/lmConf-1.json b/lemonldap-ng-portal/t/lmConf-1.json
index d4fd2d0a9..716daf346 100644
--- a/lemonldap-ng-portal/t/lmConf-1.json
+++ b/lemonldap-ng-portal/t/lmConf-1.json
@@ -107,7 +107,8 @@
},
"macros": {
"_whatToTrace": "$_auth eq 'SAML' ? \"$_user\\@$_idpConfKey\" : \"$_user\"",
- "array": "$uid eq 'french' ? 'doctor; who' : ''"
+ "array": "$uid eq 'french' ? 'doctor; who' : ''",
+ "authMode": "$authenticationLevel == 8 ? TOTP : 'DEMO'"
},
"notifications": 0,
"passwordDB": "Null",