Optimize #1797

lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Lib/ServiceToken.pm

@@ -20,13 +20,15 @@ sub fetchId {
 
     # Looking for service headers
     my $vh = $class->resolveAlias($req);
-    my %serviceHeaders =
-      map { $_ =~ /^([\w-]+)=([\w-.]+$)/ ? ( $1 => $2 ) : () } @vhosts;
-    if (%serviceHeaders) {
-        $class->logger->debug( "Found service header(s) -> "
-              . Data::Dumper::Dumper( \%serviceHeaders ) );
-        @vhosts = map { $_ =~ /^[\w-]+=[\w-.]+$/ ? () : $_ } @vhosts;
-    }
+    my %serviceHeaders;
+    @vhosts = grep {
+        if (/^([\w\-]+)=(.+)$/) {
+            $serviceHeaders{$1} = $2;
+            $class->logger->debug( "Found service header: $1 => $2");
+            0;
+        }
+        else { 1 }
+    } @vhosts;
 
     # $_session_id and at least one vhost
     unless ( @vhosts and $_session_id ) {

lemonldap-ng-handler/t/65-Lemonldap-NG-Handler-PSGI-ServiceToken.t

@@ -73,8 +73,8 @@ ok(
 ok( $res->[0] == 200, 'Code is 200' ) or explain( $res->[0], 200 );
 count(2);
 
-my @headers = grep { /service/ } @{ $res->[1] };
-my @values  = grep { /\.example\.com/ } @{ $res->[1] };
+@headers = grep { /service/ } @{ $res->[1] };
+@values  = grep { /\.example\.com/ } @{ $res->[1] };
 ok( @headers == 4, 'Found 4 service headers' )
   or print STDERR Data::Dumper::Dumper( $res->[1] );
 ok( @values == 2, 'Found 2 service header values' )
@@ -95,7 +95,7 @@ ok(
 ok( $res->[0] == 302, 'Code is 200' ) or explain( $res->[0], 302 );
 count(2);
 
-my @headers = grep { /service/ } @{ $res->[1] };
+@headers = grep { /service/ } @{ $res->[1] };
 ok( @headers == 0, 'NONE service header found' )
   or print STDERR Data::Dumper::Dumper( $res->[1] );
 count(1);
@@ -114,8 +114,8 @@ ok(
 ok( $res->[0] == 200, 'Code is 200' ) or explain( $res->[0], 200 );
 count(2);
 
-my @headers = grep { /service/ } @{ $res->[1] };
-my @values  = grep { /\.example\.com/ } @{ $res->[1] };
+@headers = grep { /service/ } @{ $res->[1] };
+@values  = grep { /\.example\.com/ } @{ $res->[1] };
 ok( @headers == 4, 'Found 4 service headers' )
   or print STDERR Data::Dumper::Dumper( $res->[1] );
 ok( @values == 2, 'Found 2 service header values' )
@@ -136,7 +136,7 @@ ok(
 ok( $res->[0] == 302, 'Code is 302' ) or explain( $res->[0], 302 );
 count(2);
 
-my @headers = grep { /service/ } @{ $res->[1] };
+@headers = grep { /service/ } @{ $res->[1] };
 ok( @headers == 0, 'NONE service header found' )
   or print STDERR Data::Dumper::Dumper( $res->[1] );
 count(1);
@@ -152,7 +152,7 @@ ok(
 ok( $res->[0] == 302, 'Code is 302' ) or explain( $res->[0], 302 );
 count(2);
 
-my @headers = grep { /service/ } @{ $res->[1] };
+@headers = grep { /service/ } @{ $res->[1] };
 ok( @headers == 0, 'NONE service header found' )
   or print STDERR Data::Dumper::Dumper( $res->[1] );
 count(1);
@@ -169,7 +169,7 @@ ok(
 ok( $res->[0] == 302, 'Code is 302' ) or explain( $res->[0], 302 );
 count(2);
 
-my @headers = grep { /service/ } @{ $res->[1] };
+@headers = grep { /service/ } @{ $res->[1] };
 ok( @headers == 0, 'NONE service header found' )
   or print STDERR Data::Dumper::Dumper( $res->[1] );
 count(1);