Merge pull request #186 from jumpserver/dev

[Update] Telnet支持自定义成功pattern

coco/conf.py

@@ -338,6 +338,7 @@ defaults = {
     'LOG_DIR': os.path.join(root_path, 'data', 'logs'),
     'REPLAY_DIR': os.path.join(root_path, 'data', 'replays'),
     'ASSET_LIST_SORT_BY': 'hostname',  # hostname, ip
+    'TELNET_REGEX': '',
     'PASSWORD_AUTH': True,
     'PUBLIC_KEY_AUTH': True,
     'SSH_TIMEOUT': 10,

coco/connection.py

 # -*- coding: utf-8 -*-
 #
 
-import os
 import re
 import socket
 import telnetlib
@@ -143,6 +142,17 @@ class SSHConnection:
 
 
 class TelnetConnection:
+    incorrect_pattern = re.compile(
+        r'incorrect|failed|失败|错误', re.I
+    )
+    username_pattern = re.compile(
+        r'login:?\s*$|username:?\s*$|用户名:?\s*$|账\s*号:?\s*$', re.I
+    )
+    password_pattern = re.compile(
+        r'Password:?\s*$|passwd:?\s*$|密\s*码:?\s*$', re.I
+    )
+    success_pattern = re.compile(r'Last\s*login|success|成功|#|\$', re.I)
+    custom_success_pattern = None
 
     def __init__(self, asset, system_user, client):
         self.client = client
@@ -150,18 +160,13 @@ class TelnetConnection:
         self.system_user = system_user
         self.sock = None
         self.sel = selectors.DefaultSelector()
-        self.incorrect_pattern = re.compile(
-            r'incorrect|failed|失败|错误', re.I
-        )
-        self.username_pattern = re.compile(
-            r'login:?\s*$|username:?\s*$|用户名:?\s*$|账\s*号:?\s*$', re.I
-        )
-        self.password_pattern = re.compile(
-            r'Password:?\s*$|passwd:?\s*$|密\s*码:?\s*$', re.I
-        )
-        self.success_pattern = re.compile(
-            r'Last\s*login|success|成功|#|\$', re.I
-        )
+        if config.TELNET_REGEX:
+            try:
+                self.custom_success_pattern = re.compile(
+                    r'{}'.format(config.TELNET_REGEX), re.I
+                )
+            except (TypeError, ValueError):
+                pass
 
     def get_socket(self):
         logger.debug('Get telnet server socket. {}'.format(self.client.user))
@@ -269,7 +274,10 @@ class TelnetConnection:
             logger.debug(b'[Password prompt]: ' + b'>>' + raw_data + b'<<')
             self.sock.send(self.system_user.password.encode('utf-8') + b'\r\n')
             return None
-        elif self.success_pattern.search(data):
+        elif self.success_pattern.search(data) or \
+                (self.custom_success_pattern and
+                 self.custom_success_pattern.search(data)):
+            self.client.send(raw_data)
             logger.debug(b'[Login Success prompt]: ' + b'>>' + raw_data + b'<<')
             return True
         else:

coco/models.py

@@ -385,6 +385,9 @@ class TelnetServer(BaseServer):
         """ self.chan: socket object """
         return getattr(self.chan, '_closed', False)
 
+    def resize_pty(self):
+        pass
+
 
 class Server(BaseServer):
     """