[Update] 改密支持windows

apps/assets/api/asset.py

@@ -16,7 +16,7 @@ from django.urls import reverse_lazy
 from django.core.cache import cache
 from django.db.models import Q
 
-from common.mixins import IDInCacheFilterMixin
+from common.mixins import IDInCacheFilterMixin, ApiMessageMixin
 
 from common.utils import get_logger, get_object_or_none
 from common.permissions import IsOrgAdmin, IsOrgAdminOrAppUser
@@ -36,7 +36,7 @@ __all__ = [
 ]
 
 
-class AssetViewSet(IDInCacheFilterMixin, LabelFilter, BulkModelViewSet):
+class AssetViewSet(IDInCacheFilterMixin, LabelFilter, ApiMessageMixin, BulkModelViewSet):
     """
     API endpoint that allows Asset to be viewed or edited.
     """
@@ -47,6 +47,7 @@ class AssetViewSet(IDInCacheFilterMixin, LabelFilter, BulkModelViewSet):
     serializer_class = serializers.AssetSerializer
     pagination_class = LimitOffsetPagination
     permission_classes = (IsOrgAdminOrAppUser,)
+    success_message = _("%(hostname)s was %(action)s successfully")
 
     def set_assets_node(self, assets):
         if not isinstance(assets, list):

apps/assets/forms/asset.py

@@ -6,21 +6,39 @@ from django.utils.translation import gettext_lazy as _
 from common.utils import get_logger
 from orgs.mixins import OrgModelForm
 
-from ..models import Asset, AdminUser
+from ..models import Asset, AdminUser, Protocol
 
 
 logger = get_logger(__file__)
-__all__ = ['AssetCreateForm', 'AssetUpdateForm', 'AssetBulkUpdateForm']
+__all__ = [
+    'AssetCreateForm', 'AssetUpdateForm', 'AssetBulkUpdateForm',
+    'ProtocolForm'
+]
+
+
+class ProtocolForm(forms.ModelForm):
+    class Meta:
+        model = Protocol
+        fields = ['name', 'port']
+        widgets = {
+            'name': forms.Select(attrs={
+                'class': 'form-control protocol-name'
+            }),
+            'port': forms.TextInput(attrs={
+                'class': 'form-control protocol-port'
+            }),
+        }
 
 
 class AssetCreateForm(OrgModelForm):
