Changeset 14269

Timestamp:

2007-07-24T16:20:41+12:00 (17 years ago)

Author:

qq6

Message:

Jeffrey has fixed operating records of users database on Windows

Location:

gsdl/trunk/src/recpt

Files:

• authenaction.cpp (modified) (5 diffs)
• authenaction.h (modified) (3 diffs)
• librarymain.cpp (modified) (3 diffs)
• userdb.cpp (modified) (8 diffs)
• userdb.h (modified) (4 diffs)
• usersaction.cpp (modified) (3 diffs)
• usersaction.h (modified) (2 diffs)

gsdl/trunk/src/recpt/authenaction.cpp

@@ -33 +33 @@
 #include "infodbclass.h"
 #include "gsdltimes.h"
-#include "userdb.h"
 
 
@@ -129 +128 @@
 
 void authenaction::configure (const text_t &key, const text_tarray &cfgline) {
-  // get the password filename
-  if (cfgline.size() == 1) {
-    if (key == "usersfile") usersfile = cfgline[0];
-    else if (key == "keyfile") keyfile = cfgline[0];
-    else if (key == "keydecay") keydecay = cfgline[0].getint();
-  }
-
   action::configure (key, cfgline);
 }
 
 bool authenaction::init (ostream &logout) {
-
   if (gdbmhome.empty()) {
     logout << "ERROR (authenaction::init) gdbmhome is not set\n";
     return false;
   }
-
-  if (usersfile.empty()) usersfile = filename_cat (gdbmhome, "etc", "users.db");
-  if (keyfile.empty()) keyfile = filename_cat (gdbmhome, "etc", "key.db");
 
   return action::init (logout);
@@ -169 +157 @@
   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
   // (if we are not already doing this)
@@ -188 +173 @@
   else args_us = "failed";
 
-  // make sure we have a username
-  if (!args_un.empty() && (user_database->get_user_info (args_un, thisuser) == ERRNO_SUCCEED)) {
+  // make sure we have a username                                                                                                 
+  int status = user_database->get_user_info (args_un, thisuser);
+  if (!args_un.empty() && (status == ERRNO_SUCCEED)) {
     if (!args_pw.empty()) {
       // we are authenticating using a password
@@ -286 +272 @@
   }
 
-  //close the database
-  user_database->closedatabase();
-  key_database->closedatabase();
   return true;
 }

gsdl/trunk/src/recpt/authenaction.h

@@ -33 +33 @@
 #include "action.h"
 #include "text_t.h"
+#include "userdb.h"
 #include "receptionist.h"
 
@@ -41 +42 @@
 class authenaction : public action {
 protected:
-  text_t usersfile;
-  text_t keyfile;
+  userdbclass *user_database;
+  keydbclass *key_database;
   int keydecay;
 
@@ -50 +51 @@
   authenaction ();
   virtual ~authenaction () {}
+
+  void set_userdb(userdbclass *udb) {user_database = udb;}
+
+  void set_keydb (keydbclass *kdb) {key_database = kdb;}
 
   void set_receptionist (receptionist *therecpt) {recpt=therecpt;}

gsdl/trunk/src/recpt/librarymain.cpp

@@ -178 +178 @@
   recpt.add_action (adocumentaction);
 
+  text_t userdbfile = filename_cat(gsdlhome, "etc", "users.db");
+  userdbclass *udb = new userdbclass(userdbfile);
+
+  text_t keydbfile = filename_cat(gsdlhome, "etc", "key.db");
+  keydbclass *kdb = new keydbclass(keydbfile);
+
 #ifdef GSDL_USE_USERS_ACTION
-  recpt.add_action (new usersaction());
+  usersaction *ausersaction = new usersaction();
+  ausersaction->set_userdb(udb);
+  recpt.add_action (ausersaction);
 #endif
 
@@ -190 +198 @@
 #ifdef GSDL_USE_AUTHEN_ACTION
   authenaction *aauthenaction = new authenaction();
+  aauthenaction->set_userdb(udb);
+  aauthenaction->set_keydb(kdb);
   aauthenaction->set_receptionist(&recpt);
   recpt.add_action (aauthenaction);
@@ -272 +282 @@
   cgiwrapper (recpt, "");
   delete cservers;
+  delete udb;
+  delete kdb;
 
   // clean up the actions

gsdl/trunk/src/recpt/userdb.cpp

@@ -77 +77 @@
 userdbclass::userdbclass(const text_t &userdbfilename)
 {
-  activated = (!userdb.opendatabase(userdbfilename, GDBM_WRCREAT, 1000, true)) ? false : true;
+  storeduserdbfilename = userdbfilename;
+  activated = (!userdb.opendatabase(storeduserdbfilename, GDBM_READER, 1000, true)) ? false : true;
+  if (activated == false) 
+    {
+      activated = (!userdb.opendatabase(storeduserdbfilename, GDBM_WRCREAT, 1000, true)) ? false : true;
+      if (activated == true)
+        {
+          userdb.closedatabase();
+          activated = (!userdb.opendatabase(storeduserdbfilename, GDBM_READER, 1000, true)) ? false : true;
+        }
+    }
+    
   external_db = false;
 }
@@ -227 +238 @@
       info["groups"] = userinfo.groups;
       info["comment"] = userinfo.comment;
-      
-      return (userdb.setinfo (username, info)) ? ERRNO_SUCCEED : ERRNO_GDBMACTIONFILED ;
+      userdb.closedatabase();
+      userdb.opendatabase(storeduserdbfilename, GDBM_WRCREAT, 1000, true);
+      int result = (userdb.setinfo (username, info)) ? ERRNO_SUCCEED : ERRNO_GDBMACTIONFILED;
+      userdb.closedatabase();
+      userdb.opendatabase(storeduserdbfilename, GDBM_READER, 1000, true);         
+      return  result;
     }
   return ERRNO_CONNECTIONFAILED;
@@ -290 +305 @@
   if (activated == true)
     {
+      userdb.closedatabase();
+      userdb.opendatabase(storeduserdbfilename, GDBM_WRCREAT, 1000, true);
       userdb.deletekey (username);
+      userdb.closedatabase();
+      userdb.opendatabase(storeduserdbfilename, GDBM_READER, 1000, true);
       return ERRNO_SUCCEED;
     }
@@ -335 +354 @@
   return ERRNO_CONNECTIONFAILED;
 }
-
-//an alernative way to colse the database if the class can't reach the destructor
-void userdbclass::closedatabase()
-{
-   userdb.closedatabase();
-}
-
 //==========================================//
 //       userdbclass functions (End)        //
@@ -351 +363 @@
 keydbclass::keydbclass(const text_t &keydbfilename)
 {
-  activated = (!keydb.opendatabase(keydbfilename, GDBM_WRCREAT, 1000, true)) ? false : true;
+  storedkeydbfilename = keydbfilename;
+  activated = (!keydb.opendatabase(storedkeydbfilename, GDBM_READER, 1000, true)) ? false : true;
+  if (activated == false) 
+    {
+      activated = (!keydb.opendatabase(storedkeydbfilename, GDBM_WRCREAT, 1000, true)) ? false : true;
+      if (activated == true)
+        {
+          keydb.closedatabase();
+          activated = (!keydb.opendatabase(storedkeydbfilename, GDBM_READER, 1000, true)) ? false : true;
+        }
+    }
   external_db = false;
 }
@@ -399 +421 @@
       keydata["time"] = time2text(time(NULL));
       
+      keydb.closedatabase();
+      keydb.opendatabase(storedkeydbfilename, GDBM_WRCREAT, 1000, true);
       if (!keydb.setinfo (crypt_userkey, keydata)) 
         {
           userkey.clear(); // failed
         }
+      keydb.closedatabase();
+      keydb.opendatabase(storedkeydbfilename, GDBM_READER, 1000, true); 
       
       return userkey;
@@ -434 +460 @@
             // succeeded, update the key's time
             info["time"] = time2text(time(NULL));
+            keydb.closedatabase();
+            keydb.opendatabase(storedkeydbfilename, GDBM_WRCREAT, 1000, true);
             keydb.setinfo (crypt_key, info);
+            keydb.closedatabase();
+            keydb.opendatabase(storedkeydbfilename, GDBM_READER, 1000, true); 
             return true;
           }
