github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3680 from jumpserver/dev 

Dev
pull/3723/head 1.5.6
BaiJiangJie 2020-02-03 14:25:24 +08:00 committed by GitHub
parent 1c2feedb27 ec1f6677ec
commit 3cc9e0a66c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/authentication/backends/openid/models.py
View File

@ -160,7 +160,8 @@ class Client(object):
defaults={ defaults={
'email': userinfo.get('email', ''), 'email': userinfo.get('email', ''),
'first_name': userinfo.get('given_name', ''), '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( oidt_profile = OpenIDTokenProfile(

5
apps/terminal/api/terminal.py
View File

@ -111,6 +111,11 @@ class StatusViewSet(viewsets.ModelViewSet):
def handle_sessions(self): def handle_sessions(self):
sessions_id = self.request.data.get('sessions', []) 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) Session.set_sessions_active(sessions_id)
def get_queryset(self): def get_queryset(self):