[Update] 修改小bug

apps/assets/forms/asset.py

@@ -41,9 +41,6 @@ class AssetCreateForm(OrgModelForm):
             'nodes': _("Node"),
         }
         help_texts = {
-            'hostname': '* required',
-            'ip': '* required',
-            'port': '* required',
             'admin_user': _(
                 'root or other NOPASSWD sudo privilege user existed in asset,'
                 'If asset is windows or other set any one, more see admin user left menu'
@@ -80,10 +77,6 @@ class AssetUpdateForm(OrgModelForm):
             'nodes': _("Node"),
         }
         help_texts = {
-            'hostname': '* required',
-            'ip': '* required',
-            'port': '* required',
-            'cluster': '* required',
             'admin_user': _(
                 'root or other NOPASSWD sudo privilege user existed in asset,'
                 'If asset is windows or other set any one, more see admin user left menu'
@@ -95,7 +88,7 @@ class AssetUpdateForm(OrgModelForm):
 
 class AssetBulkUpdateForm(OrgModelForm):
     assets = forms.ModelMultipleChoiceField(
-        required=True, help_text='* required',
+        required=True,
         label=_('Select assets'), queryset=Asset.objects.all(),
         widget=forms.SelectMultiple(
             attrs={

apps/assets/forms/domain.py

@@ -61,7 +61,3 @@ class GatewayForm(PasswordAndKeyAuthForm, OrgModelForm):
             'name': forms.TextInput(attrs={'placeholder': _('Name')}),
             'username': forms.TextInput(attrs={'placeholder': _('Username')}),
         }
-        help_texts = {
-            'name': '* required',
-            'username': '* required',
-        }

apps/assets/forms/user.py

@@ -80,10 +80,6 @@ class AdminUserForm(PasswordAndKeyAuthForm):
             'name': forms.TextInput(attrs={'placeholder': _('Name')}),
             'username': forms.TextInput(attrs={'placeholder': _('Username')}),
         }
-        help_texts = {
-            'name': '* required',
-            'username': '* required',
-        }
 
 
 class SystemUserForm(OrgModelForm, PasswordAndKeyAuthForm):
@@ -150,7 +146,6 @@ class SystemUserForm(OrgModelForm, PasswordAndKeyAuthForm):
             }),
         }
         help_texts = {
-            'name': '* required',
             'auto_push': _('Auto push system user to asset'),
             'priority': _('1-100, High level will be using login asset as default, '
                           'if user was granted more than 2 system user'),

apps/common/models.py

@@ -45,10 +45,10 @@ class Setting(models.Model):
     def cleaned_value(self):
         try:
             value = self.value
-            if not isinstance(value, (str, bytes)):
-                return value
             if self.encrypted:
                 value = signer.unsign(value)
+            if not value:
+                return None
             value = json.loads(value)
             return value
         except json.JSONDecodeError:

apps/common/templates/common/command_storage_create.html

@@ -41,7 +41,6 @@
                                 <label class="col-md-2 control-label" for="id_name">{% trans "Name" %}</label>
                                 <div class="col-md-9">
                                     <input id="id_name" class="form-control" type="text" name="NAME" value="">
-                                    <div class="help-block">* required</div>
                                     <div id="id_error" style="color: red;"></div>
                                 </div>
                             </div>

apps/common/templates/common/replay_storage_create.html

@@ -44,7 +44,6 @@
                                 <label class="col-md-2 control-label" for="id_name">{% trans "Name" %}</label>
                                 <div class="col-md-9">
                                     <input id="id_name" class="form-control" type="text" name="NAME" value="">
-                                    <div class="help-block">* required</div>
                                     <div id="id_error" style="color: red;"></div>
                                 </div>
                             </div>

apps/common/tree.py

@@ -49,7 +49,9 @@ class TreeNode:
             return False
         elif not self.isParent and other.isParent:
             return True
-        return self.id > other.id
+        if self.pId != other.pId:
+            return self.pId > other.pId
+        return self.name > other.name
 
     def __eq__(self, other):
         return self.id == other.id

apps/jumpserver/conf.py

@@ -316,7 +316,7 @@ defaults = {
     'EMAIL_SUFFIX': 'jumpserver.org',
     'TERMINAL_PASSWORD_AUTH': True,
     'TERMINAL_PUBLIC_KEY_AUTH': True,
-    'TERMINAL_HEARTBEAT_INTERVAL': 30,
+    'TERMINAL_HEARTBEAT_INTERVAL': 20,
     'TERMINAL_ASSET_LIST_SORT_BY': 'hostname',
     'TERMINAL_ASSET_LIST_PAGE_SIZE': 'auto',
     'TERMINAL_SESSION_KEEP_DURATION': 9999,

apps/jumpserver/settings.py

@@ -499,8 +499,9 @@ BOOTSTRAP3 = {
     # Field class to use in horizontal forms
     'horizontal_field_class': 'col-md-9',
     # Set placeholder attributes to label if no placeholder is provided
-    'set_placeholder': True,
+    'set_placeholder': False,
     'success_css_class': '',
+    'required_css_class': 'required',
 }
 
 TOKEN_EXPIRATION = CONFIG.TOKEN_EXPIRATION

apps/ops/models/adhoc.py

@@ -168,7 +168,10 @@ class AdHoc(models.Model):
 
     @property
     def tasks(self):
-        return json.loads(self._tasks)
+        try:
+            return json.loads(self._tasks)
+        except:
+            return []
 
     @tasks.setter
     def tasks(self, item):

apps/ops/templates/ops/adhoc_detail.html

@@ -186,6 +186,19 @@
             </div>
         </div>
     </div>
-    {% include 'users/_user_update_pk_modal.html' %}
+{% endblock %}
+{% block custom_foot_js %}
+<script>
+$(document).ready(function () {
+}).on('click', '.celery-task-log', function () {
+    var history_pk = "{{ object.latest_history.pk  }}";
+    if (!history_pk) {
+        alert("没有运行历史");
+        return
+    }
+    var url = '{% url 'ops:celery-task-log' pk=DEFAULT_PK %}'.replace('{{ DEFAULT_PK }}', history_pk);
+    window.open(url, '', 'width=800,height=600,left=400,top=400')
+})
+</script>
 {% endblock %}
 

apps/ops/templates/ops/adhoc_history_detail.html

@@ -19,7 +19,7 @@
                                 <a href="{% url 'ops:adhoc-history-detail' pk=object.pk %}" class="text-center"><i class="fa fa-laptop"></i> {% trans 'Run history detail' %} </a>
                             </li>
                             <li>
-                                <a class="text-center celery-task-log" onclick="window.open('{% url 'ops:celery-task-log' pk=object.pk %}','', 'width=800,height=600,left=400,top=400')"><i class="fa fa-laptop"></i> {% trans 'Output' %} </a>
+                                <a class="text-center celery-task-log" ><i class="fa fa-laptop"></i> {% trans 'Output' %} </a>
                             </li>
                         </ul>
                     </div>
@@ -141,4 +141,14 @@
     </div>
     {% include 'users/_user_update_pk_modal.html' %}
 {% endblock %}
+{% block custom_foot_js %}
+<script>
+$(document).ready(function () {
+}).on('click', '.celery-task-log', function () {
+    var url = '{% url 'ops:celery-task-log' pk=object.pk %}';
+    window.open(url, '', 'width=800,height=600,left=400,top=400')
+})
+
+</script>
+{% endblock %}
 

apps/ops/templates/ops/task_adhoc.html

@@ -25,7 +25,7 @@
                                 <a href="{% url 'ops:task-history' pk=object.pk %}" class="text-center"><i class="fa fa-laptop"></i> {% trans 'Run history' %} </a>
                             </li>
                             <li>
-                                <a class="text-center celery-task-log" onclick="window.open('{% url 'ops:celery-task-log' pk=object.latest_history.pk %}','', 'width=800,height=600,left=400,top=400')"><i class="fa fa-laptop"></i> {% trans 'Last run output' %} </a>
+                                <a class="text-center celery-task-log" ><i class="fa fa-laptop"></i> {% trans 'Last run output' %} </a>
                             </li>
                         </ul>
                     </div>
@@ -78,52 +78,60 @@
 {% endblock %}
 
 {% block custom_foot_js %}
-    <script>
-        $(document).ready(function () {
-            var options = {
-                ele: $('#task-version-list-table'),
-                buttons: [],
-                order: [],
-                select: [],
-                columnDefs: [
-                    {targets: 1, createdCell: function (td, cellData, rowData) {
+<script>
+$(document).ready(function () {
+    var options = {
+        ele: $('#task-version-list-table'),
+        buttons: [],
+        order: [],
+        select: [],
+        columnDefs: [
+            {targets: 1, createdCell: function (td, cellData, rowData) {
 {#                        var detail_btn = '<a href="' + cellData + '</a>';#}
-                        $(td).html(cellData);
-                     }},
-                    {targets: 2, createdCell: function (td, cellData, rowData) {
-                        var dataLength = cellData.length;
-                        $(td).html(dataLength);
-                    }},
-                    {targets: 4, createdCell: function (td, cellData) {
-                        if (!cellData) {
-                            $(td).html("Admin")
-                        } else {
-                            $(td).html(cellData)
-                        }
-                    }},
-                    {targets: 5, createdCell: function (td, cellData, rowData) {
-                        if (!cellData) {
-                            $(td).html("")
-                        } else {
-                            $(td).html(cellData.user)
-                        }
-                    }},
-                    {targets: 6, createdCell: function (td, cellData) {
-                        var d = new Date(cellData);
-                        $(td).html(d.toLocaleString())
-                    }},
-                    {targets: 7, createdCell: function (td, cellData, rowData) {
-                       var detail_btn = '<a class="btn btn-xs btn-primary m-l-xs btn-run" href="{% url 'ops:adhoc-detail' pk=DEFAULT_PK %}">{% trans "Detail" %}</a>'.replace('{{ DEFAULT_PK }}', cellData);
-                       if (cellData) {
-                           $(td).html(detail_btn);
-                       }
-                    }}
-                ],
-                ajax_url: '{% url "api-ops:adhoc-list" %}?task={{ object.pk }}',
-                columns: [{data: function(){return ""}}, {data: "short_id" }, {data: "hosts"}, {data: "pattern"},
-                          {data: "run_as"}, {data: "become"}, {data: "date_created"}, {data: "id"}]
-            };
-            jumpserver.initDataTable(options);
-        })
-    </script>
+                $(td).html(cellData);
+             }},
+            {targets: 2, createdCell: function (td, cellData, rowData) {
+                var dataLength = cellData.length;
+                $(td).html(dataLength);
+            }},
+            {targets: 4, createdCell: function (td, cellData) {
+                if (!cellData) {
+                    $(td).html("Admin")
+                } else {
+                    $(td).html(cellData)
+                }
+            }},
+            {targets: 5, createdCell: function (td, cellData, rowData) {
+                if (!cellData) {
+                    $(td).html("")
+                } else {
+                    $(td).html(cellData.user)
+                }
+            }},
+            {targets: 6, createdCell: function (td, cellData) {
+                var d = new Date(cellData);
+                $(td).html(d.toLocaleString())
+            }},
+            {targets: 7, createdCell: function (td, cellData, rowData) {
+               var detail_btn = '<a class="btn btn-xs btn-primary m-l-xs btn-run" href="{% url 'ops:adhoc-detail' pk=DEFAULT_PK %}">{% trans "Detail" %}</a>'.replace('{{ DEFAULT_PK }}', cellData);
+               if (cellData) {
+                   $(td).html(detail_btn);
+               }
+            }}
+        ],
+        ajax_url: '{% url "api-ops:adhoc-list" %}?task={{ object.pk }}',
+        columns: [{data: function(){return ""}}, {data: "short_id" }, {data: "hosts"}, {data: "pattern"},
+                  {data: "run_as"}, {data: "become"}, {data: "date_created"}, {data: "id"}]
+    };
+    jumpserver.initDataTable(options);
+}).on('click', '.celery-task-log', function () {
+    var history_pk = "{{ object.latest_history.pk  }}";
+    if (!history_pk) {
+        alert("没有运行历史");
+        return
+    }
+    var url = '{% url 'ops:celery-task-log' pk=DEFAULT_PK %}'.replace('{{ DEFAULT_PK }}', history_pk);
+    window.open(url, '', 'width=800,height=600,left=400,top=400')
+})
+</script>
 {% endblock %}

apps/ops/templates/ops/task_detail.html

@@ -26,7 +26,7 @@
                                 <a href="{% url 'ops:task-history' pk=object.pk %}" class="text-center"><i class="fa fa-laptop"></i> {% trans 'Run history' %} </a>
                             </li>
                             <li>
-                                <a class="text-center celery-task-log" onclick="window.open("{% url 'ops:celery-task-log' pk=object.latest_history.pk %}",'', 'width=800,height=600,left=400,top=400')"><i class="fa fa-laptop"></i> {% trans 'Last run output' %} </a>
+                                <a class="text-center celery-task-log"><i class="fa fa-laptop"></i> {% trans 'Last run output' %} </a>
                             </li>
                         </ul>
                     </div>
@@ -165,4 +165,19 @@
         </div>
     </div>
 {% endblock %}
+{% block custom_foot_js %}
+<script>
+$(document).ready(function () {
+}).on('click', '.celery-task-log', function () {
+    var history_pk = "{{ object.latest_history.pk  }}";
+    if (!history_pk) {
+        alert("没有运行历史");
+        return
+    }
+    var url = '{% url 'ops:celery-task-log' pk=DEFAULT_PK %}'.replace('{{ DEFAULT_PK }}', history_pk);
+    window.open(url, '', 'width=800,height=600,left=400,top=400')
+})
+
+</script>
+{% endblock %}
 

apps/ops/templates/ops/task_history.html

@@ -25,7 +25,7 @@
                                 <a href="{% url 'ops:task-history' pk=object.pk %}" class="text-center"><i class="fa fa-laptop"></i> {% trans 'Run history' %} </a>
                             </li>
                             <li>
-                                <a class="text-center celery-task-log" onclick="window.open('{% url 'ops:celery-task-log' pk=object.latest_history.pk %}','', 'width=800,height=600,left=400,top=400')"><i class="fa fa-laptop"></i> {% trans 'Last run output' %} </a>
+                                <a class="text-center celery-task-log"><i class="fa fa-laptop"></i> {% trans 'Last run output' %} </a>
                             </li>
                         </ul>
                     </div>
@@ -148,6 +148,14 @@ function initTable() {
 
 $(document).ready(function () {
     initTable();
+}).on('click', '.celery-task-log', function () {
+    var history_pk = "{{ object.latest_history.pk  }}";
+    if (!history_pk) {
+        alert("没有运行历史");
+        return
+    }
+    var url = '{% url 'ops:celery-task-log' pk=DEFAULT_PK %}'.replace('{{ DEFAULT_PK }}', history_pk);
+    window.open(url, '', 'width=800,height=600,left=400,top=400')
 })
 
 </script>

apps/perms/utils.py

@@ -18,8 +18,7 @@ class GenerateTree:
             "asset_instance": set("system_user")
         }
         """
-        self.__all_nodes = Node.objects.all()
-        self.__node_asset_map = defaultdict(set)
+        self.__all_nodes = list(Node.objects.all())
         self.nodes = defaultdict(dict)
 
     def add_asset(self, asset, system_users):

apps/static/css/jumpserver.css

@@ -438,4 +438,7 @@ div.dataTables_wrapper div.dataTables_filter {
     white-space: nowrap;
 }
 
-
+.form-group .required .control-label:after {
+    content:"*";
+    color:red;
+}

apps/users/forms.py

@@ -63,11 +63,6 @@ class UserCreateUpdateForm(OrgModelForm):
             'username', 'name', 'email', 'groups', 'wechat',
             'phone', 'role', 'date_expired', 'comment', 'otp_level'
         ]
-        help_texts = {
-            'username': '* required',
-            'name': '* required',
-            'email': '* required',
-        }
         widgets = {
             'otp_level': forms.RadioSelect(),
             'groups': forms.SelectMultiple(
@@ -141,11 +136,6 @@ class UserProfileForm(forms.ModelForm):
             'username', 'name', 'email',
             'wechat', 'phone',
         ]
-        help_texts = {
-            'username': '* required',
-            'name': '* required',
-            'email': '* required',
-        }
 
 
 UserProfileForm.verbose_name = _("Profile")
@@ -263,7 +253,6 @@ UserPublicKeyForm.verbose_name = _("Public key")
 class UserBulkUpdateForm(OrgModelForm):
     users = forms.ModelMultipleChoiceField(
         required=True,
-        help_text='* required',
         label=_('Select users'),
         queryset=User.objects.all(),
         widget=forms.SelectMultiple(
@@ -346,9 +335,6 @@ class UserGroupForm(OrgModelForm):
         fields = [
             'name', 'users', 'comment',
         ]
-        help_texts = {
-            'name': '* required'
-        }
 
 
 class FileForm(forms.Form):

config_example.py

@@ -78,7 +78,7 @@ class Config:
     REDIS_HOST = '127.0.0.1'
     REDIS_PORT = 6379
     # REDIS_PASSWORD = ''
-    # REDIS_DB_CELERY_BROKER = 3
+    # REDIS_DB_CELERY = 3
     # REDIS_DB_CACHE = 4
 
     # Use OpenID authorization

requirements/deb_requirements.txt

@@ -1 +1 @@
-libtiff5-dev libjpeg8-dev zlib1g-dev libfreetype6-dev liblcms2-dev libwebp-dev tcl8.5-dev tk8.5-dev python-tk python-dev openssl libssl-dev libldap2-dev libsasl2-dev sqlite libkrb5-dev sshpass
+libtiff5-dev libjpeg8-dev zlib1g-dev libfreetype6-dev liblcms2-dev libwebp-dev tcl8.5-dev tk8.5-dev python-tk python-dev openssl libssl-dev libldap2-dev libsasl2-dev sqlite libkrb5-dev sshpass libmysqlclient-dev