Manage cookie expiration (#1131)

lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/SAML.pm

@@ -829,7 +829,7 @@ sub extractFormInfo {
                 value   => 0,
                 domain  => $self->conf->{domain},
                 secure  => 0,
-                expires => '-1d',
+                expires => 'Wed, 21 Oct 2015 00:00:00 GMT',
             )
         );
 
@@ -878,13 +878,14 @@ sub extractFormInfo {
         # User can choose temporary (0) or persistent cookie (1)
         my $cookie_type = $req->param("cookie_type") || "0";
 
+        # Cookie available 1 year
         $req->addCookie(
             $self->p->cookie(
-                name    => $self->conf->{samlIdPResolveCookie},
+                name   => $self->conf->{samlIdPResolveCookie},
-                value   => $idp,
+                value  => $idp,
-                domain  => $self->conf->{domain},
+                domain => $self->conf->{domain},
-                secure  => $self->conf->{securedCookie},
+                secure => $self->conf->{securedCookie},
-                expires => $cookie_type ? "+365d" : "",
+                ( $cookie_type ? ( max_age => 31557600 ) : () ),
             )
         );
     }

lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/Twitter.pm

@@ -114,12 +114,12 @@ sub extractFormInfo {
             my $response = Net::OAuth->response('request token')
               ->from_post_body( $res->content );
 
-            # 1.2 Store token key and secret in cookies
+            # 1.2 Store token key and secret in cookies (available 180s)
             $req->addCookie(
                 $self->cookie(
                     name    => '_twitSec',
                     value   => $response->token_secret,
-                    expires => '+3m'
+                    max_age => 180,
                 )
             );
 
@@ -198,7 +198,12 @@ sub extractFormInfo {
 
     # Clean temporaries cookies
     $req->addCookie(
-        $self->cookie( -name => '_twitSec', -value => 0, -expires => '-3m' ) );
+        $self->cookie(
+            name    => '_twitSec',
+            value   => 0,
+            expires => 'Wed, 21 Oct 2015 00:00:00 GMT'
+        )
+    );
     PE_OK;
 }
 

lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Process.pm

@@ -253,7 +253,7 @@ sub extractFormInfo {
                 value   => 0,
                 domain  => $self->conf->{domain},
                 secure  => 0,
-                expires => '-1d',
+                expires => 'Wed, 21 Oct 2015 00:00:00 GMT'
             )
         );
         return PE_SESSIONEXPIRED;

lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Run.pm

@@ -483,7 +483,7 @@ sub _deleteSession {
                 value   => 0,
                 domain  => $self->conf->{domain},
                 secure  => 0,
-                expires => '-1d',
+                expires => 'Wed, 21 Oct 2015 00:00:00 GMT'
             )
         ) unless ($preserveCookie);
     }
@@ -498,7 +498,7 @@ sub _deleteSession {
             value   => 0,
             domain  => $self->conf->{domain},
             secure  => 0,
-            expires => '-1d',
+            expires => 'Wed, 21 Oct 2015 00:00:00 GMT'
         )
     ) unless ($preserveCookie);
 
@@ -653,7 +653,8 @@ sub cookie {
     $res[0] .= "=$h{value}";
     $h{path} ||= '/';
     $h{HttpOnly} //= $self->conf->{httpOnly};
-    $h{expires}  //= $self->conf->{cookieExpiration};
+    $h{max_age}  //= $self->conf->{cookieExpiration}
+      if ( $self->conf->{cookieExpiration} );
     foreach (qw(domain path expires max_age HttpOnly)) {
         my $f = $_;
         $f =~ s/_/-/g;

lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/StayConnected.pm

@@ -98,11 +98,13 @@ sub storeBrowser {
                             fingerprint     => $fg,
                         },
                     );
+
+                    # Cookie available 30 days
                     $req->addCookie(
                         $self->p->cookie(
                             name    => 'llngconnexion',
                             value   => $ps->id,
-                            expires => '+1M',
+                            max_age => 2592000,
                         )
                     );
                 }