@@ -477 +507 @@
     }
 }
-
-//an alernative way to colse the database if the class can't reach the destructor
-void keydbclass::closedatabase()
-{
-   keydb.closedatabase();
-}
 //==========================================//
 //       keydbclass functions (End)         //

gsdl/trunk/src/recpt/userdb.h

@@ -64 +64 @@
   bool external_db;
   bool activated;
+  text_t storeduserdbfilename; 
   
  public:
@@ -114 +115 @@
   // on success
   int get_user_list (text_tarray &userlist);
-
-  //an alernative way to colse the database if the class can't reach the destructor
-  void closedatabase();
 };
 
@@ -126 +124 @@
   bool external_db;
   bool activated;
+   text_t storedkeydbfilename; 
   
  public:
@@ -146 +145 @@
   // use sparingly, it can be quite an expensive function
   void remove_old_keys (int keydecay);
-
- //an alernative way to colse the database if the class can't reach the destructor
-  void closedatabase();
 };
 

gsdl/trunk/src/recpt/usersaction.cpp

@@ -147 +147 @@
 
 void usersaction::configure (const text_t &key, const text_tarray &cfgline) {
-  // get the password filename
-  if (cfgline.size() == 1) {
-    if (key == "usersfile") usersfile = cfgline[0];
-  }
-
   action::configure (key, cfgline);
 }
@@ -161 +156 @@
     return false;
   }
-
-  if (usersfile.empty()) usersfile = filename_cat (gdbmhome, "etc", "users.db");
 
   return action::init (logout);
@@ -193 +186 @@
                  outconvertclass &outconvert, ostream &textout, 
                  ostream &logout) {
-
-  // open the user database (it will be used a lot)
-  user_database = new userdbclass(usersfile);
 
   if (args["uma"] == "adduser" || args["uma"] == "edituser") {

gsdl/trunk/src/recpt/usersaction.h

@@ -32 +32 @@
 #include "gsdlconf.h"
 #include "action.h"
+#include "userdb.h"
 #include "text_t.h"
-#include "userdb.h"
 
 
 class usersaction : public action {
 protected:
-  text_t usersfile;
-  userdbclass* user_database;
+  userdbclass *user_database;
 
 public:
@@ -48 +47 @@
 
   bool init (ostream &logout);
+
+  void set_userdb(userdbclass *udb) {user_database = udb;}
   
   text_t get_action_name () {return "um";}