Changeset 184

Timestamp:

07/29/12 20:49:36 (12 years ago)

Author:

atzm

Message:

• enables controller options

File:

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

etherws/trunk/etherws.py

@@ -379 +379 @@
         self._debug = debug
 
-        if self._htpasswd:
-            self._htpasswd = Htpasswd(self._htpasswd)
-
     def get_type(self):
         return 'server'
@@ -592 +589 @@
                 open(v).close()  # check readable
                 setattr(ns, k, v)
-        return ns
+
+    def checkpath(ns, path):
+        val = getattr(ns, path, '')
+        if not val.startswith('/'):
+            raise ValueError('invalid %: %s' % (path, val))
+
+    def getsslopt(ns, key, cert):
+        kval = getattr(ns, key, None)
+        cval = getattr(ns, cert, None)
+        if kval and cval:
+            return {'keyfile': kval, 'certfile': cval}
+        elif kval or cval:
+            raise ValueError('both %s and %s are required' % (key, cert))
+        return None
+
+    def setport(ns, port, isssl):
+        val = getattr(ns, port, None)
+        if val is None:
+            if isssl:
+                return setattr(ns, port, 443)
+            return setattr(ns, port, 80)
+        if not (0 <= val <= 65535):
+            raise ValueError('invalid %s: %s' % (port, val))
+
+    def sethtpasswd(ns, htpasswd):
+        val = getattr(ns, htpasswd, None)
+        if val:
+            return setattr(ns, htpasswd, Htpasswd(val))
 
     parser = argparse.ArgumentParser()
@@ -601 +625 @@
 
     parser.add_argument('--path', action='store', default='/')
-    parser.add_argument('--address', action='store', default='')
+    parser.add_argument('--host', action='store', default='')
     parser.add_argument('--port', action='store', type=int)
     parser.add_argument('--htpasswd', action='store')
@@ -608 +632 @@
 
     parser.add_argument('--ctlpath', action='store', default='/ctl')
-    parser.add_argument('--ctladdress', action='store', default='127.0.0.1')
-    parser.add_argument('--ctlport', action='store', type=int, default=7867)
-
-    args = realpath(parser.parse_args(), 'htpasswd', 'sslkey', 'sslcert')
+    parser.add_argument('--ctlhost', action='store', default='')
+    parser.add_argument('--ctlport', action='store', type=int)
+    parser.add_argument('--ctlhtpasswd', action='store')
+    parser.add_argument('--ctlsslkey', action='store')
+    parser.add_argument('--ctlsslcert', action='store')
+
+    args = parser.parse_args()
 
     #if args.debug:
@@ -619 +646 @@
         raise ValueError('invalid ageout: %s' % args.ageout)
 
-    if not args.path.startswith('/'):
-        raise ValueError('invalid path: %s' % args.path)
-
-    if not args.ctlpath.startswith('/'):
-        raise ValueError('invalid ctlpath: %s' % args.ctlpath)
-
-    if args.sslkey and args.sslcert:
-        sslopt = {'keyfile': args.sslkey, 'certfile': args.sslcert}
-    elif args.sslkey or args.sslcert:
-        raise ValueError('both sslkey and sslcert are required')
-    else:
-        sslopt = None
-
-    if args.port is None:
-        if sslopt:
-            args.port = 443
-        else:
-            args.port = 80
-    elif not (0 <= args.port <= 65535):
-        raise ValueError('invalid port: %s' % args.port)
-
-    if not (0 <= args.ctlport <= 65535):
-        raise ValueError('invalid ctlport: %s' % args.ctlport)
-
-    if args.htpasswd:
-        args.htpasswd = Htpasswd(args.htpasswd)
+    realpath(args, 'htpasswd', 'sslkey', 'sslcert')
+    realpath(args, 'ctlhtpasswd', 'ctlsslkey', 'ctlsslcert')
+
+    checkpath(args, 'path')
+    checkpath(args, 'ctlpath')
+
+    sslopt = getsslopt(args, 'sslkey', 'sslcert')
+    ctlsslopt = getsslopt(args, 'ctlsslkey', 'ctlsslcert')
+
+    setport(args, 'port', sslopt)
+    setport(args, 'ctlport', ctlsslopt)
+
+    sethtpasswd(args, 'htpasswd')
+    sethtpasswd(args, 'ctlhtpasswd')
 
     ioloop = IOLoop.instance()
@@ -650 +665 @@
     switch = SwitchingHub(fdb, debug=args.debug)
 
-    app = Application([(args.path, EtherWebSocketHandler, {
-        'switch':   switch,
-        'htpasswd': args.htpasswd,
-        'debug':    args.debug,
-    })])
-    server = HTTPServer(app, ssl_options=sslopt)
-    server.listen(args.port, address=args.address)
-
-    ctl = Application([(args.ctlpath, EtherWebSocketControlHandler, {
-        'ioloop':   ioloop,
-        'switch':   switch,
-        'htpasswd': None,
-        'debug':    args.debug,
-    })])
-    ctlserver = HTTPServer(ctl)
-    ctlserver.listen(args.ctlport, address=args.ctladdress)
+    if args.port == args.ctlport and args.host == args.ctlhost:
+        if args.path == args.ctlpath:
+            raise ValueError('same path/ctlpath on same host')
+        if args.sslkey != args.ctlsslkey:
+            raise ValueError('differ sslkey/ctlsslkey on same host')
+        if args.sslcert != args.ctlsslcert:
+            raise ValueError('differ sslcert/ctlsslcert on same host')
+
+        app = Application([
+            (args.path, EtherWebSocketHandler, {
+                'switch':   switch,
+                'htpasswd': args.htpasswd,
+                'debug':    args.debug,
+            }),
+            (args.ctlpath, EtherWebSocketControlHandler, {
+                'ioloop':   ioloop,
+                'switch':   switch,
+                'htpasswd': args.ctlhtpasswd,
+                'debug':    args.debug,
+            }),
+        ])
+        server = HTTPServer(app, ssl_options=sslopt)
+        server.listen(args.port, address=args.host)
+
+    else:
+        app = Application([(args.path, EtherWebSocketHandler, {
+            'switch':   switch,
+            'htpasswd': args.htpasswd,
+            'debug':    args.debug,
+        })])
+        server = HTTPServer(app, ssl_options=sslopt)
+        server.listen(args.port, address=args.host)
+
+        ctl = Application([(args.ctlpath, EtherWebSocketControlHandler, {
+            'ioloop':   ioloop,
+            'switch':   switch,
+            'htpasswd': args.ctlhtpasswd,
+            'debug':    args.debug,
+        })])
+        ctlserver = HTTPServer(ctl, ssl_options=ctlsslopt)
+        ctlserver.listen(args.ctlport, address=args.ctlhost)
 
     if not args.foreground: