pref: 修改 asset permission

apps/authentication/api/connection_token.py

@@ -16,7 +16,7 @@ from rest_framework.request import Request
 from common.drf.api import JMSModelViewSet
 from common.http import is_true
 from orgs.mixins.api import RootOrgViewMixin
-from perms.models import Action
+from perms.models import ActionChoices
 from terminal.models import EndpointRule
 from ..serializers import (
     ConnectionTokenSerializer, ConnectionTokenSecretSerializer,
@@ -70,8 +70,8 @@ class RDPFileClientProtocolURLMixin:
         # 设置磁盘挂载
         drives_redirect = is_true(self.request.query_params.get('drives_redirect'))
         if drives_redirect:
-            actions = Action.choices_to_value(token.actions)
-            if actions & Action.UPDOWNLOAD == Action.UPDOWNLOAD:
+            actions = ActionChoices.choices_to_value(token.actions)
+            if actions & Action.TRANSFER == Action.TRANSFER:
                 rdp_options['drivestoredirect:s'] = '*'
 
         # 设置全屏

apps/authentication/serializers/connection_token.py

@@ -7,7 +7,7 @@ from common.utils import pretty_string
 from common.utils.random import random_string
 from assets.models import Asset, Gateway, Domain, CommandFilterRule, Account
 from users.models import User
-from perms.serializers.permission import ActionsField
+from perms.serializers.permission import ActionChoicesField
 
 
 __all__ = [
@@ -158,14 +158,13 @@ class ConnectionTokenSecretSerializer(OrgResourceModelSerializerMixin):
     gateway = ConnectionTokenGatewaySerializer(read_only=True)
     domain = ConnectionTokenDomainSerializer(read_only=True)
     cmd_filter_rules = ConnectionTokenCmdFilterRuleSerializer(many=True)
-    actions = ActionsField()
+    actions = ActionChoicesField()
     expire_at = serializers.IntegerField()
 
     class Meta:
         model = ConnectionToken
         fields = [
-            'id', 'secret',
-            'user', 'asset', 'account_username', 'account', 'protocol',
-            'domain', 'gateway', 'cmd_filter_rules',
-            'actions', 'expire_at',
+            'id', 'secret', 'user', 'asset', 'account_username',
+            'account', 'protocol', 'domain', 'gateway',
+            'cmd_filter_rules', 'actions', 'expire_at',
         ]

apps/authentication/views/dingtalk.py

@@ -1,27 +1,28 @@
+from urllib.parse import urlencode
+
+from django.conf import settings
+from django.db.utils import IntegrityError
+from django.http.request import HttpRequest
 from django.http.response import HttpResponseRedirect
 from django.utils.translation import ugettext_lazy as _
-from urllib.parse import urlencode
 from django.views import View
-from django.conf import settings
-from django.http.request import HttpRequest
-from django.db.utils import IntegrityError
-from rest_framework.permissions import IsAuthenticated, AllowAny
 from rest_framework.exceptions import APIException
+from rest_framework.permissions import AllowAny, IsAuthenticated
 
+from authentication import errors
+from authentication.const import ConfirmType
+from authentication.mixins import AuthMixin
+from authentication.notifications import OAuthBindMessage
+from common.mixins.views import PermissionsMixin, UserConfirmRequiredExceptionMixin
+from common.permissions import UserConfirmation
+from common.sdk.im.dingtalk import URL, DingTalk
+from common.utils import FlashMessageUtil, get_logger
+from common.utils.common import get_request_ip
+from common.utils.django import get_object_or_none, reverse
+from common.utils.random import random_string
 from users.models import User
 from users.views import UserVerifyPasswordView
-from common.utils import get_logger, FlashMessageUtil
-from common.utils.random import random_string
-from common.utils.django import reverse, get_object_or_none
-from common.sdk.im.dingtalk import URL
-from common.mixins.views import UserConfirmRequiredExceptionMixin, PermissionsMixin
-from common.permissions import UserConfirmation
-from authentication import errors
-from authentication.mixins import AuthMixin
-from authentication.const import ConfirmType
-from common.sdk.im.dingtalk import DingTalk
-from common.utils.common import get_request_ip
-from authentication.notifications import OAuthBindMessage
+
 from .mixins import METAMixin
 
 logger = get_logger(__file__)

apps/authentication/views/feishu.py

@@ -1,26 +1,27 @@
+from urllib.parse import urlencode
+
+from django.conf import settings
+from django.db.utils import IntegrityError
+from django.http.request import HttpRequest
 from django.http.response import HttpResponseRedirect
 from django.utils.translation import ugettext_lazy as _
-from urllib.parse import urlencode
 from django.views import View
-from django.conf import settings
-from django.http.request import HttpRequest
-from django.db.utils import IntegrityError
-from rest_framework.permissions import IsAuthenticated, AllowAny
 from rest_framework.exceptions import APIException
+from rest_framework.permissions import AllowAny, IsAuthenticated
 
-from users.models import User
-from users.views import UserVerifyPasswordView
-from common.utils import get_logger, FlashMessageUtil
-from common.utils.random import random_string
-from common.utils.django import reverse, get_object_or_none
-from common.mixins.views import UserConfirmRequiredExceptionMixin, PermissionsMixin
-from common.permissions import UserConfirmation
-from common.sdk.im.feishu import FeiShu, URL
-from common.utils.common import get_request_ip
 from authentication import errors
 from authentication.const import ConfirmType
 from authentication.mixins import AuthMixin
 from authentication.notifications import OAuthBindMessage
+from common.mixins.views import PermissionsMixin, UserConfirmRequiredExceptionMixin
+from common.permissions import UserConfirmation
+from common.sdk.im.feishu import URL, FeiShu
+from common.utils import FlashMessageUtil, get_logger
+from common.utils.common import get_request_ip
+from common.utils.django import get_object_or_none, reverse
+from common.utils.random import random_string
+from users.models import User
+from users.views import UserVerifyPasswordView
 
 logger = get_logger(__file__)