Changeset 3179

Timestamp:

05/29/07 11:12:17 (17 years ago)

Author:

jerome

Message:

Special DB auth seems to work fine with clear text passwords.

Location:

pykota/branches/specialauth

Files:

• bin/pknotify (modified) (5 diffs)
• pykota/storage.py (modified) (1 diff)
• pykota/storages/sql.py (modified) (1 diff)
• pykota/version.py (modified) (1 diff)

pykota/branches/specialauth/bin/pknotify

@@ -38 +38 @@
     hasPAM = 1
 
-from pykota.tool import Tool, PyKotaToolError, PyKotaCommandLineError, crashed, N_
+from pykota.tool import PyKotaTool, PyKotaToolError, PyKotaCommandLineError, crashed, N_
 
 __doc__ = N_("""pknotify v%(__version__)s (c) %(__years__)s %(__author__)s
@@ -157 +157 @@
     __str__ = __repr__
     
-class PyKotaNotify(Tool) :        
+class PyKotaNotify(PyKotaTool) :        
     """A class for pknotify."""
     def sanitizeMessage(self, msg) :
@@ -176 +176 @@
         return response
 
-    def checkAuth(self, username, password) :    
-        """Checks if we could authenticate an username with a password."""
+    def checkAuthPAM(self, username, password) :    
+        """Checks if we could authenticate an username with a password through PAM."""
         if not hasPAM :    
             raise PyKotaToolError, _("You MUST install PyPAM for this functionnality to work !")
@@ -200 +200 @@
             self.dropPriv()    
             return retcode
+            
+    def checkAuthDB(self, username, password) :    
+        """Checks if we could authenticate an username with a password through PyKota's DB with clear text passwords."""
+        user = self.storage.getUser(username)
+        if user.Exists :
+            if password == user.Password :
+                return True
+        return False        
+        
+    def checkAuth(self, username, password) :    
+        """Checks if we could authenticate an username with a password through PyKota's DB."""
+        return self.checkAuthDB(username, password)
             
     def alarmHandler(self, signum, frame) :        
@@ -372 +384 @@
         retcode = -1
         
+    try :
+        notifier.storage.close()
+    except (TypeError, NameError, AttributeError) :    
+        pass
+        
     sys.exit(retcode)    

pykota/branches/specialauth/pykota/storage.py

@@ -71 +71 @@
         self.LifeTimePaid = None
         self.Email = None
+        self.Password = None
         self.OverCharge = 1.0
         self.Payments = [] # TODO : maybe handle this smartly for SQL, for now just don't retrieve them

pykota/branches/specialauth/pykota/storages/sql.py

@@ -36 +36 @@
         user.LifeTimePaid = record.get("lifetimepaid")
         user.Email = record.get("email")
+        user.Password = record.get("password")
         user.Description = self.databaseToUserCharset(record.get("description"))
         user.OverCharge = record.get("overcharge", 1.0)

pykota/branches/specialauth/pykota/version.py

@@ -22 +22 @@
 #
 
-__version__ = "1.26alpha5_unofficial"
+__version__ = "1.26alpha5_specialauth_unofficial"
 
 __doc__ = "PyKota : a complete Printing Quota Solution for CUPS."