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

Merge remote-tracking branch 'origin/v3' into v3

Browse Source
This commit is contained in:
feng 2022-11-28 11:48:33 +08:00
commit 0417c6142d
6 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -100,6 +100,6 @@ VOLUME /opt/jumpserver/logs
ENV LANG=zh_CN.UTF-8 ENV LANG=zh_CN.UTF-8
EXPOSE 8070
EXPOSE 8080 EXPOSE 8080
ENTRYPOINT ["./entrypoint.sh"] ENTRYPOINT ["./entrypoint.sh"]

2
Dockerfile.loong64
View File

@ -91,6 +91,6 @@ VOLUME /opt/jumpserver/logs
ENV LANG=zh_CN.UTF-8 ENV LANG=zh_CN.UTF-8
EXPOSE 8070
EXPOSE 8080 EXPOSE 8080
ENTRYPOINT ["./entrypoint.sh"] ENTRYPOINT ["./entrypoint.sh"]

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

@ -1,7 +1,6 @@
import base64 import base64
import json import json
import os import os
import time
import urllib.parse import urllib.parse
from django.http import HttpResponse from django.http import HttpResponse

12
apps/authentication/models/connection_token.py
View File

@ -77,7 +77,7 @@ class ConnectionToken(OrgModelMixin, JMSBaseModel):
def permed_account(self): def permed_account(self):
from perms.utils import PermAccountUtil from perms.utils import PermAccountUtil
permed_account = PermAccountUtil().validate_permission( permed_account = PermAccountUtil().validate_permission(
self.user, self.asset, self.login self.user, self.asset, self.account_name
) )
return permed_account return permed_account
@ -100,13 +100,13 @@ class ConnectionToken(OrgModelMixin, JMSBaseModel):
is_valid = False is_valid = False
error = _('No asset or inactive asset') error = _('No asset or inactive asset')
return is_valid, error return is_valid, error
if not self.login: if not self.account_name:
error = _('No account') error = _('No account')
raise PermissionDenied(error) raise PermissionDenied(error)
if not self.permed_account or not self.permed_account.actions: if not self.permed_account or not self.permed_account.actions:
msg = 'user `{}` not has asset `{}` permission for login `{}`'.format( msg = 'user `{}` not has asset `{}` permission for login `{}`'.format(
self.user, self.asset, self.login self.user, self.asset, self.account_name
) )
raise PermissionDenied(msg) raise PermissionDenied(msg)
@ -123,10 +123,10 @@ class ConnectionToken(OrgModelMixin, JMSBaseModel):
if not self.asset: if not self.asset:
return None return None
account = self.asset.accounts.filter(name=self.login).first() account = self.asset.accounts.filter(name=self.account_name).first()
if self.login == '@INPUT' or not account: if self.account_name == '@INPUT' or not account:
return { return {
'name': self.login, 'name': self.account_name,
'username': self.username, 'username': self.username,
'secret_type': 'password', 'secret_type': 'password',
'secret': self.secret 'secret': self.secret

2
apps/authentication/serializers/connection_token.py
View File

@ -154,7 +154,7 @@ class ConnectionTokenSecretSerializer(OrgResourceModelSerializerMixin):
class Meta: class Meta:
model = ConnectionToken model = ConnectionToken
fields = [ fields = [
'id', 'secret', 'user', 'asset', 'account', 'id', 'value', 'user', 'asset', 'account',
'protocol', 'domain', 'gateway', 'protocol', 'domain', 'gateway',
'actions', 'expire_at', 'platform', 'actions', 'expire_at', 'platform',
] ]

2
apps/orgs/signal_handlers/cache.py
View File

@ -91,7 +91,7 @@ class OrgResourceStatisticsRefreshUtil:
if not cache_field_name: if not cache_field_name:
return return
OrgResourceStatisticsCache(Organization.root()).expire(*cache_field_name) OrgResourceStatisticsCache(Organization.root()).expire(*cache_field_name)
if instance.org: if getattr(instance, 'org', None):
OrgResourceStatisticsCache(instance.org).expire(*cache_field_name) OrgResourceStatisticsCache(instance.org).expire(*cache_field_name)