Merge branch 'dev' of bitbucket.org:jumpserver/coco into dev

.gitignore

@@ -8,3 +8,5 @@ logs/*
 conf.py
 host_rsa_key
 sessions/*
+Dockerfile
+conf_docker.py

Dockerfile

-FROM registry.fit2cloud.com/jumpserver/python:v3
-MAINTAINER Jumpserver Team <ibuler@qq.com>
-
-COPY . /opt/coco
-WORKDIR /opt/coco
-
-RUN cd requirements && yum -y install $(cat rpm_requirements.txt) && \
-   pip install -r requirements.txt
-
-VOLUME /opt/coco/logs
-VOLUME /opt/coco/keys
-
-RUN cp conf_docker.py conf.py
-
-EXPOSE 2222
-CMD python run_server.py
\ No newline at end of file

coco/interactive.py

@@ -53,10 +53,7 @@ class InteractiveServer:
     3) 输入 {green}P/p{end} 显示您有权限的主机.\r
     4) 输入 {green}G/g{end} 显示您有权限的主机组.\r
     5) 输入 {green}G/g{end} + {green}组ID{end} 显示该组下主机. 如: g1\r
-    6) 输入 {green}E/e{end} 批量执行命令.(未完成)\r
-    7) 输入 {green}U/u{end} 批量上传文件.(未完成)\r
-    8) 输入 {green}D/d{end} 批量下载文件.(未完成)\r
-    9) 输入 {green}H/h{end} 帮助.\r
+    6) 输入 {green}H/h{end} 帮助.\r
     0) 输入 {green}Q/q{end} 退出.\r\n""").format(
             title="\033[1;32m", green="\033[32m",
             end="\033[0m", user=self.client.user

conf_docker.py

-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-#
-
-import os
-
-BASE_DIR = os.path.dirname(__file__)
-
-
-class Config:
-    """
-    Coco config file
-    """
-    # 默认的名字
-    # APP_NAME = "localhost"
-
-    # Jumpserver项目的url, api请求注册会使用
-    CORE_HOST = os.environ.get("CORE_HOST") or 'http://core:8080'
-
-    # 启动时绑定的ip, 默认 0.0.0.0
-    # BIND_HOST = '0.0.0.0'
-
-    # 监听的SSH端口号, 默认2222
-    # SSHD_PORT = 2222
-
-    # 监听的HTTP/WS端口号，默认5000
-    # HTTPD_PORT = 5000
-
-    # 项目使用的ACCESS KEY, 默认会注册,并保存到 ACCESS_KEY_STORE中,
-    # 如果有需求, 可以写到配置文件中, 格式 access_key_id:access_key_secret
-    # ACCESS_KEY = None
-
-    # ACCESS KEY 保存的地址, 默认注册后会保存到该文件中
-    # ACCESS_KEY_STORE = os.path.join(BASE_DIR, 'keys', '.access_key')
-
-    # 加密密钥
-    # SECRET_KEY = None
-
-    # 设置日志级别 ['DEBUG', 'INFO', 'WARN', 'ERROR', 'FATAL', 'CRITICAL']
-    # LOG_LEVEL = 'INFO'
-
-    # 日志存放的目录
-    # LOG_DIR = os.path.join(BASE_DIR, 'logs')
-
-    # Session录像存放目录
-    # SESSION_DIR = os.path.join(BASE_DIR, 'sessions')
-
-    # 资产显示排序方式, ['ip', 'hostname']
-    # ASSET_LIST_SORT_BY = 'ip'
-
-    # 登录是否支持密码认证
-    # SSH_PASSWORD_AUTH = True
-
-    # 登录是否支持秘钥认证
-    # SSH_PUBLIC_KEY_AUTH = True
-
-    # 和Jumpserver 保持心跳时间间隔
-    # HEARTBEAT_INTERVAL = 5
-
-    # Admin的名字，出问题会提示给用户
-    # ADMINS = ''
-
-
-class ConfigDocker(Config):
-    pass
-
-
-config = ConfigDocker()
\ No newline at end of file

requirements/requirements.txt

@@ -28,4 +28,4 @@ tornado==4.5.2
 urllib3==1.22
 wcwidth==0.1.7
 werkzeug==0.12.2
-jumpserver-python-sdk==0.0.18
+jumpserver-python-sdk==0.0.21