Merge remote-tracking branch 'origin/dev' into dev

apps/assets/forms/asset.py

@@ -103,10 +103,10 @@ class AssetBulkUpdateForm(forms.ModelForm):
         ]
         widgets = {
             'labels': forms.SelectMultiple(
-                attrs={'class': 'select2', 'data-placeholder': _('Labels')}
+                attrs={'class': 'select2', 'data-placeholder': _('Select labels')}
             ),
             'nodes': forms.SelectMultiple(
-                attrs={'class': 'select2', 'data-placeholder': _('Nodes')}
+                attrs={'class': 'select2', 'data-placeholder': _('Select nodes')}
             ),
         }
 

apps/assets/templates/assets/admin_user_detail.html

@@ -80,7 +80,7 @@
                         <div class="col-sm-4" style="padding-left: 0;padding-right: 0">
                             <div class="panel panel-primary">
                                 <div class="panel-heading">
-                                    <i class="fa fa-info-circle"></i> {% trans 'Replace assets admin user with this' %}
+                                    <i class="fa fa-info-circle"></i> {% trans 'Replace node assets admin user with this' %}
                                 </div>
                                 <div class="panel-body">
                                     <table class="table group_edit" id="table-clusters">
@@ -88,7 +88,7 @@
                                         <form>
                                             <tr>
                                                 <td colspan="2" class="no-borders">
-                                                    <select data-placeholder="{% trans 'Nodes' %}"  id="nodes_selected"  class="select2" style="width: 100%" multiple="" tabindex="4">
+                                                    <select data-placeholder="{% trans 'Select nodes' %}"  id="nodes_selected"  class="select2" style="width: 100%" multiple="" tabindex="4">
                                                         {% for node in nodes %}
                                                         <option value="{{ node.id }}" id="opt_{{ node.id }}" >{{ node.value }}</option>
                                                         {% endfor %}

apps/assets/templates/assets/asset_list.html

@@ -50,7 +50,7 @@
        <div class="col-lg-9 animated fadeInRight" id="split-right">
            <div class="tree-toggle">
                <div class="btn btn-sm btn-primary tree-toggle-btn" onclick="toggle()">
-                   <i class="fa fa-angle-left fa-2x" id="toggle-icon"></i>
+                   <i class="fa fa-angle-left fa-x" id="toggle-icon"></i>
                </div>
            </div>
                <div class="mail-box-header">
@@ -348,12 +348,12 @@ function toggle() {
     if (show === 0) {
         $("#split-left").hide(500, function () {
             $("#split-right").attr("class", "col-lg-12");
-            $("#toggle-icon").attr("class", "fa fa-angle-right fa-2x");
+            $("#toggle-icon").attr("class", "fa fa-angle-right fa-x");
             show = 1;
         });
     } else {
         $("#split-right").attr("class", "col-lg-9");
-        $("#toggle-icon").attr("class", "fa fa-angle-left fa-2x");
+        $("#toggle-icon").attr("class", "fa fa-angle-left fa-x");
         $("#split-left").show(500);
         show = 0;
     }

apps/common/api.py

@@ -9,7 +9,7 @@ from django.core.mail import get_connection, send_mail
 from django.utils.translation import ugettext_lazy as _
 from django.conf import settings
 
-from .permissions import IsSuperUser
+from .permissions import IsSuperUser, IsAppUser
 from .serializers import MailTestSerializer, LDAPTestSerializer
 
 
@@ -102,4 +102,3 @@ class DjangoSettingsAPI(APIView):
             if i.isupper():
                 configs[i] = str(getattr(settings, i))
         return Response(configs)
-

apps/common/forms.py

@@ -127,7 +127,8 @@ class LDAPSettingForm(BaseForm):
             "name": "sn",
             "email": "mail"
         }),
-        help_text=_("User attr map present how to map LDAP user attr to jumpserver, username,name,email is jumpserver attr")
+        help_text=_(
+            "User attr map present how to map LDAP user attr to jumpserver, username,name,email is jumpserver attr")
     )
     # AUTH_LDAP_GROUP_SEARCH_OU = CONFIG.AUTH_LDAP_GROUP_SEARCH_OU
     # AUTH_LDAP_GROUP_SEARCH_FILTER = CONFIG.AUTH_LDAP_GROUP_SEARCH_FILTER
