Changeset 2805

Timestamp:

03/25/06 23:02:08 (19 years ago)

Author:

jerome

Message:

Implemented the denyafter command line option.

Files:

• pykota/trunk/bin/pknotify (modified) (5 diffs)

pykota/trunk/bin/pknotify

@@ -226 +226 @@
             server = xmlrpclib.ServerProxy("http://%s:%s" % (self.destination, self.port))
             if options["ask"] :
+                try :
+                    denyafter = int(options["denyafter"])
+                    if denyafter < 1 :
+                        raise ValueError
+                except (ValueError, TypeError) :    
+                    denyafter = 1
                 labels = []
                 varnames = []
@@ -238 +244 @@
                     varnames.append(varname)
                     varvalues[varname] = self.sanitizeMessage(varvalue)
-                result = server.askDatas(labels, varnames, varvalues)    
-                if result["isValid"] :
-                    authok = None
-                    if options["checkauth"] :
+                    
+                passnumber = 1    
+                authok = None
+                while (authok != "AUTH=YES") and (passnumber <= denyafter) :
+                    result = server.askDatas(labels, varnames, varvalues)    
+                    if not options["checkauth"] :
+                        break
+                    if result["isValid"] :
                         if ("username" in varnames) and ("password" in varnames) :
                             if self.checkAuth(self.UTF8ToUserCharset(result["username"].data[:]), 
@@ -250 +260 @@
                         else :        
                             authok = "AUTH=IMPOSSIBLE"        
+                    passnumber += 1        
+                                
+                if result["isValid"] :
                     for varname in varnames :
                         if (varname != "password") \
@@ -276 +289 @@
     try :
         defaults = { \
-                     "denyafter" : 0,
                      "timeout" : 0,
                    }
@@ -300 +312 @@
         options["quit"] = options["q"] or options["quit"]
         options["checkauth"] = options["C"] or options["checkauth"]
-        options["denyafter"] = options["D"] or options["denyafter"] or defaults["denyafter"]
+        options["denyafter"] = options["D"] or options["denyafter"]
         options["timeout"] = options["t"] or options["timeout"] or defaults["timeout"]