Merge branch 'dev' into test

coco/app.py

@@ -228,10 +228,10 @@ class Coco:
     def add_session(self, session):
         with self.lock:
             self.sessions.append(session)
-            self.heartbeat_async()
+            self.service.create_session(session.to_json())
 
     def remove_session(self, session):
         with self.lock:
             logger.info("Remove session: {}".format(session))
             self.sessions.remove(session)
-            self.heartbeat_async()
+            self.service.finish_session(session.id)

coco/recorder.py

@@ -243,6 +243,15 @@ class S3ReplayRecorder(ServerReplayRecorder):
     def __init__(self, app):
         super().__init__(app)
         self.bucket = app.config["REPLAY_STORAGE"].get("BUCKET", "jumpserver")
+        self.REGION = app.config["REPLAY_STORAGE"].get("REGION", None)
+        self.ACCESS_KEY = app.config["REPLAY_STORAGE"].get("ACCESS_KEY", None)
+        self.SECRET_KEY = app.config["REPLAY_STORAGE"].get("SECRET_KEY", None)
+        if self.ACCESS_KEY and self.REGION and self.SECRET_KEY:
+            self.s3 = boto3.client('s3',
+                                   region_name=self.REGION,
+                                   aws_access_key_id=self.ACCESS_KEY,
+                                   aws_secret_access_key=self.SECRET_KEY)
+        else:
             self.s3 = boto3.client('s3')
 
     def push_to_server(self, session_id):
@@ -250,7 +259,7 @@ class S3ReplayRecorder(ServerReplayRecorder):
             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.app.config.get("NAME", "coco") + time.strftime('%Y-%m-%d', time.localtime(
                     self.starttime)) + '/' + session_id + '.replay.gz')
         except:
             return self.app.service.push_session_replay(

requirements/requirements.txt

@@ -30,5 +30,5 @@ tornado==4.5.2
 urllib3==1.22
 wcwidth==0.1.7
 werkzeug==0.12.2
-jumpserver-python-sdk==0.0.29
+jumpserver-python-sdk==0.0.30
 jms-es-sdk