From fcbe94de374837ba16e468c198f9bf3c5e138c5c Mon Sep 17 00:00:00 2001 From: ibuler Date: Thu, 8 Mar 2018 12:28:45 +0800 Subject: [PATCH 01/25] =?UTF-8?q?[Update]=20=E6=9B=B4=E6=96=B0=E6=8C=81?= =?UTF-8?q?=E4=B9=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/step_by_step.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/step_by_step.rst b/docs/step_by_step.rst index 3112de67a..1221c2b85 100644 --- a/docs/step_by_step.rst +++ b/docs/step_by_step.rst @@ -232,7 +232,8 @@ Luna 已改为纯前端，需要 Nginx 来运行访问 docker run -d \ - -p 8081:8080 \ + -p 8081:8080 -v /opt/guacamole/key:/config/guacamole/key \ + -e JUMPSERVER_KEY_DIR=/config/guacamole/key \ -e JUMPSERVER_SERVER=http://<填写本机的IP地址>:8080 \ registry.jumpserver.org/public/guacamole:latest From 422990a992acee09ff10e4ca47c5ef7be89f4a68 Mon Sep 17 00:00:00 2001 From: fit2cloud-fengyi Date: Fri, 9 Mar 2018 10:33:57 +0800 Subject: [PATCH 02/25] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20venv=20=E5=88=B0=20i?= =?UTF-8?q?gnore=20=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index dc51315af..488f8a776 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ .env env env* +venv dist build *.egg From 050b6e6d88c1456c1dd9edfbc6da8b0217d66d8d Mon Sep 17 00:00:00 2001 From: ibuler Date: Fri, 9 Mar 2018 12:12:10 +0800 Subject: [PATCH 03/25] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E4=B8=80?= =?UTF-8?q?=E4=BA=9Bdocs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/contact.rst | 15 +++++++++------ docs/quickstart.rst | 17 ++++++++++------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/docs/contact.rst b/docs/contact.rst index 789207779..d858258cf 100644 --- a/docs/contact.rst +++ b/docs/contact.rst @@ -4,14 +4,17 @@ 商业支持 ~~~~~~~~~~~ -https://market.aliyun.com/products/53690006/cmgj026011.html +`阿里云市场购买: `_ + QQ群 ~~~~~~~~ -群1: 390139816 -群2: 399218702 -群3: 552054376 +群1: 390139816 (推荐) + +群2: 399218702 (满) + +群3: 552054376 (满) Github @@ -29,10 +32,10 @@ http://www.jumpserver.org Demo ~~~~~~~~ -http://demo.jumpserver.org:8080 +http://demo.jumpserver.org 邮件 ~~~~~~~~ -ibuler#fit2cloud.com (#替换为@) \ No newline at end of file +support@fit2cloud.com (#替换为@) \ No newline at end of file diff --git a/docs/quickstart.rst b/docs/quickstart.rst index c99675d5a..3a5315416 100644 --- a/docs/quickstart.rst +++ b/docs/quickstart.rst @@ -1,9 +1,9 @@ 快速安装 ========================== -Jumpserver 封装了一个 All in one Docker，可以快速启动。该镜像集成了所有需要的组件，可以使用外置 Database 和 Redis +Jumpserver 封装了一个 All in one Docker，可以快速启动。该镜像集成了所需要的组件(Windows组件未暂未集成)，也支持使用外置 Database 和 Redis -Tips: 不建议在生产中使用 +Tips: 不建议在生产中使用, 生产中请使用 详细安装 `详细安装 `_ Docker 安装见: `Docker官方安装文档 `_ @@ -18,9 +18,12 @@ Docker 安装见: `Docker官方安装文档 `_ 访问 ``````````````` -浏览器访问: http://localhost:8080 +浏览器访问: http://<容器所在服务器IP>:8080 + +SSH访问: ssh -p 2222 <容器所在服务器IP> + +XShell等工具请添加connection连接 -SSH访问: ssh -p 2222 localhost 额外环境变量 @@ -33,9 +36,9 @@ SSH访问: ssh -p 2222 localhost - DB_PASSWORD = xxxx - DB_NAME = jumpserver -- REDIS_HOST = '' -- REDIS_PORT = '' -- REDIS_PASSWORD = '' +- REDIS_HOST = +- REDIS_PORT = +- REDIS_PASSWORD = < :: From 9ffb079c8f7368e29a43682b2e8afe5aa077c365 Mon Sep 17 00:00:00 2001 From: ibuler Date: Fri, 9 Mar 2018 12:53:08 +0800 Subject: [PATCH 04/25] =?UTF-8?q?[Update]=20=E5=A2=9E=E5=8A=A0=E4=BF=AE?= =?UTF-8?q?=E6=94=B9system=20user=20auth=20=E7=9A=84api?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/api/system_user.py | 21 ++++++++++----------- apps/assets/serializers/system_user.py | 15 +++++++++++++++ apps/jumpserver/settings.py | 11 +++++++++-- 3 files changed, 34 insertions(+), 13 deletions(-) diff --git a/apps/assets/api/system_user.py b/apps/assets/api/system_user.py index c34690076..dd92afad4 100644 --- a/apps/assets/api/system_user.py +++ b/apps/assets/api/system_user.py @@ -40,23 +40,22 @@ class SystemUserViewSet(BulkModelViewSet): permission_classes = (IsSuperUserOrAppUser,) -class SystemUserAuthInfoApi(generics.RetrieveAPIView): +class SystemUserAuthInfoApi(generics.RetrieveUpdateAPIView): """ Get system user auth info """ queryset = SystemUser.objects.all() permission_classes = (IsSuperUserOrAppUser,) + serializer_class = serializers.SystemUserAuthSerializer - def retrieve(self, request, *args, **kwargs): - system_user = self.get_object() - data = { - 'id': system_user.id, - 'name': system_user.name, - 'username': system_user.username, - 'password': system_user.password, - 'private_key': system_user.private_key, - } - return Response(data) + def update(self, request, *args, **kwargs): + password = request.data.pop("password", None) + private_key = request.data.pop("private_key", None) + instance = self.get_object() + + if password or private_key: + instance.set_auth(password=password, private_key=private_key) + return super().update(request, *args, **kwargs) class SystemUserPushApi(generics.RetrieveAPIView): diff --git a/apps/assets/serializers/system_user.py b/apps/assets/serializers/system_user.py index 794c841f2..38aad66ce 100644 --- a/apps/assets/serializers/system_user.py +++ b/apps/assets/serializers/system_user.py @@ -36,6 +36,21 @@ class SystemUserSerializer(serializers.ModelSerializer): return len(obj.assets) +class SystemUserAuthSerializer(serializers.ModelSerializer): + """ + 系统用户认证信息 + """ + password = serializers.CharField(max_length=1024) + private_key = serializers.CharField(max_length=4096) + + class Meta: + model = SystemUser + fields = [ + "id", "name", "username", "protocol", + "password", "private_key", + ] + + class AssetSystemUserSerializer(serializers.ModelSerializer): """ 查看授权的资产系统用户的数据结构，这个和AssetSerializer不同，字段少 diff --git a/apps/jumpserver/settings.py b/apps/jumpserver/settings.py index 04fe210b2..6fa15e1df 100644 --- a/apps/jumpserver/settings.py +++ b/apps/jumpserver/settings.py @@ -27,7 +27,14 @@ sys.path.append(PROJECT_DIR) try: from config import config as CONFIG except ImportError: - CONFIG = type('_', (), {'__getattr__': lambda arg1, arg2: None})() + msg = """ + + Error: No config file found. + + You can run `cp config_example.py config.py`, and edit it. + """ + raise ImportError(msg) + # CONFIG = type('_', (), {'__getattr__': lambda arg1, arg2: None})() # Quick-start development settings - unsuitable for production # See https://docs.djangoproject.com/en/1.10/howto/deployment/checklist/ @@ -177,7 +184,7 @@ LOGGING = { 'level': 'DEBUG', 'class': 'logging.FileHandler', 'formatter': 'main', - 'filename': os.path.join(CONFIG.LOG_DIR, 'jumpserver.log') + 'filename': os.path.join(PROJECT_DIR, 'logs', 'jumpserver.log') }, 'ansible_logs': { 'level': 'DEBUG', From fe0301117764fb189dd17b0d1d0c9eafb907d89b Mon Sep 17 00:00:00 2001 From: ibuler Date: Sun, 11 Mar 2018 19:46:40 +0800 Subject: [PATCH 05/25] =?UTF-8?q?[Update]=20=E4=B8=8D=E5=85=81=E8=AE=B8?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BA=94=E7=94=A8=E7=A8=8B=E5=BA=8F=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E7=9A=84=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/users/forms.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/users/forms.py b/apps/users/forms.py index b239f58ee..58b78de71 100644 --- a/apps/users/forms.py +++ b/apps/users/forms.py @@ -20,10 +20,12 @@ class UserLoginForm(AuthenticationForm): class UserCreateUpdateForm(forms.ModelForm): + role_choices = ((i, n) for i, n in User.ROLE_CHOICES if i != User.ROLE_APP) password = forms.CharField( label=_('Password'), widget=forms.PasswordInput, max_length=128, strip=False, required=False, ) + role = forms.ChoiceField(choices=role_choices, required=True, initial=User.ROLE_USER, label=_("Role")) class Meta: model = User From e085fee101b412c8915578829f42b8f1af4af44f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=81=E5=B9=BF?= Date: Mon, 12 Mar 2018 09:16:54 +0800 Subject: [PATCH 06/25] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ba6766a1f..1a395ac27 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Jumpserver是全球首款完全开源的堡垒机，使用GNU GPL v2.0开源协 Jumpserver使用Python / Django 进行开发，遵循 Web 2.0 规范，配备了业界领先的 Web Terminal 解决方案，交互界面美观、用户体验好。 -Jumpserver采纳分布式架构，支持多机房跨区域部署，中心节点提供 API，各机房部署登录节点，可横向扩展、无并发访问限制。 +Jumpserver采纳分布式架构，支持多机房跨区域部署，中心节点提供 API，各机房部署登录节点，可横向扩展、无并发限制。 改变世界，从一点点开始。 From 0f2b0b146dea72ac7c42bef3f3ec25b8e0025a75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=81=E5=B9=BF?= Date: Mon, 12 Mar 2018 09:17:34 +0800 Subject: [PATCH 07/25] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1a395ac27..e44a23f9c 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ Jumpserver采纳分布式架构，支持多机房跨区域部署，中心节点 ### License & Copyright -Copyright (c) 2014-2017 Beijing Duizhan Tech, Inc., All rights reserved. +Copyright (c) 2014-2018 Beijing Duizhan Tech, Inc., All rights reserved. Licensed under The GNU General Public License version 2 (GPLv2) (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at From f59f03adfd00897d1cfba172385177c9b52cc749 Mon Sep 17 00:00:00 2001 From: ibuler Date: Mon, 12 Mar 2018 10:20:23 +0800 Subject: [PATCH 08/25] =?UTF-8?q?[Update]=20=E6=94=AF=E6=8C=81=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/tasks.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/apps/assets/tasks.py b/apps/assets/tasks.py index 3f792a080..be9f75152 100644 --- a/apps/assets/tasks.py +++ b/apps/assets/tasks.py @@ -1,6 +1,7 @@ # ~*~ coding: utf-8 ~*~ import json import re +import os from celery import shared_task from django.core.cache import cache @@ -20,6 +21,7 @@ TIMEOUT = 60 logger = get_logger(__file__) CACHE_MAX_TIME = 60*60*60 disk_pattern = re.compile(r'^hd|sd|xvd|vd') +PERIOD_TASK = os.environ.get("PERIOD_TASK", "on") @shared_task @@ -118,6 +120,10 @@ def update_assets_hardware_info_period(): Update asset hardware period task :return: """ + if PERIOD_TASK != "on": + logger.debug("Period task disabled, update assets hardware info pass") + return + from ops.utils import update_or_create_ansible_task task_name = _("Update assets hardware info period") hostname_list = [ @@ -190,6 +196,10 @@ def test_admin_user_connectability_period(): """ A period task that update the ansible task period """ + if PERIOD_TASK != "on": + logger.debug("Period task disabled, test admin user connectability pass") + return + admin_users = AdminUser.objects.all() for admin_user in admin_users: task_name = _("Test admin user connectability period: {}".format(admin_user.name)) @@ -287,6 +297,10 @@ def test_system_user_connectability_manual(system_user): @after_app_ready_start @after_app_shutdown_clean def test_system_user_connectability_period(): + if PERIOD_TASK != "on": + logger.debug("Period task disabled, test system user connectability pass") + return + system_users = SystemUser.objects.all() for system_user in system_users: task_name = _("test system user connectability period: {}".format(system_user)) From b92ccdd05eb9e7e753c1548c8dfbb88d7eef4f0a Mon Sep 17 00:00:00 2001 From: liuzheng Date: Mon, 12 Mar 2018 10:30:40 +0800 Subject: [PATCH 09/25] fix: update the jms-storage==0.0.11 --- apps/terminal/api.py | 44 +++++++++++------------------------ requirements/requirements.txt | 1 + 2 files changed, 14 insertions(+), 31 deletions(-) diff --git a/apps/terminal/api.py b/apps/terminal/api.py index 370835ca2..1f113ca85 100644 --- a/apps/terminal/api.py +++ b/apps/terminal/api.py @@ -4,7 +4,6 @@ from collections import OrderedDict import logging import os import uuid -import boto3 # AWS S3 sdk from django.core.cache import cache from django.shortcuts import get_object_or_404, redirect @@ -13,6 +12,8 @@ from django.core.files.storage import default_storage from django.http import HttpResponseNotFound from django.conf import settings +import jms_storage + from rest_framework import viewsets, serializers from rest_framework.views import APIView, Response from rest_framework.permissions import AllowAny @@ -282,36 +283,17 @@ class SessionReplayViewSet(viewsets.ViewSet): url = default_storage.url(path) return redirect(url) else: - config = settings.TERMINAL_REPLAY_STORAGE.items() - if config: - for name, value in config: - if value.get("TYPE", '') == "s3": - client, bucket = self.s3Client(value) - try: - date = self.session.date_start.strftime('%Y-%m-%d') - - client.head_object(Bucket=bucket, - Key=os.path.join(date, str(self.session.id) + '.replay.gz')) - client.download_file(bucket, os.path.join(date, str(self.session.id) + '.replay.gz'), - default_storage.base_location + '/' + path) - return redirect(default_storage.url(path)) - except: - pass - return HttpResponseNotFound() - - def s3Client(self, config): - bucket = config.get("BUCKET", "jumpserver") - REGION = config.get("REGION", None) - ACCESS_KEY = config.get("ACCESS_KEY", None) - SECRET_KEY = config.get("SECRET_KEY", None) - if ACCESS_KEY and REGION and SECRET_KEY: - s3 = boto3.client('s3', - region_name=REGION, - aws_access_key_id=ACCESS_KEY, - aws_secret_access_key=SECRET_KEY) - else: - s3 = boto3.client('s3') - return s3, bucket + configs = settings.TERMINAL_REPLAY_STORAGE.items() + if configs: + for name, config in configs: + client = jms_storage.init(config) + date = self.session.date_start.strftime('%Y-%m-%d') + if client.has_file(os.path.join(date, str(self.session.id) + '.replay.gz')) \ + and \ + client.download_file(os.path.join(date, str(self.session.id) + '.replay.gz'), + default_storage.base_location + '/' + path): + return redirect(default_storage.url(path)) + return HttpResponseNotFound() class TerminalConfig(APIView): diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 200d23480..536d00bc6 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -61,6 +61,7 @@ pytz==2017.3 PyYAML==3.12 redis==2.10.6 requests==2.18.4 +jms-storage==0.0.11 s3transfer==0.1.13 simplejson==3.13.2 six==1.11.0 From b19a0e1cdf07bef36de4af1aea6cea3245ebd0d1 Mon Sep 17 00:00:00 2001 From: fit2cloud-fengyi Date: Mon, 12 Mar 2018 10:33:55 +0800 Subject: [PATCH 10/25] =?UTF-8?q?=E5=88=A0=E9=99=A4faq=E5=92=8C=E4=B9=85?= =?UTF-8?q?=E7=9A=84intro?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/contact.rst | 2 +- docs/faq.rst | 2 -- docs/intro.rst | 51 ------------------------------------------------ 3 files changed, 1 insertion(+), 54 deletions(-) delete mode 100644 docs/faq.rst delete mode 100644 docs/intro.rst diff --git a/docs/contact.rst b/docs/contact.rst index 789207779..b537185a7 100644 --- a/docs/contact.rst +++ b/docs/contact.rst @@ -6,7 +6,7 @@ https://market.aliyun.com/products/53690006/cmgj026011.html -QQ群 +QQ 群 ~~~~~~~~ 群1: 390139816 diff --git a/docs/faq.rst b/docs/faq.rst deleted file mode 100644 index d02cca126..000000000 --- a/docs/faq.rst +++ /dev/null @@ -1,2 +0,0 @@ -FAQ -+++++++++++++++++++++ \ No newline at end of file diff --git a/docs/intro.rst b/docs/intro.rst deleted file mode 100644 index a8810e14f..000000000 --- a/docs/intro.rst +++ /dev/null @@ -1,51 +0,0 @@ -简介 -============ - -Jumpserver是混合云下更好用的堡垒机, 分布式架构设计无限扩展，轻松对接混合云资产，支持使用云存储（AWS S3, ES等）存储录像、命令 - -Jumpserver颠覆传统堡垒机, 无主机和并发数量限制，支持水平扩容，FIT2CLOUD提供完备的商业服务支持，用户无后顾之忧 - -Jumpserver拥有极致的用户体验, 极致UI体验，容器化的部署方式，部署过程方便快捷，可持续升级 - - -组件说明 -++++++++++++++++++++++++ - -Jumpserver -``````````` -现指Jumpserver管理后台，是核心组件(Core), 使用 Django Class Based View 风格开发，支持Restful API。 - -`Github `_ - - -Coco -```````` -实现了SSH Server 和 Web Terminal Server的组件，提供ssh和websocket接口, 使用 Paramiko 和 Flask 开发。 - - -`Github `__ - - -Luna -```````` -现在是Web Terminal前端，计划前端页面都由该项目提供，Jumpserver只提供API，不再负责后台渲染html等。 - -`Github `__ - - -Guacamole -``````````` -Apache 跳板机项目，Jumpserver使用其组件实现RDP功能，Jumpserver并没有修改其代码而是添加了额外的插件，支持Jumpserver调用 - - -Jumpserver-python-sdk -``````````````````````` -Jumpserver API Python SDK，Coco目前使用该SDK与Jumpserver API交互 - -`Github `__ - - -组件架构图 -++++++++++++++++++++++++ -.. image:: _static/img/structure.png - :alt: 组件架构图 From 43b4b7c55eedf22daae39d12f7f69b0a75b6935e Mon Sep 17 00:00:00 2001 From: ibuler Date: Mon, 12 Mar 2018 11:41:12 +0800 Subject: [PATCH 11/25] =?UTF-8?q?[Feature]=20=E8=B5=84=E4=BA=A7=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E5=A2=9E=E5=8A=A0=E6=89=B9=E9=87=8F=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E5=8F=AF=E8=BF=9E=E6=8E=A5=E6=80=A7=E5=92=8C=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E7=A1=AC=E4=BB=B6=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/api/node.py | 32 ++++- apps/assets/signals_handler.py | 2 +- apps/assets/tasks.py | 19 ++- apps/assets/templates/assets/asset_list.html | 45 +++++++ apps/assets/urls/api_urls.py | 2 + apps/i18n/zh/LC_MESSAGES/django.mo | Bin 29902 -> 30169 bytes apps/i18n/zh/LC_MESSAGES/django.po | 119 +++++++++++-------- 7 files changed, 157 insertions(+), 62 deletions(-) diff --git a/apps/assets/api/node.py b/apps/assets/api/node.py index 78cd7a27a..3c6ff292d 100644 --- a/apps/assets/api/node.py +++ b/apps/assets/api/node.py @@ -18,10 +18,12 @@ from rest_framework.views import APIView from rest_framework.response import Response from rest_framework_bulk import BulkModelViewSet from django.utils.translation import ugettext_lazy as _ +from django.shortcuts import get_object_or_404 from common.utils import get_logger, get_object_or_none from ..hands import IsSuperUser from ..models import Node +from ..tasks import update_assets_hardware_info_util, test_asset_connectability_util from .. import serializers @@ -29,7 +31,8 @@ logger = get_logger(__file__) __all__ = [ 'NodeViewSet', 'NodeChildrenApi', 'NodeAddAssetsApi', 'NodeRemoveAssetsApi', - 'NodeAddChildrenApi', + 'NodeAddChildrenApi', 'RefreshNodeHardwareInfoApi', + 'TestNodeConnectiveApi' ] @@ -117,3 +120,30 @@ class NodeRemoveAssetsApi(generics.UpdateAPIView): instance = self.get_object() if instance != Node.root(): instance.assets.remove(*tuple(assets)) + + +class RefreshNodeHardwareInfoApi(APIView): + permission_classes = (IsSuperUser,) + model = Node + + def get(self, request, *args, **kwargs): + node_id = kwargs.get('pk') + node = get_object_or_404(self.model, id=node_id) + assets = node.assets.all() + task_name = _("Refresh node assets hardware info: {}".format(node.name)) + update_assets_hardware_info_util.delay(assets, task_name=task_name) + return Response({"msg": "Task created"}) + + +class TestNodeConnectiveApi(APIView): + permission_classes = (IsSuperUser,) + model = Node + + def get(self, request, *args, **kwargs): + node_id = kwargs.get('pk') + node = get_object_or_404(self.model, id=node_id) + assets = node.assets.all() + task_name = _("Test node assets connective: {}".format(node.name)) + test_asset_connectability_util.delay(assets, task_name=task_name) + return Response({"msg": "Task created"}) + diff --git a/apps/assets/signals_handler.py b/apps/assets/signals_handler.py index 2577c7a6c..fe5508720 100644 --- a/apps/assets/signals_handler.py +++ b/apps/assets/signals_handler.py @@ -21,7 +21,7 @@ def update_asset_hardware_info_on_created(asset): def test_asset_conn_on_created(asset): logger.debug("Test asset `{}` connectability".format(asset)) - test_asset_connectability_util.delay(asset) + test_asset_connectability_util.delay([asset]) def set_asset_root_node(asset): diff --git a/apps/assets/tasks.py b/apps/assets/tasks.py index be9f75152..a6ffd2270 100644 --- a/apps/assets/tasks.py +++ b/apps/assets/tasks.py @@ -213,12 +213,12 @@ def test_admin_user_connectability_manual(admin_user): @shared_task -def test_asset_connectability_util(asset, task_name=None): +def test_asset_connectability_util(assets, task_name=None): from ops.utils import update_or_create_ansible_task if task_name is None: - task_name = _("Test asset connectability") - hosts = [asset.hostname] + task_name = _("Test assets connectability") + hosts = [asset.hostname for asset in assets] if not hosts: logger.info("No hosts, passed") return {} @@ -229,18 +229,17 @@ def test_asset_connectability_util(asset, task_name=None): ) result = task.run() summary = result[1] - if summary.get('dark'): - cache.set(const.ASSET_ADMIN_CONN_CACHE_KEY.format(asset.hostname), 0, - CACHE_MAX_TIME) - else: - cache.set(const.ASSET_ADMIN_CONN_CACHE_KEY.format(asset.hostname), 1, - CACHE_MAX_TIME) + for k in summary.get('dark'): + cache.set(const.ASSET_ADMIN_CONN_CACHE_KEY.format(k), 0, CACHE_MAX_TIME) + + for k in summary.get('contacted'): + cache.set(const.ASSET_ADMIN_CONN_CACHE_KEY.format(k), 1, CACHE_MAX_TIME) return summary @shared_task def test_asset_connectability_manual(asset): - summary = test_asset_connectability_util(asset) + summary = test_asset_connectability_util([asset]) if summary.get('dark'): return False, summary['dark'] diff --git a/apps/assets/templates/assets/asset_list.html b/apps/assets/templates/assets/asset_list.html index 628d0f905..da1b0be58 100644 --- a/apps/assets/templates/assets/asset_list.html +++ b/apps/assets/templates/assets/asset_list.html @@ -119,6 +119,8 @@
    + +
  • {% trans 'Add node' %}
  • {% trans 'Rename node' %}
    • @@ -476,6 +478,49 @@ $(document).ready(function(){ } window.open(url, '_self'); }) +.on('click', '.btn-refresh-hardware', function () { + var url = "{% url 'api-assets:node-refresh-hardware-info' pk=DEFAULT_PK %}"; + var nodes = zTree.getSelectedNodes(); + var current_node; + if (nodes && nodes.length ===1 ){ + current_node = nodes[0]; + } else { + return null; + } + + var the_url = url.replace("{{ DEFAULT_PK }}", current_node.id); + function success() { + rMenu.css({"visibility" : "hidden"}); + } + APIUpdateAttr({ + url: the_url, + method: "GET", + success_message: "更新硬件信息任务下发成功", + success: success + }); + +}) +.on('click', '.btn-test-connective', function () { + var url = "{% url 'api-assets:node-test-connective' pk=DEFAULT_PK %}"; + var nodes = zTree.getSelectedNodes(); + var current_node; + if (nodes && nodes.length ===1 ){ + current_node = nodes[0]; + } else { + return null; + } + + var the_url = url.replace("{{ DEFAULT_PK }}", current_node.id); + function success() { + rMenu.css({"visibility" : "hidden"}); + } + APIUpdateAttr({ + url: the_url, + method: "GET", + success_message: "测试可连接性任务下发成功", + success: success + }); +}) .on('click', '.btn_asset_delete', function () { var $this = $(this); var $data_table = $("#asset_list_table").DataTable(); diff --git a/apps/assets/urls/api_urls.py b/apps/assets/urls/api_urls.py index 38494539c..bfcb1c70c 100644 --- a/apps/assets/urls/api_urls.py +++ b/apps/assets/urls/api_urls.py @@ -47,6 +47,8 @@ urlpatterns = [ url(r'^v1/nodes/(?P[0-9a-zA-Z\-]{36})/children/add/$', api.NodeAddChildrenApi.as_view(), name='node-add-children'), url(r'^v1/nodes/(?P[0-9a-zA-Z\-]{36})/assets/add/$', api.NodeAddAssetsApi.as_view(), name='node-add-assets'), url(r'^v1/nodes/(?P[0-9a-zA-Z\-]{36})/assets/remove/$', api.NodeRemoveAssetsApi.as_view(), name='node-remove-assets'), + url(r'^v1/nodes/(?P[0-9a-zA-Z\-]{36})/refresh-hardware-info/$', api.RefreshNodeHardwareInfoApi.as_view(), name='node-refresh-hardware-info'), + url(r'^v1/nodes/(?P[0-9a-zA-Z\-]{36})/test-connective/$', api.TestNodeConnectiveApi.as_view(), name='node-test-connective'), ] urlpatterns += router.urls diff --git a/apps/i18n/zh/LC_MESSAGES/django.mo b/apps/i18n/zh/LC_MESSAGES/django.mo index 7a57574601761d81d519e18651860e9a014d90af..996977a184d1087ed00e5d229671baa2636795e2 100644 GIT binary patch delta 10780 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 delta 10604 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 diff --git a/apps/i18n/zh/LC_MESSAGES/django.po b/apps/i18n/zh/LC_MESSAGES/django.po index ff95b3eab..229662dd1 100644 --- a/apps/i18n/zh/LC_MESSAGES/django.po +++ b/apps/i18n/zh/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Jumpserver 0.3.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-03-07 21:18+0800\n" +"POT-Creation-Date: 2018-03-12 11:28+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: ibuler \n" "Language-Team: Jumpserver team\n" @@ -17,10 +17,18 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: assets/api/node.py:55 +#: assets/api/node.py:58 msgid "New node {}" msgstr "新节点 {}" +#: assets/api/node.py:133 +msgid "Refresh node assets hardware info: {}" +msgstr "更新一些资产硬件信息: {}" + +#: assets/api/node.py:146 +msgid "Test node assets connective: {}" +msgstr "测试节点资产可连接性" + #: assets/forms/asset.py:23 assets/forms/asset.py:54 assets/forms/user.py:125 #: assets/models/asset.py:53 assets/models/user.py:218 #: assets/templates/assets/asset_detail.html:181 @@ -52,7 +60,7 @@ msgstr "" "不支持ansible, 任意设置一个即可" #: assets/forms/asset.py:80 assets/forms/asset.py:84 assets/forms/label.py:15 -#: perms/templates/perms/asset_permission_asset.html:88 users/forms.py:242 +#: perms/templates/perms/asset_permission_asset.html:88 users/forms.py:244 msgid "Select assets" msgstr "选择资产" @@ -89,7 +97,7 @@ msgid "Password or private key passphrase" msgstr "密码或密钥密码" #: assets/forms/user.py:25 assets/models/user.py:30 common/forms.py:113 -#: users/forms.py:16 users/forms.py:24 users/templates/users/login.html:59 +#: users/forms.py:16 users/forms.py:25 users/templates/users/login.html:59 #: users/templates/users/reset_password.html:52 #: users/templates/users/user_create.html:11 #: users/templates/users/user_password_update.html:40 @@ -358,7 +366,7 @@ msgstr "默认资产组" #: terminal/templates/terminal/command_list.html:32 #: terminal/templates/terminal/command_list.html:72 #: terminal/templates/terminal/session_list.html:33 -#: terminal/templates/terminal/session_list.html:71 users/forms.py:190 +#: terminal/templates/terminal/session_list.html:71 users/forms.py:192 #: users/models/user.py:30 users/models/user.py:254 #: users/templates/users/user_group_detail.html:78 #: users/templates/users/user_group_list.html:13 users/views/user.py:333 @@ -424,43 +432,45 @@ msgstr "系统用户" msgid "%(value)s is not an even number" msgstr "%(value)s is not an even number" -#: assets/tasks.py:92 +#: assets/tasks.py:94 msgid "Update some assets hardware info" msgstr "更新一些资产硬件信息" -#: assets/tasks.py:108 +#: assets/tasks.py:110 msgid "Update asset hardware info" msgstr "更新资产硬件信息" -#: assets/tasks.py:122 +#: assets/tasks.py:128 msgid "Update assets hardware info period" msgstr "定期更新资产硬件信息" -#: assets/tasks.py:195 +#: assets/tasks.py:205 msgid "Test admin user connectability period: {}" msgstr "定期测试管理用户可连接性: {}" -#: assets/tasks.py:201 +#: assets/tasks.py:211 msgid "Test admin user connectability: {}" msgstr "测试管理用户可连接性: {}" -#: assets/tasks.py:210 -msgid "Test asset connectability" +#: assets/tasks.py:220 +#, fuzzy +#| msgid "Test asset connectability" +msgid "Test assets connectability" msgstr "测试资产可连接性" -#: assets/tasks.py:281 +#: assets/tasks.py:290 msgid "Test system user connectability: {}" msgstr "测试系统用户可连接性: {}" -#: assets/tasks.py:292 +#: assets/tasks.py:305 msgid "test system user connectability period: {}" msgstr "测试系统用户可连接性: {}" -#: assets/tasks.py:369 +#: assets/tasks.py:382 msgid "Push system user to node: {} => {}" msgstr "推送系统用户到节点: {}->{}" -#: assets/tasks.py:407 +#: assets/tasks.py:420 msgid "Push system users to node: {}" msgstr "推送系统用户到节点: {}" @@ -627,7 +637,7 @@ msgstr "提交" #: assets/templates/assets/admin_user_detail.html:24 #: assets/templates/assets/admin_user_list.html:84 #: assets/templates/assets/asset_detail.html:24 -#: assets/templates/assets/asset_list.html:166 +#: assets/templates/assets/asset_list.html:168 #: assets/templates/assets/label_list.html:38 #: assets/templates/assets/system_user_detail.html:26 #: assets/templates/assets/system_user_list.html:85 @@ -646,7 +656,7 @@ msgstr "更新" #: assets/templates/assets/admin_user_detail.html:28 #: assets/templates/assets/admin_user_list.html:85 #: assets/templates/assets/asset_detail.html:28 -#: assets/templates/assets/asset_list.html:167 +#: assets/templates/assets/asset_list.html:169 #: assets/templates/assets/label_list.html:39 #: assets/templates/assets/system_user_detail.html:30 #: assets/templates/assets/system_user_list.html:86 @@ -764,7 +774,7 @@ msgstr "替换资产的管理员" #: assets/templates/assets/admin_user_detail.html:100 #: assets/templates/assets/asset_detail.html:198 -#: assets/templates/assets/asset_list.html:541 +#: assets/templates/assets/asset_list.html:586 #: assets/templates/assets/system_user_detail.html:183 #: assets/templates/assets/system_user_list.html:135 templates/_modal.html:16 #: terminal/templates/terminal/session_detail.html:108 @@ -869,27 +879,35 @@ msgstr "从节点移除" msgid "Add asset" msgstr "添加资产到节点" +#: assets/templates/assets/asset_list.html:122 +msgid "Refresh node hardware info" +msgstr "更新节点资产硬件信息" + #: assets/templates/assets/asset_list.html:123 +msgid "Test node connective" +msgstr "测试节点资产可连接性" + +#: assets/templates/assets/asset_list.html:125 msgid "Add node" msgstr "新建节点" -#: assets/templates/assets/asset_list.html:124 +#: assets/templates/assets/asset_list.html:126 msgid "Rename node" msgstr "重命名节点" -#: assets/templates/assets/asset_list.html:126 +#: assets/templates/assets/asset_list.html:128 msgid "Delete node" msgstr "删除节点" -#: assets/templates/assets/asset_list.html:201 +#: assets/templates/assets/asset_list.html:203 msgid "Create node failed" msgstr "创建节点失败" -#: assets/templates/assets/asset_list.html:214 +#: assets/templates/assets/asset_list.html:216 msgid "Have child node, cancel" msgstr "存在子节点，不能删除" -#: assets/templates/assets/asset_list.html:536 +#: assets/templates/assets/asset_list.html:581 #: assets/templates/assets/system_user_list.html:130 #: users/templates/users/user_detail.html:334 #: users/templates/users/user_detail.html:359 @@ -898,20 +916,20 @@ msgstr "存在子节点，不能删除" msgid "Are you sure?" msgstr "你确认吗?" -#: assets/templates/assets/asset_list.html:537 +#: assets/templates/assets/asset_list.html:582 msgid "This will delete the selected assets !!!" msgstr "删除选择资产" -#: assets/templates/assets/asset_list.html:545 +#: assets/templates/assets/asset_list.html:590 msgid "Asset Deleted." msgstr "已被删除" -#: assets/templates/assets/asset_list.html:546 -#: assets/templates/assets/asset_list.html:551 +#: assets/templates/assets/asset_list.html:591 +#: assets/templates/assets/asset_list.html:596 msgid "Asset Delete" msgstr "删除" -#: assets/templates/assets/asset_list.html:550 +#: assets/templates/assets/asset_list.html:595 msgid "Asset Deleting failed." msgstr "删除失败" @@ -1598,7 +1616,7 @@ msgstr "添加" msgid "Add asset group to this permission" msgstr "添加资产组" -#: perms/templates/perms/asset_permission_asset.html:116 users/forms.py:245 +#: perms/templates/perms/asset_permission_asset.html:116 users/forms.py:247 msgid "Select asset groups" msgstr "选择资产组" @@ -1627,7 +1645,7 @@ msgstr "资产组数量" msgid "System user count" msgstr "系统用户数量" -#: perms/templates/perms/asset_permission_detail.html:144 users/forms.py:248 +#: perms/templates/perms/asset_permission_detail.html:144 users/forms.py:250 msgid "Select system users" msgstr "选择系统用户" @@ -2061,51 +2079,59 @@ msgstr "" msgid "Invalid token or cache refreshed." msgstr "" -#: users/forms.py:43 users/templates/users/user_detail.html:187 +#: users/forms.py:28 users/models/user.py:38 +#: users/templates/users/_select_user_modal.html:15 +#: users/templates/users/user_detail.html:87 +#: users/templates/users/user_list.html:25 +#: users/templates/users/user_profile.html:55 +msgid "Role" +msgstr "角色" + +#: users/forms.py:45 users/templates/users/user_detail.html:187 msgid "Join user groups" msgstr "添加到用户组" -#: users/forms.py:74 +#: users/forms.py:76 msgid "Old password" msgstr "原来密码" -#: users/forms.py:79 +#: users/forms.py:81 msgid "New password" msgstr "新密码" -#: users/forms.py:84 +#: users/forms.py:86 msgid "Confirm password" msgstr "确认密码" -#: users/forms.py:94 +#: users/forms.py:96 msgid "Old password error" msgstr "原来密码错误" -#: users/forms.py:102 +#: users/forms.py:104 msgid "Password does not match" msgstr "密码不一致" -#: users/forms.py:114 +#: users/forms.py:116 msgid "ssh public key" msgstr "ssh公钥" -#: users/forms.py:115 +#: users/forms.py:117 msgid "ssh-rsa AAAA..." msgstr "" -#: users/forms.py:116 +#: users/forms.py:118 msgid "Paste your id_rsa.pub here." msgstr "复制你的公钥到这里" -#: users/forms.py:129 +#: users/forms.py:131 msgid "Public key should not be the same as your old one." msgstr "不能和原来的密钥相同" -#: users/forms.py:133 users/serializers.py:42 +#: users/forms.py:135 users/serializers.py:42 msgid "Not a valid ssh public key" msgstr "ssh密钥不合法" -#: users/forms.py:147 users/forms.py:152 users/forms.py:164 users/forms.py:194 +#: users/forms.py:149 users/forms.py:154 users/forms.py:166 users/forms.py:196 msgid "Select users" msgstr "选择用户" @@ -2146,13 +2172,6 @@ msgstr "应用程序" msgid "Email" msgstr "邮件" -#: users/models/user.py:38 users/templates/users/_select_user_modal.html:15 -#: users/templates/users/user_detail.html:87 -#: users/templates/users/user_list.html:25 -#: users/templates/users/user_profile.html:55 -msgid "Role" -msgstr "角色" - #: users/models/user.py:39 msgid "Avatar" msgstr "头像" From b2ae0e8f445e2c3718820299e3d62e9a1dc47e60 Mon Sep 17 00:00:00 2001 From: liuzheng712 Date: Mon, 12 Mar 2018 17:53:22 +0800 Subject: [PATCH 12/25] fix: download update --- apps/terminal/api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/terminal/api.py b/apps/terminal/api.py index 1f113ca85..745079869 100644 --- a/apps/terminal/api.py +++ b/apps/terminal/api.py @@ -288,7 +288,7 @@ class SessionReplayViewSet(viewsets.ViewSet): for name, config in configs: client = jms_storage.init(config) date = self.session.date_start.strftime('%Y-%m-%d') - if client.has_file(os.path.join(date, str(self.session.id) + '.replay.gz')) \ + if client and client.has_file(os.path.join(date, str(self.session.id) + '.replay.gz')) \ and \ client.download_file(os.path.join(date, str(self.session.id) + '.replay.gz'), default_storage.base_location + '/' + path): From e4823a21e38102a2dc48fc19cdb77cd98cd07a03 Mon Sep 17 00:00:00 2001 From: ibuler Date: Mon, 12 Mar 2018 18:29:06 +0800 Subject: [PATCH 13/25] =?UTF-8?q?[Update]=20=E4=BC=98=E5=8C=96=E9=83=A8?= =?UTF-8?q?=E5=88=86=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/terminal/api.py | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/apps/terminal/api.py b/apps/terminal/api.py index 745079869..8247ac27c 100644 --- a/apps/terminal/api.py +++ b/apps/terminal/api.py @@ -284,15 +284,18 @@ class SessionReplayViewSet(viewsets.ViewSet): return redirect(url) else: configs = settings.TERMINAL_REPLAY_STORAGE.items() - if configs: - for name, config in configs: - client = jms_storage.init(config) - date = self.session.date_start.strftime('%Y-%m-%d') - if client and client.has_file(os.path.join(date, str(self.session.id) + '.replay.gz')) \ - and \ - client.download_file(os.path.join(date, str(self.session.id) + '.replay.gz'), - default_storage.base_location + '/' + path): - return redirect(default_storage.url(path)) + if not configs: + return HttpResponseNotFound() + + for name, config in configs: + client = jms_storage.init(config) + date = self.session.date_start.strftime('%Y-%m-%d') + file_path = os.path.join(date, str(self.session.id) + '.replay.gz') + target_path = default_storage.base_location + '/' + path + + if client and client.has_file(file_path) and \ + client.download_file(file_path, target_path): + return redirect(default_storage.url(path)) return HttpResponseNotFound() From 8e4ab9f3a947247b122319558da3f75a27a123ab Mon Sep 17 00:00:00 2001 From: ibuler Date: Mon, 12 Mar 2018 19:39:27 +0800 Subject: [PATCH 14/25] =?UTF-8?q?[Update]=20=E6=94=AF=E6=8C=81=E8=8E=B7?= =?UTF-8?q?=E5=8F=96token=E7=9A=84=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/users/api.py | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/apps/users/api.py b/apps/users/api.py index b485a593e..07d708d89 100644 --- a/apps/users/api.py +++ b/apps/users/api.py @@ -180,15 +180,24 @@ class UserConnectionTokenApi(APIView): 'asset': asset_id, 'system_user': system_user_id } - cache.set(token, value, timeout=3600) + cache.set(token, value, timeout=60) return Response({"token": token}, status=201) def get(self, request): token = request.query_params.get('token') + user_only = request.query_params.get('user-only', None) value = cache.get(token, None) - if value: + + if not value: + return Response('', status=404) + + if not user_only: cache.delete(token) - return Response(value) - - + return Response(value) + else: + return Response({'user': value['user']}) + def get_permissions(self): + if self.request.query_params.get('user-only', None): + self.permission_classes = (AllowAny,) + return super().get_permissions() From faf6a7b623e05ef2dc68b4f05cb095103a5ce902 Mon Sep 17 00:00:00 2001 From: ibuler Date: Mon, 12 Mar 2018 20:29:27 +0800 Subject: [PATCH 15/25] =?UTF-8?q?[Update]=20=E5=88=A0=E6=8E=89token=20api?= =?UTF-8?q?=E8=B0=83=E7=94=A8=E6=AC=A1=E6=95=B0=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/users/api.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/users/api.py b/apps/users/api.py index 07d708d89..df2f2079c 100644 --- a/apps/users/api.py +++ b/apps/users/api.py @@ -180,7 +180,7 @@ class UserConnectionTokenApi(APIView): 'asset': asset_id, 'system_user': system_user_id } - cache.set(token, value, timeout=60) + cache.set(token, value, timeout=20) return Response({"token": token}, status=201) def get(self, request): @@ -192,7 +192,6 @@ class UserConnectionTokenApi(APIView): return Response('', status=404) if not user_only: - cache.delete(token) return Response(value) else: return Response({'user': value['user']}) From 2e8f5919a80c51296985ae813b2a2ae869bdc52f Mon Sep 17 00:00:00 2001 From: ibuler Date: Tue, 13 Mar 2018 09:57:38 +0800 Subject: [PATCH 16/25] =?UTF-8?q?[Update]=20=E9=BB=98=E8=AE=A4=E5=85=B3?= =?UTF-8?q?=E9=97=AD=E8=87=AA=E5=8A=A8=E5=AE=9A=E6=97=B6=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/tasks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/assets/tasks.py b/apps/assets/tasks.py index a6ffd2270..b7385b0c8 100644 --- a/apps/assets/tasks.py +++ b/apps/assets/tasks.py @@ -21,7 +21,7 @@ TIMEOUT = 60 logger = get_logger(__file__) CACHE_MAX_TIME = 60*60*60 disk_pattern = re.compile(r'^hd|sd|xvd|vd') -PERIOD_TASK = os.environ.get("PERIOD_TASK", "on") +PERIOD_TASK = os.environ.get("PERIOD_TASK", "off") @shared_task From 9c2470b67c609a3be26c475997a87a1b86dd63b1 Mon Sep 17 00:00:00 2001 From: liuzheng712 Date: Tue, 13 Mar 2018 19:05:16 +0800 Subject: [PATCH 17/25] feat: update the sdk --- requirements/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 536d00bc6..790c19eb7 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -61,7 +61,7 @@ pytz==2017.3 PyYAML==3.12 redis==2.10.6 requests==2.18.4 -jms-storage==0.0.11 +jms-storage==0.0.13 s3transfer==0.1.13 simplejson==3.13.2 six==1.11.0 From 8b63961d4dad710d8ba9e6db8c93a293901d13dc Mon Sep 17 00:00:00 2001 From: ibuler Date: Wed, 14 Mar 2018 12:17:48 +0800 Subject: [PATCH 18/25] =?UTF-8?q?[Update]=20=E9=BB=98=E8=AE=A4=E5=BC=80?= =?UTF-8?q?=E5=90=AF=E5=AE=9A=E6=97=B6=E6=A3=80=E6=B5=8B=EF=BC=8C=E8=BF=90?= =?UTF-8?q?=E8=A1=8C=E5=A4=B1=E8=B4=A5=E9=BB=98=E8=AE=A4log=E4=B8=BAwarn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/tasks.py | 2 +- apps/ops/models.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/assets/tasks.py b/apps/assets/tasks.py index b7385b0c8..a6ffd2270 100644 --- a/apps/assets/tasks.py +++ b/apps/assets/tasks.py @@ -21,7 +21,7 @@ TIMEOUT = 60 logger = get_logger(__file__) CACHE_MAX_TIME = 60*60*60 disk_pattern = re.compile(r'^hd|sd|xvd|vd') -PERIOD_TASK = os.environ.get("PERIOD_TASK", "off") +PERIOD_TASK = os.environ.get("PERIOD_TASK", "on") @shared_task diff --git a/apps/ops/models.py b/apps/ops/models.py index 471df25d7..1120bb206 100644 --- a/apps/ops/models.py +++ b/apps/ops/models.py @@ -234,7 +234,7 @@ class AdHoc(models.Model): result = runner.run(self.tasks, self.pattern, self.task.name) return result.results_raw, result.results_summary except AnsibleError as e: - logger.error("Failed run adhoc {}, {}".format(self.task.name, e)) + logger.warn("Failed run adhoc {}, {}".format(self.task.name, e)) pass @become.setter From 5d88c7b7798d49c5c09fa1d92e1effdc5e6f713a Mon Sep 17 00:00:00 2001 From: fit2cloud-fengyi Date: Wed, 14 Mar 2018 13:09:51 +0800 Subject: [PATCH 19/25] add git install --- docs/step_by_step.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/step_by_step.rst b/docs/step_by_step.rst index 1221c2b85..8a78c19de 100644 --- a/docs/step_by_step.rst +++ b/docs/step_by_step.rst @@ -26,7 +26,7 @@ :: - $ yum -y install wget sqlite-devel xz gcc automake zlib-devel openssl-devel epel-release + $ yum -y install wget sqlite-devel xz gcc automake zlib-devel openssl-devel epel-release git **1.2 编译安装** From 42f297e6c4585deb083e0989c1d183339448c55a Mon Sep 17 00:00:00 2001 From: ibuler Date: Wed, 14 Mar 2018 13:13:32 +0800 Subject: [PATCH 20/25] =?UTF-8?q?[Update]=20=E6=9B=B4=E6=96=B0=E4=B8=80?= =?UTF-8?q?=E4=BA=9B=E6=96=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/api/node.py | 5 +- apps/assets/forms/asset.py | 8 +- apps/assets/tasks.py | 30 ++-- apps/i18n/zh/LC_MESSAGES/django.mo | Bin 30169 -> 29828 bytes apps/i18n/zh/LC_MESSAGES/django.po | 149 +++++++++++------- apps/terminal/forms.py | 10 +- .../templates/terminal/terminal_list.html | 12 +- .../terminal/terminal_modal_accept.html | 4 +- .../templates/terminal/terminal_update.html | 4 +- 9 files changed, 137 insertions(+), 85 deletions(-) diff --git a/apps/assets/api/node.py b/apps/assets/api/node.py index 3c6ff292d..9c002b271 100644 --- a/apps/assets/api/node.py +++ b/apps/assets/api/node.py @@ -130,7 +130,8 @@ class RefreshNodeHardwareInfoApi(APIView): node_id = kwargs.get('pk') node = get_object_or_404(self.model, id=node_id) assets = node.assets.all() - task_name = _("Refresh node assets hardware info: {}".format(node.name)) + # task_name = _("Refresh node assets hardware info: {}".format(node.name)) + task_name = _("更新节点资产硬件信息: {}".format(node.name)) update_assets_hardware_info_util.delay(assets, task_name=task_name) return Response({"msg": "Task created"}) @@ -143,7 +144,7 @@ class TestNodeConnectiveApi(APIView): node_id = kwargs.get('pk') node = get_object_or_404(self.model, id=node_id) assets = node.assets.all() - task_name = _("Test node assets connective: {}".format(node.name)) + task_name = _("测试节点下资产是否可连接: {}".format(node.name)) test_asset_connectability_util.delay(assets, task_name=task_name) return Response({"msg": "Task created"}) diff --git a/apps/assets/forms/asset.py b/apps/assets/forms/asset.py index ce3e3fb56..d5f4ccd04 100644 --- a/apps/assets/forms/asset.py +++ b/apps/assets/forms/asset.py @@ -38,7 +38,8 @@ class AssetCreateForm(forms.ModelForm): 'Admin user is a privilege user exist on this asset,' 'Example: root or other NOPASSWD sudo privilege user' 'If asset not support ansible, set any one' - ) + ), + 'platform': _("* required Must set exact system platform, Windows, Linux ...") } @@ -70,7 +71,8 @@ class AssetUpdateForm(forms.ModelForm): 'Admin user is a privilege user exist on this asset,' 'Example: root or other NOPASSWD sudo privilege user' 'If asset not support ansible, set any one' - ) + ), + 'platform': _("* required Must set exact system platform, Windows, Linux ...") } @@ -102,7 +104,7 @@ class AssetBulkUpdateForm(forms.ModelForm): class Meta: model = Asset fields = [ - 'assets', 'port', 'admin_user', 'labels', 'nodes', + 'assets', 'port', 'admin_user', 'labels', 'nodes', 'platform' ] widgets = { 'labels': forms.SelectMultiple( diff --git a/apps/assets/tasks.py b/apps/assets/tasks.py index a6ffd2270..0cf5cbfd8 100644 --- a/apps/assets/tasks.py +++ b/apps/assets/tasks.py @@ -91,7 +91,8 @@ def update_assets_hardware_info_util(assets, task_name=None): """ from ops.utils import update_or_create_ansible_task if task_name is None: - task_name = _("Update some assets hardware info") + # task_name = _("Update some assets hardware info") + task_name = _("更新资产硬件信息") tasks = const.UPDATE_ASSETS_HARDWARE_TASKS hostname_list = [asset.hostname for asset in assets if asset.is_active and asset.is_unixlike()] task, created = update_or_create_ansible_task( @@ -107,7 +108,8 @@ def update_assets_hardware_info_util(assets, task_name=None): @shared_task def update_asset_hardware_info_manual(asset): - task_name = _("Update asset hardware info") + # task_name = _("Update asset hardware info") + task_name = _("更新资产硬件信息") return update_assets_hardware_info_util([asset], task_name=task_name) @@ -125,7 +127,8 @@ def update_assets_hardware_info_period(): return from ops.utils import update_or_create_ansible_task - task_name = _("Update assets hardware info period") + # task_name = _("Update assets hardware info period") + task_name = _("定期更新资产硬件信息") hostname_list = [ asset.hostname for asset in Asset.objects.all() if asset.is_active and asset.is_unixlike() @@ -202,13 +205,15 @@ def test_admin_user_connectability_period(): admin_users = AdminUser.objects.all() for admin_user in admin_users: - task_name = _("Test admin user connectability period: {}".format(admin_user.name)) + # task_name = _("Test admin user connectability period: {}".format(admin_user.name)) + task_name = _("定期测试管理账号可连接性: {}".format(admin_user.name)) test_admin_user_connectability_util(admin_user, task_name) @shared_task def test_admin_user_connectability_manual(admin_user): - task_name = _("Test admin user connectability: {}").format(admin_user.name) + # task_name = _("Test admin user connectability: {}").format(admin_user.name) + task_name = _("测试管理行号可连接性: {}").format(admin_user.name) return test_admin_user_connectability_util.delay(admin_user, task_name) @@ -217,8 +222,9 @@ def test_asset_connectability_util(assets, task_name=None): from ops.utils import update_or_create_ansible_task if task_name is None: - task_name = _("Test assets connectability") - hosts = [asset.hostname for asset in assets] + # task_name = _("Test assets connectability") + task_name = _("测试资产可连接性") + hosts = [asset.hostname for asset in assets if asset.is_active and asset.is_unixlike()] if not hosts: logger.info("No hosts, passed") return {} @@ -302,7 +308,8 @@ def test_system_user_connectability_period(): system_users = SystemUser.objects.all() for system_user in system_users: - task_name = _("test system user connectability period: {}".format(system_user)) + # task_name = _("Test system user connectability period: {}".format(system_user)) + task_name = _("定期测试系统用户可连接性: {}".format(system_user)) test_system_user_connectability_util(system_user, task_name) @@ -379,7 +386,9 @@ def push_system_user_util(system_users, assets, task_name): def get_node_push_system_user_task_name(system_user, node): - return _("Push system user to node: {} => {}").format( + + # return _("Push system user to node: {} => {}").format( + return _("推送系统用户到节点资产: {} => {}").format( system_user.name, node.value ) @@ -417,7 +426,8 @@ def push_node_system_users_to_asset(node, assets): system_users.extend(list(n.systemuser_set.all())) if system_users: - task_name = _("Push system users to node: {}").format(node.value) + # task_name = _("Push system users to node: {}").format(node.value) + task_name = _("推送节点系统用户到新加入资产中: {}").format(node.value) push_system_user_util.delay(system_users, assets, task_name) diff --git a/apps/i18n/zh/LC_MESSAGES/django.mo b/apps/i18n/zh/LC_MESSAGES/django.mo index 996977a184d1087ed00e5d229671baa2636795e2..c4e2c1b8a8747972183408204baee2015edaaffd 100644 GIT binary patch delta 11087 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 delta 11280 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 LO6H^{F=hS@a)8Qk diff --git a/apps/i18n/zh/LC_MESSAGES/django.po b/apps/i18n/zh/LC_MESSAGES/django.po index 229662dd1..dba1c58a5 100644 --- a/apps/i18n/zh/LC_MESSAGES/django.po +++ b/apps/i18n/zh/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Jumpserver 0.3.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-03-12 11:28+0800\n" +"POT-Creation-Date: 2018-03-14 13:07+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: ibuler \n" "Language-Team: Jumpserver team\n" @@ -21,15 +21,15 @@ msgstr "" msgid "New node {}" msgstr "新节点 {}" -#: assets/api/node.py:133 -msgid "Refresh node assets hardware info: {}" -msgstr "更新一些资产硬件信息: {}" +#: assets/api/node.py:134 +msgid "更新节点资产硬件信息: {}" +msgstr "" -#: assets/api/node.py:146 +#: assets/api/node.py:147 msgid "Test node assets connective: {}" msgstr "测试节点资产可连接性" -#: assets/forms/asset.py:23 assets/forms/asset.py:54 assets/forms/user.py:125 +#: assets/forms/asset.py:23 assets/forms/asset.py:55 assets/forms/user.py:125 #: assets/models/asset.py:53 assets/models/user.py:218 #: assets/templates/assets/asset_detail.html:181 #: assets/templates/assets/asset_detail.html:189 @@ -37,34 +37,38 @@ msgstr "测试节点资产可连接性" msgid "Nodes" msgstr "节点管理" -#: assets/forms/asset.py:26 assets/forms/asset.py:57 assets/forms/asset.py:93 -#: assets/forms/asset.py:97 assets/models/asset.py:57 +#: assets/forms/asset.py:26 assets/forms/asset.py:58 assets/forms/asset.py:95 +#: assets/forms/asset.py:99 assets/models/asset.py:57 #: assets/models/cluster.py:19 assets/models/user.py:187 #: assets/templates/assets/asset_detail.html:73 templates/_nav.html:24 msgid "Admin user" msgstr "管理用户" -#: assets/forms/asset.py:29 assets/forms/asset.py:60 assets/models/asset.py:81 +#: assets/forms/asset.py:29 assets/forms/asset.py:61 assets/models/asset.py:81 #: assets/templates/assets/asset_create.html:32 #: assets/templates/assets/asset_detail.html:218 #: assets/templates/assets/asset_update.html:37 templates/_nav.html:26 msgid "Labels" msgstr "标签管理" -#: assets/forms/asset.py:38 assets/forms/asset.py:70 +#: assets/forms/asset.py:38 assets/forms/asset.py:71 msgid "" "Admin user is a privilege user exist on this asset,Example: root or other " "NOPASSWD sudo privilege userIf asset not support ansible, set any one" msgstr "" "管理用户是资产上已经存在的特权用户，如 root或者其它有NOPASSWD的用户, 如果资产" -"不支持ansible, 任意设置一个即可" +"是Windows或交换机, 任意设置一个即可" -#: assets/forms/asset.py:80 assets/forms/asset.py:84 assets/forms/label.py:15 +#: assets/forms/asset.py:42 assets/forms/asset.py:75 +msgid "* required Must set exact system platform, Windows, Linux ..." +msgstr "* required 必须准确设置操作系统平台，如Windows, Linux ..." + +#: assets/forms/asset.py:82 assets/forms/asset.py:86 assets/forms/label.py:15 #: perms/templates/perms/asset_permission_asset.html:88 users/forms.py:244 msgid "Select assets" msgstr "选择资产" -#: assets/forms/asset.py:89 assets/models/asset.py:52 +#: assets/forms/asset.py:91 assets/models/asset.py:52 #: assets/templates/assets/admin_user_assets.html:53 #: assets/templates/assets/asset_detail.html:69 #: assets/templates/assets/system_user_asset.html:51 @@ -72,11 +76,11 @@ msgstr "选择资产" msgid "Port" msgstr "端口" -#: assets/forms/asset.py:109 assets/templates/assets/asset_create.html:36 +#: assets/forms/asset.py:111 assets/templates/assets/asset_create.html:36 msgid "Select labels" msgstr "选择标签" -#: assets/forms/asset.py:112 assets/templates/assets/admin_user_detail.html:91 +#: assets/forms/asset.py:114 assets/templates/assets/admin_user_detail.html:91 msgid "Select nodes" msgstr "选择节点" @@ -432,47 +436,41 @@ msgstr "系统用户" msgid "%(value)s is not an even number" msgstr "%(value)s is not an even number" -#: assets/tasks.py:94 -msgid "Update some assets hardware info" -msgstr "更新一些资产硬件信息" +#: assets/tasks.py:95 assets/tasks.py:112 +msgid "更新资产硬件信息" +msgstr "" -#: assets/tasks.py:110 -msgid "Update asset hardware info" -msgstr "更新资产硬件信息" +#: assets/tasks.py:131 +msgid "定期更新资产硬件信息" +msgstr "" -#: assets/tasks.py:128 -msgid "Update assets hardware info period" -msgstr "定期更新资产硬件信息" +#: assets/tasks.py:209 +msgid "定期测试管理账号可连接性: {}" +msgstr "" -#: assets/tasks.py:205 -msgid "Test admin user connectability period: {}" -msgstr "定期测试管理用户可连接性: {}" +#: assets/tasks.py:216 +msgid "测试管理行号可连接性: {}" +msgstr "" -#: assets/tasks.py:211 -msgid "Test admin user connectability: {}" -msgstr "测试管理用户可连接性: {}" +#: assets/tasks.py:226 +msgid "测试资产可连接性" +msgstr "" -#: assets/tasks.py:220 -#, fuzzy -#| msgid "Test asset connectability" -msgid "Test assets connectability" -msgstr "测试资产可连接性" - -#: assets/tasks.py:290 +#: assets/tasks.py:296 msgid "Test system user connectability: {}" msgstr "测试系统用户可连接性: {}" -#: assets/tasks.py:305 -msgid "test system user connectability period: {}" -msgstr "测试系统用户可连接性: {}" +#: assets/tasks.py:312 +msgid "定期测试系统用户可连接性: {}" +msgstr "" -#: assets/tasks.py:382 -msgid "Push system user to node: {} => {}" -msgstr "推送系统用户到节点: {}->{}" +#: assets/tasks.py:391 +msgid "推送系统用户到节点资产: {} => {}" +msgstr "" -#: assets/tasks.py:420 -msgid "Push system users to node: {}" -msgstr "推送系统用户到节点: {}" +#: assets/tasks.py:430 +msgid "推送节点系统用户到新加入资产中: {}" +msgstr "" #: assets/templates/assets/_asset_group_bulk_update_modal.html:5 msgid "Update asset group" @@ -1229,7 +1227,7 @@ msgid "" msgstr "设置终端命令存储，default是默认用的存储方式" #: common/forms.py:165 common/templates/common/terminal_setting.html:81 -#: terminal/forms.py:34 terminal/models.py:21 +#: terminal/forms.py:35 terminal/models.py:21 msgid "Replay storage" msgstr "录像存储" @@ -1833,13 +1831,18 @@ msgstr "输出" msgid "Session" msgstr "会话" -#: terminal/forms.py:44 -msgid "Coco ssh listen port" -msgstr "SSH 监听端口" +#: terminal/forms.py:31 +msgid "Command can store in server db or ES, default to server, more see docs" +msgstr "" +"命令支持存储到服务器端数据库、ES中，默认存储的服务器端数据库，更多查看文档" -#: terminal/forms.py:45 -msgid "Coco http/ws listen port" -msgstr "Http/Websocket 监听端口" +#: terminal/forms.py:36 +msgid "" +"Replay file can store in server disk, AWS S3, Aliyun OSS, default to server, " +"more see docs" +msgstr "" +"录像文件支持存储到服务器端硬盘、AWS S3、 阿里云 OSS 中，默认存储到服务器端硬" +"盘, 更多查看文档" #: terminal/models.py:17 msgid "Remote Address" @@ -1966,12 +1969,10 @@ msgid "Terminal detail" msgstr "终端详情" #: terminal/templates/terminal/terminal_detail.html:51 -#: terminal/templates/terminal/terminal_list.html:31 msgid "SSH port" msgstr "SSH端口" #: terminal/templates/terminal/terminal_detail.html:55 -#: terminal/templates/terminal/terminal_list.html:32 msgid "Http port" msgstr "HTTP端口" @@ -2667,5 +2668,43 @@ msgstr "密码更新" msgid "Public key update" msgstr "密钥更新" +#~ msgid "Refresh node assets hardware info: {}" +#~ msgstr "更新一些资产硬件信息: {}" + +#~ msgid "Update some assets hardware info" +#~ msgstr "更新一些资产硬件信息" + +#~ msgid "Update asset hardware info" +#~ msgstr "更新资产硬件信息" + +#~ msgid "Update assets hardware info period" +#~ msgstr "定期更新资产硬件信息" + +#~ msgid "Test admin user connectability period: {}" +#~ msgstr "定期测试管理用户可连接性: {}" + +#~ msgid "Test admin user connectability: {}" +#~ msgstr "测试管理用户可连接性: {}" + +#, fuzzy +#~| msgid "Test asset connectability" +#~ msgid "Test assets connectability" +#~ msgstr "测试资产可连接性" + +#~ msgid "Test system user connectability period: {}" +#~ msgstr "测试系统用户可连接性: {}" + +#~ msgid "Push system user to node: {} => {}" +#~ msgstr "推送系统用户到节点: {}->{}" + +#~ msgid "Push system users to node: {}" +#~ msgstr "推送系统用户到节点: {}" + +#~ msgid "Coco ssh listen port" +#~ msgstr "SSH 监听端口" + +#~ msgid "Coco http/ws listen port" +#~ msgstr "Http/Websocket 监听端口" + #~ msgid "Create asset permission " #~ msgstr "创建资产权限" diff --git a/apps/terminal/forms.py b/apps/terminal/forms.py index ab4520b03..dbba3cb01 100644 --- a/apps/terminal/forms.py +++ b/apps/terminal/forms.py @@ -27,20 +27,20 @@ def get_all_replay_storage(): class TerminalForm(forms.ModelForm): command_storage = forms.ChoiceField( choices=get_all_command_storage(), - label=_("Command storage") + label=_("Command storage"), + help_text=_("Command can store in server db or ES, default to server, more see docs"), ) replay_storage = forms.ChoiceField( choices=get_all_replay_storage(), - label=_("Replay storage") + label=_("Replay storage"), + help_text=_("Replay file can store in server disk, AWS S3, Aliyun OSS, default to server, more see docs"), ) class Meta: model = Terminal fields = [ - 'name', 'remote_addr', 'ssh_port', 'http_port', 'comment', + 'name', 'remote_addr', 'comment', 'command_storage', 'replay_storage', ] help_texts = { - 'ssh_port': _("Coco ssh listen port"), - 'http_port': _("Coco http/ws listen port"), } diff --git a/apps/terminal/templates/terminal/terminal_list.html b/apps/terminal/templates/terminal/terminal_list.html index a56843852..3039c0425 100644 --- a/apps/terminal/templates/terminal/terminal_list.html +++ b/apps/terminal/templates/terminal/terminal_list.html @@ -28,8 +28,8 @@ {% trans 'Name' %} {% trans 'Addr' %} - {% trans 'SSH port' %} - {% trans 'Http port' %} +{# {% trans 'SSH port' %}#} +{# {% trans 'Http port' %}#} {% trans 'Session' %} {% trans 'Active' %} {% trans 'Alive' %} @@ -53,21 +53,21 @@ function initTable() { var detail_btn = '' + cellData + ''; $(td).html(detail_btn.replace('{{ DEFAULT_PK }}', rowData.id)); }}, - {targets: 6, createdCell: function (td, cellData) { + {targets: 4, createdCell: function (td, cellData) { if (!cellData) { $(td).html('') } else { $(td).html('') } }}, - {targets: 7, createdCell: function (td, cellData) { + {targets: 5, createdCell: function (td, cellData) { if (!cellData) { $(td).html('') } else { $(td).html('') } }}, - {targets: 8, createdCell: function (td, cellData, rowData) { + {targets: 6, createdCell: function (td, cellData, rowData) { var update_btn = '{% trans "Update" %}' .replace('{{ DEFAULT_PK }}', cellData); var delete_btn = '{% trans "Delete" %}' @@ -88,7 +88,7 @@ function initTable() { }} ], ajax_url: '{% url "api-terminal:terminal-list" %}', - columns: [{data: function(){return ""}}, {data: "name" }, {data: "remote_addr" }, {data: "ssh_port"}, {data: "http_port"}, + columns: [{data: function(){return ""}}, {data: "name" }, {data: "remote_addr" }, {data: "session_online"}, {data: "is_active" }, {data: 'is_alive'}, {data: "id"}], op_html: $('#actions').html() }; diff --git a/apps/terminal/templates/terminal/terminal_modal_accept.html b/apps/terminal/templates/terminal/terminal_modal_accept.html index e846a63e1..ae81ff95e 100644 --- a/apps/terminal/templates/terminal/terminal_modal_accept.html +++ b/apps/terminal/templates/terminal/terminal_modal_accept.html @@ -10,8 +10,8 @@ {% bootstrap_field form.name layout="horizontal" %} {% bootstrap_field form.remote_addr layout="horizontal" %} - {% bootstrap_field form.ssh_port layout="horizontal" %} - {% bootstrap_field form.http_port layout="horizontal" %} +{# {% bootstrap_field form.ssh_port layout="horizontal" %}#} +{# {% bootstrap_field form.http_port layout="horizontal" %}#} {% bootstrap_field form.command_storage layout="horizontal" %} {% bootstrap_field form.replay_storage layout="horizontal" %} {% bootstrap_field form.comment layout="horizontal" %} diff --git a/apps/terminal/templates/terminal/terminal_update.html b/apps/terminal/templates/terminal/terminal_update.html index a40e3c362..bde86563d 100644 --- a/apps/terminal/templates/terminal/terminal_update.html +++ b/apps/terminal/templates/terminal/terminal_update.html @@ -33,8 +33,8 @@

    {% trans 'Info' %}

    {% bootstrap_field form.name layout="horizontal" %} {% bootstrap_field form.remote_addr layout="horizontal" %} - {% bootstrap_field form.ssh_port layout="horizontal" %} - {% bootstrap_field form.http_port layout="horizontal" %} +{# {% bootstrap_field form.ssh_port layout="horizontal" %}#} +{# {% bootstrap_field form.http_port layout="horizontal" %}#} {% bootstrap_field form.command_storage layout="horizontal" %} {% bootstrap_field form.replay_storage layout="horizontal" %} From 5c3846a886117cec14dfe7a6e6778712737d05c5 Mon Sep 17 00:00:00 2001 From: ibuler Date: Wed, 14 Mar 2018 15:54:27 +0800 Subject: [PATCH 21/25] =?UTF-8?q?[Update]=20=E6=B7=BB=E5=8A=A0Faq?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/faq.rst | 19 +++++++++++++++- docs/index.rst | 1 + docs/intro.rst | 51 ------------------------------------------- docs/step_by_step.rst | 20 +++++++++++++++-- 4 files changed, 37 insertions(+), 54 deletions(-) delete mode 100644 docs/intro.rst diff --git a/docs/faq.rst b/docs/faq.rst index d02cca126..ef13f3968 100644 --- a/docs/faq.rst +++ b/docs/faq.rst @@ -1,2 +1,19 @@ FAQ -+++++++++++++++++++++ \ No newline at end of file +========== + +1. Windows 无法连接 + +:: + + (1). 如果白屏 可能是nginx设置的不对，也可能运行guacamole的docker容器有问题，总之请求到不了guacamole + (2). 如果显示没有权限 可能是你在 终端管理里没有接受 guacamole的注册，请接受一下，如果还是不行，就删除刚才的注册，重启guacamole的docker重新注册 + (3). 如果显示未知问题 可能是你的资产填写的端口不对，或者授权的系统用户的协议不是rdp + + +2. 用户、系统用户、管理用户的关系 + +:: + + 用户：每个公司的同事创建一个用户账号，用来登录Jumpserver + 系统用户：使用来登录到服务器的用户，如 web, dba, root等 + 管理用户：是服务器上已存在的特权用户，Ansible用来获取硬件信息 diff --git a/docs/index.rst b/docs/index.rst index 41a9ffcb0..ac111c690 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -19,3 +19,4 @@ Jumpserver 文档 contributor contact snapshot + faq diff --git a/docs/intro.rst b/docs/intro.rst deleted file mode 100644 index a8810e14f..000000000 --- a/docs/intro.rst +++ /dev/null @@ -1,51 +0,0 @@ -简介 -============ - -Jumpserver是混合云下更好用的堡垒机, 分布式架构设计无限扩展，轻松对接混合云资产，支持使用云存储（AWS S3, ES等）存储录像、命令 - -Jumpserver颠覆传统堡垒机, 无主机和并发数量限制，支持水平扩容，FIT2CLOUD提供完备的商业服务支持，用户无后顾之忧 - -Jumpserver拥有极致的用户体验, 极致UI体验，容器化的部署方式，部署过程方便快捷，可持续升级 - - -组件说明 -++++++++++++++++++++++++ - -Jumpserver -``````````` -现指Jumpserver管理后台，是核心组件(Core), 使用 Django Class Based View 风格开发，支持Restful API。 - -`Github `_ - - -Coco -```````` -实现了SSH Server 和 Web Terminal Server的组件，提供ssh和websocket接口, 使用 Paramiko 和 Flask 开发。 - - -`Github `__ - - -Luna -```````` -现在是Web Terminal前端，计划前端页面都由该项目提供，Jumpserver只提供API，不再负责后台渲染html等。 - -`Github `__ - - -Guacamole -``````````` -Apache 跳板机项目，Jumpserver使用其组件实现RDP功能，Jumpserver并没有修改其代码而是添加了额外的插件，支持Jumpserver调用 - - -Jumpserver-python-sdk -``````````````````````` -Jumpserver API Python SDK，Coco目前使用该SDK与Jumpserver API交互 - -`Github `__ - - -组件架构图 -++++++++++++++++++++++++ -.. image:: _static/img/structure.png - :alt: 组件架构图 diff --git a/docs/step_by_step.rst b/docs/step_by_step.rst index 1221c2b85..92a1d9e75 100644 --- a/docs/step_by_step.rst +++ b/docs/step_by_step.rst @@ -230,6 +230,7 @@ Luna 已改为纯前端，需要 Nginx 来运行访问 .. code:: shell + # 注意：这里一定要改写一下本机的IP地址, 否则会出错 docker run -d \ -p 8081:8080 -v /opt/guacamole/key:/config/guacamole/key \ @@ -239,14 +240,23 @@ Luna 已改为纯前端，需要 Nginx 来运行访问 这里所需要注意的是 guacamole 暴露出来的端口是 8081，若与主机上其他端口冲突请自定义一下。 -修改 JUMPSERVER SERVER 的配置，填上 Jumpserver 的内网地址 +再次强调：修改 JUMPSERVER_SERVER 环境变量的配置，填上 Jumpserver 的内网地址, 这时 +去 Jumpserver-会话管理-终端管理 接受[Gua]开头的一个注册 + + 六. 配置 Nginx 整合各组件 ~~~~~~~~~~~~~~~~~~~~~~~~~ 6.1 安装 Nginx 根据喜好选择安装方式和版本 -6.2 配置文件 +.. code:: shell + + yum -y install nginx + + +6.2 准备配置文件 修改 /etc/nginx/nginx.conf + :: @@ -296,4 +306,10 @@ Luna 已改为纯前端，需要 Nginx 来运行访问 6.3 运行 Nginx +:: + + nginx -t + service nginx start + + 6.4 访问 http://192.168.244.144 \ No newline at end of file From 496403bde0a2781d3008818f41f8deccbc1ad9ad Mon Sep 17 00:00:00 2001 From: ibuler Date: Wed, 14 Mar 2018 16:08:27 +0800 Subject: [PATCH 22/25] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9docs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/faq.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/faq.rst b/docs/faq.rst index ef13f3968..90775dc54 100644 --- a/docs/faq.rst +++ b/docs/faq.rst @@ -16,4 +16,4 @@ FAQ 用户：每个公司的同事创建一个用户账号，用来登录Jumpserver 系统用户：使用来登录到服务器的用户，如 web, dba, root等 - 管理用户：是服务器上已存在的特权用户，Ansible用来获取硬件信息 + 管理用户：是服务器上已存在的特权用户，Ansible用来获取硬件信息, 如 root, 或者其它拥有 sudo NOPASSWD: ALL权限的用户 From e9be4f51e560a38697729b22c5fbecfc28e56430 Mon Sep 17 00:00:00 2001 From: ibuler Date: Wed, 14 Mar 2018 16:19:59 +0800 Subject: [PATCH 23/25] =?UTF-8?q?[Update]=20=E5=88=A0=E9=99=A4=E8=B5=84?= =?UTF-8?q?=E4=BA=A7=E8=AF=A6=E6=83=85=E4=B8=AD=E7=9A=84windows=E7=AD=89?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=BF=9E=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/templates/assets/asset_detail.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/assets/templates/assets/asset_detail.html b/apps/assets/templates/assets/asset_detail.html index 80916340f..9767320a3 100644 --- a/apps/assets/templates/assets/asset_detail.html +++ b/apps/assets/templates/assets/asset_detail.html @@ -155,6 +155,7 @@ + {% if asset.is_unixlike %} {% trans 'Refresh hardware' %}: @@ -171,6 +172,7 @@ + {% endif %} From 4d7fbcc49b18d8135f023ad01b3b10bef8323b64 Mon Sep 17 00:00:00 2001 From: q4speed Date: Wed, 14 Mar 2018 18:01:37 +0800 Subject: [PATCH 24/25] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=87=E5=AD=97?= =?UTF-8?q?=E8=BF=87=E9=95=BFbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/static/css/jumpserver.css | 6 ++++++ apps/templates/index.html | 11 ++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/apps/static/css/jumpserver.css b/apps/static/css/jumpserver.css index 29e786eb3..cf570c4ad 100644 --- a/apps/static/css/jumpserver.css +++ b/apps/static/css/jumpserver.css @@ -432,4 +432,10 @@ div.dataTables_wrapper div.dataTables_filter { font-size: 12px !important; } +.ellipsis { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + diff --git a/apps/templates/index.html b/apps/templates/index.html index a297adedd..e64287fbd 100644 --- a/apps/templates/index.html +++ b/apps/templates/index.html @@ -125,9 +125,9 @@ {% for data in week_asset_hot_ten %}
    -
    +
    - {{ data.asset }} + {{ data.asset }}
    {{ data.total }}次
    @@ -213,9 +213,9 @@ {% for data in week_user_hot_ten %}
    -
    +
    - {{ data.user }} + {{ data.user }}
    {{ data.total }}次
    @@ -245,7 +245,8 @@ $(document).ready(function(){ $('#show').click(function(){ $('#show').css('display', 'none'); $('#more').css('display', 'block'); - }) + }); + $("[data-toggle='tooltip']").tooltip(); }); require.config({ paths: { From 93895b6b9289214b437b99313f986807c6ad4f5b Mon Sep 17 00:00:00 2001 From: ibuler Date: Wed, 14 Mar 2018 18:14:37 +0800 Subject: [PATCH 25/25] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E4=B8=80?= =?UTF-8?q?=E4=BA=9B=E6=96=87=E6=A1=88=E8=AF=B4=E6=98=8E=E5=92=8C=E7=BF=BB?= =?UTF-8?q?=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/forms/asset.py | 10 +- .../templates/assets/admin_user_list.html | 3 +- .../templates/assets/system_user_list.html | 6 +- apps/i18n/zh/LC_MESSAGES/django.mo | Bin 29828 -> 29717 bytes apps/i18n/zh/LC_MESSAGES/django.po | 124 ++++++++++-------- apps/ops/templates/ops/task_list.html | 4 +- 6 files changed, 78 insertions(+), 69 deletions(-) diff --git a/apps/assets/forms/asset.py b/apps/assets/forms/asset.py index d5f4ccd04..65716f533 100644 --- a/apps/assets/forms/asset.py +++ b/apps/assets/forms/asset.py @@ -35,9 +35,8 @@ class AssetCreateForm(forms.ModelForm): 'ip': '* required', 'port': '* required', 'admin_user': _( - 'Admin user is a privilege user exist on this asset,' - 'Example: root or other NOPASSWD sudo privilege user' - 'If asset not support ansible, set any one' + 'root or other NOPASSWD sudo privilege user existed in asset,' + 'If asset is windows or other set any one, more see admin user left menu' ), 'platform': _("* required Must set exact system platform, Windows, Linux ...") } @@ -68,9 +67,8 @@ class AssetUpdateForm(forms.ModelForm): 'port': '* required', 'cluster': '* required', 'admin_user': _( - 'Admin user is a privilege user exist on this asset,' - 'Example: root or other NOPASSWD sudo privilege user' - 'If asset not support ansible, set any one' + 'root or other NOPASSWD sudo privilege user existed in asset,' + 'If asset is windows or other set any one, more see admin user left menu' ), 'platform': _("* required Must set exact system platform, Windows, Linux ...") } diff --git a/apps/assets/templates/assets/admin_user_list.html b/apps/assets/templates/assets/admin_user_list.html index 7cccc6d03..bcb40fb29 100644 --- a/apps/assets/templates/assets/admin_user_list.html +++ b/apps/assets/templates/assets/admin_user_list.html @@ -5,7 +5,8 @@ {% block help_message %}
    - 管理用户是 服务器上已存在的特权用户，Jumpserver使用该用户来 `推送系统用户`、`获取资产硬件信息`等。 + 管理用户是服务器的root，或拥有 NOPASSWD: ALL sudo权限的用户，Jumpserver使用该用户来 `推送系统用户`、`获取资产硬件信息`等。 + Windows或其它硬件可以随意设置一个
    {% endblock %} diff --git a/apps/assets/templates/assets/system_user_list.html b/apps/assets/templates/assets/system_user_list.html index b1dd401bc..9e83f93d3 100644 --- a/apps/assets/templates/assets/system_user_list.html +++ b/apps/assets/templates/assets/system_user_list.html @@ -3,8 +3,10 @@ {% block help_message %}
    - 系统用户是 用户登录资产(服务器)时使用的用户，如 web, sa, dba等具有特殊功能的用户。系统用户创建时，如果选择了自动推送 - Jumpserver会使用ansible自动推送系统用户到资产中，如果资产(交换机、windows)不支持ansible, 请手动填写账号密码。 + 系统用户是 Jumpserver跳转登录资产时使用的用户，可以理解为登录资产用户，如 web, sa, dba(`ssh web@some-host`), 而不是使用某个用户的用户名跳转登录服务器(`ssh xiaoming@some-host`); + 简单来说是 用户使用自己的用户名登录Jumpserver, Jumpserver使用系统用户登录资产。 + 系统用户创建时，如果选择了自动推送 Jumpserver会使用ansible自动推送系统用户到资产中，如果资产(交换机、windows)不支持ansible, 请手动填写账号密码。 + 目前还不支持Windows的自动推送
    {% endblock %} diff --git a/apps/i18n/zh/LC_MESSAGES/django.mo b/apps/i18n/zh/LC_MESSAGES/django.mo index c4e2c1b8a8747972183408204baee2015edaaffd..a3449ac8e8fd080bc2bb03ab6fd29c78cf183d61 100644 GIT binary patch delta 10694 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 eK6`#Y-}CjouHSFVeXqRgGyj^8=fVTN zD;=)OK8{ldTUT_P7fLx!?*~=uIO9VdXAvf0CjO46=sPvcabCq<;pEg8M>tM3%xmU2 z_3$Ki!e5agPK)NQgVB$C4zixdSwO*`ip|!r!+a0fi<5_?@hAr132cA`s14u4vRJc) zdXz4gXn1&pJ zlZj<;8`8yj2epxlSOu@6`a6;C1}dQXSHbeE@6@DF0UKj=Y=fGhx782E^5o-C6J=QY zT&zsK1hw%EsCnK-ozy|pxKFVXok{36iaTD(a3rs10UW`*PG#uSJdDh?;LZ*1-H$oWGv!ch=#YS!mug@1UM(=_q&M z@~DZcpdLwWRC_pTE}YLDvI#q5ba$oryBW>pmDuL(9$p$T%W;~~_Yd}{eOsG~iL zI?8LPcjhkYyf{td9HLSn~$X`bdc+c{~ zsD%owz7X}y|3EERs*Ss`K-7G-Q77>bYQd(c4YjkpD{4MZ90lFcQ>Y0im{U;$GEo~@ zh+1eJdQS|ikmsV_h0jqF9=GW`&B77Q`=g*%Ec<@mL#2qZaU(S*QhGMBT^=)JAt< zBm5XS0gqEmK}UBTHQ+XC1NTu!7}VLlgPN!X>!bQbqQ-SVok(|U?~AR-N1!&o40Y6R zpuRu0qE0T~E6@KZ1?~KM)PxtX23|!Soe!TSJ(2*_ozy}dVH?!RJ%ZZk4v$CsfBNsJA^6BXBk9jy^>_<1bMQ97EmN zY1D>(LLK=H)QvgOu7Ri%u8JNtG_ZyUYiNr);_hY~>gWfeHZ&Hs;8fHRKZja)3F>=c zow*CO&?n|eRKFjs{dzRdUpsXkb$41G)uA5h4kJ*HA`-jfW2l!c8})L&jot-NkLo09 zg9YYQ)W-inoveR1x4jN(qv72+f8A*pDpD{Or{I3ngiTph?X6Ics3SJPXw*xWgua-8 zI*}Quaha%%EI_>jtI-!fM9udZs{e5h1?}Vv>gBnHb@4vxWa`GaM;vB$L_O0u^nO91 zPHYOQ|7?uHMc5ScF&wX<9(A=IuJuskJz*3yK?l@P_QWzc0JYPh<`~pbPDb^cg___+ z)WkWcjlGF_Ck|i;9z|cgj(UlIMa@&Tr&o_tgMtQxVgu}e^>8@qna#q6xC}FJFE+;T zSpGo8{uqjL%x&0&{1oz=*7+0pJ>^98av#lP)P|;FAn%_ulY(BdEYvewZyk1EDe`x* zH14tX1E{0^0{!qb>U-fF>PBv(PPFV}?uk@Gy{w_A`mU&caafV{oe>oD%u-Nyya{!b z`_%!Dq82=d8d!|}c*pd4+R$u(s2ZW(tyZWTj75zfgdXjD1cgAHi5ifF ziMZVA?_fD{-`?&7l~5b5hkAMAQRBy<-ib8SM(3eUb|vaYcB1CV#{fLioAcL#r>W4+ zE?L8`s1x`Td0(6gaqbZhKuw&AT6iv&#Z{=6_BGU2)<+bKWd>fsFOKw`AzdS>PY{>^5{R%?OzqE zk=I5&f=E<*wCU+%4MVMBqUF;qUw~S8rI}-HGPj{7+->HgHh2_s@Pg&f4stiR1VgD` zgUsu3KBDj-6n$-!TZw4t6(C-K=XiLiGOCftfO@DS4n}RH$xxoZ3XxXP5j9Z^YN6id2-JdU zmU~d+mRWs{)o(QqnJ29M66%g`qQ>1veGdc-c8?(&_buoi`H-h)$w=BeTTdK%9%A#3q52;U=#8v z%ZHi?sBg?9)Jym*YQ0xcU)7#%R*`3ZftvV?<>xKGX8s#B;UCr>@U(jp)luWZ%$BHy z+L_%^NB@N7Ly`U-XFLV{@)8?Zg@K;1zx>gWSTxb1aN6Ni~msFUl2 z+E5&7{wGnt&PSLD*qrs9L~nurLcv%%e1cuE{7Bb0)I>{A8(L}kMsutA4n{kCuUme{ zbVj)w@<(kv7&Tv0^#1!_qzY7YwuZ+o?{E1C^uBDUJDFk5xAtt*_*Ld6^Bwbj)c3{_ z^Rm_7Lyz|;6WkruK~2;U^##<@^7dvAGu|AD8b2AEVkYXV`)$-6et??qu;r)Bv*u3; zoWD9;wTfG){2uC=28?#|DrN|3;%1h&Mr|M(^)^3gd7`yXH?z!T=4+^N+eh>K^|E|G zg%&(v9STqj6`428-_1W!6ObDYW0IubQ59rb8uqQ-mXQBcRl_#m#e z`~YgeVblc2tp1{T!`knnCh{5U-f211xJIaP;i!2#Tm5jvqD~^yTx6~=*P}MD1$864BLmUlxf&<}NjgOH(4s^tade=vahauay|8c>abCahzInQhH(W*qLv5`5 zWY;QKp1hXX#B6Owqx$#pSj7M{0rfdgu?|a7cecjbccbnoAN7rQ66@h5)W@t8f2Ya% z*Z{j?GaQZj!dZ%%ZwG1~&tVF>g95CM*Dx0K&ml3;3-z*OqjvlX>drQx{$q8A#rF`9mU z>FzwSsQI5ZlTq`{Mvo?3K;Z#gX&ttpp51;_$3v)Rb{N(Fn0eOfi_Kq9{cl-*AH&K0 zGTfK26>9uQb8-gfuK_cu@WB(rHsT}V5)~g}OQH+$H2ENP;(FFh!-uVW(c9wwco>R^ zM~Ps!%E`h&g7@2b(#Gih^Zu{f>eG(Oro{Kwc#^sx%6fZsT_$D`ZxI!#Z%%ZxzN2s} z^&9cOSOxh5+4(my-unDWd8?J@VlQ%k4~2XRx+1M{iRojyt^5Wf_b1Uyq^lnJeXNCn z);ARO`Tw2RN0cV-hW&68mR#}H-&07<1`_?NL~E;5r};!Od09elwXVvPzjTYv>3{US zOI;n}Tk2lLAz0J;rBLof^e5_3w-6f=y7GNE|Ed&rQ85JHRIOd>sf(ce2ho}Go5X2r z8;lK!I@IZU83z;Dlq(SWn0j9*n5HsU2ihOC{ukUTe)9ZFu6JoXVI5jg*^?Ma?+K^AB+?Qxf=wqns7O~u0a({T{(=mql zfY7DyfuD&4^3J%F&?fg-JE?OHd% zi2>AoOL%YN6Y!(*5!_6?LDVHC5Rt@-wCTD>yhQn&<&Wb8VyfldPW+hkk9><&{tMrr zz7lbac%J-2oT#JSLSz%Ih(&~csl?jA732k!r=zaM7=lsw9??;iTx*F`^5aATly$9k@&0|_dD)T(Ivk?hj`-E;Ld}Y}nD)h%i#`7+tN0f&_8)cS=--hj zx&DvBvzBbL`V~6=RaQBZO8rszq~$r}*C>C7UlMtg4-@YaZxjC^T2NndeL}eh$s>3h zjs z`1g-})IITc>U==?Q(_m9M$Do8pVubx13qa_FNsFT|xbeex;QhLa!kkquKXObo*j!O)gnx2>zk~lpn zJtHI~IV5Aen$y!0Ga_Q9kD8o1DX~My@(XcI!+MQ%t3#4gGD6a)rlzK(WrU1MPESgh zlo%00f07x@keIu>giggz5|qdK%~m-}^} zS|_IVb\n" "Language-Team: Jumpserver team\n" @@ -26,49 +26,49 @@ msgid "更新节点资产硬件信息: {}" msgstr "" #: assets/api/node.py:147 -msgid "Test node assets connective: {}" -msgstr "测试节点资产可连接性" +msgid "测试节点下资产是否可连接: {}" +msgstr "" -#: assets/forms/asset.py:23 assets/forms/asset.py:55 assets/forms/user.py:125 +#: assets/forms/asset.py:23 assets/forms/asset.py:54 assets/forms/user.py:125 #: assets/models/asset.py:53 assets/models/user.py:218 -#: assets/templates/assets/asset_detail.html:181 -#: assets/templates/assets/asset_detail.html:189 +#: assets/templates/assets/asset_detail.html:183 +#: assets/templates/assets/asset_detail.html:191 #: assets/templates/assets/system_user_detail.html:166 msgid "Nodes" msgstr "节点管理" -#: assets/forms/asset.py:26 assets/forms/asset.py:58 assets/forms/asset.py:95 -#: assets/forms/asset.py:99 assets/models/asset.py:57 +#: assets/forms/asset.py:26 assets/forms/asset.py:57 assets/forms/asset.py:93 +#: assets/forms/asset.py:97 assets/models/asset.py:57 #: assets/models/cluster.py:19 assets/models/user.py:187 #: assets/templates/assets/asset_detail.html:73 templates/_nav.html:24 msgid "Admin user" msgstr "管理用户" -#: assets/forms/asset.py:29 assets/forms/asset.py:61 assets/models/asset.py:81 +#: assets/forms/asset.py:29 assets/forms/asset.py:60 assets/models/asset.py:81 #: assets/templates/assets/asset_create.html:32 -#: assets/templates/assets/asset_detail.html:218 +#: assets/templates/assets/asset_detail.html:220 #: assets/templates/assets/asset_update.html:37 templates/_nav.html:26 msgid "Labels" msgstr "标签管理" -#: assets/forms/asset.py:38 assets/forms/asset.py:71 +#: assets/forms/asset.py:38 assets/forms/asset.py:70 msgid "" -"Admin user is a privilege user exist on this asset,Example: root or other " -"NOPASSWD sudo privilege userIf asset not support ansible, set any one" +"root or other NOPASSWD sudo privilege user existed in asset,If asset is " +"windows or other set any one, more see admin user left menu" msgstr "" -"管理用户是资产上已经存在的特权用户，如 root或者其它有NOPASSWD的用户, 如果资产" -"是Windows或交换机, 任意设置一个即可" +"root或其他拥有NOPASSWD: ALL权限的用户, 如果是windows或其它硬件可以随意设置一" +"个, 更多信息查看左侧 `管理用户` 菜单" -#: assets/forms/asset.py:42 assets/forms/asset.py:75 +#: assets/forms/asset.py:41 assets/forms/asset.py:73 msgid "* required Must set exact system platform, Windows, Linux ..." msgstr "* required 必须准确设置操作系统平台，如Windows, Linux ..." -#: assets/forms/asset.py:82 assets/forms/asset.py:86 assets/forms/label.py:15 +#: assets/forms/asset.py:80 assets/forms/asset.py:84 assets/forms/label.py:15 #: perms/templates/perms/asset_permission_asset.html:88 users/forms.py:244 msgid "Select assets" msgstr "选择资产" -#: assets/forms/asset.py:91 assets/models/asset.py:52 +#: assets/forms/asset.py:89 assets/models/asset.py:52 #: assets/templates/assets/admin_user_assets.html:53 #: assets/templates/assets/asset_detail.html:69 #: assets/templates/assets/system_user_asset.html:51 @@ -76,18 +76,18 @@ msgstr "选择资产" msgid "Port" msgstr "端口" -#: assets/forms/asset.py:111 assets/templates/assets/asset_create.html:36 +#: assets/forms/asset.py:109 assets/templates/assets/asset_create.html:36 msgid "Select labels" msgstr "选择标签" -#: assets/forms/asset.py:114 assets/templates/assets/admin_user_detail.html:91 +#: assets/forms/asset.py:112 assets/templates/assets/admin_user_detail.html:91 msgid "Select nodes" msgstr "选择节点" #: assets/forms/label.py:13 assets/models/asset.py:153 -#: assets/templates/assets/admin_user_list.html:24 +#: assets/templates/assets/admin_user_list.html:25 #: assets/templates/assets/label_list.html:16 -#: assets/templates/assets/system_user_list.html:26 perms/models.py:17 +#: assets/templates/assets/system_user_list.html:28 perms/models.py:17 #: terminal/backends/command/models.py:11 terminal/models.py:123 #: terminal/templates/terminal/command_list.html:40 #: terminal/templates/terminal/command_list.html:73 @@ -125,10 +125,10 @@ msgstr "密码和私钥, 必须输入一个" #: assets/forms/user.py:79 assets/forms/user.py:120 assets/models/cluster.py:18 #: assets/models/group.py:20 assets/models/label.py:17 assets/models/user.py:28 #: assets/templates/assets/admin_user_detail.html:56 -#: assets/templates/assets/admin_user_list.html:22 +#: assets/templates/assets/admin_user_list.html:23 #: assets/templates/assets/label_list.html:14 #: assets/templates/assets/system_user_detail.html:58 -#: assets/templates/assets/system_user_list.html:24 common/models.py:26 +#: assets/templates/assets/system_user_list.html:26 common/models.py:26 #: common/templates/common/terminal_setting.html:67 #: common/templates/common/terminal_setting.html:85 ops/models.py:31 #: ops/templates/ops/task_detail.html:56 ops/templates/ops/task_list.html:34 @@ -148,9 +148,9 @@ msgstr "名称" #: assets/forms/user.py:80 assets/forms/user.py:121 assets/models/user.py:29 #: assets/templates/assets/admin_user_detail.html:60 -#: assets/templates/assets/admin_user_list.html:23 +#: assets/templates/assets/admin_user_list.html:24 #: assets/templates/assets/system_user_detail.html:62 -#: assets/templates/assets/system_user_list.html:25 +#: assets/templates/assets/system_user_list.html:27 #: perms/templates/perms/asset_permission_user.html:55 users/forms.py:14 #: users/models/authentication.py:45 users/models/user.py:34 #: users/templates/users/_select_user_modal.html:14 @@ -297,10 +297,10 @@ msgstr "创建日期" #: assets/models/asset.py:84 assets/models/cluster.py:29 #: assets/models/group.py:23 assets/models/label.py:21 assets/models/user.py:33 #: assets/templates/assets/admin_user_detail.html:72 -#: assets/templates/assets/admin_user_list.html:28 +#: assets/templates/assets/admin_user_list.html:29 #: assets/templates/assets/asset_detail.html:125 #: assets/templates/assets/system_user_detail.html:100 -#: assets/templates/assets/system_user_list.html:30 common/models.py:30 +#: assets/templates/assets/system_user_list.html:32 common/models.py:30 #: ops/models.py:37 perms/models.py:24 perms/models.py:81 #: perms/templates/perms/asset_permission_detail.html:98 terminal/models.py:26 #: terminal/templates/terminal/terminal_detail.html:63 users/models/group.py:15 @@ -556,21 +556,21 @@ msgstr "激活中" #: assets/templates/assets/_asset_list_modal.html:24 #: assets/templates/assets/admin_user_assets.html:54 -#: assets/templates/assets/admin_user_list.html:25 -#: assets/templates/assets/asset_detail.html:357 +#: assets/templates/assets/admin_user_list.html:26 +#: assets/templates/assets/asset_detail.html:359 #: assets/templates/assets/asset_list.html:90 #: assets/templates/assets/system_user_asset.html:52 -#: assets/templates/assets/system_user_list.html:27 +#: assets/templates/assets/system_user_list.html:29 #: users/templates/users/user_granted_asset.html:47 #: users/templates/users/user_group_granted_asset.html:47 msgid "Reachable" msgstr "可连接" #: assets/templates/assets/_asset_list_modal.html:25 -#: assets/templates/assets/admin_user_list.html:29 +#: assets/templates/assets/admin_user_list.html:30 #: assets/templates/assets/asset_list.html:91 #: assets/templates/assets/label_list.html:17 -#: assets/templates/assets/system_user_list.html:31 +#: assets/templates/assets/system_user_list.html:33 #: ops/templates/ops/adhoc_history.html:59 ops/templates/ops/task_adhoc.html:61 #: ops/templates/ops/task_history.html:62 ops/templates/ops/task_list.html:41 #: perms/templates/perms/asset_permission_list.html:72 @@ -633,12 +633,12 @@ msgstr "提交" #: assets/templates/assets/_asset_list_modal.html:79 #: assets/templates/assets/admin_user_detail.html:24 -#: assets/templates/assets/admin_user_list.html:84 +#: assets/templates/assets/admin_user_list.html:85 #: assets/templates/assets/asset_detail.html:24 #: assets/templates/assets/asset_list.html:168 #: assets/templates/assets/label_list.html:38 #: assets/templates/assets/system_user_detail.html:26 -#: assets/templates/assets/system_user_list.html:85 +#: assets/templates/assets/system_user_list.html:87 #: perms/templates/perms/asset_permission_detail.html:30 #: perms/templates/perms/asset_permission_list.html:121 #: terminal/templates/terminal/terminal_detail.html:16 @@ -652,12 +652,12 @@ msgstr "更新" #: assets/templates/assets/_asset_list_modal.html:80 #: assets/templates/assets/admin_user_detail.html:28 -#: assets/templates/assets/admin_user_list.html:85 +#: assets/templates/assets/admin_user_list.html:86 #: assets/templates/assets/asset_detail.html:28 #: assets/templates/assets/asset_list.html:169 #: assets/templates/assets/label_list.html:39 #: assets/templates/assets/system_user_detail.html:30 -#: assets/templates/assets/system_user_list.html:86 +#: assets/templates/assets/system_user_list.html:88 #: ops/templates/ops/task_list.html:71 #: perms/templates/perms/asset_permission_detail.html:34 #: perms/templates/perms/asset_permission_list.html:122 @@ -751,12 +751,12 @@ msgid "Quick update" msgstr "快速更新" #: assets/templates/assets/admin_user_assets.html:72 -#: assets/templates/assets/asset_detail.html:167 +#: assets/templates/assets/asset_detail.html:168 msgid "Test connective" msgstr "测试可连接性" #: assets/templates/assets/admin_user_assets.html:75 -#: assets/templates/assets/asset_detail.html:170 +#: assets/templates/assets/asset_detail.html:171 #: assets/templates/assets/system_user_asset.html:81 #: assets/templates/assets/system_user_detail.html:147 msgid "Test" @@ -771,10 +771,10 @@ msgid "Replace node assets admin user with this" msgstr "替换资产的管理员" #: assets/templates/assets/admin_user_detail.html:100 -#: assets/templates/assets/asset_detail.html:198 +#: assets/templates/assets/asset_detail.html:200 #: assets/templates/assets/asset_list.html:586 #: assets/templates/assets/system_user_detail.html:183 -#: assets/templates/assets/system_user_list.html:135 templates/_modal.html:16 +#: assets/templates/assets/system_user_list.html:137 templates/_modal.html:16 #: terminal/templates/terminal/session_detail.html:108 #: users/templates/users/user_detail.html:339 #: users/templates/users/user_detail.html:364 @@ -786,18 +786,18 @@ msgstr "替换资产的管理员" msgid "Confirm" msgstr "确认" -#: assets/templates/assets/admin_user_list.html:14 +#: assets/templates/assets/admin_user_list.html:15 #: assets/views/admin_user.py:48 msgid "Create admin user" msgstr "创建管理用户" -#: assets/templates/assets/admin_user_list.html:26 -#: assets/templates/assets/system_user_list.html:28 +#: assets/templates/assets/admin_user_list.html:27 +#: assets/templates/assets/system_user_list.html:30 msgid "Unreachable" msgstr "不可达" -#: assets/templates/assets/admin_user_list.html:27 -#: assets/templates/assets/system_user_list.html:29 +#: assets/templates/assets/admin_user_list.html:28 +#: assets/templates/assets/system_user_list.html:31 #: ops/templates/ops/adhoc_history.html:54 #: ops/templates/ops/task_history.html:57 msgid "Ratio" @@ -841,15 +841,15 @@ msgstr "创建日期" msgid "Quick modify" msgstr "快速修改" -#: assets/templates/assets/asset_detail.html:159 +#: assets/templates/assets/asset_detail.html:160 msgid "Refresh hardware" msgstr "更新硬件信息" -#: assets/templates/assets/asset_detail.html:162 +#: assets/templates/assets/asset_detail.html:163 msgid "Refresh" msgstr "刷新" -#: assets/templates/assets/asset_detail.html:299 +#: assets/templates/assets/asset_detail.html:301 #: users/templates/users/user_detail.html:273 msgid "Update successfully!" msgstr "更新成功" @@ -906,7 +906,7 @@ msgid "Have child node, cancel" msgstr "存在子节点，不能删除" #: assets/templates/assets/asset_list.html:581 -#: assets/templates/assets/system_user_list.html:130 +#: assets/templates/assets/system_user_list.html:132 #: users/templates/users/user_detail.html:334 #: users/templates/users/user_detail.html:359 #: users/templates/users/user_group_list.html:81 @@ -990,25 +990,25 @@ msgstr "Uid" msgid "Add to node" msgstr "添加到节点" -#: assets/templates/assets/system_user_list.html:16 +#: assets/templates/assets/system_user_list.html:18 #: assets/views/system_user.py:45 msgid "Create system user" msgstr "创建系统用户" -#: assets/templates/assets/system_user_list.html:131 +#: assets/templates/assets/system_user_list.html:133 msgid "This will delete the selected System Users !!!" msgstr "删除选择系统用户" -#: assets/templates/assets/system_user_list.html:139 +#: assets/templates/assets/system_user_list.html:141 msgid "System Users Deleted." msgstr "已被删除" -#: assets/templates/assets/system_user_list.html:140 -#: assets/templates/assets/system_user_list.html:145 +#: assets/templates/assets/system_user_list.html:142 +#: assets/templates/assets/system_user_list.html:147 msgid "System Users Delete" msgstr "删除系统用户" -#: assets/templates/assets/system_user_list.html:144 +#: assets/templates/assets/system_user_list.html:146 msgid "System Users Deleting failed." msgstr "系统用户删除失败" @@ -1548,7 +1548,7 @@ msgstr "日期" msgid "Run" msgstr "执行" -#: ops/templates/ops/task_list.html:125 +#: ops/templates/ops/task_list.html:123 msgid "Task start: " msgstr "任务开始: " @@ -2668,6 +2668,16 @@ msgstr "密码更新" msgid "Public key update" msgstr "密钥更新" +#~ msgid "Test node assets connective: {}" +#~ msgstr "测试节点资产可连接性" + +#~ msgid "" +#~ "Admin user is a privilege user exist on this asset,Example: root or other " +#~ "NOPASSWD sudo privilege userIf asset not support ansible, set any one" +#~ msgstr "" +#~ "管理用户是资产上已经存在的特权用户，如 root或者其它有NOPASSWD的用户, 如果" +#~ "资产是Windows或交换机, 任意设置一个即可" + #~ msgid "Refresh node assets hardware info: {}" #~ msgstr "更新一些资产硬件信息: {}" diff --git a/apps/ops/templates/ops/task_list.html b/apps/ops/templates/ops/task_list.html index e564eec73..f098a4d78 100644 --- a/apps/ops/templates/ops/task_list.html +++ b/apps/ops/templates/ops/task_list.html @@ -112,9 +112,7 @@ $(document).ready(function() { alert(data) }; var success = function () { - setTimeout(function () { - console.log("ok") - }, 1000); + alert("任务开始执行，重定向到任务详情页面，多刷新几次查看结果") window.location = "{% url 'ops:task-detail' pk=DEFAULT_PK %}".replace('{{ DEFAULT_PK }}', uid); }; APIUpdateAttr({