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 000000000..2b6326c43
Binary files /dev/null and b/lemonldap-ng-portal/site/htdocs/static/common/logos/logo_llng_old.png differ
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#;
+ ' Captcha image inserted' )
+ or print STDERR Dumper( $res->[2]->[0] );
# Try to get captcha value
-
my ( $ts, $captcha );
ok( $ts = getCache()->get($token), ' Found token session' );
$ts = eval { JSON::from_json($ts) };
@@ -107,9 +103,6 @@ SKIP: {
'Try to authenticate'
);
expectCookie($res);
-
- # Delete main logo
- `rm site/htdocs/static/common/logos/test.png`;
}
count($maintests);
diff --git a/lemonldap-ng-portal/t/43-MailReset-with-captcha.t b/lemonldap-ng-portal/t/43-MailReset-with-captcha.t
index 816cc99cf..b4fb7804d 100644
--- a/lemonldap-ng-portal/t/43-MailReset-with-captcha.t
+++ b/lemonldap-ng-portal/t/43-MailReset-with-captcha.t
@@ -32,14 +32,11 @@ SKIP: {
captcha_mail_enabled => 1,
requireToken => 1,
portalDisplayResetPassword => 1,
- portalMainLogo => 'common/logos/test.png',
+ portalMainLogo => 'common/logos/logo_llng_old.png',
}
}
);
- # Create main logo to avoid mail send error
- `touch site/htdocs/static/common/logos/test.png`;
-
# Test form
# ------------------------
ok( $res = $client->_get( '/resetpwd', accept => 'text/html' ),
@@ -60,7 +57,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%<img src=)
[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);