Use status 403 for access denied

[ndwebbie.git] / lib / NDWeb / Controller / Root.pm

diff --git a/lib/NDWeb/Controller/Root.pm b/lib/NDWeb/Controller/Root.pm
index 8a6ab6abce00df8223909fbd281a55399fcad48f..fcff93f24b0de56073d1d1ef37a7dfe34366e17a 100644 (file)
--- a/lib/NDWeb/Controller/Root.pm
+++ b/lib/NDWeb/Controller/Root.pm
@@ -60,10 +60,10 @@ sub login : Local {
                $log->execute($c->user->id,$c->req->address
                        ,$country,$c->sessionid,$remember);
 
-               my $ref = $c->req->referer;
-               $ref =~ s/^http:/https:/ unless $c->debug;
-               $c->res->redirect($ref);
+               $c->forward('redirect');
                return;
+       } elsif ($c->req->method eq 'POST'){
+               $c->res->status(400);
        }
 }
 
@@ -142,13 +142,18 @@ sub auto : Private {
        }else{
                $c->stash(UID => -4);
        }
+}
 
+sub redirect : Private {
+       my ($self, $c) = @_;
+       $c->res->redirect($c->uri_for('/'.$c->flash->{referrer}));
 }
 
 sub access_denied : Private {
        my ($self, $c, $action) = @_;
 
        $c->stash->{template} = 'access_denied.tt2';
+       $c->res->status(403);
 
 }
 
@@ -161,14 +166,20 @@ Attempt to render a view, if needed.
 sub end : ActionClass('RenderView') {
        my ($self, $c) = @_;
 
+       if ($c->res->status == 302){
+               return;
+       }
+
        my $dbh = $c ->model;
 
        if (scalar @{ $c->error } ){
                if ($c->error->[0] =~ m/Can't call method "id" on an undefined value at/){
                        $c->stash->{template} = 'access_denied.tt2';
+                       $c->res->status(403);
                        $c->clear_errors;
                }elsif ($c->error->[0] =~ m/Missing roles: /){
                        $c->stash->{template} = 'access_denied.tt2';
+                       $c->res->status(403);
                        $c->clear_errors;
                }
        }
@@ -205,6 +216,10 @@ sub end : ActionClass('RenderView') {
                });
        $birthdays->execute;
        $c->stash(birthdays => $birthdays->fetchall_arrayref({}));
+
+       if ($c->res->status == 200 || $c->req->method eq 'GET'){
+               $c->flash(referrer => $c->req->path);
+       }
 }
 
 =head1 AUTHOR