github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-07-19 09:16:57 +00:00
Code Issues Projects Releases Wiki Activity

fix: 修复connection token 获取user错误 (#11603)

Browse Source 
Co-authored-by: feng <1304903146@qq.com>
This commit is contained in:
fit2bot 2023-09-19 11:09:58 +08:00 committed by GitHub
parent e6fe7c489e
commit cbb772def7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -312,11 +312,11 @@ class ConnectionTokenViewSet(ExtraActionApiMixin, RootOrgViewMixin, JMSModelView
self.validate_serializer(serializer) self.validate_serializer(serializer)
return super().perform_create(serializer) return super().perform_create(serializer)
def _insert_connect_options(self, data): def _insert_connect_options(self, data, user):
name = 'file_name_conflict_resolution' name = 'file_name_conflict_resolution'
connect_options = data.pop('connect_options', {}) connect_options = data.pop('connect_options', {})
preference = Preference.objects.filter( preference = Preference.objects.filter(
name=name, user=self.request.user, category='koko' name=name, user=user, category='koko'
).first() ).first()
value = preference.value if preference else FileNameConflictResolution.REPLACE value = preference.value if preference else FileNameConflictResolution.REPLACE
connect_options[name] = value connect_options[name] = value
@ -325,7 +325,7 @@ class ConnectionTokenViewSet(ExtraActionApiMixin, RootOrgViewMixin, JMSModelView
def validate_serializer(self, serializer): def validate_serializer(self, serializer):
data = serializer.validated_data data = serializer.validated_data
user = self.get_user(serializer) user = self.get_user(serializer)
self._insert_connect_options(data) self._insert_connect_options(data, user)
asset = data.get('asset') asset = data.get('asset')
account_name = data.get('account') account_name = data.get('account')
_data = self._validate(user, asset, account_name) _data = self._validate(user, asset, account_name)