Changeset 1030

Timestamp:

06/16/03 00:26:52 (21 years ago)

Author:

jalet

Message:

More work on LDAP

Location:

pykota/trunk

Files:

• bin/repykota (modified) (3 diffs)
• po/en/pykota.po (modified) (2 diffs)
• po/fr/pykota.mo (modified) (previous)
• po/fr/pykota.po (modified) (2 diffs)
• po/pykota.pot (modified) (2 diffs)
• pykota/storages/ldapstorage.py (modified) (7 diffs)
• pykota/version.py (modified) (1 diff)

pykota/trunk/bin/repykota

@@ -23 +23 @@
 #
 # $Log$
+# Revision 1.38  2003/06/15 22:26:52  jalet
+# More work on LDAP
+#
 # Revision 1.37  2003/06/10 16:37:54  jalet
 # Deletion of the second user which is not needed anymore.
@@ -225 +228 @@
                 print _("Group           used    soft    hard    balance grace         total       paid") 
                 print "------------------------------------------------------------------------------"
-                for (ident, name) in self.storage.getPrinterGroups(printerid) :
+                for (ident, name) in (self.storage.getPrinterGroups(printerid) or []) :
                     quota = self.storage.getGroupPQuota(ident, printerid) 
                     balance = self.storage.getGroupBalance(ident)
@@ -236 +239 @@
                 print _("User            used    soft    hard    balance grace         total       paid") 
                 print "------------------------------------------------------------------------------"
-                for (ident, name) in self.storage.getPrinterUsers(printerid) :
+                for (ident, name) in (self.storage.getPrinterUsers(printerid) or []) :
                     quota = self.storage.getUserPQuota(ident, printerid)
                     balance = self.storage.getUserBalance(ident)

pykota/trunk/po/en/pykota.po

@@ -21 +21 @@
 #
 # $Log$
+# Revision 1.25  2003/06/15 22:26:52  jalet
+# More work on LDAP
+#
 # Revision 1.24  2003/04/30 19:53:58  jalet
 # 1.05
@@ -352 +355 @@
 msgid "Unable to compute job size with external accounter %s"
 msgstr ""
+
+msgid "Search for %s(%s) from %s(scope=%s) returned no answer."
+msgstr ""
+
+msgid "Problem adding LDAP entry (%s, %s)"
+msgstr ""
+
+msgid "Problem modifying LDAP entry (%s, %s)"
+msgstr ""

pykota/trunk/po/fr/pykota.po

@@ -21 +21 @@
 #
 # $Log$
+# Revision 1.24  2003/06/15 22:26:52  jalet
+# More work on LDAP
+#
 # Revision 1.23  2003/04/30 19:53:58  jalet
 # 1.05
@@ -364 +367 @@
 msgid "Unable to compute job size with external accounter %s"
 msgstr "Impossible de calculer la taille du job avec le compteur externe %s"
+
+msgid "Search for %s(%s) from %s(scope=%s) returned no answer."
+msgstr "La recherche de %s(%s) depuis %s(scope=%s) n'a renvoy�ucun r�ltat."
+
+msgid "Problem adding LDAP entry (%s, %s)"
+msgstr "Probl� durant l'ajout de l'entr�LDAP (%s, %s)"
+
+msgid "Problem modifying LDAP entry (%s, %s)"
+msgstr "Probl� durant la modification de l'entr�LDAP (%s, %s)"

pykota/trunk/po/pykota.pot

@@ -21 +21 @@
 #
 # $Log$
+# Revision 1.25  2003/06/15 22:26:52  jalet
+# More work on LDAP
+#
 # Revision 1.24  2003/04/30 19:53:58  jalet
 # 1.05
@@ -352 +355 @@
 msgid "Unable to compute job size with external accounter %s"
 msgstr ""
+
+msgid "Search for %s(%s) from %s(scope=%s) returned no answer."
+msgstr ""
+
+msgid "Problem adding LDAP entry (%s, %s)"
+msgstr ""
+
+msgid "Problem modifying LDAP entry (%s, %s)"
+msgstr ""

pykota/trunk/pykota/storages/ldapstorage.py

@@ -21 +21 @@
 #
 # $Log$
