Merge branch 'master' of code.jumpserver.org:Jumpserver/jumpserver

Merge

apps/audits/api.py

 # ~*~ coding: utf-8 ~*~
 # 
 
+
+from rest_framework import generics
+
+import serializers
+
+from .models import ProxyLog
+
+
+class ProxyLogListCreateApi(generics.ListCreateAPIView):
+    queryset = ProxyLog.objects.all()
+    serializer_class = serializers.ProxyLogSerializer
+
+
+class ProxyLogDetailApi(generics.RetrieveUpdateDestroyAPIView):
+    queryset = ProxyLog.objects.all()
+    serializer_class = serializers.ProxyLogSerializer
+
+
+class CommandLogCreateApi(generics.CreateAPIView):
+    serializer_class = serializers.CommandLogSerializer

apps/audits/models.py

+# -*- coding: utf-8 -*-
+#
+
 from __future__ import unicode_literals
 
 from django.db import models
+from django.utils.translation import ugettext_lazy as _
+
+
+class LoginLog(models.Model):
+    LOGIN_TYPE_CHOICE = (
+        ('S', 'ssh'),
+        ('W', 'web'),
+    )
+
+    username = models.CharField(max_length=20, verbose_name=_('Username'))
+    name = models.CharField(max_length=20, blank=True, verbose_name=_('Name'))
+    login_type = models.CharField(choices=LOGIN_TYPE_CHOICE, max_length=1, verbose_name=_('Login type'))
+    login_ip = models.GenericIPAddressField(verbose_name=_('Login ip'))
+    login_city = models.CharField(max_length=100, blank=True, null=True, verbose_name=_('Login city'))
+    user_agent = models.CharField(max_length=100, blank=True, null=True, verbose_name=_('User agent'))
+    date_login = models.DateTimeField(auto_now=True, verbose_name=_('Date login'))
+    date_logout = models.DateTimeField(null=True, verbose_name=_('Date logout'))
+
+    class Meta:
+        db_table = 'login_log'
+        ordering = ['-date_login', 'username']
+
+
+class ProxyLog(models.Model):
+    LOGIN_TYPE_CHOICE = (
+        ('S', 'ssh'),
+        ('W', 'web'),
+    )
+
+    username = models.CharField(max_length=20,  verbose_name=_('Username'))
+    name = models.CharField(max_length=20, blank=True, verbose_name=_('Name'))
+    hostname = models.CharField(max_length=128, blank=True, verbose_name=_('Hostname'))
+    ip = models.GenericIPAddressField(max_length=32, verbose_name=_('IP'))
+    system_user = models.CharField(max_length=20, verbose_name=_('System user'))
+    login_type = models.CharField(choices=LOGIN_TYPE_CHOICE, max_length=1, verbose_name=_('Login type'))
+    log_file = models.CharField(max_length=1000, blank=True, null=True)
+    was_failed = models.BooleanField(default=False, verbose_name=_('Did connect failed'))
+    is_finished = models.BooleanField(default=False, verbose_name=_('Is finished'))
+    date_start = models.DateTimeField(auto_now=True, verbose_name=_('Date start'))
+    date_finished = models.DateTimeField(null=True, verbose_name=_('Date finished'))
+
+    def __unicode__(self):
+        return '%s-%s-%s-%s' % (self.username, self.hostname, self.system_user, self.id)
+
+    class Meta:
+        db_table = 'proxy_log'
+        ordering = ['-date_start', 'username']
+
+
+class CommandLog(models.Model):
+    proxy_log = models.ForeignKey(ProxyLog, on_delete=models.CASCADE, related_name='command_log')
+    command = models.CharField(max_length=1000, blank=True)
+    output = models.TextField(blank=True)
+    date_start = models.DateTimeField(null=True)
+    date_finished = models.DateTimeField(null=True)
+
+    def __unicode__(self):
+        return '%s: %s' % (self.id, self.command)
 
-# Create your models here.
+    class Meta:
+        db_table = 'command_log'
+        ordering = ['-date_start', 'command']

apps/audits/serializers.py

