fixing ws auth

Author: VeryBigSad

chats/consumers.py

@@ -48,6 +48,7 @@ async def connect(self):
         """User connected to websocket"""
 
         if self.scope["user"].is_anonymous:
+            # not authenticated
             return await self.close(403)
 
         self.user = self.scope["user"]

chats/middleware.py

@@ -84,12 +84,12 @@ def get_user(scope):
             "TokenAuthMiddleware."
         )
     token = scope["token"]
-    # user = None
-    # try:
-    auth = TokenAuthentication()
-    user = auth.authenticate(token)
-    # except AuthenticationFailed:
-    #     pass
+    user = None
+    try:
+        auth = TokenAuthentication()
+        user = auth.authenticate(token)
+    except AuthenticationFailed:
+        pass
     return user or AnonymousUser()
 
 
@@ -107,21 +107,22 @@ async def __call__(self, scope, receive, send):
         # checking if it is a valid user ID, or if scope["user"] is already
         # populated).
         headers = scope["headers"]
-        token = None
-        for name, value in headers:
-            if name == b"authorization":
-                token = value.decode()
-                break
-
-        if token is None:
-            raise ValueError("Token is missing from headers")
-
-        scope["token"] = token
-        scope["user"] = await get_user(scope)
-        # Token is missing from headers
-        # if token is None:
-        #     from django.contrib.auth.models import AnonymousUser
-        #
-        #     scope["user"] = AnonymousUser()
+        try:
+            token = None
+            for name, value in headers:
+                if name == b"authorization":
+                    token = value.decode()
+                    break
+
+            if token is None:
+                raise ValueError("Token is missing from headers")
+
+            scope["token"] = token
+            scope["user"] = await get_user(scope)
+        except ValueError:
+            # Token is missing from headers
+            from django.contrib.auth.models import AnonymousUser
+
+            scope["user"] = AnonymousUser()
 
         return await self.app(scope, receive, send)

procollab/settings.py

@@ -27,11 +27,13 @@
 ]
 
 ALLOWED_HOSTS = [
+    "127.0.0.1:8000",
     "127.0.0.1",
     "localhost",
     "0.0.0.0",
     "api.procollab.ru",
-    "127.0.0.1:8000",
+    "app.procollab.ru",
+    "procollab.ru",
 ]
 
 PASSWORD_HASHERS = [