From 2e658fd5576691cc6adb8f4cfe17508d75096324 Mon Sep 17 00:00:00 2001 From: Christophe Maudoux Date: Sun, 21 Oct 2018 22:12:56 +0200 Subject: [PATCH] Append old LLNG logo & Fix unit tests (#1515) --- lemonldap-ng-portal/MANIFEST | 1 + .../static/common/logos/logo_llng_old.png | Bin 0 -> 12427 bytes .../t/40-Notifications-JSON-File.t | 4 ++-- .../t/40-Notifications-XML-File.t | 4 ++-- lemonldap-ng-portal/t/41-Captcha.t | 4 ++-- .../t/42-Register-Demo-with-captcha.t | 15 ++++----------- .../t/43-MailReset-with-captcha.t | 10 ++-------- lemonldap-ng-portal/t/61-GrantSession.t | 6 +++--- lemonldap-ng-portal/t/63-History.t | 4 ++-- lemonldap-ng-portal/t/70-2F-TOTP.t | 4 ++-- lemonldap-ng-portal/t/71-2F-U2F.t | 4 ++-- lemonldap-ng-portal/t/72-2F-REST-with-HISTORY.t | 4 ++-- .../t/73-2F-UTOTP-TOTP-and-U2F.t | 4 ++-- lemonldap-ng-portal/t/75-2F-Registers.t | 4 ++-- 14 files changed, 28 insertions(+), 40 deletions(-) create mode 100644 lemonldap-ng-portal/site/htdocs/static/common/logos/logo_llng_old.png diff --git a/lemonldap-ng-portal/MANIFEST b/lemonldap-ng-portal/MANIFEST index 45765f2dd..59ed66346 100644 --- a/lemonldap-ng-portal/MANIFEST +++ b/lemonldap-ng-portal/MANIFEST @@ -283,6 +283,7 @@ site/htdocs/static/common/js/u2fcheck.min.js site/htdocs/static/common/js/u2fregistration.js site/htdocs/static/common/js/u2fregistration.min.js site/htdocs/static/common/logos/logo_llng_400px.png +site/htdocs/static/common/logos/logo_llng_old.png site/htdocs/static/common/modules/Apache.png site/htdocs/static/common/modules/CAS.png site/htdocs/static/common/modules/Facebook.png diff --git a/lemonldap-ng-portal/site/htdocs/static/common/logos/logo_llng_old.png b/lemonldap-ng-portal/site/htdocs/static/common/logos/logo_llng_old.png new file mode 100644 index 0000000000000000000000000000000000000000..2b6326c43ee6d77ea28f5d4d4f4fc1c7cc4bb9a7 GIT binary patch literal 12427 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 P0HLm|t@J^`BIJJn*kQJe literal 0 HcmV?d00001 diff --git a/lemonldap-ng-portal/t/40-Notifications-JSON-File.t b/lemonldap-ng-portal/t/40-Notifications-JSON-File.t index 07a6d2cee..4c9abfab6 100644 --- a/lemonldap-ng-portal/t/40-Notifications-JSON-File.t +++ b/lemonldap-ng-portal/t/40-Notifications-JSON-File.t @@ -30,7 +30,7 @@ my $client = LLNG::Manager::Test->new( notificationStorage => 'File', notificationStorageOptions => { dirName => 't' }, oldNotifFormat => 0, - portalMainLogo => 'common/logos/test.png', + portalMainLogo => 'common/logos/logo_llng_old.png', } } ); @@ -79,7 +79,7 @@ ok( $res->[2]->[0] =~ qr%

Test title

%, or print STDERR Dumper( $res->[2]->[0] ); count(2); -ok( $res->[2]->[0] =~ qr%[2]->[0] =~ qr%[2]->[0] ); count(1); diff --git a/lemonldap-ng-portal/t/40-Notifications-XML-File.t b/lemonldap-ng-portal/t/40-Notifications-XML-File.t index b80594266..e696bf5a2 100644 --- a/lemonldap-ng-portal/t/40-Notifications-XML-File.t +++ b/lemonldap-ng-portal/t/40-Notifications-XML-File.t @@ -34,7 +34,7 @@ SKIP: { notificationStorage => 'File', notificationStorageOptions => { dirName => 't' }, oldNotifFormat => 1, - portalMainLogo => 'common/logos/test.png', + portalMainLogo => 'common/logos/logo_llng_old.png', } } ); @@ -79,7 +79,7 @@ SKIP: { ok( $res->[2]->[0] =~ qr%

Test title

%, 'Notification displayed' ) or print STDERR Dumper( $res->[2]->[0] ); - ok( $res->[2]->[0] =~ qr%[2]->[0] =~ qr%[2]->[0] ); diff --git a/lemonldap-ng-portal/t/41-Captcha.t b/lemonldap-ng-portal/t/41-Captcha.t index c1552a90f..7dd4ec8ae 100644 --- a/lemonldap-ng-portal/t/41-Captcha.t +++ b/lemonldap-ng-portal/t/41-Captcha.t @@ -18,7 +18,7 @@ SKIP: { logLevel => 'error', useSafeJail => 1, captcha_login_enabled => 1, - portalMainLogo => 'common/logos/test.png', + portalMainLogo => 'common/logos/logo_llng_old.png', } } ); @@ -43,7 +43,7 @@ SKIP: { ok( $ts = getCache()->get($token), ' Found token session' ); $ts = eval { JSON::from_json($ts) }; ok( $captcha = $ts->{captcha}, ' Found captcha value' ); - ok( $res->[2]->[0] =~ qr%[2]->[0] =~ qr%[2]->[0] ); diff --git a/lemonldap-ng-portal/t/42-Register-Demo-with-captcha.t b/lemonldap-ng-portal/t/42-Register-Demo-with-captcha.t index 9a1f5108b..80ae72af5 100644 --- a/lemonldap-ng-portal/t/42-Register-Demo-with-captcha.t +++ b/lemonldap-ng-portal/t/42-Register-Demo-with-captcha.t @@ -22,20 +22,16 @@ SKIP: { my $client = LLNG::Manager::Test->new( { ini => { - logLevel => 'debug', + logLevel => 'error', useSafeJail => 1, portalDisplayRegister => 1, registerDB => 'Demo', captcha_register_enabled => 1, - portalMainLogo => 'common/logos/test.png', + portalMainLogo => 'common/logos/logo_llng_old.png', } } ); - # Create main logo to avoid mail send error - `mkdir -p site/htdocs/static/common/logos/`; - `touch site/htdocs/static/common/logos/test.png`; - # Test normal first access # ------------------------ ok( $res = $client->_get( '/register', accept => 'text/html' ), @@ -50,10 +46,10 @@ SKIP: { my $token; ok( $token = $1, ' Token value is defined' ); ok( $res->[2]->[0] =~ m#[2]->[0] =~ qr%[2]->[0] ); @@ -101,9 +98,6 @@ SKIP: { ); ok( mail() =~ /Your password was changed/, 'Password was changed' ); - # Delete main logo - `rm site/htdocs/static/common/logos/test.png`; - #print STDERR Dumper($query); } count($maintests); diff --git a/lemonldap-ng-portal/t/61-GrantSession.t b/lemonldap-ng-portal/t/61-GrantSession.t index fc2ce8c4c..6ef87a37a 100644 --- a/lemonldap-ng-portal/t/61-GrantSession.t +++ b/lemonldap-ng-portal/t/61-GrantSession.t @@ -14,7 +14,7 @@ my $client = LLNG::Manager::Test->new( logLevel => 'error', authentication => 'Demo', userdb => 'Same', - portalMainLogo => 'common/logos/test.png', + portalMainLogo => 'common/logos/logo_llng_old.png', grantSessionRules => { '$uid . " not allowed"##rule1' => '$uid ne "dwho"', 'Rtyler_Allowed##rule3' => '$uid eq "rtyler"', @@ -41,7 +41,7 @@ ok( $res->[2]->[0] =~ qr%src="/static/common/js/info.(?:min\.)?js">%, 'Found INFO js' ) or print STDERR Dumper( $res->[2]->[0] ); count(1); -ok( $res->[2]->[0] =~ qr%[2]->[0] =~ qr%[2]->[0] ); count(1); @@ -69,7 +69,7 @@ ok( $res->[2]->[0] =~ /<\/span><\/div>/, 'rtyler rejected with PE_SESSIONNOTGRANTED' ) or print STDERR Dumper( $res->[2]->[0] ); count(1); -ok( $res->[2]->[0] =~ qr%[2]->[0] =~ qr%[2]->[0] ); count(1); diff --git a/lemonldap-ng-portal/t/63-History.t b/lemonldap-ng-portal/t/63-History.t index e063865f1..d444dd35c 100644 --- a/lemonldap-ng-portal/t/63-History.t +++ b/lemonldap-ng-portal/t/63-History.t @@ -15,7 +15,7 @@ my $client = LLNG::Manager::Test->new( userDB => 'Same', loginHistoryEnabled => 1, brutForceProtection => 0, - portalMainLogo => 'common/logos/test.png', + portalMainLogo => 'common/logos/logo_llng_old.png', sessionDataToRemember => { uid => 'identity', _auth => 'AuthModule' }, } @@ -34,7 +34,7 @@ ok( $res = $client->_post( count(1); expectOK($res); my $id1 = expectCookie($res); -ok( $res->[2]->[0] =~ qr%[2]->[0] =~ qr%[2]->[0] ); count(1); diff --git a/lemonldap-ng-portal/t/70-2F-TOTP.t b/lemonldap-ng-portal/t/70-2F-TOTP.t index cb0c8b1a1..298f38be5 100644 --- a/lemonldap-ng-portal/t/70-2F-TOTP.t +++ b/lemonldap-ng-portal/t/70-2F-TOTP.t @@ -17,7 +17,7 @@ SKIP: { logLevel => 'error', totp2fSelfRegistration => 1, totp2fActivation => 1, - portalMainLogo => 'common/logos/test.png', + portalMainLogo => 'common/logos/logo_llng_old.png', } } ); @@ -51,7 +51,7 @@ SKIP: { 'Form registration' ); ok( $res->[2]->[0] =~ /totpregistration\.(?:min\.)?js/, 'Found TOTP js' ); - ok( $res->[2]->[0] =~ qr%[2]->[0] =~ qr%[2]->[0] ); count(1); diff --git a/lemonldap-ng-portal/t/71-2F-U2F.t b/lemonldap-ng-portal/t/71-2F-U2F.t index 4a387bed4..43fc76493 100644 --- a/lemonldap-ng-portal/t/71-2F-U2F.t +++ b/lemonldap-ng-portal/t/71-2F-U2F.t @@ -17,7 +17,7 @@ SKIP: { logLevel => 'error', u2fSelfRegistration => 1, u2fActivation => 1, - portalMainLogo => 'common/logos/test.png', + portalMainLogo => 'common/logos/logo_llng_old.png', } } ); @@ -52,7 +52,7 @@ SKIP: { 'Form registration' ); ok( $res->[2]->[0] =~ /u2fregistration\.(?:min\.)?js/, 'Found U2F js' ); - ok( $res->[2]->[0] =~ qr%[2]->[0] =~ qr%[2]->[0] ); 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 13a09f4c0..fc9eca69d 100644 --- a/lemonldap-ng-portal/t/72-2F-REST-with-HISTORY.t +++ b/lemonldap-ng-portal/t/72-2F-REST-with-HISTORY.t @@ -42,7 +42,7 @@ my $client = LLNG::Manager::Test->new( loginHistoryEnabled => 1, authentication => 'Demo', userDB => 'Same', - portalMainLogo => 'common/logos/test.png', + portalMainLogo => 'common/logos/logo_llng_old.png', } } ); @@ -58,7 +58,7 @@ ok( $res = $client->_post( ), 'Auth query' ); -ok( $res->[2]->[0] =~ qr%[2]->[0] =~ qr%[2]->[0] ); count(1); diff --git a/lemonldap-ng-portal/t/73-2F-UTOTP-TOTP-and-U2F.t b/lemonldap-ng-portal/t/73-2F-UTOTP-TOTP-and-U2F.t index 0f0480834..82f71a5c7 100644 --- a/lemonldap-ng-portal/t/73-2F-UTOTP-TOTP-and-U2F.t +++ b/lemonldap-ng-portal/t/73-2F-UTOTP-TOTP-and-U2F.t @@ -23,7 +23,7 @@ SKIP: { utotp2fActivation => 1, totp2fSelfRegistration => 1, u2fSelfRegistration => 1, - portalMainLogo => 'common/logos/test.png', + portalMainLogo => 'common/logos/logo_llng_old.png', u2fSelfRegistration => '$_2fDevices =~ /"type":\s*"(?:TOTP|U2F)"/s', } @@ -59,7 +59,7 @@ SKIP: { 'Form registration' ); ok( $res->[2]->[0] =~ /totpregistration\.(?:min\.)?js/, 'Found TOTP js' ); - ok( $res->[2]->[0] =~ qr%[2]->[0] =~ qr%[2]->[0] ); count(1); diff --git a/lemonldap-ng-portal/t/75-2F-Registers.t b/lemonldap-ng-portal/t/75-2F-Registers.t index b22105d7a..6f411f070 100644 --- a/lemonldap-ng-portal/t/75-2F-Registers.t +++ b/lemonldap-ng-portal/t/75-2F-Registers.t @@ -26,7 +26,7 @@ SKIP: { totp2fActivation => 1, u2fSelfRegistration => 1, u2fActivation => 1, - portalMainLogo => 'common/logos/test.png', + portalMainLogo => 'common/logos/logo_llng_old.png', } } ); @@ -61,7 +61,7 @@ SKIP: { 'Form registration' ); ok( $res->[2]->[0] =~ /totpregistration\.(?:min\.)?js/, 'Found TOTP js' ); - ok( $res->[2]->[0] =~ qr%[2]->[0] =~ qr%[2]->[0] ); count(1);