Merge branch 'master' of https://github.com/PexMor/websockify

test-requirements.txt

@@ -2,3 +2,5 @@ mox3
 nose
 jwcrypto;python_version>="2.7"
 enum34;python_version=="3.3"
+redis;python_version>="2.7"
+simplejson;python_version>="2.7"

websockify/auth_plugins.py

@@ -87,7 +87,7 @@ def authenticate(self, headers, target_host, target_port):
         origin = headers.get('Origin', None)
         if origin is None or origin not in self.source:
             raise InvalidOriginError(expected=self.source, actual=origin)
-            
+
 class ClientCertCNAuth(object):
     """Verifies client by SSL certificate. Specify src as whitespace separated list of common names."""
 

websockify/token_plugins.py

@@ -134,3 +134,23 @@ def lookup(self, token):
         except ImportError as e:
             print("package jwcrypto not found, are you sure you've installed it correctly?", file=sys.stderr)
             return None
+
+import sys
+
+if sys.version_info >= (2, 7):
+    import redis
+    import simplejson
+
+    class TokenRedis(object):
+        def __init__(self, src):
+            self._server, self._port = src.split(":")
+
+        def lookup(self, token):
+            client = redis.Redis(host=self._server,port=self._port)
+            stuff = client.get(token)
+            if stuff is None:
+                return None
+            else:
+                combo = simplejson.loads(stuff.decode("utf-8"))
+                pair = combo["host"]
+                return pair.split(':')