Changeset 143

Timestamp:

05/15/12 22:47:29 (12 years ago)

Author:

atzm

Message:

• add SSL support

File:

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

etherws/trunk/etherws.py

@@ -11 +11 @@
 #
 # todo:
-#   - SSL support
-#   - servant mode (like typical p2p software)
+#   - authentication support
+#   - servant mode support (like typical p2p software)
 #
 # ===========================================================================
@@ -44 +44 @@
 import os
 import sys
+import time
 import argparse
 import threading
@@ -137 +138 @@
 
 def server_main(args):
+    ssl_options = {}
+
+    for k in ['keyfile', 'certfile']:
+        v = getattr(args, k, None)
+        if v:
+            v = os.path.realpath(v)
+            ssl_options[k] = v
+            open(v).close()  # readable test
+
+    if len(ssl_options) == 1:
+        raise ValueError('both keyfile and certfile are required')
+    elif not ssl_options:
+        ssl_options = None
+
+    if not args.port:
+        if ssl_options:
+            args.port = 443
+        else:
+            args.port = 80
+
+    if not args.foreground:
+        daemonize()
+
     tap = TapHandler(args.device, debug=args.debug)
     app = tornado.web.Application([
         (args.path, EtherWebSocket, {'tap': tap, 'debug': args.debug}),
     ])
-    server = tornado.httpserver.HTTPServer(app)
+    server = tornado.httpserver.HTTPServer(app, ssl_options=ssl_options)
     server.listen(args.port, address=args.address)
 
@@ -152 +176 @@
     if args.debug:
         websocket.enableTrace(True)
+
+    if not args.foreground:
+        daemonize()
 
     tap = TapHandler(args.device, debug=args.debug)
@@ -164 +191 @@
     t.start()
 
+    while not client.sock:
+        time.sleep(0.1)
+
     ioloop = tornado.ioloop.IOLoop.instance()
     ioloop.add_handler(tap.fileno(), tap, ioloop.READ)
@@ -179 +209 @@
     parser_server = subparsers.add_parser('server')
     parser_server.add_argument('--address', action='store', default='')
-    parser_server.add_argument('--port', action='store', type=int, default=80)
+    parser_server.add_argument('--port', action='store', type=int)
     parser_server.add_argument('--path', action='store', default='/')
+    parser_server.add_argument('--keyfile', action='store')
+    parser_server.add_argument('--certfile', action='store')
 
     parser_client = subparsers.add_parser('client')
@@ -186 +218 @@
 
     args = parser.parse_args()
-
-    if not args.foreground:
-        daemonize()
 
     if args.subcommand == 'server':