Merge branch 'fix_rbac' of github.com:jumpserver/jumpserver into fix_rbac

apps/applications/migrations/0018_auto_20220223_1642.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.1.14 on 2022-02-23 08:42
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('applications', '0017_auto_20220217_2135'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='application',
+            name='type',
+            field=models.CharField(choices=[('mysql', 'MySQL'), ('oracle', 'Oracle'), ('postgresql', 'PostgreSQL'), ('mariadb', 'MariaDB'), ('sqlserver', 'SQLServer'), ('redis', 'Redis'), ('mongodb', 'MongoDB'), ('chrome', 'Chrome'), ('mysql_workbench', 'MySQL Workbench'), ('vmware_client', 'vSphere Client'), ('custom', 'Custom'), ('k8s', 'Kubernetes')], max_length=16, verbose_name='Type'),
+        ),
+    ]

apps/assets/migrations/0087_auto_20220223_1642.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.1.14 on 2022-02-23 08:42
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('assets', '0086_auto_20220217_2135'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='systemuser',
+            name='protocol',
+            field=models.CharField(choices=[('ssh', 'SSH'), ('rdp', 'RDP'), ('telnet', 'Telnet'), ('vnc', 'VNC'), ('mysql', 'MySQL'), ('oracle', 'Oracle'), ('mariadb', 'MariaDB'), ('postgresql', 'PostgreSQL'), ('sqlserver', 'SQLServer'), ('redis', 'Redis'), ('mongodb', 'MongoDB'), ('k8s', 'K8S')], default='ssh', max_length=16, verbose_name='Protocol'),
+        ),
+    ]

apps/common/migrations/0007_permission.py

@@ -0,0 +1,24 @@
+# Generated by Django 3.1.14 on 2022-02-23 08:42
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('common', '0006_auto_20190304_1515'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Permission',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+            ],
+            options={
+                'permissions': [('view_resourcestatistics', 'Can view resource statistics')],
+            },
+        ),
+    ]

apps/common/models.py

@@ -0,0 +1,9 @@
+from django.db import models
+from django.utils.translation import gettext_lazy as _
+
+
+class Permission(models.Model):
+    class Meta:
+        permissions = [
+            ('view_resourcestatistics', _('Can view resource statistics'))
+        ]

apps/jumpserver/api.py

@@ -214,7 +214,7 @@ class DatesLoginMetricMixin:
 class IndexApi(DatesLoginMetricMixin, APIView):
     http_method_names = ['get']
     rbac_perms = {
-        'GET': 'view_auditview'
+        'GET': 'common.view_resourcestatistics'
     }
 
     def get(self, request, *args, **kwargs):

apps/perms/migrations/0025_auto_20220223_1642.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.1.14 on 2022-02-23 08:42
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('perms', '0024_auto_20220217_2135'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='applicationpermission',
+            name='type',
+            field=models.CharField(choices=[('mysql', 'MySQL'), ('oracle', 'Oracle'), ('postgresql', 'PostgreSQL'), ('mariadb', 'MariaDB'), ('sqlserver', 'SQLServer'), ('redis', 'Redis'), ('mongodb', 'MongoDB'), ('chrome', 'Chrome'), ('mysql_workbench', 'MySQL Workbench'), ('vmware_client', 'vSphere Client'), ('custom', 'Custom'), ('k8s', 'Kubernetes')], max_length=16, verbose_name='Type'),
+        ),
+    ]

apps/rbac/builtin.py

@@ -4,6 +4,7 @@ from .const import Scope, system_exclude_permissions, org_exclude_permissions
 
 
 auditor_perms = (
+    ('common', 'permission', 'view', 'resourcestatistics'),
     ('audits', '*', '*', '*'),
     ('rbac', 'menupermission', 'view', 'auditview'),
     ('terminal', 'session', '*', '*'),

apps/terminal/api/task.py

@@ -12,7 +12,6 @@ from .. import serializers
 from terminal.utils import is_session_approver
 from orgs.utils import tmp_to_root_org
 
-
 __all__ = ['TaskViewSet', 'KillSessionAPI', 'KillSessionForTicketAPI']
 logger = logging.getLogger(__file__)
 
@@ -45,6 +44,11 @@ class KillSessionAPI(APIView):
         'POST': 'terminal.terminate_session'
     }
 
+    def post(self, request, *args, **kwargs):
+        session_ids = request.data
+        validated_session = kill_sessions(session_ids, request.user)
+        return Response({"ok": validated_session})
+
 
 class KillSessionForTicketAPI(APIView):
     permission_classes = (IsAuthenticated, )
@@ -61,4 +65,3 @@ class KillSessionForTicketAPI(APIView):
             validated_session = kill_sessions(session_ids, request.user)
 
         return Response({"ok": validated_session})
-

apps/terminal/migrations/0044_auto_20220223_1642.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.1.14 on 2022-02-23 08:42
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('terminal', '0043_auto_20220217_2135'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='session',
+            name='protocol',
+            field=models.CharField(choices=[('ssh', 'ssh'), ('rdp', 'rdp'), ('vnc', 'vnc'), ('telnet', 'telnet'), ('mysql', 'mysql'), ('oracle', 'oracle'), ('mariadb', 'mariadb'), ('sqlserver', 'sqlserver'), ('postgresql', 'postgresql'), ('redis', 'redis'), ('mongodb', 'MongoDB'), ('k8s', 'kubernetes')], db_index=True, default='ssh', max_length=16),
+        ),
+    ]