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

.gitignore

+env/
 .idea
 *.pyc
 *.pyo

coco/app.py

@@ -13,8 +13,8 @@ from jms.service import AppService
 from .config import Config
 from .sshd import SSHServer
 from .httpd import HttpServer
-from .logging import create_logger
-from .queue import get_queue
+from .logger import create_logger
+from .alignment import get_queue
 from .record import get_recorder, START_SENTINEL, END_SENTINEL
 from .tasks import TaskHandler
 

coco/record.py

@@ -5,7 +5,6 @@
 import abc
 import logging
 
-
 logger = logging.getLogger(__file__)
 BUF_SIZE = 1024
 
@@ -14,7 +13,6 @@ END_SENTINEL = object()
 
 
 class ReplayRecorder(metaclass=abc.ABCMeta):
-
     def __init__(self, app):
         self.app = app
 
@@ -35,11 +33,12 @@ class ReplayRecorder(metaclass=abc.ABCMeta):
                 self.session_end(data["session"])
 
     @abc.abstractmethod
-    def session_end(self, session_id):
+    def session_start(self, session_id):
+        print("Session start")
         pass
 
     @abc.abstractmethod
-    def session_start(self, session_id):
+    def session_end(self, session_id):
         pass
 
 
@@ -74,7 +73,6 @@ class CommandRecorder(metaclass=abc.ABCMeta):
 
 
 class ServerReplayRecorder(ReplayRecorder):
-
     def record_replay(self, data_set):
         """
         :param data_set:
@@ -91,7 +89,6 @@ class ServerReplayRecorder(ReplayRecorder):
 
 
 class ServerCommandRecorder(CommandRecorder):
-
     def record_command(self, data_set):
         if not data_set:
             return True

requirements.txt

-paramiko>=2.1.2
-python-gssapi>=0.6.4
-requests>=2.11.1
-pyte>=0.5.2
-tornado>=4.5.2
\ No newline at end of file
+asn1crypto==0.23.0
+bcrypt==3.1.4
+certifi==2017.11.5
+cffi==1.11.2
+chardet==3.0.4
+click==6.7
+cryptography==2.1.4
+Flask==0.12.2
+Flask-SocketIO==2.9.2
+idna==2.6
+itsdangerous==0.24
+Jinja2==2.10
+MarkupSafe==1.0
+paramiko==2.4.0
+psutil==5.4.1
+pyasn1==0.4.2
+pycparser==2.18
+PyNaCl==1.2.0
+pyte==0.7.0
+python-engineio==2.0.1
+python-gssapi==0.6.4
+python-socketio==1.8.3
+pytz==2017.3
+requests==2.18.4
+simplejson==3.13.2
+six==1.11.0
+tornado==4.5.2
+urllib3==1.22
+wcwidth==0.1.7
+Werkzeug==0.12.2