Render CDA compatible with Try (Fixes: #1849)

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

@@ -44,6 +44,7 @@ sub run {
                     : ""
                   )
             );
+            $req->data->{'noTry'} = 1;
             return $class->REDIRECT;
         }
     }

lemonldap-ng-handler/lib/Lemonldap/NG/Handler/PSGI/Try.pm

@@ -72,7 +72,7 @@ sub _run {
             $self->routes( $self->authRoutes );
             $req->userData( $self->api->data );
         }
-        elsif ( $res->[0] != 403 ) {
+        elsif ( $res->[0] != 403 and not $req->data->{noTry} ) {
 
             # Unset headers (handler adds a Location header)
             $self->logger->debug(

lemonldap-ng-portal/t/66-CDA-PSGI-Try.t

@@ -0,0 +1,146 @@
+package LocalApp;
+
+use Mouse;
+
+extends 'Lemonldap::NG::Handler::PSGI::Try';
+
+sub init {
+    my ($self) = @_;
+    $self->SUPER::init($_[1]) or return 0;
+    $self->addAuthRouteWithRedirect('*' => 'my');
+    return 1;
+}
+
+sub my {
+    return [200,[],['OK']];
+}
+
+package main;
+
+use Test::More;
+use strict;
+use IO::String;
+
+use Lemonldap::NG::Portal::Main::Constants qw(
+  PE_FIRSTACCESS
+);
+
+require 't/test-lib.pm';
+
+my $res;
+my %handlerOR = ( portal => [], app => [] );
+
+my $client = LLNG::Manager::Test->new( {
+        ini => {
+            logLevel    => 'error',
+            useSafeJail => 1,
+            cda         => 1,
+            logger      => 'Lemonldap::NG::Common::Logger::Std',
+        }
+    }
+);
+$handlerOR{portal} = \@Lemonldap::NG::Handler::Main::_onReload;
+
+# CDA with unauthentified user
+ok(
+    $res = $client->_get(
+        '/',
+        query  => 'url=aHR0cDovL3Rlc3QuZXhhbXBsZS5vcmcv',
+        accept => 'text/html',
+    ),
+    'Unauth CDA request'
+);
+my ( $host, $url, $query ) = expectForm( $res, undef, undef, 'url' );
+ok( $query =~ /\burl=aHR0cDovL3Rlc3QuZXhhbXBsZS5vcmcv\b/, ' check url value' );
+count(2);
+
+# Authentification
+$query .= '&user=dwho&password=dwho';
+ok(
+    $res = $client->_post(
+        '/'    => IO::String->new($query),
+        length => length($query),
+        accept => 'text/html',
+    ),
+    'Post credentials'
+);
+count(1);
+
+($query) =
+  expectRedirection( $res, qr#^http://test.example.org/\?(lemonldapcda=.*)$# );
+
+# Handler part
+use_ok('Lemonldap::NG::Handler::PSGI');
+use_ok('Lemonldap::NG::Common::PSGI::Cli::Lib');
+count(2);
+
+my ( $cli, $app );
+switch ('app');
+ok( $app = LocalApp->run( $client->ini ), 'App' );
+count(1);
+
+ok(
+    $res = $app->( {
+            'HTTP_ACCEPT'          => 'text/html',
+            'SCRIPT_NAME'          => '/',
+            'SERVER_NAME'          => '127.0.0.1',
+            'QUERY_STRING'         => $query,
+            'HTTP_CACHE_CONTROL'   => 'max-age=0',
+            'HTTP_ACCEPT_LANGUAGE' => 'fr,fr-FR;q=0.8,en-US;q=0.5,en;q=0.3',
+            'PATH_INFO'            => '/',
+            'REQUEST_METHOD'       => 'GET',
+            'REQUEST_URI'          => "/?$query",
+            'X_ORIGINAL_URI'       => "/?$query",
+            'SERVER_PORT'          => '80',
+            'SERVER_PROTOCOL'      => 'HTTP/1.1',
+            'HTTP_USER_AGENT' =>
+              'Mozilla/5.0 (VAX-4000; rv:36.0) Gecko/20350101 Firefox',
+            'REMOTE_ADDR' => '127.0.0.1',
+            'HTTP_HOST'   => 'test.example.org',
+            'VHOSTTYPE'   => 'CDA',
+        }
+    ),
+    'Push cda cookie'
+);
+count(1);
+expectRedirection( $res, 'http://test.example.org/' );
+my $cid = expectCookie($res);
+
+ok(
+    $res = $app->( {
+            'HTTP_ACCEPT'          => 'text/html',
+            'SCRIPT_NAME'          => '/',
+            'SERVER_NAME'          => '127.0.0.1',
+            'HTTP_COOKIE'          => "lemonldap=$cid",
+            'HTTP_CACHE_CONTROL'   => 'max-age=0',
+            'HTTP_ACCEPT_LANGUAGE' => 'fr,fr-FR;q=0.8,en-US;q=0.5,en;q=0.3',
+            'PATH_INFO'            => '/',
+            'REQUEST_METHOD'       => 'GET',
+            'REQUEST_URI'          => "/",
+            'X_ORIGINAL_URI'       => "/",
+            'SERVER_PORT'          => '80',
+            'SERVER_PROTOCOL'      => 'HTTP/1.1',
+            'HTTP_USER_AGENT' =>
+              'Mozilla/5.0 (VAX-4000; rv:36.0) Gecko/20350101 Firefox',
+            'REMOTE_ADDR' => '127.0.0.1',
+            'HTTP_HOST'   => 'test.example.org',
+            'VHOSTTYPE'   => 'CDA',
+        }
+    ),
+    'Authenticated query'
+);
+count(1);
+expectOK($res);
+expectAuthenticatedAs( $res, 'dwho' );
+
+clean_sessions();
+
+done_testing( count() );
+
+sub switch {
+    my $type = shift;
+    @Lemonldap::NG::Handler::Main::_onReload = @{
+        $handlerOR{$type};
+    };
+}
+