[Bugfix] 修改登陆错误

apps/authentication/views/login.py

@@ -26,6 +26,7 @@ from users.utils import (
 )
 from ..signals import post_auth_success, post_auth_failed
 from .. import forms
+from .. import const
 
 
 __all__ = [
@@ -81,7 +82,7 @@ class UserLoginView(FormView):
         user = form.get_user()
         # user password expired
         if user.password_has_expired:
-            reason = LoginLog.REASON_PASSWORD_EXPIRED
+            reason = const.password_expired
             self.send_auth_signal(success=False, username=user.username, reason=reason)
             return self.render_to_response(self.get_context_data(password_expired=True))
 
@@ -96,7 +97,7 @@ class UserLoginView(FormView):
         # write login failed log
         username = form.cleaned_data.get('username')
         exist = User.objects.filter(username=username).first()
-        reason = LoginLog.REASON_PASSWORD if exist else LoginLog.REASON_NOT_EXIST
+        reason = const.password_failed if exist else const.user_not_exist
         # limit user login failed count
         ip = get_request_ip(self.request)
         increase_login_failed_count(username, ip)
@@ -166,7 +167,7 @@ class UserLoginOtpView(FormView):
         else:
             self.send_auth_signal(
                 success=False, username=user.username,
-                reason=LoginLog.REASON_MFA
+                reason=const.mfa_failed
             )
             form.add_error(
                 'otp_code', _('MFA code invalid, or ntp sync server time')

apps/jumpserver/settings.py

@@ -215,7 +215,7 @@ LOGGING = {
             'format': '%(levelname)s %(message)s'
         },
         'syslog': {
-            'format': '%(name)s: %(message)s'
+            'format': 'jumpserver: %(message)s'
         },
         'msg': {
             'format': '%(message)s'
@@ -249,6 +249,11 @@ LOGGING = {
             'backupCount': 7,
             'filename': ANSIBLE_LOG_FILE,
         },
+        'syslog': {
+            'level': 'INFO',
+            'class': 'logging.NullHandler',
+            'formatter': 'syslog'
+        },
     },
     'loggers': {
         'django': {
@@ -257,17 +262,17 @@ LOGGING = {
             'level': LOG_LEVEL,
         },
         'django.request': {
-            'handlers': ['console', 'file'],
+            'handlers': ['console', 'file', 'syslog'],
             'level': LOG_LEVEL,
             'propagate': False,
         },
         'django.server': {
-            'handlers': ['console', 'file'],
+            'handlers': ['console', 'file', 'syslog'],
             'level': LOG_LEVEL,
             'propagate': False,
         },
         'jumpserver': {
-            'handlers': ['console', 'file'],
+            'handlers': ['console', 'file', 'syslog'],
             'level': LOG_LEVEL,
         },
         'ops.ansible_api': {
@@ -278,6 +283,10 @@ LOGGING = {
             'handlers': ['console', 'file'],
             'level': "INFO",
         },
+        'jms_audits': {
+            'handlers': ['syslog'],
+            'level': 'INFO'
+        },
         # 'django.db': {
         #     'handlers': ['console', 'file'],
         #     'level': 'DEBUG'
@@ -290,17 +299,11 @@ SYSLOG_ENABLE = False
 if CONFIG.SYSLOG_ADDR != '' and len(CONFIG.SYSLOG_ADDR.split(':')) == 2:
     host, port = CONFIG.SYSLOG_ADDR.split(':')
     SYSLOG_ENABLE = True
-    LOGGING['handlers']['syslog'] = {
-        'level': 'INFO',
+    LOGGING['handlers']['syslog'].update({
         'class': 'logging.handlers.SysLogHandler',
         'facility': CONFIG.SYSLOG_FACILITY,
         'address': (host, int(port)),
-        'formatter': 'syslog'
-    }
-    LOGGING['loggers']['jms'] = {
-        'handlers': ['syslog'],
-        'level': 'INFO'
-    }
+    })
 
 # Internationalization
 # https://docs.djangoproject.com/en/1.10/topics/i18n/