+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# 
+from rest_framework import serializers
+
+import models
+
+
+class ProxyLogSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = models.ProxyLog
+
+
+class CommandLogSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = models.CommandLog
+
+
+if __name__ == '__main__':
+    pass

apps/audits/urls.py

 from django.conf.urls import url
+
+
+import api
+import views
+
+app_name = 'audits'
+
+urlpatterns = [
+]
+
+
+urlpatterns += [
+    url(r'^v1/proxy-log/$', api.ProxyLogListCreateApi.as_view(), name='proxy-log-list-create-api'),
+    url(r'^v1/proxy-log/(?P<pk>\d+)/$', api.ProxyLogDetailApi.as_view(), name='proxy-log-detail-api'),
+    url(r'^v1/command-log/$', api.CommandLogCreateApi.as_view(), name='command-log-create-api'),
+]

apps/jumpserver/urls.py

@@ -25,6 +25,7 @@ urlpatterns = [
     url(r'^(api/)?users/', include('users.urls')),
     url(r'^assets/', include('assets.urls')),
     url(r'^perms/', include('perms.urls')),
+    url(r'^(api/)?audits/', include('audits.urls')),
 ]
 
 

apps/users/api.py

 # ~*~ coding: utf-8 ~*~
 #
 
-import logging
-
 from django.shortcuts import get_object_or_404
 
 from rest_framework import generics, status
@@ -13,9 +11,10 @@ from .models import User, UserGroup
 from .serializers import UserDetailSerializer, UserAndGroupSerializer, \
     GroupDetailSerializer, UserPKUpdateSerializer, UserBulkUpdateSerializer, GroupBulkUpdateSerializer
 from common.mixins import BulkDeleteApiMixin
+from common.utils import get_logger
 
 
-logger = logging.getLogger('jumpserver.users.api')
+logger = get_logger(__name__)
 
 
 class UserDetailApi(generics.RetrieveUpdateDestroyAPIView):

apps/users/utils.py

@@ -3,6 +3,7 @@
 from __future__ import unicode_literals
 import logging
 import os
+import re
 
 from django.conf import settings
 from django.contrib.auth.mixins import UserPassesTestMixin

docs/table_design.xml

@@ -634,10 +634,13 @@
 <part>id</part>
 </key>
 </table>
-<table x="300" y="770" name="login_log">
+<table x="268" y="776" name="login_log">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
+<row name="name" null="1" autoincrement="0">
+<datatype>CHAR</datatype>
+<default>NULL</default></row>
 <row name="username" null="1" autoincrement="0">
 <datatype>VARCHAR</datatype>
 <default>NULL</default></row>
@@ -663,7 +666,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="139" y="772" name="admin_log">
+<table x="108" y="775" name="admin_log">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -689,14 +692,20 @@
 <part>id</part>
 </key>
 </table>
-<table x="435" y="806" name="proxy_log">
+<table x="418" y="775" name="proxy_log">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
+<row name="name" null="1" autoincrement="0">
+<datatype>VARCHAR</datatype>
+<default>NULL</default></row>
 <row name="username" null="1" autoincrement="0">
 <datatype>CHAR</datatype>
 <default>NULL</default></row>
 <row name="hostname" null="1" autoincrement="0">
+<datatype>VARCHAR</datatype>
+<default>NULL</default></row>
+<row name="ip" null="1" autoincrement="0">
 <datatype>CHAR</datatype>
 <default>NULL</default></row>
 <row name="sysuser" null="1" autoincrement="0">
@@ -705,18 +714,9 @@
 <row name="login_type" null="1" autoincrement="0">
 <datatype>CHAR</datatype>
 <default>NULL</default></row>
-<row name="refer_id" null="1" autoincrement="0">
-<datatype>INTEGER</datatype>
-<default>NULL</default></row>
 <row name="log_file" null="1" autoincrement="0">
 <datatype>CHAR</datatype>
 <default>NULL</default></row>
-<row name="login_ip" null="1" autoincrement="0">
-<datatype>VARCHAR</datatype>
-<default>NULL</default></row>
-<row name="login_city" null="1" autoincrement="0">
-<datatype>VARCHAR</datatype>
-<default>NULL</default></row>
 <row name="is_finished" null="1" autoincrement="0">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -738,11 +738,17 @@
 <datatype>INTEGER</datatype>
 <default>NULL</default><relation table="proxy_log" row="id" />
 </row>
