Changeset 151

Timestamp:

05/16/12 08:56:50 (13 years ago)

Author:

atzm

Message:

• add basic auth support to client

File:

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

etherws/trunk/etherws.py

@@ -11 +11 @@
 #
 # todo:
-#   - authentication support
 #   - servant mode support (like typical p2p software)
 #
@@ -44 +43 @@
 import os
 import sys
-import time
 import base64
 import hashlib
+import getpass
 import argparse
 import threading
@@ -112 +111 @@
     def on_close(self):
         self._tap.unregister_client(self)
+
+
+class  EtherWebSocketClient(object):
+    def __init__(self, tap, url, user=None, passwd=None):
+        self._sock = None
+        self._tap = tap
+        self._url = url
+        self._options = {}
+
+        if user and passwd:
+            token = base64.b64encode('%s:%s' % (user, passwd))
+            auth = ['Authorization: Basic %s' % token]
+            self._options['header'] = auth
+
+    def open(self):
+        self._sock = websocket.WebSocket()
+        self._sock.connect(self._url, **self._options)
+
+    def close(self):
+        self._sock.close()
+        self._sock = None
+
+    def write_message(self, message, binary=False):
+        flag = websocket.ABNF.OPCODE_TEXT
+        if binary:
+            flag = websocket.ABNF.OPCODE_BINARY
+        self._sock.send(message, flag)
+
+    def run_forever(self):
+        try:
+            if not self._sock:
+                self.open()
+            while True:
+                data = self._sock.recv()
+                if data is None:
+                    break
+                self._tap.write(self, data)
+        finally:
+            self.close()
 
 
@@ -214 +252 @@
             args.port = 80
 
-    if not args.foreground:
-        daemonize()
-
     tap = TapHandler(args.device, debug=args.debug)
     app = tornado.web.Application([
@@ -226 +261 @@
     ioloop = tornado.ioloop.IOLoop.instance()
     ioloop.add_handler(tap.fileno(), tap, ioloop.READ)
+
+    if not args.foreground:
+        daemonize()
+
     ioloop.start()
 
@@ -233 +272 @@
         websocket.enableTrace(True)
 
+    passwd = None
+    if args.user:
+        passwd = getpass.getpass()
+
+    tap = TapHandler(args.device, debug=args.debug)
+    client = EtherWebSocketClient(tap, args.uri, args.user, passwd)
+
+    tap.register_client(client)
+    client.open()
+
+    t = threading.Thread(target=client.run_forever)
+    t.setDaemon(True)
+
+    ioloop = tornado.ioloop.IOLoop.instance()
+    ioloop.add_handler(tap.fileno(), tap, ioloop.READ)
+
     if not args.foreground:
         daemonize()
 
-    tap = TapHandler(args.device, debug=args.debug)
-    client = websocket.WebSocketApp(args.uri)
-    client.on_message = lambda s, m: tap.write(client, m)
-    client.write_message = \
-        lambda m, b: client.sock.send(m, websocket.ABNF.OPCODE_BINARY)
-    tap.register_client(client)
-
-    t = threading.Thread(target=client.run_forever)
-    t.setDaemon(True)
     t.start()
-
-    while not client.sock:
-        time.sleep(0.1)
-
-    ioloop = tornado.ioloop.IOLoop.instance()
-    ioloop.add_handler(tap.fileno(), tap, ioloop.READ)
     ioloop.start()
 
@@ -273 +313 @@
     parser_client = subparsers.add_parser('client')
     parser_client.add_argument('--uri', action='store', required=True)
+    parser_client.add_argument('--user', action='store')
 
     args = parser.parse_args()