Commit 692d0aa2 authored by zheng liu's avatar zheng liu

Merged in dev (pull request #3)

fix: current user
Approved-by: 's avatarzheng liu <liuzheng712@gmail.com>
parents 656b4d91 6b9689b2
...@@ -32,7 +32,7 @@ class BaseWebSocketHandler: ...@@ -32,7 +32,7 @@ class BaseWebSocketHandler:
else: else:
remote_ip = request.remote_addr remote_ip = request.remote_addr
self.clients[request.sid]["request"] = Request((remote_ip, 0)) self.clients[request.sid]["request"] = Request((remote_ip, 0))
self.clients[request.sid]["request"].user = self.get_current_user() self.clients[request.sid]["request"].user = self.current_user
self.clients[request.sid]["request"].meta = {"width": self.clients[request.sid]["cols"], self.clients[request.sid]["request"].meta = {"width": self.clients[request.sid]["cols"],
"height": self.clients[request.sid]["rows"]} "height": self.clients[request.sid]["rows"]}
# self.request.__dict__.update(request.__dict__) # self.request.__dict__.update(request.__dict__)
...@@ -41,9 +41,6 @@ class BaseWebSocketHandler: ...@@ -41,9 +41,6 @@ class BaseWebSocketHandler:
self.app.clients.append(self.clients[request.sid]["client"]) self.app.clients.append(self.clients[request.sid]["client"])
self.clients[request.sid]["forwarder"] = ProxyServer(self.app, self.clients[request.sid]["client"]) self.clients[request.sid]["forwarder"] = ProxyServer(self.app, self.clients[request.sid]["client"])
def get_current_user(self):
return self.app.service.get_profile()
def check_origin(self, origin): def check_origin(self, origin):
return True return True
...@@ -78,7 +75,8 @@ class SSHws(Namespace, BaseWebSocketHandler): ...@@ -78,7 +75,8 @@ class SSHws(Namespace, BaseWebSocketHandler):
"rw": [] "rw": []
} }
join_room(room) join_room(room)
self.current_user = self.app.service.check_user_cookie(session_id=request.cookies.get('sessionid', ''),
csrf_token=request.cookies.get('csrftoken', ''))
self.prepare(request) self.prepare(request)
def on_data(self, message): def on_data(self, message):
...@@ -162,4 +160,3 @@ class HttpServer: ...@@ -162,4 +160,3 @@ class HttpServer:
def shutdown(self): def shutdown(self):
pass pass
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment