Changeset 209 for etherws/trunk

Timestamp:

08/04/12 02:58:04 (12 years ago)

Author:

atzm

Message:

• fixed behavior when "addport client" password was empty

File:

• etherws/trunk/etherws.py (modified) (2 diffs)

etherws/trunk/etherws.py

@@ -783 +783 @@
         if args.ctluser:
             if not args.ctlpasswd:
-                args.ctlpasswd = getpass.getpass()
+                args.ctlpasswd = getpass.getpass('Control Password: ')
             token = base64.b64encode('%s:%s' % (args.ctluser, args.ctlpasswd))
             req.add_header('Authorization', 'Basic %s' % token)
@@ -823 +823 @@
                not args.target.startswith('wss://'):
                 raise ValueError('Invalid target URL scheme: %s' % args.target)
-        if opts['user'] and not opts['passwd']:
-            raise ValueError('Authentication required but password empty')
         if not opts['user'] and opts['passwd']:
             raise ValueError('Authentication required but username empty')
+        if opts['user'] and not opts['passwd']:
+            opts['passwd'] = getpass.getpass('Client Password: ')
         result = request(args, 'addPort', {
             'type':    args.iftype,