From c67a9eb845edfa867aff4a0bbd1c4cde430e1d1d Mon Sep 17 00:00:00 2001 From: liuzheng Date: Thu, 15 Mar 2018 07:27:30 +0800 Subject: [PATCH 1/4] Update quickstart.rst --- docs/quickstart.rst | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/quickstart.rst b/docs/quickstart.rst index 3a5315416..7b316c304 100644 --- a/docs/quickstart.rst +++ b/docs/quickstart.rst @@ -13,7 +13,7 @@ Docker 安装见: `Docker官方安装文档 `_ ``````````````` 使用 root 命令行输入:: - $ docker run -d -p 8080:80 -p 2222:2222 registry.jumpserver.org/public/jumpserver:latest + $ docker run -d -p 8080:80 -p 2222:2222 registry.jumpserver.org/public/jumpserver:1.0.0 访问 ``````````````` @@ -42,10 +42,13 @@ XShell等工具请添加connection连接 :: - docker run -d -p 8080:80 -p 2222:2222 -e DB_ENGINE=mysql -e DB_HOST=192.168.1.1 -e DB_PORT=3306 -e DB_USER=root -e DB_PASSWORD=xxx -e DB_NAME=jumpserver registry.jumpserver.org/public/jumpserver:latest + docker run -d -p 8080:80 -p 2222:2222 -e DB_ENGINE=mysql -e DB_HOST=192.168.1.1 -e DB_PORT=3306 -e DB_USER=root -e DB_PASSWORD=xxx -e DB_NAME=jumpserver registry.jumpserver.org/public/jumpserver:1.0.0 仓库地址 ``````````````` https://github.com/jumpserver/Dockerfile + + + From eeae989c06f3beeefb5caa0cec745971c6d695db Mon Sep 17 00:00:00 2001 From: liuzheng Date: Thu, 15 Mar 2018 07:30:32 +0800 Subject: [PATCH 2/4] Update step_by_step.rst --- docs/step_by_step.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/step_by_step.rst b/docs/step_by_step.rst index afa11a8f4..761debc00 100644 --- a/docs/step_by_step.rst +++ b/docs/step_by_step.rst @@ -49,7 +49,7 @@ # 看到下面的提示符代表成功，以后运行 Jumpserver 都要先运行以上 source 命令，以下所有命令均在该虚拟环境中运行 (py3) [root@localhost py3] -二. 安装 Jumpserver 0.5.0 +二. 安装 Jumpserver 1.0.0 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **2.1 下载或 Clone 项目** @@ -201,7 +201,7 @@ Luna 已改为纯前端，需要 Nginx 来运行访问 -访问（https://github.com/jumpserver/luna/releases）下载对应 release 包，直接解压，不需要编译 +访问（https://github.com/jumpserver/luna/releases）下载 1.0.0 的包，直接解压，不需要编译 4.1 解压 Luna @@ -228,7 +228,7 @@ Luna 已改为纯前端，需要 Nginx 来运行访问 -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 + registry.jumpserver.org/public/guacamole:1.0.0 这里所需要注意的是 guacamole 暴露出来的端口是 8081，若与主机上其他端口冲突请自定义一下。 From 227804b7ab84b0b6ef0c104a3f71634d29e1725d Mon Sep 17 00:00:00 2001 From: liuzheng Date: Thu, 15 Mar 2018 07:33:56 +0800 Subject: [PATCH 3/4] Update step_by_step.rst --- 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 761debc00..6549b4bde 100644 --- a/docs/step_by_step.rst +++ b/docs/step_by_step.rst @@ -201,7 +201,7 @@ Luna 已改为纯前端，需要 Nginx 来运行访问 -访问（https://github.com/jumpserver/luna/releases）下载 1.0.0 的包，直接解压，不需要编译 +访问（https://github.com/jumpserver/luna/releases）下载对应版本的 release 包，直接解压，不需要编译 4.1 解压 Luna From 72cd7a3be267f5966931d19ad2ad0ec709042cf3 Mon Sep 17 00:00:00 2001 From: ibuler Date: Mon, 16 Apr 2018 17:01:25 +0800 Subject: [PATCH 4/4] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E5=A4=8D=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=9C=8B=E4=B8=8D=E5=88=B0=E6=88=91=E7=9A=84=E8=B5=84?= =?UTF-8?q?=E4=BA=A7=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/perms/api.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/apps/perms/api.py b/apps/perms/api.py index f9b60dcb6..be69d6158 100644 --- a/apps/perms/api.py +++ b/apps/perms/api.py @@ -98,6 +98,11 @@ class UserGrantedNodesApi(ListAPIView): nodes = AssetPermissionUtil.get_user_nodes_with_assets(user) return nodes.keys() + def get_permissions(self): + if self.kwargs.get('pk') is None: + self.permission_classes = (IsValidUser,) + return super().get_permissions() + class UserGrantedNodesWithAssetsApi(ListAPIView): permission_classes = (IsSuperUserOrAppUser,)