Changeset 2418

Timestamp:

09/03/05 14:20:30 (19 years ago)

Author:

jerome

Message:

Allow PyKota admins and users to use different database backends
or locations depending on their permissions.
Severity : minor, but with great possibilities :)

Location:

pykota/trunk

Files:

• conf/pykotadmin.conf.sample (modified) (2 diffs)
• NEWS (modified) (1 diff)
• pykota/config.py (modified) (2 diffs)
• pykota/storages/ldapstorage.py (modified) (1 diff)
• pykota/storages/pgstorage.py (modified) (1 diff)
• pykota/version.py (modified) (1 diff)

pykota/trunk/conf/pykotadmin.conf.sample

@@ -51 +51 @@
 
 #
-# THIS FILE CAN ONLY CONTAIN A [global] SECTION AND TWO FIELDS
-# NAMED storageadmin AND storageadminpw
+# THIS FILE CAN ONLY CONTAIN A [global] SECTION AND ONE MANDATORY
+# FIELD NAMED storageadmin, ALONG WITH THE FOLLOWING FOUR OPTIONAL
+# FIELDS : storageadminpw, storagebackend, storageserver, storagename.
 #
 
@@ -61 +62 @@
 # storageadminpw: Comment out if unused, or set to Quota Storage admin password
 
+# storagebackend: ldapstorage
+# storageserver: ldap://ldapmaster.example.com:389
+# storagename: dc=example,dc=com
+

pykota/trunk/NEWS

@@ -22 +22 @@
 PyKota NEWS :
        
+    - 1.23alpha24 :
+    
+        - Allows different databases to be used depending on the
+          user's rights. This allows PyKota admins to directly
+          use a master LDAP server for read+write, while letting
+          normal users using the replicas for readonly access.
+          NB : using different storage backends is also possible,
+          but you're on your own there.
+          
     - 1.23alpha23 :
     

pykota/trunk/pykota/config.py

@@ -43 +43 @@
         self.directory = directory
         self.filename = os.path.join(directory, "pykota.conf")
+        self.adminfilename = os.path.join(directory, "pykotadmin.conf")
         if not os.path.isfile(self.filename) :
             raise PyKotaConfigError, _("Configuration file %s not found.") % self.filename
+        if not os.path.isfile(self.adminfilename) :
+            raise PyKotaConfigError, _("Configuration file %s not found.") % self.adminfilename
+        if os.access(self.adminfilename, os.R_OK) :    
+            self.isAdmin = 1
         self.config = ConfigParser.ConfigParser()
         self.config.read([self.filename])
@@ -97 +102 @@
         backendinfo["storageadmin"] = None
         backendinfo["storageadminpw"] = None
-        adminconf = ConfigParser.ConfigParser()
-        filename = os.path.join(self.directory, "pykotadmin.conf")
-        adminconf.read([filename])
-        if adminconf.sections() : # were we able to read the file ?
-            try :
-                backendinfo["storageadmin"] = adminconf.get("global", "storageadmin", raw=1)
-            except (ConfigParser.NoSectionError, ConfigParser.NoOptionError) :    
-                raise PyKotaConfigError, _("Option %s not found in section global of %s") % ("storageadmin", filename)
-            else :    
-                self.isAdmin = 1 # We are a PyKota administrator
-            try :
-                backendinfo["storageadminpw"] = adminconf.get("global", "storageadminpw", raw=1)
-            except (ConfigParser.NoSectionError, ConfigParser.NoOptionError) :    
-                pass # Password is optional
+        if self.isAdmin :
+            adminconf = ConfigParser.ConfigParser()
+            adminconf.read([self.adminfilename])
+            if adminconf.sections() : # were we able to read the file ?
+                try :
+                    backendinfo["storageadmin"] = adminconf.get("global", "storageadmin", raw=1)
+                except (ConfigParser.NoSectionError, ConfigParser.NoOptionError) :    
+                    raise PyKotaConfigError, _("Option %s not found in section global of %s") % ("storageadmin", self.adminfilename)
+                try :
+                    backendinfo["storageadminpw"] = adminconf.get("global", "storageadminpw", raw=1)
+                except (ConfigParser.NoSectionError, ConfigParser.NoOptionError) :    
+                    pass # Password is optional
+                # Now try to overwrite the storagebackend, storageserver 
+                # and storagename. This allows admins to use the master LDAP
+                # server directly and users to use the replicas transparently.
+                try :
+                    backendinfo["storagebackend"] = adminconf.get("global", "storagebackend", raw=1)
+                except ConfigParser.NoOptionError :
+                    pass
+                try :
+                    backendinfo["storageserver"] = adminconf.get("global", "storageserver", raw=1)
+                except ConfigParser.NoOptionError :
+                    pass
+                try :
+                    backendinfo["storagename"] = adminconf.get("global", "storagename", raw=1)
+                except ConfigParser.NoOptionError :
+                    pass
         return backendinfo
         

pykota/trunk/pykota/storages/ldapstorage.py

@@ -72 +72 @@
         for tryit in range(3) :
             try :
+                self.tool.logdebug("Trying to open database (host=%s, dbname=%s, user=%s)..." % (self.savedhost, self.saveddbname, self.saveduser))
                 self.database = ldap.initialize(self.savedhost) 
                 if self.info["ldaptls"] :

pykota/trunk/pykota/storages/pgstorage.py

@@ -48 +48 @@
             port = -1         # Use PostgreSQL's default tcp/ip port (5432).
         
+        self.tool.logdebug("Trying to open database (host=%s, port=%s, dbname=%s, user=%s)..." % (host, port, dbname, user))
         self.database = pg.connect(host=host, port=port, dbname=dbname, user=user, passwd=passwd)
         self.closed = 0

pykota/trunk/pykota/version.py

@@ -22 +22 @@
 #
 
-__version__ = "1.23alpha23_unofficial"
+__version__ = "1.23alpha24_unofficial"
 
 __doc__ = "PyKota : a complete Printing Quota Solution for CUPS and LPRng."