Stash

apps/assets/serializers/system_user.py

@@ -50,19 +50,14 @@ class AssetSystemUserSerializer(serializers.ModelSerializer):
     """
     查看授权的资产系统用户的数据结构，这个和AssetSerializer不同，字段少
     """
-    actions = serializers.SerializerMethodField()
 
     class Meta:
         model = SystemUser
         fields = (
             'id', 'name', 'username', 'priority',
-            'protocol',  'comment', 'login_mode', 'actions',
+            'protocol',  'comment', 'login_mode',
         )
 
-    @staticmethod
-    def get_actions(obj):
-        return [action.name for action in obj.actions]
-
 
 class SystemUserSimpleSerializer(serializers.ModelSerializer):
     """

apps/assets/utils.py

@@ -54,17 +54,19 @@ class NodeUtil:
     def sorted_by(node):
         return [int(i) for i in node.key.split(':')]
 
-    def get_all_nodes(self):
+    def get_queryset(self):
         all_nodes = Node.objects.all()
         if self.with_assets_amount:
-            now = time.time()
             all_nodes = all_nodes.prefetch_related(
                 Prefetch('assets', queryset=Asset.objects.all().only('id'))
             )
             all_nodes = list(all_nodes)
             for node in all_nodes:
                 node._assets = set(node.assets.all())
-        all_nodes = sorted(all_nodes, key=self.sorted_by)
+        return all_nodes
+
+    def get_all_nodes(self):
+        all_nodes = sorted(self.get_queryset(), key=self.sorted_by)
 
         guarder = Node(key='', value='Guarder')
         guarder._assets = []
@@ -119,11 +121,11 @@ class NodeUtil:
     def get_nodes_by_queryset(self, queryset):
         nodes = []
         for n in queryset:
-            node = self._nodes.get(n.key)
+            node = self.get_node_by_key(n.key)
             if not node:
                 continue
-            nodes.append(nodes)
-        return [self]
+            nodes.append(node)
+        return nodes
 
     def get_node_by_key(self, key):
         return self._nodes.get(key)
@@ -156,11 +158,17 @@ class NodeUtil:
             tree_nodes.add(node)
             if with_children:
                 tree_nodes.update(node._children)
-        for n in tree_nodes:
-            delattr(n, '_children')
-            delattr(n, '_parents')
         return list(tree_nodes)
 
+    def get_nodes_parents(self, nodes, with_self=True):
+        parents = set()
+        for n in nodes:
+            node = self.get_node_by_key(n.key)
+            parents.update(set(node._parents))
+            if with_self:
+                parents.add(node)
+        return parents
+
 
 def test_node_tree():
     tree = NodeUtil()

apps/perms/api/asset_permission.py

@@ -35,7 +35,8 @@ class AssetPermissionViewSet(viewsets.ModelViewSet):
     permission_classes = (IsOrgAdmin,)
 
     def get_serializer_class(self):
-        if self.action in ("list", 'retrieve'):
+        if self.action in ("list", 'retrieve') and \
+                self.request.query_params.get("display"):
             return serializers.AssetPermissionListSerializer
         return self.serializer_class
 

apps/perms/api/user_permission.py

 # -*- coding: utf-8 -*-
 #
-
+import time
 from hashlib import md5
 from django.core.cache import cache
 from django.conf import settings
@@ -261,14 +261,19 @@ class UserGrantedNodesWithAssetsAsTreeApi(UserPermissionCacheMixin, ListAPIView)
         nodes = util.get_nodes_with_assets()
         print("22222222222222")
         for node, assets in nodes.items():
+            now = time.time()
+            print("Parse to node")
             data = parse_node_to_tree_node(node)
+            print("parse to node end, using: {0:.2f}".format(time.time() - now))
             queryset.append(data)
             if not self.show_assets:
                 continue
             for asset, system_users in assets.items():
+                now1 = time.time()
+                print("parse to asset")
                 data = parse_asset_to_tree_node(node, asset, system_users)
+                print("parse to asset end, using: {0:.2f}".format(time.time()-now1))
                 queryset.append(data)
-        queryset = sorted(queryset)
         return queryset
 
 

apps/perms/forms/asset_permission.py

@@ -74,13 +74,13 @@ class AssetPermissionForm(OrgModelForm):
             'system_users': forms.SelectMultiple(
                 attrs={'class': 'select2', 'data-placeholder': _('System user')}
             ),
-            'action': forms.CheckboxSelectMultiple()
+            'actions': forms.CheckboxSelectMultiple()
         }
         labels = {
             'nodes': _("Node"),
         }
         help_texts = {
-            'action': _('Tips: The RDP protocol does not support separate '
+            'actions': _('Tips: The RDP protocol does not support separate '
                         'controls for uploading or downloading files')
         }
 

apps/perms/migrations/0006_auto_20190628_1921.py

@@ -36,7 +36,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='assetpermission',
             name='action',
-            field=models.IntegerField(choices=[(255, 'All'), (1, 'Connect'), (2, 'Upload file'), (5, 'Upload download'), (4, 'Download file')], default=255, verbose_name='Action'),
+            field=models.IntegerField(choices=[(255, 'All'), (1, 'Connect'), (2, 'Upload file'), (4, 'Download file'), (6, 'Upload download')], default=255, verbose_name='Actions'),
         ),
         migrations.RunPython(migrate_old_actions),
     ]

apps/perms/migrations/0007_remove_assetpermission_actions.py

@@ -14,4 +14,9 @@ class Migration(migrations.Migration):
             model_name='assetpermission',
             name='actions',
         ),
+        migrations.RenameField(
+            model_name='assetpermission',
+            old_name='action',
+            new_name='actions',
+        ),
     ]

apps/perms/models/asset_permission.py

@@ -39,39 +39,46 @@ class ActionFlag:
     UPLOAD = 0b00000010
     DOWNLOAD = 0b00000100
     UPDOWNLOAD = UPLOAD | DOWNLOAD
-    CONNECT_UPLOADOWN = CONNECT | UPDOWNLOAD
     ALL = 0b11111111
-    NAME_MAP = {
-        "connect": CONNECT,
-        "upload": UPLOAD,
-        "download": DOWNLOAD,
-        "updownload": UPDOWNLOAD,
-        "all": ALL,
-    }
 
-    CHOICES = (
+    DB_CHOICES = (
         (ALL, _('All')),
         (CONNECT, _('Connect')),
-        (UPDOWNLOAD, _("Upload download")),
         (UPLOAD, _('Upload file')),
         (DOWNLOAD, _('Download file')),
+        (UPDOWNLOAD, _("Upload download")),
     )
 
+    NAME_MAP = {
+        ALL: "all",
+        CONNECT: "connect",
+        UPLOAD: "upload_file",
+        DOWNLOAD: "download_file",
+        UPDOWNLOAD: "updownload",
+    }
+
+    NAME_MAP_REVERSE = dict({v: k for k, v in NAME_MAP.items()})
+    CHOICES = []
+    for i, j in DB_CHOICES:
+        CHOICES.append((NAME_MAP[i], j))
+
     @classmethod
     def value_to_choices(cls, value):
         value = int(value)
-        if value == cls.ALL:
-            return [cls.ALL]
-        elif value == cls.UPDOWNLOAD:
-            return [cls.UPDOWNLOAD]
-        elif value == cls.CONNECT_UPLOADOWN:
-            return [cls.CONNECT, cls.UPDOWNLOAD]
-        else:
-            return [i for i in dict(cls.CHOICES) if i == i & int(value)]
+        choices = [cls.NAME_MAP[i] for i, j in cls.DB_CHOICES if value & i == i]
+        return choices
 
     @classmethod
     def choices_to_value(cls, value):
-        return reduce(lambda x, y: int(x) | int(y), value)
+        def to_choices(x, y):
+            x = cls.NAME_MAP_REVERSE.get(x, 0)
+            y = cls.NAME_MAP_REVERSE.get(y, 0)
+            return x | y
+        return reduce(to_choices, value)
+
+    @classmethod
+    def choices(cls):
+        return [(cls.NAME_MAP[i], j) for i, j in cls.DB_CHOICES]
 
 
 class AssetPermission(BasePermission):
@@ -79,7 +86,7 @@ class AssetPermission(BasePermission):
     nodes = models.ManyToManyField('assets.Node', related_name='granted_by_permissions', blank=True, verbose_name=_("Nodes"))
     system_users = models.ManyToManyField('assets.SystemUser', related_name='granted_by_permissions', verbose_name=_("System user"))
     # actions = models.ManyToManyField(Action, related_name='permissions', blank=True, verbose_name=_('Action'))
-    action = models.IntegerField(choices=ActionFlag.CHOICES, default=ActionFlag.ALL, verbose_name=_("Action"))
+    actions = models.IntegerField(choices=ActionFlag.DB_CHOICES, default=ActionFlag.ALL, verbose_name=_("Actions"))
 
     class Meta:
         unique_together = [('org_id', 'name')]

apps/perms/serializers/asset_permission.py

@@ -38,7 +38,7 @@ class ActionDisplayField(ActionField):
 
 
 class AssetPermissionCreateUpdateSerializer(BulkOrgResourceModelSerializer):
-    action = ActionField()
+    actions = ActionField()
 
     class Meta:
         model = AssetPermission
@@ -51,7 +51,7 @@ class AssetPermissionListSerializer(BulkOrgResourceModelSerializer):
     assets = StringManyToManyField(many=True, read_only=True)
     nodes = StringManyToManyField(many=True, read_only=True)
     system_users = StringManyToManyField(many=True, read_only=True)
-    action = ActionDisplayField()
+    actions = ActionDisplayField()
     is_valid = serializers.BooleanField()
     is_expired = serializers.BooleanField()
 

apps/perms/templates/perms/asset_permission_list.html

@@ -122,8 +122,8 @@ function format(d) {
     if (d.system_users.length > 0) {
         data += makeLabel(["{% trans 'System user' %}", d.system_users.join(", ")])
     }
-    if (d.action.length > 0) {
-        data += makeLabel(["{% trans 'Action' %}", d.action.join(", ")])
+    if (d.actions.length > 0) {
+        data += makeLabel(["{% trans 'Action' %}", d.actions.join(", ")])
     }
     return data
 }
@@ -180,7 +180,7 @@ function initTable() {
 				$(td).html(update_btn + del_btn);
             }}
         ],
-        ajax_url: '{% url "api-perms:asset-permission-list" %}',
+        ajax_url: '{% url "api-perms:asset-permission-list" %}?display=1',
         columns: [
             {data: "id"}, {data: "name"}, {data: "users"},
             {data: "user_groups"}, {data: "assets"},

apps/perms/utils/test_asset_permission.py

-# -*- coding: utf-8 -*-
-#
-from django.test import TestCase
-
-from assets.models import Node, SystemUser
-from .asset_permission import FlatPermission
-from ..models import ActionFlag
-
-
-class TestFlatPermissionEqual(TestCase):
-    def setUp(self):
-        node1 = Node(value="parent", key="1:1")
-        node2 = Node(value="child", key="1:1:1")
-
-        system_user1 = SystemUser(username="name1", name="name1", priority=20)
-        system_user2 = SystemUser(username="name2", name="name2", priority=10)
-
-        action1 = ActionFlag.ALL
-        action2 = ActionFlag.CONNECT
-        action3 = ActionFlag.UPDOWNLOAD
-
-        perm1 = FlatPermission(node1, system_user1, action1)
-        perm2 = FlatPermission(node2, system_user1, action1)
-        perm3 = FlatPermission(node2, system_user2, action1)
-
-        self.groups = (
-            (perm1, perm2, True),
-            (perm1, perm3, True),
-        )
-
-    def test_equal(self):
-        for k, k2, wanted in self.groups:
-            if (k == k2) != wanted:
-                print("Not equal {} {}", k, k2)
-
-