@@ -160,3 +161,10 @@ class TerminalSettingForm(BaseForm):
             "You can set other storage and some terminal using"
         )
     )
+    TERMINAL_REPLAY_STORAGE = DictField(
+        label=_("Replay storage"), help_text=_(
+            "Set replay storage setting, `default` is the using as default,"
+            "You can set other storage and some terminal using"
+        )
+    )
+

apps/common/views.py

@@ -97,10 +97,12 @@ class TerminalSettingView(AdminUserRequiredMixin, TemplateView):
 
     def get_context_data(self, **kwargs):
         command_storage = settings.TERMINAL_COMMAND_STORAGE
+        replay_storage = settings.TERMINAL_REPLAY_STORAGE
         context = {
             'app': _('Settings'),
             'action': _('Terminal setting'),
             'form': self.form_class(),
+            'replay_storage': replay_storage,
             'command_storage': command_storage,
         }
         kwargs.update(context)
@@ -117,3 +119,4 @@ class TerminalSettingView(AdminUserRequiredMixin, TemplateView):
             context = self.get_context_data()
             context.update({"form": form})
             return render(request, self.template_name, context)
+

apps/jumpserver/settings.py

@@ -17,7 +17,6 @@ import ldap
 from django_auth_ldap.config import LDAPSearch
 from django.urls import reverse_lazy
 
-
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 PROJECT_DIR = os.path.dirname(BASE_DIR)
@@ -39,11 +38,9 @@ SECRET_KEY = CONFIG.SECRET_KEY
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = CONFIG.DEBUG or False
 
-
 # Absolute url for some case, for example email link
 SITE_URL = CONFIG.SITE_URL or 'http://localhost'
 
-
 # LOG LEVEL
 LOG_LEVEL = 'DEBUG' if DEBUG else CONFIG.LOG_LEVEL or 'WARNING'
 
@@ -114,7 +111,7 @@ LOGIN_URL = reverse_lazy('users:login')
 
 SESSION_COOKIE_DOMAIN = CONFIG.SESSION_COOKIE_DOMAIN or None
 CSRF_COOKIE_DOMAIN = CONFIG.CSRF_COOKIE_DOMAIN or None
-SESSION_COOKIE_AGE = CONFIG.SESSION_COOKIE_AGE or 3600*24
+SESSION_COOKIE_AGE = CONFIG.SESSION_COOKIE_AGE or 3600 * 24
 
 MESSAGE_STORAGE = 'django.contrib.messages.storage.cookie.CookieStorage'
 # Database
@@ -250,7 +247,6 @@ STATIC_URL = '/static/'
 STATIC_ROOT = os.path.join(PROJECT_DIR, "data", "static")
 STATIC_DIR = os.path.join(BASE_DIR, "static")
 
-
 STATICFILES_DIRS = (
     os.path.join(BASE_DIR, "static"),
 )
@@ -265,7 +261,7 @@ MEDIA_ROOT = os.path.join(PROJECT_DIR, 'data', 'media').replace('\\', '/') + '/'
 # BOOTSTRAP_COLUMN_COUNT = 11
 
 # Init data or generate fake data source for development
-FIXTURE_DIRS = [os.path.join(BASE_DIR, 'fixtures'),]
+FIXTURE_DIRS = [os.path.join(BASE_DIR, 'fixtures'), ]
 
 # Email config
 EMAIL_HOST = CONFIG.EMAIL_HOST
