Changeset 13844 for trunk/gsdl/src/recpt/authenaction.cpp

Timestamp:

2007-02-01T16:30:11+13:00 (17 years ago)

Author:

mdewsnip

Message:

Jeffrey's (DL Consulting) changes to userdb to make it a proper class, so it can be easily extended for collection-specific receptionists.

File:

• trunk/gsdl/src/recpt/authenaction.cpp (modified) (3 diffs)

trunk/gsdl/src/recpt/authenaction.cpp

@@ -169 +169 @@
   if (args["uan"].empty()) return true;
 
+  userdbclass *user_database = new userdbclass(usersfile);
+  keydbclass *key_database = new keydbclass(keyfile);
 
   // failure means we have to redirect to this action to get authentication
@@ -187 +189 @@
 
   // make sure we have a username
-  if (!args_un.empty() && get_user_info (usersfile, args_un, thisuser)) {
+  if (!args_un.empty() && (user_database->get_user_info (args_un, thisuser) == ERRNO_SUCCEED)) {
     if (!args_pw.empty()) {
       // we are authenticating using a password
-      if (check_passwd (thisuser, args_pw)) args_ua = "1"; // succeeded
+      if (user_database->check_passwd (thisuser.username, args_pw) == ERRNO_SUCCEED) args_ua = "1"; // succeeded
       
     } else if (!args_ky.empty()) {
       // we are authenticating using a key
-      if (check_key (keyfile, thisuser, args_ky, args_ug, keydecay)) args_ua = "1";
+      if (key_database->check_key(thisuser, args_ky, args_ug, keydecay)) args_ua = "1";
       else args_us = "stalekey";
     }
@@ -245 +247 @@
      // note: we don't need to set "ug" as it is already set to what it needs to be
      args_us = "enabled";
-    args_ky = generate_key (keyfile, args_un); // new key
+     args_ky = key_database->generate_key(args_un); // new key
     
     // delete old keys around every 50 accesses
-    if (rand()%50 == 1) remove_old_keys (keyfile, keydecay);
+    if (rand()%50 == 1) key_database->remove_old_keys(keydecay);
     
       } else {