feat: update

.gitignore

@@ -8,5 +8,3 @@ logs/*
 conf.py
 host_rsa_key
 sessions/*
-Dockerfile
-conf_docker.py

coco/httpd.py

@@ -94,11 +94,13 @@ class SSHws(Namespace, BaseWebSocketHandler):
 
                 child, parent = socket.socketpair()
                 self.clients[request.sid]["client"][connection] = Client(parent, self.clients[request.sid]["request"])
+
                 self.clients[request.sid]["proxy"][connection] = WSProxy(self, child, self.clients[request.sid]["room"],
                                                                          connection)
                 self.app.clients.append(self.clients[request.sid]["client"][connection])
-                self.clients[request.sid]["forwarder"][connection] = ProxyServer(self.app,
-                                                                                 self.clients[request.sid]["client"][connection])
+                self.clients[request.sid]["forwarder"][connection] = ProxyServer(
+                    self.app, self.clients[request.sid]["client"][connection]
+                )
 
                 self.socketio.start_background_task(self.clients[request.sid]["forwarder"][connection].proxy, asset,
                                                     system_user)
@@ -135,6 +137,8 @@ class SSHws(Namespace, BaseWebSocketHandler):
     def on_disconnect(self):
         self.on_leave(self.clients[request.sid]["room"])
         try:
+            for connection in self.clients[request.sid]["client"]:
+                self.on_logout(connection)
             del self.clients[request.sid]
         except:
             pass
@@ -142,7 +146,7 @@ class SSHws(Namespace, BaseWebSocketHandler):
         pass
 
     def on_logout(self, connection):
-        print("logout", connection)
+        logger.debug("{} logout".format(connection))
         if connection:
             self.clients[request.sid]["proxy"][connection].close()
             del self.clients[request.sid]["proxy"][connection]

coco/models.py

@@ -212,7 +212,10 @@ class WSProxy:
 
     def forward(self):
         while not self.stop_event.is_set():
-            data = self.child.recv(BUF_SIZE)
+            try:
+                data = self.child.recv(BUF_SIZE)
+            except OSError:
+                continue
             if len(data) == 0:
                 self.close()
             self.ws.emit("data", {'data': data.decode("utf-8"), 'room': self.connection}, room=self.room)
@@ -225,3 +228,5 @@ class WSProxy:
     def close(self):
         self.stop_event.set()
         self.child.close()
+        self.ws.on_logout(self.connection)
+        logger.debug("Proxy {} closed".format(self))

coco/recorder.py

@@ -9,6 +9,7 @@ import os
 import gzip
 import json
 import shutil
+import boto3  # AWS S3 sdk
 
 from jms_es_sdk import ESStore
 
@@ -238,6 +239,20 @@ class ESCommandRecorder(CommandRecorder, metaclass=Singleton):
         print("{} has been gc".format(self))
 
 
+class S3ReplayRecorder(ServerReplayRecorder):
+    def __init__(self, app):
+        super().__init__(app)
+        self.bucket = app.config["REPLAY_RECORD_ENGINE"].get("BUCKET", "jumpserver")
+        self.s3 = boto3.client('s3')
+
+    def push_to_server(self, session_id):
+        self.s3.upload_file(
+            os.path.join(self.app.config['LOG_DIR'], session_id + '.replay.gz'),
+            self.bucket,
+            time.strftime('%Y-%m-%d', time.localtime(
+                self.starttime)) + '/' + session_id + '.replay.gz')
+
+
 def get_command_recorder_class(config):
     command_storage = config["COMMAND_STORAGE"]
 
@@ -249,7 +264,7 @@ def get_command_recorder_class(config):
 
 def get_replay_recorder_class(config):
     replay_engine = config["REPLAY_RECORD_ENGINE"]
-    if replay_engine == "server":
-        return ServerReplayRecorder
+    if replay_engine == "s3":
+        return S3ReplayRecorder
     else:
         return ServerReplayRecorder

requirements/requirements.txt

 asn1crypto==0.23.0
 bcrypt==3.1.4
+boto3==1.5.18
+botocore==1.8.32
 certifi==2017.11.5
 cffi==1.11.2
 chardet==3.0.4