[minion-cvs] Allow client to accept passwords from stdin (bug found ...

[nickm@seul.org (Nick Mathewson)]

Update of /home/minion/cvsroot/src/minion/lib/mixminion
In directory moria.mit.edu:/tmp/cvs-serv23068/lib/mixminion

Modified Files:
	ClientUtils.py 
Log Message:
Allow client to accept passwords from stdin (bug found by george Danezis)

Index: ClientUtils.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/ClientUtils.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- ClientUtils.py	28 Nov 2003 04:14:04 -0000	1.12
+++ ClientUtils.py	3 Dec 2003 23:12:00 -0000	1.13
@@ -114,14 +114,24 @@
     else:
         f = sys.stderr
         nl = 1
-    f.write(prompt)
-    f.flush()
-    try:
-        p = getpass.getpass("")
-    except KeyboardInterrupt:
+    if os.isatty(sys.stdin.fileno()):
+        # If stdin is a tty, then we use the magic from getpass.getpass to
+        # disable echoing and read a line.
+        f.write(prompt)
+        f.flush()
+        try:
+            p = getpass.getpass("")
+        except KeyboardInterrupt:
+            if nl: print >>f
+            raise UIError("Interrupted")
         if nl: print >>f
-        raise UIError("Interrupted")
-    if nl: print >>f
+    else:
+        # If stdin is _not_ a tty, however, then the getpass magic can
+        # raise exceptions.
+        print >>f, "Reading password from stdin."
+        p = sys.stdin.readline()
+        if not p: raise UIError("No password received")
+        if p[-1] == '\n': p = p[:-1]
     return p
 
 def getNewPassword_term(prompt):
@@ -131,6 +141,9 @@
         f = sys.stdout
     else:
         f = sys.stderr
+    if not os.isatty(sys.stdin.fileno()):
+        p1 = getPassword_term("")
+        return p1
     while 1:
         p1 = getPassword_term(prompt)
         p2 = getPassword_term(s2)
@@ -636,7 +649,7 @@
     #    [These formats are redundant so that 0.0.6 and 0.0.5 clients
     #     stay backward compatible for now.]
     #
-    # XXXX006 write unit tests
+    # XXXX write unit tests
     def __init__(self, directory, prng=None):
         """Create a new ClientQueue object, storing packets in 'directory'
            and generating random filenames using 'prng'."""