[Feature] es support

apps/common/api.py

@@ -63,8 +63,6 @@ class LDAPTestingAPI(APIView):
             search_filter = serializer.validated_data["AUTH_LDAP_SEARCH_FILTER"]
             attr_map = serializer.validated_data["AUTH_LDAP_USER_ATTR_MAP"]
 
-            print(serializer.validated_data)
-
             try:
                 attr_map = json.loads(attr_map)
             except json.JSONDecodeError:
@@ -77,9 +75,6 @@ class LDAPTestingAPI(APIView):
             except Exception as e:
                 return Response({"error": str(e)}, status=401)
 
-            print(search_ou)
-            print(search_filter % ({"user": "*"}))
-            print(attr_map.values())
             ok = conn.search(search_ou, search_filter % ({"user": "*"}),
                              attributes=list(attr_map.values()))
             if not ok:

apps/common/fields.py

@@ -18,7 +18,6 @@ class DictField(forms.Field):
         # we don't need to handle that explicitly.
         if isinstance(value, six.string_types):
             try:
-                print(value)
                 value = json.loads(value)
                 return value
             except json.JSONDecodeError:

apps/common/forms.py

@@ -36,9 +36,9 @@ class BaseForm(forms.Form):
         for name, field in self.fields.items():
             db_value = getattr(db_settings, name).value
             django_value = getattr(settings, name) if hasattr(settings, name) else None
-            if db_value is not None:
+            if db_value is False or db_value:
                 field.initial = to_form_value(db_value)
-            elif django_value is not None:
+            elif django_value is False or django_value:
                 field.initial = django_value
 
     def save(self, category="default"):

apps/common/models.py

@@ -2,6 +2,7 @@ import json
 
 import ldap
 from django.db import models
+from django.db.utils import ProgrammingError, OperationalError
 from django.utils.translation import ugettext_lazy as _
 from django.conf import settings
 from django_auth_ldap.config import LDAPSearch
@@ -50,9 +51,12 @@ class Setting(models.Model):
 
     @classmethod
     def refresh_all_settings(cls):
-        settings_list = cls.objects.all()
-        for setting in settings_list:
-            setting.refresh_setting()
+        try:
+            settings_list = cls.objects.all()
+            for setting in settings_list:
+                setting.refresh_setting()
+        except (ProgrammingError, OperationalError):
+            pass
 
     def refresh_setting(self):
         try:

apps/common/views.py

@@ -107,7 +107,6 @@ class TerminalSettingView(AdminUserRequiredMixin, TemplateView):
         return super().get_context_data(**kwargs)
 
     def post(self, request):
-        print(request.POST)
         form = self.form_class(request.POST)
         if form.is_valid():
             form.save()

apps/jumpserver/settings.py

@@ -385,10 +385,6 @@ TERMINAL_COMMAND_STORAGE = {
     #     'TYPE': 'elasticsearch',
     #     'HOSTS': ['http://elastic:changeme@localhost:9200'],
     # },
-    # 'ali-hz-es': {
-    #     'TYPE': 'elasticsearch',
-    #     'HOSTS': ['http://elastic:changeme@localhost:9200'],
-    # }
 }
 
 

apps/users/forms.py

@@ -172,7 +172,6 @@ class UserBulkUpdateForm(forms.ModelForm):
             if self.data.get(field) is not None:
                 changed_fields.append(field)
 
-        print(changed_fields)
         cleaned_data = {k: v for k, v in self.cleaned_data.items()
                         if k in changed_fields}
         users = cleaned_data.pop('users', '')