+<row name="command" null="1" autoincrement="0">
+<datatype>CHAR</datatype>
+<default>NULL</default></row>
+<row name="output" null="1" autoincrement="0">
+<datatype>VARCHAR</datatype>
+<default>NULL</default></row>
 <row name="date_start" null="1" autoincrement="0">
 <datatype>DATE</datatype>
 <default>NULL</default></row>
-<row name="command" null="1" autoincrement="0">
-<datatype>CHAR</datatype>
+<row name="date_finished" null="1" autoincrement="0">
+<datatype>DATE</datatype>
 <default>NULL</default></row>
 <key type="PRIMARY" name="">
 <part>id</part>

requirements.txt

 Django==1.10
 django-bootstrap-form==3.2.1
-django-redis-sessions==0.5.6
-django-websocket-redis==0.4.6
-gevent==1.1.2
-greenlet==0.4.10
 logging==0.4.9.6
 Pillow==3.3.1
-pyte==0.5.2
-redis==2.10.5
-six==1.10.0
-wcwidth==0.1.7
-websocket-client==0.37.0
 djangorestframework==3.4.5
 ForgeryPy==0.1
 openpyxl==2.4.0
-paramiko==2.0.2
 celery==3.1.23
 ansible==2.1.1.0
 django-simple-captcha==0.5.2
 django-formtools==1.0
 sshpubkeys==2.2.0
 djangorestframework-bulk==0.2.1
-python-gssapi==0.6.4
-tornado==4.4.2
-

terminal/__init__.py

-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# 
-
-
-if __name__ == '__main__':
-    pass

terminal/ssh_config.py

-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
-
-import logging
-import os
-
-
-BASE_DIR = os.path.dirname(os.path.abspath(__name__))
-
-
-class Config:
-    SSH_HOST = ''
-    SSH_PORT = 2200
-    LOG_LEVEL = 'INFO'
-    LOG_DIR = os.path.join(BASE_DIR, 'logs')
-    LOG_FILENAME = 'ssh_server.log'
-    LOGGING = {
-        'version': 1,
-        'disable_existing_loggers': False,
-        'formatters': {
-            'verbose': {
-                'format': '%(levelname)s %(asctime)s %(module)s %(process)d %(thread)d %(message)s'
-            },
-            'main': {
-                'datefmt': '%Y-%m-%d %H:%M:%S',
-                'format': '%(asctime)s [%(module)s %(levelname)s] %(message)s',
-            },
-            'simple': {
-                'format': '%(levelname)s %(message)s'
-            },
-        },
-        'handlers': {
-            'null': {
-                'level': 'DEBUG',
-                'class': 'logging.NullHandler',
-            },
-            'console': {
-                'level': 'DEBUG',
-                'class': 'logging.StreamHandler',
-                'formatter': 'main',
-                'stream': 'ext://sys.stdout',
-            },
-            'file': {
-                'level': 'DEBUG',
-                'class': 'logging.handlers.TimedRotatingFileHandler',
-                'formatter': 'main',
-                'filename': os.path.join(LOG_DIR, LOG_FILENAME),
-                'when': 'D',
-                'backupCount': 10,
-            },
-        },
-        'loggers': {
-            'jumpserver': {
-                'handlers': ['console', 'file'],
-                # 'level': LOG_LEVEL_CHOICES.get(LOG_LEVEL, None) or LOG_LEVEL_CHOICES.get('info')
-                'level': LOG_LEVEL,
-                'propagate': True,
-            },
-            'jumpserver.web_ssh_server': {
-                'handlers': ['console', 'file'],
-                # 'level': LOG_LEVEL_CHOICES.get(LOG_LEVEL, None) or LOG_LEVEL_CHOICES.get('info')
-                'level': LOG_LEVEL,
-                'propagate': True,
-            },
-            'jumpserver.ssh_server': {
-                'handlers': ['console', 'file'],
-                # 'level': LOG_LEVEL_CHOICES.get(LOG_LEVEL, None) or LOG_LEVEL_CHOICES.get('info')
-                'level': LOG_LEVEL,
-                'propagate': True,
-            }
-        }
-    }
-
-    def __init__(self):
-        pass
-
-    def __getattr__(self, item):
-        return None
-
-
-class DevelopmentConfig(Config):
-    pass
-
-
-class ProductionConfig(Config):
-    pass
-
-
-class TestingConfig(Config):
-    pass
-
-
-config = {
-    'development': DevelopmentConfig,
-    'production': ProductionConfig,
-    'testing': TestingConfig,
-    'default': DevelopmentConfig,
-}
-
-env = 'default'
-

