Merge pull request #3679 from jumpserver/dev_session

[Bugfix] 处理心跳时guacamole上报的session为str处理为list
2020-02-03 14:08:37 +08:00 · 2020-02-03 14:08:37 +08:00 · ec1f6677ec
parent 29730757b8 ae98fb4332
commit ec1f6677ec
1 changed files with 5 additions and 0 deletions
--- a/apps/terminal/api/terminal.py
+++ b/apps/terminal/api/terminal.py
@ -111,6 +111,11 @@ class StatusViewSet(viewsets.ModelViewSet):

    def handle_sessions(self):
        sessions_id = self.request.data.get('sessions', [])
+        # guacamole 上报的 session 是字符串
+        # "[53cd3e47-210f-41d8-b3c6-a184f3, 53cd3e47-210f-41d8-b3c6-a184f4]"
+        if isinstance(sessions_id, str):
+            sessions_id = sessions_id[1:-1].split(',')
+            sessions_id = [sid.strip() for sid in sessions_id if sid.strip()]
        Session.set_sessions_active(sessions_id)

    def get_queryset(self):