Changeset 182

Timestamp:

07/27/12 03:05:02 (12 years ago)

Author:

atzm

Message:

• mix-in'ize basic auth handler

File:

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

etherws/trunk/etherws.py

@@ -55 +55 @@
 import tornado.web
 import tornado.ioloop
-import tornado.websocket
 import tornado.httpserver
 
+from tornado.websocket import WebSocketHandler
 from pytun import TunTapDevice, IFF_TAP, IFF_NO_PI
 
@@ -237 +237 @@
 
 
+class BasicAuthMixIn(object):
+    def _execute(self, transforms, *args, **kwargs):
+        def do_execute():
+            sp = super(BasicAuthMixIn, self)
+            return sp._execute(transforms, *args, **kwargs)
+
+        def auth_required():
+            self.stream.write(tornado.escape.utf8(
+                'HTTP/1.1 401 Authorization Required\r\n'
+                'WWW-Authenticate: Basic realm=etherws\r\n\r\n'
+            ))
+            self.stream.close()
+
+        try:
+            if not self._htpasswd:
+                return do_execute()
+
+            creds = self.request.headers.get('Authorization')
+
+            if not creds or not creds.startswith('Basic '):
+                return auth_required()
+
+            name, passwd = base64.b64decode(creds[6:]).split(':', 1)
+
+            if self._htpasswd.load().auth(name, passwd):
+                return do_execute()
+        except:
+            traceback.print_exc()
+
+        return auth_required()
+
+
 class TapHandler(DebugMixIn):
     READ_SIZE = 65535
@@ -296 +328 @@
 
 
-class EtherWebSocketHandler(tornado.websocket.WebSocketHandler, DebugMixIn):
+class EtherWebSocketHandler(DebugMixIn, BasicAuthMixIn, WebSocketHandler):
     def __init__(self, app, req, switch, htpasswd=None, debug=False):
         super(EtherWebSocketHandler, self).__init__(app, req)
@@ -316 +348 @@
         self._switch.unregister_port(self)
         self.dprintf('disconnected: %s\n', lambda: self.request.remote_ip)
-
-    def _execute(self, transforms, *args, **kwargs):
-        def do_execute():
-            sp = super(EtherWebSocketHandler, self)
-            return sp._execute(transforms, *args, **kwargs)
-
-        def auth_required():
-            self.stream.write(tornado.escape.utf8(
-                'HTTP/1.1 401 Authorization Required\r\n'
-                'WWW-Authenticate: Basic realm=etherws\r\n\r\n'
-            ))
-            self.stream.close()
-
-        try:
-            if not self._htpasswd:
-                return do_execute()
-
-            creds = self.request.headers.get('Authorization')
-
-            if not creds or not creds.startswith('Basic '):
-                return auth_required()
-
-            name, passwd = base64.b64decode(creds[6:]).split(':', 1)
-
-            if self._htpasswd.load().auth(name, passwd):
-                return do_execute()
-        except:
-            traceback.print_exc()
-
-        return auth_required()