Changeset 27349 for main

Timestamp:

2013-05-15T16:12:53+12:00 (11 years ago)

Author:

ak19

Message:

1. Updated timestamp for a key that has been reused should not have a newline at its end. 2. Changed baseaction::authenticate_user() to go through dbutil to read users.gdb and key.gdb rather than directly using db2txt, since it makes the code easier to understand.

File:

• main/trunk/greenstone2/perllib/cgiactions/baseaction.pm (modified) (6 diffs)

main/trunk/greenstone2/perllib/cgiactions/baseaction.pm

@@ -248 +248 @@
     my $users_db_file_path = &util::filename_cat($etc_directory, "users.gdb");
 
-    # Use db2txt to get the user accounts information
-    my $users_db_content = "";
-    open(USERS_DB, "db2txt \"$users_db_file_path\" |");
-    while (<USERS_DB>) {
-    $users_db_content .= $_;
-    }
-
-    # Get the user account information from the users.gdb database
-    my %users_db_data = ();
-    foreach my $users_db_entry (split(/-{70}/, $users_db_content)) {
-    if ($users_db_entry =~ /\n?\[(.+)\]\n/) {
-        $users_db_data{$1} = $users_db_entry;
-    }
-    }
-
+    # Use dbutil to get the user accounts information
+    # infodbtype can be different for different collections, but the userDB and keyDB are gdbm
+
+    my $user_rec = &dbutil::read_infodb_entry("gdbm", $users_db_file_path, $username);
     # Check username
-    my $user_data = $users_db_data{$username};
-    if (!defined $user_data) {
+    if (!defined $user_rec) {
     $gsdl_cgi->generate_error("Authentication failed: no account for user '$username'.");
     }
@@ -271 +259 @@
     # Check password
     if(defined $user_password) {
-    my ($valid_user_password) = ($user_data =~ /\<password\>(.*)/);
+    my $valid_user_password = $user_rec->{"password"}->[0];
     if ($user_password ne $valid_user_password) {
         $gsdl_cgi->generate_error("Authentication failed: incorrect password.");
@@ -281 +269 @@
     # if the key validates, refresh the key again by setting its timestamp to the present time.
 
-    # Use db2txt to get the key accounts information
+    # Use dbutil to get the key accounts information
     my $key_db_file_path = &util::filename_cat($etc_directory, "key.gdb");
-    
-    my $key_db_content = "";
-    open(USERS_DB, "db2txt \"$key_db_file_path\" |");
-    while (<USERS_DB>) {
-        $key_db_content .= $_;
-    }
-    
-    my %key_db_data = ();
-    foreach my $key_db_entry (split(/-{70}/, $key_db_content)) {
-        if ($key_db_entry =~ /\n?\[(.+)\]\n/) {
-        $key_db_data{$1} = $key_db_entry;
-        }
-    }
-
-    # check key entry
-    my $key_data = $key_db_data{$user_key};
-    if (!defined $key_data) {
+    my $key_rec = &dbutil::read_infodb_entry("gdbm", $key_db_file_path, $user_key);
+
+    if (!defined $key_rec) {
         
         #$gsdl_cgi->generate_error("Authentication failed: invalid key $user_key. Does not exist.");
@@ -305 +279 @@
     }
     else {
-        my ($valid_username) = ($key_data =~ /\<user\>(.*)/);
+        my $valid_username = $key_rec->{"user"}->[0];
         if ($username ne $valid_username) {
         $gsdl_cgi->generate_error("Authentication failed: key does not belong to user.");
@@ -316 +290 @@
         my $current_timestamp = time; #localtime(time);
         
-        my ($keycreation_time) = ($key_data =~ /\<time\>(.*)/); # of the form: 2013/05/06 14:39:23
+        my $keycreation_time = $key_rec->{"time"}->[0]; # of the form: 2013/05/06 14:39:23
         if ($keycreation_time !~ m/^\s*$/) { # not empty
         
@@ -328 +302 @@
             
             # beware http://community.activestate.com/forum/posixstrftime-problem-e-numeric-day-month
-            my $current_time = strftime("%Y/%m/%d %H:%M:%S\n", localtime($current_timestamp)); # POSIX
+            my $current_time = strftime("%Y/%m/%d %H:%M:%S", localtime($current_timestamp)); # POSIX
             
             # infodbtype can be different for different collections, but the key DB is gdbm