+# Revision 1.8  2003/06/15 22:26:52  jalet
+# More work on LDAP
+#
 # Revision 1.7  2003/06/14 22:44:21  jalet
 # More work on LDAP storage backend.
@@ -55 +58 @@
 #
 
+import time
+import md5
 import fnmatch
 
@@ -61 +66 @@
 try :
     import ldap
+    from ldap import modlist
 except ImportError :    
     import sys
@@ -93 +99 @@
                 self.tool.logger.log_message("Database closed.", "debug")
         
-    def doSearch(self, key, fields, base="", scope=ldap.SCOPE_SUBTREE) :
+    def genUUID(self) :    
+        """Generates an unique identifier.
+        
+           TODO : this one is not unique accross several print servers, but should be sufficient for testing.
+        """
+        return md5.md5("%s" % time.time()).hexdigest()
+        
+    def doSearch(self, key, fields=None, base="", scope=ldap.SCOPE_SUBTREE) :
         """Does an LDAP search query."""
         try :
-            # prepends something more restrictive at the beginning of the base dn
+            base = base or self.basedn
             if self.debug :
-                self.tool.logger.log_message("QUERY : BaseDN : %s, Scope : %s, Filter : %s, Attributes : %s" % ((base or self.basedn), scope, key, fields), "debug")
+                self.tool.logger.log_message("QUERY : BaseDN : %s, Scope : %s, Filter : %s, Attributes : %s" % (base, scope, key, fields), "debug")
             result = self.database.search_s(base or self.basedn, scope, key, fields)
-        except ldap.NO_SUCH_OBJECT :    
-            return
+        except ldap.LDAPError :    
+            raise PyKotaStorageError, _("Search for %s(%s) from %s(scope=%s) returned no answer.") % (key, fields, base, scope)
         else :     
             return result
+            
+    def doAdd(self, dn, fields) :
+        """Adds an entry in the LDAP directory."""
+        try :
+            if self.debug :
+                self.tool.logger.log_message("QUERY : ADD(%s, %s)" % (dn, str(fields)), "debug")
+            self.database.add_s(dn, modlist.addModlist(fields))
+        except ldap.LDAPError :
+            raise PyKotaStorageError, _("Problem adding LDAP entry (%s, %s)") % (dn, str(fields))
+        else :
+            return dn
+            
+    def doModify(self, dn, fields) :
+        """Modifies an entry in the LDAP directory."""
+        try :
+            oldentry = self.doSearch("objectClass=*", base=dn, scope=ldap.SCOPE_BASE)
+            if self.debug :
+                self.tool.logger.log_message("QUERY : Modify(%s, %s ==> %s)" % (dn, oldentry[0][1], fields), "debug")
+            self.database.modify_s(dn, modlist.modifyModlist(oldentry[0][1], fields, ignore_oldexistent=1))
+        except ldap.LDAPError :
+            raise PyKotaStorageError, _("Problem modifying LDAP entry (%s, %s)") % (dn, fields)
+        else :
+            return dn
         
     def getMatchingPrinters(self, printerpattern) :
@@ -116 +152 @@
         if result :
             return result[0][0]
+            
+    def getPrinterName(self, printerid) :        
+        """Returns a printerid given a printer id."""
+        result = self.doSearch("objectClass=*", ["pykotaPrinterName"], base=printerid, scope=ldap.SCOPE_BASE)
+        if result :
+            return result[0][1]["pykotaPrinterName"][0]
             
     def getPrinterPrices(self, printerid) :        
@@ -182 +224 @@
     def addPrinter(self, printername) :        
         """Adds a printer to the quota storage, returns its id."""
-        raise PyKotaStorageError, "Not implemented !"
+        fields = { self.info["printerrdn"] : printername,
+                   "objectClass" : ["pykotaObject", "pykotaPrinter"],
+                   "pykotaPrinterName" : printername,
+                   "pykotaPricePerPage" : "0.0",
+                   "pykotaPricePerJob" : "0.0",
+                 } 
+        dn = "%s=%s,%s" % (self.info["printerrdn"], printername, self.info["printerbase"])
+        return self.doAdd(dn, fields)
         
     def addUser(self, username) :        
         """Adds a user to the quota storage, returns its id."""