terminal/ssh_config_example.py

-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
-
-import logging
-import os
-
-
-BASE_DIR = os.path.dirname(os.path.abspath(__name__))
-
-
-class Config:
-    LOG_LEVEL = 'INFO'
-    LOG_DIR = os.path.join(BASE_DIR, 'logs')
-    LOGGING = {
-        'version': 1,
-        'disable_existing_loggers': False,
-        'formatters': {
-            'verbose': {
-                'format': '%(levelname)s %(asctime)s %(module)s %(process)d %(thread)d %(message)s'
-            },
-            'main': {
-                'datefmt': '%Y-%m-%d %H:%M:%S',
-                'format': '%(asctime)s [%(module)s %(levelname)s] %(message)s',
-            },
-            'simple': {
-                'format': '%(levelname)s %(message)s'
-            },
-        },
-        'handlers': {
-            'null': {
-                'level': 'DEBUG',
-                'class': 'logging.NullHandler',
-            },
-            'console': {
-                'level': 'DEBUG',
-                'class': 'logging.StreamHandler',
-                'formatter': 'main'
-            },
-            'file': {
-                'level': 'DEBUG',
-                'class': 'logging.FileHandler',
-                'formatter': 'main',
-                'filename': LOG_DIR,
-            },
-        },
-        'loggers': {
-            'jumpserver': {
-                'handlers': ['console', 'file'],
-                # 'level': LOG_LEVEL_CHOICES.get(LOG_LEVEL, None) or LOG_LEVEL_CHOICES.get('info')
-                'level': LOG_LEVEL,
-            },
-            'jumpserver.web_ssh_server': {
-                'handlers': ['console', 'file'],
-                # 'level': LOG_LEVEL_CHOICES.get(LOG_LEVEL, None) or LOG_LEVEL_CHOICES.get('info')
-                'level': LOG_LEVEL,
-            },
-            'jumpserver.ssh_server': {
-                'handlers': ['console', 'file'],
-                # 'level': LOG_LEVEL_CHOICES.get(LOG_LEVEL, None) or LOG_LEVEL_CHOICES.get('info')
-                'level': LOG_LEVEL,
-            }
-        }
-    }
-
-    def __init__(self):
-        pass
-
-    def __getattr__(self, item):
-        return None
-
-
-class DevelopmentConfig(Config):
-    pass
-
-
-class ProductionConfig(Config):
-    pass
-
-
-class TestingConfig(Config):
-    pass
-
-
-config = {
-    'development': DevelopmentConfig,
-    'production': ProductionConfig,
-    'testing': TestingConfig,
-    'default': DevelopmentConfig,
-}
-
-env = 'default'
-
-
-if __name__ == '__main__':
-    pass

terminal/utils.py

-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
-
-import logging
-from logging.config import dictConfig
-from ssh_config import config, env
-
-
-CONFIG_SSH_SERVER = config.get(env)
-
-
-def get_logger(name):
-    dictConfig(CONFIG_SSH_SERVER.LOGGING)
-    return logging.getLogger('jumpserver.%s' % name)
-
-
-class ControlChar:
-    CHARS = {
-        'clear': '\x1b[H\x1b[2J',
-    }
-
-    def __init__(self):
-        pass
-
-    def __getattr__(self, item):
-        return self.__class__.CHARS.get(item, '')
-
-
-class SSHServerException(Exception):
-    pass
-
-
-control_char = ControlChar()

terminal/web_ssh_server.py

-# -*- coding: utf-8 -*-
-#
-