Changeset 7036

Timestamp:

18/06/10 16:28:16 (11 years ago)

Author:

spascoe

Message:

Forgot redirecting stdout doesn't allow you to see the password prompt.

File:

• TI12-security/trunk/MyProxyClient/myproxy/script.py (modified) (6 diffs)

TI12-security/trunk/MyProxyClient/myproxy/script.py

@@ -28 +28 @@
 
 def make_optparser():
-    usage = "usage: %prog [options] username"
+    usage = "usage: %prog [options] [proxyfile]"
     op = optparse.OptionParser(usage=usage)
 
@@ -51 +51 @@
     op.add_option('-k', '--keyfile', dest='keyfile', 
                   action='store', type='string', metavar='KEYFILE',
-                  help='Write the private key to KEYFILE rather than stdout')
+                  help='Write the private key to KEYFILE rather than proxyfile')
     op.add_option('-c', '--certfile', dest='certfile',
                   action='store', type='string', metavar='CERTFILE',
-                  help='Write the proxy certificate to CERTFILE rather than stdout')
+                  help='Write the proxy certificate to CERTFILE rather than proxyfile')
     op.add_option('-O', '--openid', dest='openid',
                   action='store', type='string', metavar='OPENID',
@@ -82 +82 @@
 
     options, args = op.parse_args(argv[1:])
-    #!NOTE: no arguments
+    if args:
+        outfile = args[0]
+    else:
+        outfile = None
 
     if options.openid:
@@ -114 +117 @@
     cert, key = creds
 
+    if outfile:
+        fout = open(outfile, 'w')
+    else:
+        fout = sys.stdout
+
     if options.certfile:
         fh = open(options.certfile, 'w')
@@ -119 +127 @@
         fh.close()
     else:
-        sys.stdout.write(cert)
+        fout.write(cert)
 
     if options.keyfile:
@@ -126 +134 @@
         fh.close()
     else:
-        sys.stdout.write(key)
+        fout.write(key)