Changeset 1977

Timestamp:

03/28/17 13:18:18 (7 years ago)

Author:

nanardon

Message:

Fix ssl auth and redirect issue introduce by previous fix

Location:

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller

Files:

• Login.pm (modified) (2 diffs)
• Root.pm (modified) (1 diff)

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Login.pm

@@ -18 +18 @@
 
 sub begin : Private {
+    my ( $self, $c ) = @_;
+    $c->forward('/needlogin');
     return 1;
 }
@@ -27 +29 @@
 sub index :Path :Args(0) {
     my ( $self, $c ) = @_;
-
-    my $sslid = $c->config->{ssl}->{SSL_ID} || 'HTTP_SSL_CLIENT_S_DN_EMAIL';
-    for ($sslid) {
-        $_ or last;
-
-        /^NULL$/ and last;
-
-        my @id = $c->model('Accounts')->db->search_objects('user', "mail=$sslid");
-
-        scalar(@id) == 1 or last;
-
-        $c->stash->{sslid} = $ENV{$sslid};
-    }
 
     if ($c->req->param('username')) {

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Root.pm

@@ -86 +86 @@
 
     if ($path !~ /^(login|static)/) {
-        $c->session->{redirurl} ||= $c->req->uri;
-        $c->session->{redirparam} ||= $c->req->params;
+        $c->session->{redirurl} = $c->req->uri;
+        $c->session->{redirparam} = $c->req->params;
     }
 
-    my $sslid = $c->config->{ssl}->{SSL_ID} || 'HTTP_SSL_CLIENT_S_DN_EMAIL';
-    $c->stash->{sslid} = $ENV{$sslid};
+    my $sslenv = $c->config->{ssl}->{SSL_ID} || 'HTTP_SSL_CLIENT_S_DN_EMAIL';
+    my $sslid = $ENV{$sslenv};
+    for ($sslid) {
+        $_ or last;
+
+        /^NULL$/ and last;
+
+        my @id = $c->model('Accounts')->db->search_objects('user', "mail~$sslid");
+
+        scalar(@id) == 1 or last;
+
+        $c->stash->{sslid} = $sslid;
+    }
 
     $c->stash->{template} = 'login/index.tt';