@@ -308,7 +304,6 @@ AUTHENTICATION_BACKENDS = [
 # Custom User Auth model
 AUTH_USER_MODEL = 'users.User'
 
-
 # Auth LDAP settings
 AUTH_LDAP = CONFIG.AUTH_LDAP
 AUTH_LDAP_SERVER_URI = CONFIG.AUTH_LDAP_SERVER_URI
@@ -319,7 +314,7 @@ AUTH_LDAP_SEARCH_FILTER = CONFIG.AUTH_LDAP_SEARCH_FILTER
 AUTH_LDAP_START_TLS = CONFIG.AUTH_LDAP_START_TLS
 AUTH_LDAP_USER_ATTR_MAP = CONFIG.AUTH_LDAP_USER_ATTR_MAP
 AUTH_LDAP_USER_SEARCH = LDAPSearch(
-   AUTH_LDAP_SEARCH_OU, ldap.SCOPE_SUBTREE, AUTH_LDAP_SEARCH_FILTER,
+    AUTH_LDAP_SEARCH_OU, ldap.SCOPE_SUBTREE, AUTH_LDAP_SEARCH_FILTER,
 )
 AUTH_LDAP_GROUP_SEARCH_OU = CONFIG.AUTH_LDAP_GROUP_SEARCH_OU
 AUTH_LDAP_GROUP_SEARCH_FILTER = CONFIG.AUTH_LDAP_GROUP_SEARCH_FILTER
@@ -332,7 +327,6 @@ AUTH_LDAP_BACKEND = 'django_auth_ldap.backend.LDAPBackend'
 if AUTH_LDAP:
     AUTHENTICATION_BACKENDS.insert(0, AUTH_LDAP_BACKEND)
 
-
 # Celery using redis as broker
 CELERY_BROKER_URL = 'redis://:%(password)s@%(host)s:%(port)s/3' % {
     'password': CONFIG.REDIS_PASSWORD if CONFIG.REDIS_PASSWORD else '',
@@ -354,7 +348,6 @@ CELERY_REDIRECT_STDOUTS = True
 CELERY_REDIRECT_STDOUTS_LEVEL = "INFO"
 CELERY_WORKER_HIJACK_ROOT_LOGGER = False
 
-
 # Cache use redis
 CACHES = {
     'default': {
@@ -387,6 +380,11 @@ TERMINAL_COMMAND_STORAGE = {
     # },
 }
 
+TERMINAL_REPLAY_STORAGE = {
+    "default": {
+        "TYPE": "server",
+    },
+}
 
 # Django bootstrap3 setting, more see http://django-bootstrap3.readthedocs.io/en/latest/settings.html
 BOOTSTRAP3 = {

apps/perms/templates/perms/asset_permission_list.html

@@ -49,7 +49,7 @@
        <div class="col-lg-9 animated fadeInRight" id="split-right">
            <div class="tree-toggle">
                <div class="btn btn-sm btn-primary tree-toggle-btn" onclick="toggle()">
-                   <i class="fa fa-angle-left fa-2x" id="toggle-icon"></i>
+                   <i class="fa fa-angle-left fa-x" id="toggle-icon"></i>
                </div>
            </div>
           <div class="mail-box-header">
@@ -200,12 +200,12 @@ function toggle() {
     if (show === 0) {
         $("#split-left").hide(500, function () {
             $("#split-right").attr("class", "col-lg-12");
-            $("#toggle-icon").attr("class", "fa fa-angle-right fa-2x");
+            $("#toggle-icon").attr("class", "fa fa-angle-right fa-x");
             show = 1;
         });
     } else {
         $("#split-right").attr("class", "col-lg-9");
-        $("#toggle-icon").attr("class", "fa fa-angle-left fa-2x");
+        $("#toggle-icon").attr("class", "fa fa-angle-left fa-x");
         $("#split-left").show(500);
         show = 0;
     }

apps/templates/base.html

@@ -17,8 +17,8 @@
     {% include '_left_side_bar.html' %}
     <div id="page-wrapper" class="gray-bg">
         {% include '_header_bar.html' %}
-        {% include '_message.html' %}
         {% block help_message %} {% endblock %}
+        {% include '_message.html' %}
         {% block content %}{% endblock %}
         {% include '_footer.html' %}
     </div>

apps/users/migrations/0001_initial.py

@@ -28,6 +28,9 @@ def add_default_admin(apps, schema_editor):
         email="admin@mycomany.com", role="Admin",
         password=make_password("admin"),
     )
+    group_model = apps.get_model("users", "UserGroup")
+    default_group = group_model.objects.using(db_alias).get(name="Default")
+    admin.groups.add(default_group)
 
 
 class Migration(migrations.Migration):