Merge pull request #134 from jumpserver/dev

Dev

coco/app.py

@@ -20,7 +20,7 @@ from .session import Session
 from .models import Connection
 
 
-__version__ = '1.4.4'
+__version__ = '1.4.5'
 
 BASE_DIR = os.path.dirname(os.path.dirname(__file__))
 logger = get_logger(__file__)

coco/config.py

@@ -277,6 +277,7 @@ access_key_path = os.path.abspath(os.path.join(root_path, 'keys', '.access_key')
 default_config = {
     'NAME': socket.gethostname(),
     'CORE_HOST': 'http://127.0.0.1:8080',
+    'BOOTSTRAP_TOKEN': os.environ.get("BOOTSTRAP_TOKEN") or 'PleaseChangeMe',
     'ROOT_PATH': root_path,
     'DEBUG': True,
     'BIND_HOST': '0.0.0.0',

coco/interface.py

@@ -176,7 +176,7 @@ class SSHInterface(paramiko.ServerInterface):
             'command': command
         })
         self.event.set()
-        return False
+        return True
 
     def check_channel_forward_agent_request(self, channel):
         logger.debug("Check channel forward agent request: %s" % channel)

conf_example.py

@@ -17,6 +17,10 @@ class Config:
     # Jumpserver项目的url, api请求注册会使用
     # CORE_HOST = os.environ.get("CORE_HOST") or 'http://127.0.0.1:8080'
 
+    # Bootstrap Token, 预共享秘钥, 用来注册coco使用的service account和terminal
+    # 请和jumpserver 配置文件中保持一致，注册完成后可以删除
+    # BOOTSTRAP_TOKEN = "PleaseChangeMe"
+
     # 启动时绑定的ip, 默认 0.0.0.0
     # BIND_HOST = '0.0.0.0'
 

requirements/alpine_requirements.txt

+krb5-dev sshpass libffi-dev libressl-dev linux-headers

requirements/requirements.txt

@@ -19,7 +19,7 @@ itsdangerous==0.24
 Jinja2==2.10
 jmespath==0.9.3
 jms-storage==0.0.20
-jumpserver-python-sdk==0.0.51
+jumpserver-python-sdk==0.0.53
 MarkupSafe==1.0
 oss2==2.4.0
 paramiko==2.4.1