diff --git a/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Lib/ServiceToken.pm b/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Lib/ServiceToken.pm index fdb2da2fc..eca281047 100644 --- a/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Lib/ServiceToken.pm +++ b/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Lib/ServiceToken.pm @@ -24,7 +24,7 @@ sub fetchId { @vhosts = grep { if (/^([\w\-]+)=(.+)$/) { $serviceHeaders{$1} = $2; - $class->logger->debug( "Found service header: $1 => $2"); + $class->logger->debug("Found service header: $1 => $2"); 0; } else { 1 } diff --git a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build.pm b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build.pm index f7c68b6f5..427e157e0 100644 --- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build.pm +++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build.pm @@ -370,7 +370,8 @@ EOF } keys(%$attributes) }; $managerAttr = mydump( $managerAttr, 'attributes' ); - my $managerSub = Dumper( \&Lemonldap::NG::Manager::Build::Attributes::perlExpr ); + my $managerSub = + Dumper( \&Lemonldap::NG::Manager::Build::Attributes::perlExpr ); $managerSub =~ s/\$VAR1 = sub/sub perlExpr/s; $managerSub =~ s/^\s*(?:use strict;|package .*?;|)\n//gm; my $managerTypes = diff --git a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Parser.pm b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Parser.pm index 6b17e91fd..8b91ffc6b 100644 --- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Parser.pm +++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Parser.pm @@ -70,7 +70,7 @@ has confChanged => ( ); # Properties required during build -has refConf => ( is => 'ro', isa => 'HashRef', required => 1 ); +has refConf => ( is => 'ro', isa => 'HashRef', required => 1 ); has req => ( is => 'ro', required => 1 ); has newConf => ( is => 'rw', isa => 'HashRef' ); has tree => ( is => 'rw', isa => 'ArrayRef' ); @@ -160,7 +160,7 @@ sub _scanNodes { hdebug("Looking to $name"); # subnode - my $subNodes = $leaf->{nodes} // $leaf->{_nodes}; + my $subNodes = $leaf->{nodes} // $leaf->{_nodes}; my $subNodesCond = $leaf->{nodes_cond} // $leaf->{_nodes_cond}; ################################## @@ -1101,14 +1101,14 @@ sub _unitTest { or $attr->{type} =~ /Container$/ ) { my $keyMsg = $attr->{keyMsgFail} // $type->{keyMsgFail}; - my $msg = $attr->{msgFail} // $type->{msgFail}; + my $msg = $attr->{msgFail} // $type->{msgFail}; $res = 0 unless ( $self->_execTest( { - keyTest => $attr->{keyTest} // $type->{keyTest}, + keyTest => $attr->{keyTest} // $type->{keyTest}, keyMsgFail => $attr->{keyMsgFail} // $type->{keyMsgFail}, - test => $attr->{test} // $type->{test}, + test => $attr->{test} // $type->{test}, msgFail => $attr->{msgFail} // $type->{msgFail}, }, $conf->{$key}, diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/ar.json b/lemonldap-ng-manager/site/htdocs/static/languages/ar.json index 7d74586ee..0722b3c29 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/ar.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/ar.json @@ -1003,4 +1003,4 @@ "samlRelayStateTimeout":"تناوب حالة مهلة الجلسة ", "samlUseQueryStringSpecific":"استخدام أسلوب query_string المعين", "samlOverrideIDPEntityID":"Override Entity ID when acting as IDP" -} +} \ No newline at end of file diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/de.json b/lemonldap-ng-manager/site/htdocs/static/languages/de.json index 990d33a52..836e5629a 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/de.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/de.json @@ -1003,4 +1003,4 @@ "samlRelayStateTimeout":"RelayState session timeout", "samlUseQueryStringSpecific":"Use specific query_string method", "samlOverrideIDPEntityID":"Override Entity ID when acting as IDP" -} +} \ No newline at end of file diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/it.json b/lemonldap-ng-manager/site/htdocs/static/languages/it.json index 237aad150..68f803da5 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/it.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/it.json @@ -1003,4 +1003,4 @@ "samlRelayStateTimeout":"Timeout di sessione di RelayState", "samlUseQueryStringSpecific":"Utilizza il metodo specifico query_string", "samlOverrideIDPEntityID":"Sostituisci l'ID entità quando agisce come IDP" -} +} \ No newline at end of file diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/vi.json b/lemonldap-ng-manager/site/htdocs/static/languages/vi.json index 70e006609..8c7c42acb 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/vi.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/vi.json @@ -1003,4 +1003,4 @@ "samlRelayStateTimeout":"Thời gian hết hạn phiên RelayState ", "samlUseQueryStringSpecific":"Sử dụng phương pháp query_string cụ thể", "samlOverrideIDPEntityID":"Override Entity ID when acting as IDP" -} +} \ No newline at end of file diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/zh.json b/lemonldap-ng-manager/site/htdocs/static/languages/zh.json index be7e32a82..aba0c2e75 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/zh.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/zh.json @@ -1003,4 +1003,4 @@ "samlRelayStateTimeout":"RelayState session timeout", "samlUseQueryStringSpecific":"Use specific query_string method", "samlOverrideIDPEntityID":"Override Entity ID when acting as IDP" -} +} \ No newline at end of file diff --git a/lemonldap-ng-manager/t/80-attributes.t b/lemonldap-ng-manager/t/80-attributes.t index 81ca0437d..b584ba732 100644 --- a/lemonldap-ng-manager/t/80-attributes.t +++ b/lemonldap-ng-manager/t/80-attributes.t @@ -54,7 +54,8 @@ my @notManagedAttributes = ( # Other ini-only prms 'configStorage', 'status', 'localStorageOptions', 'localStorage', 'max2FDevices', 'max2FDevicesNameLength', 'checkTime', - 'mySessionAuthorizedRWKeys', 'handlerInternalCache', 'handlerServiceTokenTTL' + 'mySessionAuthorizedRWKeys', 'handlerInternalCache', + 'handlerServiceTokenTTL' ); # Words used either as attribute name and node title diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Menu.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Menu.pm index 62a13657e..6210b881a 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Menu.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Menu.pm @@ -203,7 +203,8 @@ sub _buildCategoryHash { if ( scalar keys %$apphash > 0 ) { foreach my $appkey ( sort { - ($apphash->{$a}->{order} || 0) <=> ($apphash->{$b}->{order} || 0) + ( $apphash->{$a}->{order} || 0 ) + <=> ( $apphash->{$b}->{order} || 0 ) or $a cmp $b } keys %$apphash @@ -217,7 +218,8 @@ sub _buildCategoryHash { # Display subcategories foreach my $catkey ( sort { - ($cathash->{$a}->{order} || 0) <=> ($cathash->{$b}->{order} || 0) + ( $cathash->{$a}->{order} || 0 ) + <=> ( $cathash->{$b}->{order} || 0 ) or $a cmp $b } grep { not /^(?:catname|type|options|order)$/ } keys %$cathash @@ -270,7 +272,8 @@ sub _buildApplicationHash { if ( scalar keys %$subapphash > 0 ) { foreach my $appkey ( sort { - ($subapphash->{$a}->{order} || 0) <=> ( $subapphash->{$b}->{order} || 0 ) + ( $subapphash->{$a}->{order} || 0 ) + <=> ( $subapphash->{$b}->{order} || 0 ) or $a cmp $b } keys %$subapphash diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Run.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Run.pm index b640d973d..63d11e365 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Run.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Run.pm @@ -796,7 +796,7 @@ sub sendHtml { if ( $self->conf->{corsEnabled} ) { push @{ $res->[1] }, @cors; $self->logger->debug( - "Apply following CORS policy : " . Data::Dumper::Dumper(\@cors) ); + "Apply following CORS policy : " . Data::Dumper::Dumper( \@cors ) ); } # Set authorized URL for POST diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/Impersonation.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/Impersonation.pm index 7eaf5a07f..be70ea2bb 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/Impersonation.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/Impersonation.pm @@ -125,7 +125,7 @@ sub run { } # Merging SSO Groups and hGroups & dedup - $spoofSession->{groups} ||= ''; + $spoofSession->{groups} ||= ''; $spoofSession->{hGroups} ||= {}; if ( $self->{conf}->{impersonationMergeSSOgroups} ) { $self->userLogger->warn("MERGING SSO groups and hGroups..."); diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/SOAPServer.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/SOAPServer.pm index 21e07a547..ae82831f6 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/SOAPServer.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/SOAPServer.pm @@ -384,7 +384,7 @@ sub deleteSession { my ( $self, $req, $id ) = @_; die('id parameter is required') unless ($id); - my $session = $self->p->getApacheSession($id, kind => ''); + my $session = $self->p->getApacheSession( $id, kind => '' ); return 0 unless ($session); diff --git a/lemonldap-ng-portal/t/04-language-selection.t b/lemonldap-ng-portal/t/04-language-selection.t index b697daccf..cf64b66c0 100644 --- a/lemonldap-ng-portal/t/04-language-selection.t +++ b/lemonldap-ng-portal/t/04-language-selection.t @@ -8,8 +8,11 @@ BEGIN { my ( $client, $res, $id ); -$client = LLNG::Manager::Test->new( - { ini => { logLevel => 'error', restSessionServer => 1, useSafeJail => 1 }, } ); +$client = LLNG::Manager::Test->new( { + ini => + { logLevel => 'error', restSessionServer => 1, useSafeJail => 1 }, + } +); # Try to authenticate # ------------------- @@ -24,12 +27,12 @@ ok( count(1); expectOK($res); $id = expectCookie($res); - + ok( $res = $client->_get("/sessions/global/$id"), 'Get session' ); count(1); expectOK($res); ok( $res = eval { JSON::from_json( $res->[2]->[0] ) }, ' GET JSON' ) - or print STDERR $@; + or print STDERR $@; count(1); ok( $res->{_language} eq 'en', 'Default value for _language' ); count(1); @@ -49,17 +52,16 @@ ok( count(1); expectOK($res); $id = expectCookie($res); - + ok( $res = $client->_get("/sessions/global/$id"), 'Get session' ); count(1); expectOK($res); ok( $res = eval { JSON::from_json( $res->[2]->[0] ) }, ' GET JSON' ) - or print STDERR $@; + or print STDERR $@; count(1); ok( $res->{_language} eq 'fr', 'Correct value for _language' ); count(1); - # Test logout $client->logout($id); diff --git a/lemonldap-ng-portal/t/28-AuthChoice-with-token.t b/lemonldap-ng-portal/t/28-AuthChoice-with-token.t index ef5353e9b..c638b3ba8 100644 --- a/lemonldap-ng-portal/t/28-AuthChoice-with-token.t +++ b/lemonldap-ng-portal/t/28-AuthChoice-with-token.t @@ -9,14 +9,14 @@ my $maintests = 6; my $client = LLNG::Manager::Test->new( { ini => { - logLevel => 'error', - useSafeJail => 1, - authentication => 'Choice', - userDB => 'Same', - passwordDB => 'Choice', - requireToken => 1, - authChoiceParam => 'test', - authChoiceModules => { + logLevel => 'error', + useSafeJail => 1, + authentication => 'Choice', + userDB => 'Same', + passwordDB => 'Choice', + requireToken => 1, + authChoiceParam => 'test', + authChoiceModules => { '1_demo' => 'Demo;Demo;Null', '2_ssl' => 'SSL;Demo;Null', }, diff --git a/lemonldap-ng-portal/t/30-SAML-POST-Logout-when-expired.t b/lemonldap-ng-portal/t/30-SAML-POST-Logout-when-expired.t index 6af4aba01..4ca0bb350 100644 --- a/lemonldap-ng-portal/t/30-SAML-POST-Logout-when-expired.t +++ b/lemonldap-ng-portal/t/30-SAML-POST-Logout-when-expired.t @@ -205,7 +205,7 @@ SKIP: { ), 'Post SAML response to SP' ); - ok($res->[2]->[0] =~ /trmsg="56"/, 'Found SLO error'); + ok( $res->[2]->[0] =~ /trmsg="56"/, 'Found SLO error' ); } count($maintests); diff --git a/lemonldap-ng-portal/t/59-Double-cookies-Refresh-and-Logout.t b/lemonldap-ng-portal/t/59-Double-cookies-Refresh-and-Logout.t index 486266d6a..e5a1d0379 100644 --- a/lemonldap-ng-portal/t/59-Double-cookies-Refresh-and-Logout.t +++ b/lemonldap-ng-portal/t/59-Double-cookies-Refresh-and-Logout.t @@ -189,7 +189,8 @@ ok( $attributes2{'_updateTime'} =~ /^\d{14}$/, 'Timestamp found' ) or print STDERR Dumper( \%attributes2 ); count(3); -ok( $attributes2{_updateTime} - $attributes{_updateTime} >= 3, '_updateTime has been updated' ) +ok( $attributes2{_updateTime} - $attributes{_updateTime} >= 3, + '_updateTime has been updated' ) or print STDERR Dumper( \%attributes2 ); count(1); diff --git a/lemonldap-ng-portal/t/59-Secured-cookie-Refresh-and-Logout.t b/lemonldap-ng-portal/t/59-Secured-cookie-Refresh-and-Logout.t index 237fd6b98..0c350f3f8 100644 --- a/lemonldap-ng-portal/t/59-Secured-cookie-Refresh-and-Logout.t +++ b/lemonldap-ng-portal/t/59-Secured-cookie-Refresh-and-Logout.t @@ -68,11 +68,9 @@ ok( ); count(1); expectOK($res); -ok( - $res->[2]->[0] =~ -m%Connected as dwho%, - 'Connected as Dwho' -) or print STDERR Dumper( $res->[2]->[0] ); +ok( $res->[2]->[0] =~ m%Connected as dwho%, + 'Connected as Dwho' ) + or print STDERR Dumper( $res->[2]->[0] ); count(1); # Refresh rights @@ -101,11 +99,9 @@ ok( count(1); expectOK($res); -ok( - $res->[2]->[0] =~ -m%Connected as dwho%, - 'Connected as Dwho' -) or print STDERR Dumper( $res->[2]->[0] ); +ok( $res->[2]->[0] =~ m%Connected as dwho%, + 'Connected as Dwho' ) + or print STDERR Dumper( $res->[2]->[0] ); count(1); # Log out request diff --git a/lemonldap-ng-portal/t/67-CheckUser-with-Global-token.t b/lemonldap-ng-portal/t/67-CheckUser-with-Global-token.t index 18d3b5366..be4bf0d55 100644 --- a/lemonldap-ng-portal/t/67-CheckUser-with-Global-token.t +++ b/lemonldap-ng-portal/t/67-CheckUser-with-Global-token.t @@ -105,7 +105,8 @@ count(1); ( $host, $url, $query ) = expectForm( $res, undef, '/checkuser', 'user', 'url', 'token' ); -ok( $res->[2]->[0] =~ m%%, 'Found trspan="checkUserComputeSession"' ) +ok( $res->[2]->[0] =~ m%%, + 'Found trspan="checkUserComputeSession"' ) or explain( $res->[2]->[0], 'trspan="checkUserComputeSession"' ); ok( $res->[2]->[0] =~ diff --git a/lemonldap-ng-portal/t/67-CheckUser-with-token.t b/lemonldap-ng-portal/t/67-CheckUser-with-token.t index caeaf0e05..6d5788841 100644 --- a/lemonldap-ng-portal/t/67-CheckUser-with-token.t +++ b/lemonldap-ng-portal/t/67-CheckUser-with-token.t @@ -105,10 +105,9 @@ count(1); ( $host, $url, $query ) = expectForm( $res, undef, '/checkuser', 'user', 'url', 'token' ); -ok( - $res->[2]->[0] =~ m%%, - 'Found trspan="checkUserComputeSession"' -) or explain( $res->[2]->[0], 'trspan="checkUserComputeSession"' ); +ok( $res->[2]->[0] =~ m%%, + 'Found trspan="checkUserComputeSession"' ) + or explain( $res->[2]->[0], 'trspan="checkUserComputeSession"' ); ok( $res->[2]->[0] =~ m%
%, diff --git a/lemonldap-ng-portal/t/68-Impersonation-with-TOTP.t b/lemonldap-ng-portal/t/68-Impersonation-with-TOTP.t index ba21b8e9c..b592b49ae 100644 --- a/lemonldap-ng-portal/t/68-Impersonation-with-TOTP.t +++ b/lemonldap-ng-portal/t/68-Impersonation-with-TOTP.t @@ -39,6 +39,7 @@ SKIP: { $query =~ s/user=/user=rtyler/; $query =~ s/password=/password=rtyler/; + #$query =~ s/spoofId=/spoofId=/; ok( $res = $client->_post( diff --git a/lemonldap-ng-portal/t/68-Impersonation-with-doubleCookies.t b/lemonldap-ng-portal/t/68-Impersonation-with-doubleCookies.t index 7056cca88..ab83228b0 100644 --- a/lemonldap-ng-portal/t/68-Impersonation-with-doubleCookies.t +++ b/lemonldap-ng-portal/t/68-Impersonation-with-doubleCookies.t @@ -329,7 +329,8 @@ ok( scalar keys %attributes == 33, 'Found 33 attributes' ) or print STDERR ( keys %attributes < 33 ) ? "Missing attributes -> " . scalar keys %attributes : "Too much attributes -> " . scalar keys %attributes; -ok( $attributes{'_auth'} eq 'Demo', '_auth' ) or print STDERR Dumper( \%attributes ); +ok( $attributes{'_auth'} eq 'Demo', '_auth' ) + or print STDERR Dumper( \%attributes ); ok( $attributes{'_httpSession'}, '_httpSession' ) or print STDERR Dumper( \%attributes ); ok( $attributes{'uid'}, 'uid' ) or print STDERR Dumper( \%attributes ); diff --git a/lemonldap-ng-portal/t/68-Impersonation-with-filtered-merge.t b/lemonldap-ng-portal/t/68-Impersonation-with-filtered-merge.t index c0588c2bd..27f184fe9 100644 --- a/lemonldap-ng-portal/t/68-Impersonation-with-filtered-merge.t +++ b/lemonldap-ng-portal/t/68-Impersonation-with-filtered-merge.t @@ -61,11 +61,9 @@ ok( ); count(1); expectOK($res); -ok( - $res->[2]->[0] =~ -m%Connected as dwho%, - 'Connected as dwho' -) or print STDERR Dumper( $res->[2]->[0] ); +ok( $res->[2]->[0] =~ m%Connected as dwho%, + 'Connected as dwho' ) + or print STDERR Dumper( $res->[2]->[0] ); expectAuthenticatedAs( $res, 'dwho' ); count(1); @@ -103,8 +101,7 @@ count(1); ( $host, $url, $query ) = expectForm( $res, undef, '/checkuser', 'user', 'url' ); -ok( $res->[2]->[0] =~ m%%, - 'Found trspan="checkUser"' ) +ok( $res->[2]->[0] =~ m%%, 'Found trspan="checkUser"' ) or explain( $res->[2]->[0], 'trspan="checkUser"' ); ok( $res->[2]->[0] =~ @@ -130,11 +127,14 @@ ok( $res->[2]->[0] =~ m%dwho%, 'Found dwho' ) or explain( $res->[2]->[0], 'Header Value: dwho' ); ok( $res->[2]->[0] =~ m%su%, 'Found su' ) or explain( $res->[2]->[0], 'SSO Groups: su' ); -ok( $res->[2]->[0] =~ m%su_test%, 'Found su_test' ) +ok( $res->[2]->[0] =~ m%su_test%, + 'Found su_test' ) or explain( $res->[2]->[0], 'SSO Groups: su_test' ); -ok( $res->[2]->[0] !~ m%_test_%, 'NOT found _test_' ) +ok( $res->[2]->[0] !~ m%_test_%, + 'NOT found _test_' ) or explain( $res->[2]->[0], 'SSO Groups: _test_' ); -ok( $res->[2]->[0] !~ m%test_su%, 'NOT found test_su' ) +ok( $res->[2]->[0] !~ m%test_su%, + 'NOT found test_su' ) or explain( $res->[2]->[0], 'SSO Groups: test_su' ); ok( $res->[2]->[0] =~ m%_whatToTrace%, 'Found _whatToTrace' ) diff --git a/lemonldap-ng-portal/t/68-Impersonation-with-merge.t b/lemonldap-ng-portal/t/68-Impersonation-with-merge.t index 32a3db364..87d015052 100644 --- a/lemonldap-ng-portal/t/68-Impersonation-with-merge.t +++ b/lemonldap-ng-portal/t/68-Impersonation-with-merge.t @@ -61,11 +61,9 @@ ok( ); count(1); expectOK($res); -ok( - $res->[2]->[0] =~ -m%Connected as dwho%, - 'Connected as dwho' -) or print STDERR Dumper( $res->[2]->[0] ); +ok( $res->[2]->[0] =~ m%Connected as dwho%, + 'Connected as dwho' ) + or print STDERR Dumper( $res->[2]->[0] ); expectAuthenticatedAs( $res, 'dwho' ); count(1); @@ -139,11 +137,14 @@ ok( $res->[2]->[0] =~ m%dwho%, 'Found dwho' ) or explain( $res->[2]->[0], 'Header Value: dwho' ); ok( $res->[2]->[0] =~ m%su%, 'Found su' ) or explain( $res->[2]->[0], 'SSO Groups: su' ); -ok( $res->[2]->[0] =~ m%su_test%, 'Found su_test' ) +ok( $res->[2]->[0] =~ m%su_test%, + 'Found su_test' ) or explain( $res->[2]->[0], 'SSO Groups: su_test' ); -ok( $res->[2]->[0] !~ m%_test_%, 'NOT found _test_' ) +ok( $res->[2]->[0] !~ m%_test_%, + 'NOT found _test_' ) or explain( $res->[2]->[0], 'SSO Groups: _test_' ); -ok( $res->[2]->[0] =~ m%test_su%, 'Found test_su' ) +ok( $res->[2]->[0] =~ m%test_su%, + 'Found test_su' ) or explain( $res->[2]->[0], 'SSO Groups: test_su' ); ok( $res->[2]->[0] =~ m%_whatToTrace%, 'Found _whatToTrace' ) diff --git a/lemonldap-ng-portal/t/68-Impersonation.t b/lemonldap-ng-portal/t/68-Impersonation.t index 0625264a7..e5d78a671 100644 --- a/lemonldap-ng-portal/t/68-Impersonation.t +++ b/lemonldap-ng-portal/t/68-Impersonation.t @@ -325,8 +325,9 @@ count(16); my %attributes = map /(.+)?<\/td>/g, $res->[2]->[0]; ok( keys %attributes == 31, 'Found 31 attributes' ) or print STDERR "Missing attributes -> " . scalar %attributes; -ok( $attributes{'_auth'} eq 'Demo', '_auth' ) or print STDERR Dumper( \%attributes ); -ok( $attributes{'uid'}, 'uid' ) or print STDERR Dumper( \%attributes ); +ok( $attributes{'_auth'} eq 'Demo', '_auth' ) + or print STDERR Dumper( \%attributes ); +ok( $attributes{'uid'}, 'uid' ) or print STDERR Dumper( \%attributes ); ok( $attributes{'testPrefix__auth'}, 'testPrefix__auth' ) or print STDERR Dumper( \%attributes ); ok( $attributes{'testPrefix_uid'} eq 'rtyler', 'testPrefix_uid' )