diff --git a/apps/perms/api.py b/apps/perms/api.py index f9b60dcb65731cdfa631652a8f1ab4fc8d3314e9..be69d615842e713e6411645d13d3ae946ae7f48a 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,) diff --git a/docs/quickstart.rst b/docs/quickstart.rst index 71a0f742bb148b498a84b86815a00efa5e4ef87c..58aac783cfa1b7af98159098c31949bb57f9ee02 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 + + + diff --git a/docs/step_by_step.rst b/docs/step_by_step.rst index 21903a73bac2b5d03cd1ea1b20589a1498ccf272..484013e1bc1b6e2959a636b9dab70e051670bfff 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)下载对应版本的 release 包,直接解压,不需要编译 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,若与主机上其他端口冲突请自定义一下。