Session verification-related changes

lib/CharmBoard.pm

@@ -106,34 +106,39 @@ sub startup {
   $self->helper(session_verify => sub {
     my $self = shift;
 
-    # get info from user's session cookie and store it in vars
-    my $_user_id = $self->session('user_id');
-    my $_session_key = $self->session('session_key');
-
     my $_validity = 1;
     my $_catch_error;
 
-    try {
+    # get info from user's session cookie and store it in vars
-      # check to see if session with this id is present in db
+    my $_user_id = $self->session('user_id');
-      ($self->schema->resultset('Session')->search
+    my $_session_key = $self->session('session_key');
-        ({ 'session_key' => $_session_key })
+    my $_is_auth = $self->session('is_auth');
-        ->get_column('session_key')->first)
+
+    if ($_is_auth) {
+      try {
+        # check to see if session with this id is present in db
+        ($self->schema->resultset('Session')->search
+          ({ 'session_key' => $_session_key })
+          ->get_column('session_key')->first)
+              or die;
+
+        # check to see if the current session key's user id matches
+        # that of the user id in the database
+        $_user_id == ($self->schema->resultset('Session')->
+          session_uid($_session_key))
             or die;
         
-      # check to see if the current session key's user id matches
+        # check if session is still within valid time as recorded in
-      # that of the user id in the database
+        # the db
-      $_user_id == ($self->schema->resultset('Session')->
+        time < ($self->schema->resultset('Session')->
-        session_uid($_session_key))
+          session_expiry($_session_key))
-           or die;
+              or die;
-      
+      } catch ($_catch_error) {
-      # check if session is still within valid time as recorded in
+        $_validity = undef;
-      # the db
+        $self->session_destroy;
-      time < ($self->schema->resultset('Session')->
+      }
-        session_expiry($_session_key))
+    } else {
-            or die;
+      $_validity = 0;
-    } catch ($_catch_error) {
-      $_validity = undef;
-      $self->session_destroy;
     }
 
     return $_validity;

lib/CharmBoard/Controller/Index.pm

@@ -12,6 +12,10 @@ use Tree::Simple;
 sub index {
   my $self = shift;
 
+  if ($self->session_verify eq undef) {
+    $self->redirect_to('/')
+  }
+
   $self->render(
     template      => 'index',
     category_tree => $self->model('forums')->list_full

templates/layouts/default/_header.html.ep

@@ -2,8 +2,8 @@
 my $userControls;
 
 # TODO: once implemented, put username + profile link first
-if ($self->session('is_auth') == 1) {
+if ($self->session('is_auth')) {
-  my $username =
+  my $username = '';
   $userControls = "<a href=\"/logout\">logout</a>"}
 else {
     $userControls =