Changeset 2786

Timestamp:

03/05/06 22:16:17 (19 years ago)

Author:

jerome

Message:

Combining cupspykota, pknotify and PyKotIcon? now work fine to check user's credentials.

Location:

pykota/trunk/bin

Files:

• cupspykota (modified) (2 diffs)
• pknotify (modified) (3 diffs)

pykota/trunk/bin/cupspykota

@@ -295 +295 @@
             self.logdebug("Launching subprocess [%s] to overwrite the job ticket." \
                                      % jobticketcommand)
+            self.regainPriv()                         
             inputfile = os.popen(jobticketcommand, "r")
             for line in inputfile.xreadlines() :
                 line = line.strip()
-                if line == "DENY" :
-                    self.logdebug("Seen DENY command.")
+                if line in ("DENY", "AUTH=NO", "AUTH=IMPOSSIBLE") :
+                    self.logdebug("Seen %s command." % line)
                     action = "DENY"
                 elif line == "CANCEL" :
@@ -313 +314 @@
                     action = None
             inputfile.close()    
+            self.dropPriv()
             
             # now overwrite the job's ticket if new data was supplied

pykota/trunk/bin/pknotify

@@ -61 +61 @@
                              user. Then pknotify will output the result.
                        
-  -C | --checkauth           When --ask is used and an 'username' and a 
+  -C | --checkauth           When --ask is used and both an 'username' and a
                              'password' are asked to the end user, then
                              pknotify will try to authenticate the user
@@ -67 +67 @@
                              will print "AUTH=YES", else "AUTH=NO".
                              If a field is missing, "AUTH=IMPOSSIBLE" will
-                             be printed.
+                             be printed. If the user is authenticated, then
+                             "USERNAME=xxxx" will be printed as well.
                              
   -c | --confirm             Tells pknotify to ask for either a confirmation                       
@@ -188 +189 @@
                 result = server.askDatas(labels, varnames, varvalues)    
                 if result["isValid"] :
-                    for varname in varnames :
-                        result[varname] = result[varname].data
-                        if (varname != "password") :
-                            print "%s=%s" % (varname.upper(), result[varname])
+                    authok = None
                     if options["checkauth"] :
                         if ("username" in varnames) and ("password" in varnames) :
-                            if self.checkAuth(result["username"], result["password"]) :
-                                print "AUTH=YES"
+                            if self.checkAuth(result["username"].data, result["password"].data) :
+                                authok = "AUTH=YES"
                             else :    
-                                print "AUTH=NO"
+                                authok = "AUTH=NO"
                         else :        
-                            print "AUTH=IMPOSSIBLE"
+                            authok = "AUTH=IMPOSSIBLE"        
+                    for varname in varnames :
+                        if (varname != "password") \
+                           and ((varname != "username") or (authok == "AUTH=YES")) :
+                            print "%s=%s" % (varname.upper(), result[varname].data)
+                    if authok is not None :        
+                        print authok        
             elif options["confirm"] :
                 print server.showDialog(self.sanitizeMessage(arguments[0]), True)