Merge pull request jumpserver#3680 from jumpserver/dev

Dev
york67617 · Feb 3, 2020 · 3cc9e0a · 3cc9e0a
2 parents 1c2feed + ec1f667
commit 3cc9e0a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/apps/authentication/backends/openid/models.py b/apps/authentication/backends/openid/models.py
@@ -160,7 +160,8 @@ def _update_or_create(self, token_response):
                 defaults={
                     'email': userinfo.get('email', ''),
                     'first_name': userinfo.get('given_name', ''),
-                    'last_name': userinfo.get('family_name', '')
+                    'last_name': userinfo.get('family_name', ''),
+                    'name': userinfo.get('name', '')
                 }
             )
             oidt_profile = OpenIDTokenProfile(

diff --git a/apps/terminal/api/terminal.py b/apps/terminal/api/terminal.py
@@ -111,6 +111,11 @@ def handle_status(self, request):
 
     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):