Merge pull request #79 from jumpserver/dev

Dev

coco/interface.py

@@ -104,7 +104,6 @@ class SSHInterface(paramiko.ServerInterface):
         token = info.get('token', None)
         if seed and not token:
             self.otp_auth = True
-
         return user
 
     def check_channel_direct_tcpip_request(self, chanid, origin, destination):

coco/recorder.py

@@ -67,7 +67,9 @@ class ReplayRecorder(metaclass=abc.ABCMeta):
             if self.storage.type == 'jms':
                 return False
             else:
-                self.storage = jms_storage.JMSReplayStorage(app_service)
+                self.storage = jms_storage.JMSReplayStorage(
+                    {"SERVICE": app_service}
+                )
                 self.upload_replay(session_id, times=3)
 
         ok, msg = self.push_to_storage(session_id)

coco/session.py

@@ -83,6 +83,7 @@ class Session:
             return
         self._command_recorder.record({
             "session": self.id,
+            "org_id": self.server.asset.org_id,
             "input": _input,
             "output": _output,
             "user": self.client.user.username,
@@ -174,6 +175,7 @@ class Session:
             "id": self.id,
             "user": self.client.user.username,
             "asset": self.server.asset.hostname,
+            "org_id": self.server.asset.org_id,
             "system_user": self.server.system_user.username,
             "login_from": self.login_from,
             "remote_addr": self.client.addr[0],

coco/sftp.py

@@ -51,10 +51,16 @@ class SFTPServer(paramiko.SFTPServerInterface):
             return self._sftp[host]['sftp']
 
     def get_perm_hosts(self):
+        hosts = {}
         assets = app_service.get_user_assets(
             self.server.request.user
         )
-        return {asset.hostname: asset for asset in assets}
+        for asset in assets:
+            key = asset.hostname
+            if asset.org_id:
+                key = "{}.{}".format(asset.hostname, asset.org_name)
+            hosts[key] = asset
+        return hosts
 
     def parse_path(self, path):
         data = path.lstrip('/').split('/')
@@ -89,10 +95,12 @@ class SFTPServer(paramiko.SFTPServerInterface):
 
     def create_ftp_log(self, path, operate, is_success=True, filename=None):
         host, su, rpath = self.parse_path(path)
+        asset = self.hosts.get(host)
         date_start = datetime.utcnow().strftime("%Y-%m-%d %H:%M:%S") + " +0000",
         data = {
             "user": self.server.request.user.username,
             "asset": host,
+            "org_id": asset.org_id,
             "system_user": su,
             "remote_addr": self.server.request.addr[0],
             "operate": operate,

requirements/requirements.txt

@@ -19,10 +19,10 @@ itsdangerous==0.24
 Jinja2==2.10
 jmespath==0.9.3
 jms-storage==0.0.18
-jumpserver-python-sdk==0.0.44
+jumpserver-python-sdk==0.0.47
 MarkupSafe==1.0
 oss2==2.4.0
-paramiko==2.4.0
+paramiko==2.4.1
 psutil==5.4.1
 pyasn1==0.4.2
 pycparser==2.18