+    PROTOCOL_CHOICES = Protocol.PROTOCOL_CHOICES
+
     class Meta:
         model = Asset
         fields = [
-            'hostname', 'ip', 'public_ip', 'port',  'comment',
+            'hostname', 'ip', 'public_ip', 'protocols', 'comment',
             'nodes', 'is_active', 'admin_user', 'labels', 'platform',
-            'domain', 'protocol',
-
+            'domain',
         ]
         widgets = {
             'nodes': forms.SelectMultiple(attrs={
@@ -32,7 +50,6 @@ class AssetCreateForm(OrgModelForm):
             'labels': forms.SelectMultiple(attrs={
                 'class': 'select2', 'data-placeholder': _('Label')
             }),
-            'port': forms.TextInput(),
             'domain': forms.Select(attrs={
                 'class': 'select2', 'data-placeholder': _('Domain')
             }),
@@ -54,9 +71,9 @@ class AssetUpdateForm(OrgModelForm):
     class Meta:
         model = Asset
         fields = [
-            'hostname', 'ip', 'port', 'nodes',  'is_active', 'platform',
+            'hostname', 'ip', 'protocols', 'nodes',  'is_active', 'platform',
             'public_ip', 'number', 'comment', 'admin_user', 'labels',
-            'domain', 'protocol',
+            'domain',
         ]
         widgets = {
             'nodes': forms.SelectMultiple(attrs={
@@ -68,7 +85,6 @@ class AssetUpdateForm(OrgModelForm):
             'labels': forms.SelectMultiple(attrs={
                 'class': 'select2', 'data-placeholder': _('Label')
             }),
-            'port': forms.TextInput(),
             'domain': forms.Select(attrs={
                 'class': 'select2', 'data-placeholder': _('Domain')
             }),
@@ -101,8 +117,8 @@ class AssetBulkUpdateForm(OrgModelForm):
     class Meta:
         model = Asset
         fields = [
-            'assets', 'port',  'admin_user', 'labels', 'platform',
-            'protocol', 'domain',
+            'assets', 'admin_user', 'labels', 'platform',
+            'domain',
         ]
         widgets = {
             'labels': forms.SelectMultiple(

apps/assets/migrations/0027_auto_20190521_1703.py

@@ -15,4 +15,9 @@ class Migration(migrations.Migration):
             name='ip',
             field=models.CharField(db_index=True, max_length=128, verbose_name='IP'),
         ),
+        migrations.AlterField(
+            model_name='asset',
+            name='public_ip',
+            field=models.CharField(blank=True, max_length=128, null=True, verbose_name='Public IP'),
+        ),
     ]

apps/assets/migrations/0028_protocol.py

+# Generated by Django 2.1.7 on 2019-05-22 02:58
+
+import django.core.validators
+from django.db import migrations, models
+import uuid
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('assets', '0027_auto_20190521_1703'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Protocol',
+            fields=[
+                ('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False)),
+                ('name', models.CharField(choices=[('ssh', 'ssh'), ('rdp', 'rdp'), ('telnet', 'telnet (beta)'), ('vnc', 'vnc')], default='ssh', max_length=16, verbose_name='Name')),
+                ('port', models.IntegerField(default=22, validators=[django.core.validators.MaxValueValidator(65535), django.core.validators.MinValueValidator(1)], verbose_name='Port')),
+            ],
+        ),
+        migrations.AddField(
+            model_name='asset',
+            name='protocols',
+            field=models.ManyToManyField(to='assets.Protocol',
+                                         verbose_name='Protocol'),
+        ),
+    ]

apps/assets/migrations/0029_auto_20190522_1114.py

+# Generated by Django 2.1.7 on 2019-05-22 03:14
+
+from django.db import migrations
+
+
+def migrate_assets_protocol(apps, schema_editor):
+    asset_model = apps.get_model("assets", "Asset")
+    db_alias = schema_editor.connection.alias
+    assets = asset_model.objects.using(db_alias).all()
+    for asset in assets:
+        asset.protocols.create(name=asset.protocol, port=asset.port)
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('assets', '0028_protocol'),
+    ]
+
+    operations = [
+        migrations.RunPython(migrate_assets_protocol),
+    ]

apps/assets/models/__init__.py

@@ -8,4 +8,3 @@ from .asset import *
 from .cmd_filter import *
 from .utils import *
 from .authbook import *
-from applications.models.remote_app import *

apps/assets/models/asset.py

@@ -12,11 +12,12 @@ from django.db import models
 from django.db.models import Q
 from django.utils.translation import ugettext_lazy as _
 from django.core.cache import cache
+from django.core.validators import MinValueValidator, MaxValueValidator
 
 from .user import AdminUser, SystemUser
 from orgs.mixins import OrgModelMixin, OrgManager
 
-__all__ = ['Asset']
+__all__ = ['Asset', 'Protocol']
 logger = logging.getLogger(__name__)
 
 
@@ -47,6 +48,29 @@ class AssetQuerySet(models.QuerySet):
         return self.active()
 
 
+class Protocol(models.Model):
+    PROTOCOL_SSH = 'ssh'
+    PROTOCOL_RDP = 'rdp'
+    PROTOCOL_TELNET = 'telnet'
+    PROTOCOL_VNC = 'vnc'
+    PROTOCOL_CHOICES = (
+        (PROTOCOL_SSH, 'ssh'),
+        (PROTOCOL_RDP, 'rdp'),
+        (PROTOCOL_TELNET, 'telnet (beta)'),
+        (PROTOCOL_VNC, 'vnc'),
+    )
+    PORT_VALIDATORS = [MaxValueValidator(65535), MinValueValidator(1)]
+
+    id = models.UUIDField(default=uuid.uuid4, primary_key=True)
+    name = models.CharField(max_length=16, choices=PROTOCOL_CHOICES,
+                            default=PROTOCOL_SSH, verbose_name=_("Name"))
+    port = models.IntegerField(default=22, verbose_name=_("Port"),
+                               validators=PORT_VALIDATORS)
+
+    def __str__(self):
+        return "{}:{}".format(self.name, self.port)
+
+
 class Asset(OrgModelMixin):
     # Important
     PLATFORM_CHOICES = (
@@ -59,22 +83,15 @@ class Asset(OrgModelMixin):
         ('Other', 'Other'),
     )
 
-    PROTOCOL_SSH = 'ssh'
-    PROTOCOL_RDP = 'rdp'
-    PROTOCOL_TELNET = 'telnet'
-    PROTOCOL_VNC = 'vnc'
-    PROTOCOL_CHOICES = (
-        (PROTOCOL_SSH, 'ssh'),
-        (PROTOCOL_RDP, 'rdp'),
-        (PROTOCOL_TELNET, 'telnet (beta)'),
-        (PROTOCOL_VNC, 'vnc'),
-    )
-
     id = models.UUIDField(default=uuid.uuid4, primary_key=True)
     ip = models.CharField(max_length=128, verbose_name=_('IP'), db_index=True)
     hostname = models.CharField(max_length=128, verbose_name=_('Hostname'))
-    protocol = models.CharField(max_length=128, default=PROTOCOL_SSH, choices=PROTOCOL_CHOICES, verbose_name=_('Protocol'))
+    protocol = models.CharField(max_length=128, default=Protocol.PROTOCOL_SSH,
+                                choices=Protocol.PROTOCOL_CHOICES,
+                                verbose_name=_('Protocol'))
     port = models.IntegerField(default=22, verbose_name=_('Port'))
+
+    protocols = models.ManyToManyField('Protocol', verbose_name=_("Protocol"))
     platform = models.CharField(max_length=128, choices=PLATFORM_CHOICES, default='Linux', verbose_name=_('Platform'))
     domain = models.ForeignKey("assets.Domain", null=True, blank=True, related_name='assets', verbose_name=_("Domain"), on_delete=models.SET_NULL)
     nodes = models.ManyToManyField('assets.Node', default=default_node, related_name='assets', verbose_name=_("Nodes"))
@@ -84,7 +101,7 @@ class Asset(OrgModelMixin):
     admin_user = models.ForeignKey('assets.AdminUser', on_delete=models.PROTECT, null=True, verbose_name=_("Admin user"))
 
     # Some information
-    public_ip = models.GenericIPAddressField(max_length=32, blank=True, null=True, verbose_name=_('Public IP'))
+    public_ip = models.CharField(max_length=128, blank=True, null=True, verbose_name=_('Public IP'))
     number = models.CharField(max_length=32, null=True, blank=True, verbose_name=_('Asset number'))
 
     # Collect

apps/assets/serializers/asset.py

 # -*- coding: utf-8 -*-
 #
 from rest_framework import serializers
+from rest_framework.validators import ValidationError
 
 from django.utils.translation import ugettext_lazy as _
 
 from orgs.mixins import OrgResourceSerializerMixin
 from common.mixins import BulkSerializerMixin
 from common.serializers import AdaptedBulkListSerializer
-from ..models import Asset
+from common.validators import ProjectUniqueValidator
+from ..models import Asset, Protocol
 from .system_user import AssetSystemUserSerializer
 
 __all__ = [
@@ -16,25 +18,32 @@ __all__ = [
 ]
 
 
-class AssetSerializer(BulkSerializerMixin, serializers.ModelSerializer, OrgResourceSerializerMixin):
+class ProtocolSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Protocol
+        fields = ["name", "port"]
+
+
+class AssetSerializer(BulkSerializerMixin, OrgResourceSerializerMixin, serializers.ModelSerializer):
+    protocols = ProtocolSerializer(many=True)
+
     """
     资产的数据结构
     """
     class Meta:
         model = Asset
         list_serializer_class = AdaptedBulkListSerializer
-        # validators = [] # 解决批量导入时unique_together字段校验失败
         fields = [
             'id', 'org_id', 'org_name', 'ip', 'hostname', 'protocol', 'port',
-            'platform', 'is_active', 'public_ip', 'domain', 'admin_user',
-            'nodes', 'labels', 'number', 'vendor', 'model', 'sn',
+            'protocols', 'platform', 'is_active', 'public_ip', 'domain',
+            'admin_user', 'nodes', 'labels', 'number', 'vendor', 'model', 'sn',
             'cpu_model', 'cpu_count', 'cpu_cores', 'cpu_vcpus', 'memory',
             'disk_total', 'disk_info', 'os', 'os_version', 'os_arch',
             'hostname_raw', 'comment', 'created_by', 'date_created',
             'hardware_info', 'connectivity'
         ]
         read_only_fields = (
-            'number', 'vendor', 'model', 'sn', 'cpu_model', 'cpu_count',
+            'vendor', 'model', 'sn', 'cpu_model', 'cpu_count',
             'cpu_cores', 'cpu_vcpus', 'memory', 'disk_total', 'disk_info',
             'os', 'os_version', 'os_arch', 'hostname_raw',
             'created_by', 'date_created',
@@ -43,7 +52,6 @@ class AssetSerializer(BulkSerializerMixin, serializers.ModelSerializer, OrgResou
             'hardware_info': {'label': _('Hardware info')},
             'connectivity': {'label': _('Connectivity')},
             'org_name': {'label': _('Org name')}
-
         }
 
     @classmethod
@@ -53,18 +61,64 @@ class AssetSerializer(BulkSerializerMixin, serializers.ModelSerializer, OrgResou
             .select_related('admin_user')
         return queryset
 
-    def get_field_names(self, declared_fields, info):
-        fields = super().get_field_names(declared_fields, info)
-        fields.extend([
-            'hardware_info', 'connectivity', 'org_name'
-        ])
-        return fields
+    @staticmethod
+    def validate_protocols(attr):
+        protocols_name = [i.get("name", "ssh") for i in attr]
+        errors = [{} for i in protocols_name]
+        for i, name in enumerate(protocols_name):
+            if name in protocols_name[:i]:
+                errors[i] = {"name": _("Protocol duplicate: {}").format(name)}
+        if any(errors):
+            raise ValidationError(errors)
+        return attr
+
+    def create(self, validated_data):
+        protocols_data = validated_data.pop("protocols")
+
+        # 兼容老的api
+        protocol = validated_data.get("protocol")
+        port = validated_data.get("port")
+        if not protocols_data and protocol and port:
+            protocols_data = [{"name": protocol, "port": port}]
+
+        if not protocol and not port and protocols_data:
+            validated_data["protocol"] = protocols_data[0]["name"]
+            validated_data["port"] = protocols_data[0]["port"]
+
+        protocols_serializer = ProtocolSerializer(data=protocols_data, many=True)
+        protocols_serializer.is_valid(raise_exception=True)
+        protocols = protocols_serializer.save()
+        instance = super().create(validated_data)
+        instance.protocols.set(protocols)
+        return instance
+
+    def update(self, instance, validated_data):
+        protocols_data = validated_data.pop("protocols")
+
+        # 兼容老的api
+        protocol = validated_data.get("protocol")
+        port = validated_data.get("port")
+        if not protocols_data and protocol and port:
+            protocols_data = [{"name": protocol, "port": port}]
+
+        if not protocol and not port and protocols_data:
+            validated_data["protocol"] = protocols_data[0]["name"]
+            validated_data["port"] = protocols_data[0]["port"]
+
+        protocols_serializer = ProtocolSerializer(data=protocols_data, many=True)
+        protocols_serializer.is_valid(raise_exception=True)
+        protocols = protocols_serializer.save()
+
+        instance = super().update(instance, validated_data)
+        instance.protocols.all().delete()
+        instance.protocols.set(protocols)
+        return instance
 
 
 class AssetAsNodeSerializer(serializers.ModelSerializer):
     class Meta:
         model = Asset
-        fields = ['id', 'hostname', 'ip', 'port', 'platform', 'protocol']
+        fields = ['id', 'hostname', 'ip', 'platform', 'protocols']
 
 
 class AssetGrantedSerializer(serializers.ModelSerializer):
@@ -78,9 +132,9 @@ class AssetGrantedSerializer(serializers.ModelSerializer):
     class Meta:
         model = Asset
         fields = (
-            "id", "hostname", "ip", "port", "system_users_granted",
+            "id", "hostname", "ip", "system_users_granted",
             "is_active", "system_users_join", "os", 'domain',
-            "platform", "comment", "protocol", "org_id", "org_name",
+            "platform", "comment", "protocols", "org_id", "org_name",
         )
 
     @staticmethod

apps/assets/signals_handler.py

@@ -5,6 +5,7 @@ from django.db.models.signals import post_save, m2m_changed, post_delete
 from django.dispatch import receiver
 
 from common.utils import get_logger
+from common.decorator import on_transaction_commit
 from .models import Asset, SystemUser, Node, AuthBook
 from .tasks import (
     update_assets_hardware_info_util,
@@ -32,9 +33,12 @@ def set_asset_root_node(asset):
 
 
 @receiver(post_save, sender=Asset, dispatch_uid="my_unique_identifier")
+@on_transaction_commit
 def on_asset_created_or_update(sender, instance=None, created=False, **kwargs):
     if created:
         logger.info("Asset `{}` create signal received".format(instance))
+
+        # 获取资产硬件信息
         update_asset_hardware_info_on_created(instance)
         test_asset_conn_on_created(instance)
 

apps/assets/templates/assets/asset_create.html

@@ -16,12 +16,24 @@
     <h3>{% trans 'Basic' %}</h3>
     {% bootstrap_field form.hostname layout="horizontal" %}
     {% bootstrap_field form.ip layout="horizontal" %}
-    {% bootstrap_field form.protocol layout="horizontal" %}
-    {% bootstrap_field form.port layout="horizontal" %}
     {% bootstrap_field form.platform layout="horizontal" %}
     {% bootstrap_field form.public_ip layout="horizontal" %}
     {% bootstrap_field form.domain layout="horizontal" %}
+    <div class="hr-line-dashed"></div>
 
+    <h3>{% trans 'Protocols' %}</h3>
+    <div class="protocols">
+        {% for fm in formset.forms %}
+        <div class="form-group">
+            <div class="col-md-2 col-md-offset-2" style="text-align: right">{{ fm.name }}</div>
+            <div class="col-md-6">{{ fm.port }}</div>
+            <div class="col-md-1" style="padding: 6px 0">
+                <a class="btn btn-danger btn-xs btn-protocol btn-del"><span class="fa fa-minus"></span> </a>
+                <a class="btn btn-primary btn-xs btn-protocol btn-add" style="display: none"><span class="fa fa-plus"></span></a>
+            </div>
+        </div>
+        {% endfor %}
+    </div>
     <div class="hr-line-dashed"></div>
     <h3>{% trans 'Auth' %}</h3>
     {% bootstrap_field form.admin_user layout="horizontal" %}
@@ -55,6 +67,8 @@
             {% endif %}
         </div>
     </div>
+    {% block extra %}
+    {% endblock %}
 
     <div class="hr-line-dashed"></div>
     <h3>{% trans 'Other' %}</h3>
@@ -73,11 +87,25 @@
 
 {% block custom_foot_js %}
 <script>
+var instanceId = "{{ object.id }}";
+var protocolLen = 0;
 function format(item) {
    var group = item.element.parentElement.label;
    return group + ':' + item.text;
 }
 
+function protocolBtnShow() {
+    $(".btn-protocol.btn-add").hide();
+    $(".btn-protocol.btn-add:last").show();
+    var btnDel = $(".btn-protocol.btn-del");
+    if (btnDel.length === 1) {
+        btnDel.addClass("disabled")
+    } else {
+        btnDel.removeClass("disabled")
+    }
+}
+
+
 $(document).ready(function () {
     $('.select2').select2({
         allowClear: true
@@ -89,20 +117,130 @@ $(document).ready(function () {
     $('#id_nodes.select2').select2({
         closeOnSelect: false
     });
-    $("#id_protocol").change(function (){
-        var protocol = $("#id_protocol option:selected").text();
-        var port = 22;
-        if(protocol === 'rdp'){
-            port = 3389;
-        }
-        else if(protocol === 'telnet (beta)'){
-            port = 23;
+    protocolBtnShow()
+})
+.on("change", "#id_platform", function () {
+    if (instanceId !== "") {
+        return
+    }
+    var platform = $(this).val();
+    var protocolRef = $(".protocols").find("select").first()
+    var protocol = protocolRef.val();
+
+    var protocolShould = "";
+    if (platform.startsWith("Windows")){
+        protocolShould = "rdp"
+    } else {
+        protocolShould = "ssh"
+    }
+    if (protocol !== protocolShould) {
+        protocolRef.val(protocolShould);
+        protocolRef.trigger("change")
+    }
+
+})
+.on("click", ".btn-protocol.btn-del", function () {
+    $(this).parent().parent().remove();
+    protocolBtnShow()
+})
+.on("click", ".btn-protocol.btn-add", function () {
+    var protocol = "";
+    var protocolsRef = $(".protocols");
+    var firstProtocolForm = protocolsRef.children().first();
+    var newProtocolForm = firstProtocolForm.clone();
+    var protocolChoices = $.map($(firstProtocolForm.find('select option')), function (option) {
+        return option.value
+    });
+    var protocolsSet = $.map(protocolsRef.find('select option:selected'), function(option) {
+        return option.value
+    });
+    for (var i=0;i<protocolChoices.length;i++) {
+        var p = protocolChoices[i];
+        if (protocolsSet.indexOf(p) === -1) {
+            protocol = p;
+            break
         }
-        else if(protocol === 'vnc'){
+    }
+    if (protocol === "") {
+        return
+    }
+    if (protocolLen === 0) {
+        protocolLen = protocolsRef.length;
+    }
+    var selectName = "form-" + protocolLen + "-name";
+    var selectId = "id_" + selectName;
+    var portName = "form-" + protocolLen + "-port";
+    var portId = "id_" + portName;
+    newProtocolForm.find("select").prop("name", selectName).prop("id", selectId);
+    newProtocolForm.find("input").prop("name", portName).prop("id", portId);
+    newProtocolForm.find("option[value='" + protocol + "']").attr("selected", true);
+    protocolsRef.append(newProtocolForm);
+    protocolLen += 1;
+    $("#" + selectId).trigger("change");
+    protocolBtnShow()
+})
+.on("change", ".protocol-name", function () {
+    var name = $(this).val();
+    var port = 22;
+    switch (name) {
+        case "ssh":
+            port = 22;
+            break;
+        case "rdp":
+            port = 3389;
+            break;
+        case "telnet":
+            port = 21;
+            break;
+        case "vnc":
             port = 5901;
-        }
-        $("#id_port").val(port);
-    });
+            break;
+        default:
+            port = 22;
+            break
+    }
+    $(this).parent().parent().find(".protocol-port").val(port);
 })
 </script>
+    {% block form_submit %}
+    <script>
+    $(document).ready(function () {
+    })
+    .on("submit", "form", function (evt) {
+        evt.preventDefault();
+        var the_url = '{% url 'api-assets:asset-list' %}';
+        var redirect_to = '{% url "assets:asset-list" %}';
+        var form = $("form");
+        var protocols = {};
+        var data = form.serializeObject();
+        $.each(data, function (k, v) {
+            if (k.startsWith("form")){
+                delete data[k];
+                var _k = k.split("-");
+                var formName = _k.slice(0, 2).join("-");
+                var key = _k[_k.length-1];
+                if (!protocols[formName]) {
+                    protocols[formName] = {}
+                }
+                protocols[formName][key] = v
+            }
+        });
+        protocols = $.map(protocols, function ( v) {
+            return v
+        });
+        data["protocols"] = protocols;
+        if (typeof data["nodes"] == "string") {
+            data["nodes"] = [data["nodes"]]
+        }
+        var props = {
+            url: the_url,
+            data: data,
+            method: "POST",
+            form: form,
+            redirect_to: redirect_to
+        };
+        formSubmit(props);
+     })
+    </script>
+    {% endblock %}
 {% endblock %}
\ No newline at end of file

apps/assets/templates/assets/asset_update.html

-{% extends '_base_create_update.html' %}
-{% load static %}
+{% extends 'assets/asset_create.html' %}
 {% load bootstrap3 %}
 {% load i18n %}
-{% load asset_tags %}
-{% load common_tags %}
-
-{% block custom_head_css_js_create %}
-    <link href="{% static "css/plugins/inputTags.css" %}" rel="stylesheet">
-    <script src="{% static "js/plugins/inputTags.jquery.min.js" %}"></script>
-{% endblock %}
-
-{% block form %}
-    <form action="" method="post" class="form-horizontal">
-    {% 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.hostname layout="horizontal" %}
-    {% bootstrap_field form.ip layout="horizontal" %}
-    {% bootstrap_field form.protocol layout="horizontal" %}
-    {% bootstrap_field form.port layout="horizontal" %}
-    {% bootstrap_field form.platform layout="horizontal" %}
-    {% bootstrap_field form.public_ip layout="horizontal" %}
-    {% bootstrap_field form.domain layout="horizontal" %}
-
-    <div class="hr-line-dashed"></div>
-    <h3>{% trans 'Auth' %}</h3>
-    {% bootstrap_field form.admin_user layout="horizontal" %}
-
-    <div class="hr-line-dashed"></div>
-    <h3>{% trans 'Node' %}</h3>
-    {% bootstrap_field form.nodes layout="horizontal" %}
-
-    <div class="hr-line-dashed"></div>
-    <h3>{% trans 'Labels' %}</h3>
-    <div class="form-group">
-        <label for="{{ form.labels.id_for_label }}" class="col-md-2 control-label">{% trans 'Label' %}</label>
-        <div class="col-md-9">
-            <select name="labels" class="select2 labels" data-placeholder="{% trans 'Label'  %}" style="width: 100%" multiple="" tabindex="4" id="{{ form.labels.id_for_label }}">
-                {% for name, labels in form.labels.field.queryset|group_labels %}
-                <optgroup label="{{ name }}">
-                    {% for label in labels %}
-                        {% if label in form.labels.initial %}
-                            <option value="{{ label.id }}" selected>{{ label.value }}</option>
-                        {% else %}
-                            <option value="{{ label.id }}">{{ label.value }}</option>
-                        {% endif %}
-                    {% endfor %}
-                </optgroup>
-                {% endfor %}
-            </select>
-        </div>
-    </div>
 
+{% block extra %}
     <div class="hr-line-dashed"></div>
     <h3>{% trans 'Configuration' %}</h3>
     {% bootstrap_field form.number layout="horizontal" %}
-
-    <div class="hr-line-dashed"></div>
-    <h3>{% trans 'Other' %}</h3>
-    {% bootstrap_field form.comment layout="horizontal" %}
-    {% bootstrap_field form.is_active layout="horizontal" %}
-
-    <div class="hr-line-dashed"></div>
-    <div class="form-group">
-        <div class="col-sm-4 col-sm-offset-2">
-            <button class="btn btn-white" type="reset">{% trans 'Reset' %}</button>
-            <button id="submit_button" class="btn btn-primary" type="submit">{% trans 'Submit' %}</button>
-        </div>
-    </div>
-
-</form>
 {% endblock %}
 
-{% block custom_foot_js %}
-    <script>
-    function format(item) {
-        var group = item.element.parentElement.label;
-        return group + ':' + item.text;
-    }
+{% block form_submit %}
+<script>
     $(document).ready(function () {
-        $('.select2').select2({
-            allowClear: true
-        });
-        $(".labels").select2({
-            allowClear: true,
-            templateSelection: format
-        });
     })
-    </script>
+    .on("submit", "form", function (evt) {
+    evt.preventDefault();
+    var the_url = '{% url 'api-assets:asset-detail' pk=object.id %}';
+    var redirect_to = '{% url "assets:asset-list" %}';
+    var form = $("form");
+    var protocols = {};
+    var data = form.serializeObject();
+    $.each(data, function (k, v) {
+        if (k.startsWith("form")){
+            delete data[k];
+            var _k = k.split("-");
+            var formName = _k.slice(0, 2).join("-");
+            var key = _k[_k.length-1];
+            if (!protocols[formName]) {
+                protocols[formName] = {}
+            }
+            protocols[formName][key] = v
+        }
+    });
+    protocols = $.map(protocols, function ( v) {
+        return v
+    });
+    data["protocols"] = protocols;
+    if (typeof data["nodes"] == "string") {
+        data["nodes"] = [data["nodes"]]
+    }
+    var props = {
+        url: the_url,
+        data: data,
+        method: "PUT",
+        form: form,
+        redirect_to: redirect_to
+    };
+    formSubmit(props);
+ });
+</script>
 {% endblock %}
\ No newline at end of file

apps/assets/views/asset.py

@@ -23,6 +23,7 @@ from django.utils import timezone
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.shortcuts import redirect
 from django.contrib.messages.views import SuccessMessageMixin
+from django.forms.formsets import formset_factory
 
 from common.mixins import JSONResponseMixin
 from common.utils import get_object_or_none, get_logger
@@ -30,8 +31,6 @@ from common.permissions import AdminUserRequiredMixin
 from common.const import (
     create_success_msg, update_success_msg, KEY_CACHE_RESOURCES_ID
 )
-from ..const import CACHE_KEY_ASSET_BULK_UPDATE_ID_PREFIX
-from orgs.utils import current_org
 from .. import forms
 from ..models import Asset, AdminUser, SystemUser, Label, Node, Domain
 
@@ -101,10 +100,30 @@ class AssetCreateView(AdminUserRequiredMixin, SuccessMessageMixin, CreateView):
         form["nodes"].initial = node
         return form
 
+    def get_protocol_formset(self):
+        ProtocolFormset = formset_factory(forms.ProtocolForm, extra=0, min_num=1, max_num=5)
+        if self.request.method == "POST":
+            formset = ProtocolFormset(self.request.POST)
+        else:
+            formset = ProtocolFormset()
+        return formset
+
+    def form_valid(self, form):
+        formset = self.get_protocol_formset()
+        valid = formset.is_valid()
+        if not valid:
+            return self.form_invalid(form)
+        protocols = formset.save()
+        instance = super().form_valid(form)
+        instance.protocols.set(protocols)
+        return instance
+
     def get_context_data(self, **kwargs):
+        formset = self.get_protocol_formset()
         context = {
             'app': _('Assets'),
             'action': _('Create asset'),
+            'formset': formset,
         }
         kwargs.update(context)
         return super().get_context_data(**kwargs)
@@ -159,10 +178,21 @@ class AssetUpdateView(AdminUserRequiredMixin, SuccessMessageMixin, UpdateView):
     template_name = 'assets/asset_update.html'
     success_url = reverse_lazy('assets:asset-list')
 
+    def get_protocol_formset(self):
+        ProtocolFormset = formset_factory(forms.ProtocolForm, extra=0, min_num=1, max_num=5)
+        if self.request.method == "POST":
+            formset = ProtocolFormset(self.request.POST)
+        else:
+            initial_data = [{"name": p.name, "port": p.port} for p in self.object.protocols.all()]
+            formset = ProtocolFormset(initial=initial_data)
+        return formset
+
     def get_context_data(self, **kwargs):
+        formset = self.get_protocol_formset()
         context = {
             'app': _('Assets'),
             'action': _('Update asset'),
+            'formset': formset,
         }
         kwargs.update(context)
         return super().get_context_data(**kwargs)

apps/common/decorator.py

+# -*- coding: utf-8 -*-
+#
+from django.db import transaction
+
+
+def on_transaction_commit(func):
+    """
+    如果不调用on_commit, 对象创建时添加多对多字段值失败
+    """
+    def inner(*args, **kwargs):
+        transaction.on_commit(lambda: func(*args, **kwargs))
+    return inner

apps/common/mixins.py

@@ -5,6 +5,7 @@ from django.http import JsonResponse
 from django.utils import timezone
 from django.core.cache import cache
 from django.utils.translation import ugettext_lazy as _
+from django.contrib import messages
 from rest_framework.utils import html
 from rest_framework.settings import api_settings
 from rest_framework.exceptions import ValidationError
@@ -203,3 +204,26 @@ class DatetimeSearchMixin:
     def get(self, request, *args, **kwargs):
         self.get_date_range()
         return super().get(request, *args, **kwargs)
+
+
+class ApiMessageMixin:
+    success_message = _("%(name)s was %(action)s successfully")
+    _action_map = {"create": _("create"), "update": _("update")}
+
+    def get_success_message(self, cleaned_data):
+        data = {k: v for k, v in cleaned_data.items()}
+        action = getattr(self, "action", "create")
+        data["action"] = self._action_map.get(action)
+        message = self.success_message % data
+        return message
+
+    def dispatch(self, request, *args, **kwargs):
+        resp = super().dispatch(request, *args, **kwargs)
+        if request.method.lower() in ("get", "delete"):
+            return resp
+        if resp.status_code >= 400:
+            return resp
+        message = self.get_success_message(resp.data)
+        if message:
+            messages.success(request, message)
+        return resp

apps/common/validators.py

@@ -3,5 +3,22 @@
 from django.core.validators import RegexValidator
 from django.utils.translation import ugettext_lazy as _
 
+from rest_framework.validators import (
+    UniqueTogetherValidator, ValidationError
+)
 
-alphanumeric = RegexValidator(r'^[0-9a-zA-Z_@\-\.]*$', _('Special char not allowed'))
+
\ No newline at end of file
+alphanumeric = RegexValidator(r'^[0-9a-zA-Z_@\-\.]*$', _('Special char not allowed'))
+
+
+class ProjectUniqueValidator(UniqueTogetherValidator):
+    def __call__(self, attrs):
+        try:
+            super().__call__(attrs)
+        except ValidationError as e:
+            errors = {}
+            for field in self.fields:
+                if field == "org_id":
+                    continue
+                errors[field] = _('This field must be unique.')
+            raise ValidationError(errors)

apps/jumpserver/conf.py

@@ -274,7 +274,10 @@ class Config(dict):
             return v
         tp = type(default_value)
         try:
-            v = tp(v)
+            if tp in [list, dict]:
+                v = json.loads(v)
+            else:
+                v = tp(v)
         except Exception:
             pass
         return v

apps/orgs/mixins.py

@@ -9,8 +9,10 @@ from django.forms import ModelForm
 from django.http.response import HttpResponseForbidden
 from django.core.exceptions import ValidationError
 from rest_framework import serializers
+from rest_framework.validators import UniqueTogetherValidator
 
 from common.utils import get_logger
+from common.validators import ProjectUniqueValidator
 from .utils import (
     current_org, set_current_org, set_to_root_org, get_current_org_id
 )
@@ -214,3 +216,14 @@ class OrgResourceSerializerMixin(serializers.Serializer):
     (同时为serializer.is_valid()对Model的unique_together校验做准备)
     """
     org_id = serializers.HiddenField(default=get_current_org_id)
+
+    def get_validators(self):
+        _validators = super().get_validators()
+        validators = []
+
+        for v in _validators:
+            if isinstance(v, UniqueTogetherValidator) \
+                    and "org_id" in v.fields:
+                v = ProjectUniqueValidator(v.queryset, v.fields)
+            validators.append(v)
+        return validators

apps/perms/hands.py

@@ -3,11 +3,12 @@
 
 from common.permissions import AdminUserRequiredMixin
 from users.models import User, UserGroup
-from assets.models import Asset, SystemUser, Node, RemoteApp
+from assets.models import Asset, SystemUser, Node
 from assets.serializers import (
     AssetGrantedSerializer, NodeSerializer
 )
 from applications.serializers import RemoteAppSerializer
+from applications.models import RemoteApp
 
 
 

apps/perms/views/remote_app_permission.py

@@ -11,9 +11,8 @@ from django.conf import settings
 
 from common.permissions import AdminUserRequiredMixin
 from orgs.utils import current_org
-from users.models import UserGroup
-from assets.models import RemoteApp
 
+from ..hands import RemoteApp, UserGroup
 from ..models import RemoteAppPermission
 from ..forms import RemoteAppPermissionCreateUpdateForm
 

apps/static/css/jumpserver.css

@@ -453,4 +453,16 @@ div.dataTables_wrapper div.dataTables_filter {
 
 #tree-refresh .fa-refresh {
     font: normal normal normal 14px/1 FontAwesome !important;
-}
+}
\ No newline at end of file
+
+.select2-selection__rendered span.select2-selection, .select2-container .select2-selection--single, .select2-selection__arrow {
+    height: 34px !important;
+}
+
+.select2-selection {
+    border-radius: 0 !important;
+}
+
+span.select2-selection__placeholder {
+    line-height: 34px !important;
+}

apps/static/js/jumpserver.js

@@ -165,11 +165,13 @@ function formSubmit(props) {
     /*
     {
       "form": $("form"),
+      "data": {},
       "url": "",
       "method": "POST",
       "redirect_to": "",
       "success": function(data, textStatue, jqXHR){},
-      "error": function(jqXHR, textStatus, errorThrown) {}
+      "error": function(jqXHR, textStatus, errorThrown) {},
+      "message": "",
     }
     */
     props = props || {};
@@ -183,6 +185,10 @@ function formSubmit(props) {
         dataType: props.data_type || "json"
     }).done(function (data, textState, jqXHR) {
         if (redirect_to) {
+            if (props.message) {
+                var messages="ed65330a45559c87345a0eb6ac7812d18d0d8976$[[\"__json_message\"\0540\05425\054\"asdfasdf \\u521b\\u5efa\\u6210\\u529f\"]]"
+                setCookie("messages", messages)
+            }
             location.href = redirect_to;
         } else if (typeof props.success === 'function') {
             return props.success(data, textState, jqXHR);
@@ -230,7 +236,15 @@ function formSubmit(props) {
                     var help_msg = v.join("<br/>") ;
                     helpBlockRef.html(help_msg);
                 } else {
-                    noneFieldErrorMsg += v + '<br/>';
+                    $.each(v, function (kk, vv) {
+                        if (typeof errors === "object") {
+                            $.each(vv, function (kkk, vvv) {
+                                noneFieldErrorMsg += " " + vvv + '<br/>';
+                            })
+                        } else{
+                            noneFieldErrorMsg += vv + '<br/>';
+                        }
+                    })
                 }
             });
             if (noneFieldErrorRef.length === 1 && noneFieldErrorMsg !== '') {