Merge pull request #2279 from jumpserver/dev

Dev

apps/assets/api/node.py

@@ -34,7 +34,7 @@ __all__ = [
     'NodeAddAssetsApi', 'NodeRemoveAssetsApi', 'NodeReplaceAssetsApi',
     'NodeAddChildrenApi', 'RefreshNodeHardwareInfoApi',
     'TestNodeConnectiveApi', 'NodeListAsTreeApi',
-    'NodeChildrenAsTreeApi',
+    'NodeChildrenAsTreeApi', 'RefreshAssetsAmount',
 ]
 
 
@@ -275,3 +275,12 @@ class TestNodeConnectiveApi(APIView):
         task_name = _("Test if the assets under the node are connectable: {}".format(node.name))
         task = test_asset_connectivity_util.delay(assets, task_name=task_name)
         return Response({"task": task.id})
+
+
+class RefreshAssetsAmount(APIView):
+    permission_classes = (IsOrgAdmin,)
+    model = Node
+
+    def get(self, request, *args, **kwargs):
+        self.model.expire_nodes_assets_amount()
+        return Response("Ok")

apps/assets/templates/assets/asset_create.html

@@ -95,9 +95,12 @@ $(document).ready(function () {
         if(protocol === 'rdp'){
             port = 3389;
         }
-        if(protocol === 'telnet (beta)'){
+        else if(protocol === 'telnet (beta)'){
             port = 23;
         }
+        else if(protocol === 'vnc'){
+            port = 5901;
+        }
         $("#id_port").val(port);
     });
 })

apps/assets/templates/assets/asset_list.html

@@ -133,6 +133,8 @@
         <li id="menu_refresh_hardware_info" class="btn-refresh-hardware" tabindex="-1"><a><i class="fa fa-refresh"></i> {% trans 'Refresh node hardware info' %}</a></li>
         <li id="menu_test_connective" class="btn-test-connective" tabindex="-1"><a><i class="fa fa-chain"></i> {% trans 'Test node connective' %}</a></li>
         <li class="divider"></li>
+        <li id="menu_refresh_assets_amount" class="btn-refresh-assets-amount" tabindex="-1"><a><i class="fa fa-refresh"></i> {% trans 'Refresh all node assets amount' %}</a></li>
+        <li class="divider"></li>
         <li id="show_current_asset" class="btn-show-current-asset" style="display: none;" tabindex="-1"><a><i class="fa fa-hand-o-up"></i> {% trans 'Display only current node assets' %}</a></li>
         <li id="show_all_asset" class="btn-show-all-asset" style="display: none;" tabindex="-1"><a><i class="fa fa-th"></i> {% trans 'Displays all child node assets' %}</a></li>
 {#        <li id="fresh_tree" class="btn-refresh-tree" tabindex="-1"><a><i class="fa fa-refresh"></i> {% trans 'Refresh' %}</a></li>#}
@@ -558,6 +560,15 @@ $(document).ready(function(){
     hideRMenu();
 
 })
+.on('click', '#menu_refresh_assets_amount', function () {
+    hideRMenu();
+    var url = "{% url 'api-assets:refresh-assets-amount' %}";
+    APIUpdateAttr({
+        'url': url,
+        'method': 'GET'
+    });
+    window.location.reload();
+})
 .on('click', '.btn_asset_delete', function () {
     var $this = $(this);
     var $data_table = $("#asset_list_table").DataTable();
@@ -724,6 +735,7 @@ $(document).ready(function(){
 }).on('click', '#menu_asset_move', function () {
     update_node_action = "move"
 })
+
 </script>
 
 {% endblock %}
\ No newline at end of file

apps/assets/urls/api_urls.py

@@ -74,6 +74,8 @@ urlpatterns = [
          api.RefreshNodeHardwareInfoApi.as_view(), name='node-refresh-hardware-info'),
     path('nodes/<uuid:pk>/test-connective/',
          api.TestNodeConnectiveApi.as_view(), name='node-test-connective'),
+    path('nodes/refresh-assets-amount/',
+         api.RefreshAssetsAmount.as_view(), name='refresh-assets-amount'),
 
     path('gateway/<uuid:pk>/test-connective/',
          api.GatewayTestConnectionApi.as_view(), name='test-gateway-connective'),

apps/common/api.py

@@ -104,7 +104,11 @@ class ReplayStorageCreateAPI(APIView):
         data = {storage_name: storage_data}
 
         if not self.is_valid(storage_data):
-            return Response({"error": _("Error: Account invalid")}, status=401)
+            return Response({
+                "error": _("Error: Account invalid (Please make sure the "
+                           "information such as Access key or Secret key is correct)")},
+                status=401
+            )
 
         Setting.save_storage('TERMINAL_REPLAY_STORAGE', data)
         return Response({"msg": _('Create succeed')}, status=200)
@@ -136,7 +140,11 @@ class CommandStorageCreateAPI(APIView):
         storage_name = storage_data.pop('NAME')
         data = {storage_name: storage_data}
         if not self.is_valid(storage_data):
-            return Response({"error": _("Error: Account invalid")}, status=401)
+            return Response(
+                {"error": _("Error: Account invalid (Please make sure the "
+                            "information such as Access key or Secret key is correct)")},
+                status=401
+            )
 
         Setting.save_storage('TERMINAL_COMMAND_STORAGE', data)
         return Response({"msg": _('Create succeed')}, status=200)

apps/perms/templates/perms/asset_permission_create_update.html

@@ -29,6 +29,11 @@
                     </div>
                     <div class="ibox-content">
                         <form method="post" class="form-horizontal" action="" >
+                            {% if form.non_field_errors %}
+                                 <div class="alert alert-danger">
+                                     {{ form.non_field_errors }}
+                                 </div>
+                            {% endif %}
                             {% csrf_token %}
                             <h3>{% trans 'Basic' %}</h3>
                             {% bootstrap_field form.name layout="horizontal" %}

apps/terminal/migrations/0014_auto_20181226_1441.py

+# Generated by Django 2.1 on 2018-12-26 06:41
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('terminal', '0013_auto_20181123_1113'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='session',
+            name='protocol',
+            field=models.CharField(choices=[('ssh', 'ssh'), ('rdp', 'rdp'), ('vnc', 'vnc')], default='ssh', max_length=8),
+        ),
+    ]

apps/terminal/models.py

@@ -132,7 +132,8 @@ class Session(OrgModelMixin):
     )
     PROTOCOL_CHOICES = (
         ('ssh', 'ssh'),
-        ('rdp', 'rdp')
+        ('rdp', 'rdp'),
+        ('vnc', 'vnc')
     )
 
     id = models.UUIDField(default=uuid.uuid4, primary_key=True)