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

apps/assets/models/node.py

@@ -203,17 +203,14 @@ class Node(OrgModelMixin):
         # 如果使用current_org 在set_current_org时会死循环
         _current_org = get_current_org()
         with transaction.atomic():
-            if _current_org.is_root():
-                key = '0'
-            elif _current_org.is_default():
-                key = '1'
-            else:
-                set_current_org(Organization.root())
-                org_nodes_roots = cls.objects.filter(key__regex=r'^[0-9]+$')
-                org_nodes_roots_keys = org_nodes_roots.values_list('key', flat=True) or ['1']
-                key = max([int(k) for k in org_nodes_roots_keys])
-                key = str(key + 1) if key != 0 else '2'
-                set_current_org(_current_org)
+            if not _current_org.is_real():
+                return cls.default_node()
+            set_current_org(Organization.root())
+            org_nodes_roots = cls.objects.filter(key__regex=r'^[0-9]+$')
+            org_nodes_roots_keys = org_nodes_roots.values_list('key', flat=True) or ['1']
+            key = max([int(k) for k in org_nodes_roots_keys])
+            key = str(key + 1) if key != 0 else '2'
+            set_current_org(_current_org)
             root = cls.objects.create(key=key, value=_current_org.name)
             return root
 

apps/assets/templates/assets/label_create_update.html

@@ -35,7 +35,7 @@ $(document).ready(function () {
 })
 .on('click', '#btn_asset_modal_confirm', function () {
     var assets = asset_table2.selected;
-    $('.select2').val(assets).trigger('change');
+    $('#id_assets').val(assets).trigger('change');
     $("#asset_list_modal").modal('hide');
 })
 </script>

apps/ops/ansible/callback.py

 # ~*~ coding: utf-8 ~*~
 
 import datetime
+import json
 from collections import defaultdict
 
 from ansible import constants as C
@@ -163,6 +164,28 @@ class CommandResultCallback(AdHocResultCallback):
         self._play = play
         self._display.banner(msg)
 
+    def v2_runner_on_unreachable(self, result):
+        self.results_summary['success'] = False
+        self.gather_result("unreachable", result)
+        msg = result._result.get("msg")
+        if not msg:
+            msg = json.dumps(result._result, indent=4)
+        self._display.display("%s | FAILED! => \n%s" % (
+            result._host.get_name(),
+            msg,
+        ), color=C.COLOR_ERROR)
+
+    def v2_runner_on_failed(self, result, ignore_errors=False):
+        self.results_summary['success'] = False
+        self.gather_result("failed", result)
+        msg = result._result.get("msg") or result._result.get("module_stdout")
+        if not msg:
+            msg = json.dumps(result._result, indent=4)
+        self._display.display("%s | FAILED! => \n%s" % (
+            result._host.get_name(),
+            msg,
+        ), color=C.COLOR_ERROR)
+
     def _print_task_banner(self, task):
         pass
 

apps/ops/templates/ops/command_execution_create.html

@@ -11,6 +11,10 @@
     <script src="{% static 'js/plugins/xterm/xterm.js' %}"></script>
     <link rel="stylesheet" href="{% static 'js/plugins/xterm/xterm.css' %}" />
     <script src="{% static 'js/plugins/xterm/addons/fit/fit.js' %}"></script>
+    <script src="{% static 'js/plugins/codemirror/codemirror.js' %}"></script>
+    <script src="{% static 'js/plugins/codemirror/mode/shell/shell.js' %}"></script>
+    <link href="{% static 'css/plugins/codemirror/codemirror.css' %}" rel="stylesheet">
+    <link href="{% static 'css/plugins/codemirror/ambiance.css' %}" rel="stylesheet">
     <link href="{% static 'css/plugins/select2/select2.min.css' %}" rel="stylesheet">
     <script src="{% static 'js/plugins/select2/select2.full.min.js' %}"></script>
 	<style type="text/css">
@@ -51,24 +55,22 @@
                        <div id="term" style="height: 100%;width: 100%"></div>
                    </div>
                    <div class="row">
+                       <div class="col-lg-10">
+                       <div class="input-group" style="height: 100%; width: 100%">
+                           <textarea class="form-control" id="command-text"></textarea>
+                       </div>
+                       </div>
                        <div class="col-lg-2">
-                       <select class="select2 form-control" id="system-users-select">
-                           {% for s in system_users %}
+                            <select class="select2 form-control" id="system-users-select">
+                            {% for s in system_users %}
                                {% if s.protocol == 'ssh' and s.login_mode == 'auto' %}
                                    <option value="{{ s.id }}">{{ s }}</option>
                                {% endif %}
-                           {% endfor %}
-                       </select>
-                   </div>
-                   <div class="col-lg-10">
-                       <div class="input-group" style="height: 100%">
-                           <input type="text" id="command-text" class="form-control">
-                           <span class="input-group-btn">
-                              <button type="button" class="btn btn-primary btn-execute">{% trans 'Go' %}</button>
-                           </span>
+                            {% endfor %}
+                            </select>
+                           <button type="button" class="btn btn-primary btn-execute" style="margin-top: 30px; width: 100%">{% trans 'Go' %}</button>
                        </div>
                    </div>
-                   </div>
                 </form>
            </div>
        </div>
@@ -186,7 +188,7 @@ function execute() {
     }
     var url = '{% url "api-ops:command-execution-list" %}';
     var run_as = systemUserId;
