Changeset 800

Timestamp:

02/17/03 23:06:07 (21 years ago)

Author:

jalet

Message:

Storage backend now supports admin and user passwords (untested)

Location:

pykota/trunk

Files:

• conf/pykota.conf.sample (modified) (1 diff)
• pykota/config.py (modified) (3 diffs)
• pykota/storage.py (modified) (3 diffs)
• pykota/storages/postgresql.py (modified) (2 diffs)

pykota/trunk/conf/pykota.conf.sample

@@ -27 +27 @@
 storageadmin: pykotaadmin
 storageuser: pykotauser
-# storageadminpw: NOT YET SUPPORTED
-# storageuserpw: NOT YET SUPPORTED
+# storageadminpw: Comment out if unused
+# storageuserpw: Comment out if unused
 
 # Where to log ?

pykota/trunk/pykota/config.py

@@ -15 +15 @@
 #
 # $Log$
+# Revision 1.14  2003/02/17 22:05:50  jalet
+# Storage backend now supports admin and user passwords (untested)
+#
 # Revision 1.13  2003/02/10 11:47:39  jalet
 # Moved some code down into the requesters
@@ -90 +93 @@
         for option in [ "storagebackend", "storageserver", \
                         "storagename", "storageadmin", \
-                        "storageuser", # TODO : "storageadminpw", "storageusepw", \
+                        "storageuser", 
                         "logger", "admin", "adminmail",
                         "smtpserver", "method", "gracedelay" ] :
@@ -130 +133 @@
         
     def getStorageBackend(self) :    
-        """Returns the storage backend information as a tuple.
-        
-           The tuple has the form :
-           
-             (backend, host, database, admin, user)
-        """        
-        backendinfo = []
+        """Returns the storage backend information as a Python mapping."""        
+        backendinfo = {}
         for option in [ "storagebackend", "storageserver", \
                         "storagename", "storageadmin", \
-                        "storageuser", # TODO : "storageadminpw", "storageusepw", \
+                        "storageuser", \
                       ] :
-            backendinfo.append(self.config.get("global", option, raw=1))
-        return tuple(backendinfo)    
+            backendinfo[option] = self.config.get("global", option, raw=1)
+        for option in [ "storageadminpw", "storageuserpw" ] :    
+            if self.config.has_option("global", option) :
+                backendinfo[option] = self.config.get("global", option, raw=1)
+            else :    
+                backendinfo[option] = None
+        return backendinfo
         
     def getLoggingBackend(self) :    

pykota/trunk/pykota/storage.py

@@ -15 +15 @@
 #
 # $Log$
+# Revision 1.8  2003/02/17 22:05:50  jalet
+# Storage backend now supports admin and user passwords (untested)
+#
 # Revision 1.7  2003/02/10 12:07:31  jalet
 # Now repykota should output the recorded total page number for each printer too.
@@ -109 +112 @@
     """Returns a connection handle to the appropriate Quota Storage Database."""
     (backend, host, database, admin, user) = config.getStorageBackend()
+    backendinfo = config.getStorageBackend()
+    backend = backendinfo["storagebackend"]
     try :
         if not backend.isalpha() :
@@ -117 +122 @@
         raise PyKotaStorageError, _("Unsupported quota storage backend %s") % backend
     else :    
-        return getattr(storagebackend, "Storage")(host, database, (asadmin and admin) or user)
+        host = backendinfo["storageserver"]
+        database = backendinfo["storagename"]
+        admin = backendinfo["storageadmin"]
+        user = backendinfo["storageuser"]
+        adminpw = backendinfo["storageadminpw"]
+        userpw = backendinfo["storageuserpw"]
+        if asadmin :
+            return getattr(storagebackend, "Storage")(host, database, admin, adminpw)
+        else :    
+            return getattr(storagebackend, "Storage")(host, database, user, userpw)
 

pykota/trunk/pykota/storages/postgresql.py

@@ -15 +15 @@
 #
 # $Log$
+# Revision 1.4  2003/02/17 22:05:50  jalet
+# Storage backend now supports admin and user passwords (untested)
+#
 # Revision 1.3  2003/02/06 14:49:04  jalet
 # edpykota should be ok now
@@ -33 +36 @@
 
 class Storage(sql.SQLStorage) :
-    def __init__(self, host, dbname, user) :
+    def __init__(self, host, dbname, user, passwd) :
         """Opens the PostgreSQL database connection."""
         self.closed = 1
         try :
-            self.database = pg.connect(host=host, dbname=dbname, user=user)
+            self.database = pg.connect(host=host, dbname=dbname, user=user, passwd=passwd)
             self.closed = 0
         except pg.error, msg :