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

Merge pull request #14664 from jumpserver/pr@dev@feat_add_face_verify_on_exchange_token 

feat: add face verify on exchange connect token
pull/14667/head
Chenyang Shen 2024-12-16 19:00:56 +08:00 committed by GitHub
parent 7419139b29 abad98a190
commit 88905bd28d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/authentication/api/connection_token.py
View File

@ -255,6 +255,8 @@ class ExtraActionApiMixin(RDPFileClientProtocolURLMixin):
get_serializer: callable get_serializer: callable
perform_create: callable perform_create: callable
validate_exchange_token: callable validate_exchange_token: callable
need_face_verify: bool
create_face_verify: callable
@action(methods=['POST', 'GET'], detail=True, url_path='rdp-file') @action(methods=['POST', 'GET'], detail=True, url_path='rdp-file')
def get_rdp_file(self, request, *args, **kwargs): def get_rdp_file(self, request, *args, **kwargs):
@ -314,7 +316,10 @@ class ExtraActionApiMixin(RDPFileClientProtocolURLMixin):
instance.date_expired = date_expired_default() instance.date_expired = date_expired_default()
instance.save() instance.save()
serializer = self.get_serializer(instance) serializer = self.get_serializer(instance)
return Response(serializer.data, status=status.HTTP_201_CREATED) response = Response(serializer.data, status=status.HTTP_201_CREATED)
if self.need_face_verify:
self.create_face_verify(response)
return response
class ConnectionTokenViewSet(AuthFaceMixin, ExtraActionApiMixin, RootOrgViewMixin, JMSModelViewSet): class ConnectionTokenViewSet(AuthFaceMixin, ExtraActionApiMixin, RootOrgViewMixin, JMSModelViewSet):
@ -429,7 +434,7 @@ class ConnectionTokenViewSet(AuthFaceMixin, ExtraActionApiMixin, RootOrgViewMixi
data['is_active'] = False data['is_active'] = False
if self.face_monitor_token: if self.face_monitor_token:
FaceMonitorContext.get_or_create_context(self.face_monitor_token, FaceMonitorContext.get_or_create_context(self.face_monitor_token,
self.request.user.id) self.request.user.id)
data['face_monitor_token'] = self.face_monitor_token data['face_monitor_token'] = self.face_monitor_token
return data return data