-    var command = $("#command-text").val();
+    var command = editor.getValue();
     var hosts = getSelectedAssetsNode().map(function (node) {
         return node.id;
     });
@@ -242,6 +244,7 @@ function execute() {
     return false;
 }
 
+var editor;
 $(document).ready(function(){
     systemUserId = $('#system-users-select').val();
     $(".select2").select2().on('select2:select', function(evt) {
@@ -249,6 +252,19 @@ $(document).ready(function(){
          systemUserId = data.id;
          initTree();
     });
+    editor = CodeMirror.fromTextArea(document.getElementById("command-text"), {
+        lineNumbers: true,
+        lineWrapping: true,
+        mode: "shell"
+    });
+    editor.setSize(600, 100);
+    var charWidth = editor.defaultCharWidth(), basePadding = 4;
+    editor.on("renderLine", function(cm, line, elt) {
+        var off = CodeMirror.countColumn(line.text, null, cm.getOption("tabSize")) * charWidth;
+        elt.style.textIndent = "-" + off + "px";
+        elt.style.paddingLeft = (basePadding + off) + "px";
+    });
+    editor.refresh();
     initTree();
     initResultTerminal();
 }).on('click', '.btn-execute', function () {

apps/perms/templates/perms/asset_permission_create_update.html

@@ -54,9 +54,15 @@
                                 <div class="col-sm-9">
                                     <div class="input-daterange input-group" id="datepicker">
                                         <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                                        <input type="text" class="input-sm form-control" id="date_start" name="date_start" value="{{ form.date_start.value|date:'Y-m-d H:i' }}">
-                                        <span class="input-group-addon">to</span>
-                                        <input type="text" class="input-sm form-control" id="date_expired" name="date_expired" value="{{ form.date_expired.value|date:'Y-m-d H:i' }}">
+                                        {% if form.errors %}
+                                            <input type="text" class="input-sm form-control" id="date_start" name="date_start" value="{{ form.date_start.value }}">
+                                            <span class="input-group-addon">to</span>
+                                            <input type="text" class="input-sm form-control" id="date_expired" name="date_expired" value="{{ form.date_expired.value }}">
+                                        {% else %}
+                                            <input type="text" class="input-sm form-control" id="date_start" name="date_start" value="{{ form.date_start.value|date:'Y-m-d H:i' }}">
+                                            <span class="input-group-addon">to</span>
+                                            <input type="text" class="input-sm form-control" id="date_expired" name="date_expired" value="{{ form.date_expired.value|date:'Y-m-d H:i' }}">
+                                        {% endif %}
                                     </div>
                                     <span class="help-block ">{{ form.date_expired.errors }}</span>
                                     <span class="help-block ">{{ form.date_start.errors }}</span>
@@ -113,7 +119,7 @@ $(document).ready(function () {
 .on('click', '#btn_asset_modal_confirm', function () {
     var assets = asset_table2.selected;
 
-    $('.select2').val(assets).trigger('change');
+    $('#id_assets').val(assets).trigger('change');
 
     $("#asset_list_modal").modal('hide');
 });

apps/users/forms.py

@@ -131,6 +131,10 @@ class UserCreateUpdateForm(OrgModelForm):
 
 
 class UserProfileForm(forms.ModelForm):
+    username = forms.CharField(disabled=True)
+    name = forms.CharField(disabled=True)
+    email = forms.CharField(disabled=True)
+
     class Meta:
         model = User
         fields = [

apps/users/models/user.py

@@ -260,8 +260,6 @@ class User(AbstractUser):
             self.role = 'Admin'
             self.is_active = True
         super().save(*args, **kwargs)
-        if current_org and current_org.is_real():
-            self.orgs.add(current_org.id)
 
     @property
     def private_token(self):

apps/users/templates/users/_user.html

@@ -30,7 +30,11 @@
             <div class="col-sm-9">
                 <div class="input-group date">
                     <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                    <input id="{{ form.date_expired.id_for_label }}" name="{{ form.date_expired.html_name }}" type="text" class="form-control" value="{{ form.date_expired.value|date:'Y-m-d H:i' }}">
+                    {% if form.errors %}
+                    <input id="{{ form.date_expired.id_for_label }}" name="{{ form.date_expired.html_name }}" type="text" class="form-control"  value="{{ form.date_expired.value }}">
+                    {% else %}
+                    <input id="{{ form.date_expired.id_for_label }}" name="{{ form.date_expired.html_name }}" type="text" class="form-control"  value="{{ form.date_expired.value|date:'Y-m-d H:i' }}">
+                    {% endif %}
                 </div>
                 <span class="help-block ">{{ form.date_expired.errors }}</span>
             </div>

apps/users/views/user.py

@@ -87,6 +87,8 @@ class UserCreateView(AdminUserRequiredMixin, SuccessMessageMixin, CreateView):
         user = form.save(commit=False)
         user.created_by = self.request.user.username or 'System'
         user.save()
+        if current_org and current_org.is_real():
+            user.orgs.add(current_org.id)
         post_user_create.send(self.__class__, user=user)
         return super().form_valid(form)
 

requirements/alpine_requirements.txt

+tiff-dev jpeg-dev zlib-dev freetype-dev lcms-dev libwebp-dev tcl-dev tk-dev python3-dev libressl-dev openldap-dev cyrus-sasl-dev krb5-dev sshpass postgresql-dev mariadb-dev sqlite-dev libffi-dev openssh-client