-        raise PyKotaStorageError, "Not implemented !"
+        fields = { self.info["userrdn"] : username,
+                   "objectClass" : ["pykotaObject", "pykotaAccount", "pykotaAccountBalance"],
+                   "pykotaUserName" : username,
+                   "pykotaLimitBy" : "quota",
+                   "pykotaBalance" : "0.0",
+                   "pykotaLifeTimePaid" : "0.0",
+                 } 
+        dn = "%s=%s,%s" % (self.info["userrdn"], username, self.info["userbase"])
+        return self.doAdd(dn, fields)
         
     def addGroup(self, groupname) :        
         """Adds a group to the quota storage, returns its id."""
-        raise PyKotaStorageError, "Not implemented !"
+        fields = { self.info["grouprdn"] : groupname,
+                   "objectClass" : ["pykotaObject", "pykotaGroup"],
+                   "pykotaGroupName" : groupname,
+                   "pykotaLimitBy" : "quota",
+                 } 
+        dn = "%s=%s,%s" % (self.info["grouprdn"], groupname, self.info["groupbase"])
+        return self.doAdd(dn, fields)
         
     def addUserPQuota(self, username, printerid) :
         """Initializes a user print quota on a printer, adds the user to the quota storage if needed."""
-        raise PyKotaStorageError, "Not implemented !"
+        uuid = self.genUUID()
+        fields = { "objectClass" : ["pykotaObject", "pykotaUserPQuota"],
+                   "cn" : uuid,
+                   "pykotaUserName" : username,
+                   "pykotaPrinterName" : self.getPrinterName(printerid), 
+                   "pykotaPageCounter" : "0",
+                   "pykotaLifePageCounter" : "0",
+                   "pykotaSoftLimit" : "0",
+                   "pykotaHardLimit" : "0",
+                   "pykotaDateLimit" : "None",
+                 } 
+        dn = "cn=%s,%s" % (uuid, self.info["userquotabase"])
+        return self.doAdd(dn, fields)
         
     def addGroupPQuota(self, groupname, printerid) :
         """Initializes a group print quota on a printer, adds the group to the quota storage if needed."""
-        raise PyKotaStorageError, "Not implemented !"
+        uuid = self.genUUID()
+        fields = { "objectClass" : ["pykotaObject", "pykotaGroupPQuota"],
+                   "cn" : uuid,
+                   "pykotaGroupName" : groupname,
+                   "pykotaPrinterName" : self.getPrinterName(printerid), 
+                   "pykotaSoftLimit" : "0",
+                   "pykotaHardLimit" : "0",
+                   "pykotaDateLimit" : "None",
+                 } 
+        dn = "cn=%s,%s" % (uuid, self.info["groupquotabase"])
+        return self.doAdd(dn, fields)
         
     def increaseUserBalance(self, userid, amount) :    
@@ -276 +361 @@
         raise PyKotaStorageError, "Not implemented !"
         
-    def setUserPQuota(self, userid, printerid, softlimit, hardlimit) :
+    def setUserPQuota(self, userquotaid, printerid, softlimit, hardlimit) :
         """Sets soft and hard limits for a user quota on a specific printer given (userid, printerid)."""
-        raise PyKotaStorageError, "Not implemented !"
-        
-    def setGroupPQuota(self, groupid, printerid, softlimit, hardlimit) :
+        fields = { 
+                   "pykotaSoftLimit" : str(softlimit),
+                   "pykotaHardLimit" : str(hardlimit),
+                 } 
+        return self.doModify(userquotaid, fields)
+        
+    def setGroupPQuota(self, groupquotaid, printerid, softlimit, hardlimit) :
         """Sets soft and hard limits for a group quota on a specific printer given (groupid, printerid)."""
-        raise PyKotaStorageError, "Not implemented !"
+        fields = { 
+                   "pykotaSoftLimit" : str(softlimit),
+                   "pykotaHardLimit" : str(hardlimit),
+                 } 
+        return self.doModify(groupquotaid, fields)
         
     def resetUserPQuota(self, userid, printerid) :    

pykota/trunk/pykota/version.py

@@ -21 +21 @@
 #
 
-__version__ = "1.09alpha1_unofficial"
+__version__ = "1.09alpha2_unofficial"
 
 __doc__ = """PyKota : a complete Printing Quota Solution for CUPS and LPRng."""