Changeset 205 for etherws/trunk

Timestamp:

08/03/12 01:11:35 (12 years ago)

Author:

atzm

Message:

• add error handling

File:

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

etherws/trunk/etherws.py

@@ -642 +642 @@
 
 
+def print_error(error):
+    print('  %s (%s)' % (error['message'], error['code']))
+    print('    %s' % error['data'])
+
+
 def start_sw(args):
     def daemonize(nochdir=False, noclose=False):
@@ -811 +816 @@
                   (r['port'], r['type'], shut, r['rx'], r['tx'], r['target']))
 
-    def print_error(error):
-        print('  %s (%s)' % (error['message'], error['code']))
-        print('    %s' % error['data'])
-
     def handle_ctl_addport(args):
+        opts = {
+            'user':     getattr(args, 'user', None),
+            'passwd':   getattr(args, 'passwd', None),
+            'cacerts':  getattr(args, 'cacerts', None),
+            'insecure': getattr(args, 'insecure', None),
+        }
+        if args.iftype == EtherWebSocketClient.IFTYPE:
+            if not args.target.startswith('ws://') and \
+               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')
         result = request(args, 'addPort', {
             'type':    args.iftype,
             'target':  args.target,
-            'options': {
-                'user':     getattr(args, 'user', None),
-                'passwd':   getattr(args, 'passwd', None),
-                'cacerts':  getattr(args, 'cacerts', None),
-                'insecure': getattr(args, 'insecure', None),
-            },
+            'options': opts,
         })
         if 'error' in result:
@@ -944 +954 @@
     # -- go
     args = parser.parse_args()
-    globals()['start_' + args.subcommand](args)
+
+    try:
+        globals()['start_' + args.subcommand](args)
+    except Exception as e:
+        print_error({
+            'code':    0 - 32603,
+            'message': 'Internal error',
+            'data':    '%s: %s' % (e.__class__.__name__, str(e)),
+        })