From 45ef54dccc510fc811f16f4b7002d81b2260a65c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois-Xavier=20Deltombe?= <fxdeltombe@gmail.com>
Date: Fri, 31 Jan 2014 14:11:39 +0000
Subject: [PATCH] Get CDA working in http with "double cookie for single
 session" (Lemonldap-680)

---
 lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Simple.pm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Simple.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Simple.pm
index a4adf441c..34bb61de6 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Simple.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Simple.pm
@@ -2456,6 +2456,11 @@ sub store {
     # Main session
     my $h = $self->getApacheSession( $self->{id} )
       or return PE_APACHESESSIONERROR;
+    # Compute unsecure cookie value if needed
+    if ( $self->{securedCookie} == 3 ) {
+        $self->{sessionInfo}->{_httpSession} =
+          $self->{cipher}->encryptHex( $self->{id}, "http" );
+    }
     foreach my $k ( keys %{ $self->{sessionInfo} } ) {
         next unless defined $self->{sessionInfo}->{$k};
         my $displayValue = $self->{sessionInfo}->{$k};
@@ -2508,11 +2513,7 @@ sub buildCookie {
         push @{ $self->{cookie} },
           $self->cookie(
             -name  => $self->{cookieName} . "http",
-            -value => (
-                  $self->{securedCookie} == 2
-                ? $self->{sessionInfo}->{_httpSession}
-                : $self->{cipher}->encryptHex( $self->{id}, "http" )
-            ),
+            -value => $self->{sessionInfo}->{_httpSession},
             -domain   => $self->{domain},
             -path     => "/",
             -secure   => 0,