Merge pull request #260 from jumpserver/dev

Dev

README.md

@@ -7,6 +7,10 @@ It's implement a ssh server and a web terminal server,
 User can connect them except jumpserver openssh server and connect.py 
 pre version.
 
+# Warning 
+
+Coco has been replace by [koko](https://github.com/jumpserver/koko.git)
+From v1.5.2, coco will be stop update
 
 ## Install
 

coco/conf.py

@@ -377,6 +377,7 @@ defaults = {
     'UPLOAD_FAILED_REPLAY_ON_START': True,
     'REUSE_CONNECTION': True,
     'FORCE_REMOVE_FOLDER': False,
+    'TELNET_TTYPE': 'XTERM-256COLOR',
 }
 
 

coco/connection.py

@@ -300,25 +300,31 @@ class TelnetConnection:
                         logger.info(msg)
                         return None, msg
 
-                    if data.startswith(telnetlib.IAC):
-                        self.option_negotiate(data)
-                    else:
-                        result = self.login_auth(data)
-                        if result:
-                            msg = 'Successful asset connection.<{}>/<{}>/<{}>.'.format(
-                                self.client.user, self.system_user.username,
-                                self.asset.hostname
-                            )
-                            logger.info(msg)
-                            return self.sock, None
-                        elif result is False:
-                            self.sock.close()
-                            msg = 'Authentication failed.\r\n'
-                            logger.info(msg)
-                            return None, msg
-                        elif result is None:
+                    # 将数据以 \r\n 进行分割
+                    _data_list = data.split(b'\r\n')
+                    for _data in _data_list:
+                        if not _data:
                             continue
 
+                        if _data.startswith(telnetlib.IAC):
+                            self.option_negotiate(_data)
+                        else:
+                            result = self.login_auth(_data)
+                            if result:
+                                msg = 'Successful asset connection.<{}>/<{}>/<{}>.'.format(
+                                    self.client.user, self.system_user.username,
+                                    self.asset.hostname
+                                )
+                                logger.info(msg)
+                                return self.sock, None
+                            elif result is False:
+                                self.sock.close()
+                                msg = 'Authentication failed.\r\n'
+                                logger.info(msg)
+                                return None, msg
+                            elif result is None:
+                                continue
+
     def option_negotiate(self, data):
         """
         Telnet server option negotiate before connection
@@ -338,7 +344,8 @@ class TelnetConnection:
             elif x == telnetlib.DO + telnetlib.TTYPE:
                 new_data_list.append(telnetlib.WILL + telnetlib.TTYPE)
             elif x == telnetlib.SB + telnetlib.TTYPE + b'\x01':
-                new_data_list.append(telnetlib.SB + telnetlib.TTYPE + b'\x00' + b'XTERM-256COLOR')
+                terminal_type = bytes(config.TELNET_TTYPE, encoding='utf-8')
+                new_data_list.append(telnetlib.SB + telnetlib.TTYPE + b'\x00' + terminal_type)
             elif telnetlib.DO in x:
                 new_data_list.append(x.replace(telnetlib.DO, telnetlib.WONT))
             elif telnetlib.WILL in x:

coco/httpd/ws.py

@@ -72,13 +72,22 @@ class ProxyNamespace(BaseNamespace):
         client.chan = ws_proxy
         self.emit('room', {'room': client_id, 'secret': secret})
         join_room(client_id)
+
         if not asset_id or not system_user_id:
+            msg = "Not asset id or system user id found".format(
+                asset_id, system_user_id
+            )
+            logger.error(msg)
             return
 
         asset = app_service.get_asset(asset_id)
         system_user = app_service.get_system_user(system_user_id)
 
         if not asset or not system_user:
+            msg = "No asset or system user found {} {}: {} {}".format(
+                 asset_id, system_user_id, asset, system_user
+            )
+            logger.error(msg)
             return
         forwarder = ProxyServer(client, asset, system_user)
 

coco/sshd.py

@@ -99,12 +99,11 @@ class SSHServer:
                 t.start()
             transport.close()
         except paramiko.SSHException as e:
-            logger.warning("SSH negotiation failed: {}".format(e))
+            logger.debug("SSH negotiation failed: {}".format(e))
         except EOFError as e:
-            logger.warning("Handle connection EOF Error: {}".format(e))
+            logger.debug("Handle connection EOF Error: {}".format(e))
         except Exception as e:
             logger.error("Unexpect error occur on handle connection: {}".format(e))
-            logger.error(e, exc_info=True)
         finally:
             Connection.remove_connection(connection.id)
             sock.close()

coco/tasks.py

@@ -22,7 +22,7 @@ class TaskHandler:
         session = Session.sessions.get(session_id)
         if session:
             session.terminate()
-        app_service.finish_task(task.id)
+            app_service.finish_task(task.id)
 
     def handle(self, task):
         func = self.routes.get(task.name)

config_example.yml

@@ -63,3 +63,6 @@ BOOTSTRAP_TOKEN: <PleasgeChangeSameWithJumpserver>
 
 # 是否强制删除文件夹:(default false)
 # FORCE_REMOVE_FOLDER: false
+
+# Telnet连接协商使用的终端类型
+# TELNET_TTYPE: XTERM-256COLOR