github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
8,457 Commits
95 Branches
262 Tags
144 MiB
Commit Graph

5308 Commits (94e1d94423c89a048d58167321bafacad0cbbcfa)

Author SHA1 Message Date
feng 8de2ffe5f4 perf: rbac asset 2022-12-23 16:10:04 +08:00
ibuler 4bd913b585 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-23 16:00:11 +08:00
ibuler 6bf4de8134 perf: 修改登录页面 2022-12-23 15:59:34 +08:00
fit2bot 7530afe368
perf: 翻译 (#9239) 
Co-authored-by: feng <1304903146@qq.com>
 2022-12-23 15:49:32 +08:00
Bai 4f8e0fc28e fix: 修改授权树API，连续刷新3次转为强制刷新；修改异步授权树一级节点的资产显示问题； 2022-12-23 13:19:38 +08:00
ibuler 047ba34238 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-23 11:12:31 +08:00
ibuler ffa30fdb69 perf: 修改 Logo 2022-12-23 11:11:56 +08:00
fit2bot c5edb9981e
perf: rbac tree (#9237) 
Co-authored-by: feng <1304903146@qq.com>
 2022-12-22 20:09:20 +08:00
Bai 3443b06a28 fix: 修复异步加载luna资产授权树时根节点下资产没有返回的问题 2022-12-22 19:17:52 +08:00
Bai 4aed287efc Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-22 18:57:04 +08:00
Bai ab6518e60e fix: 开启授权规则signal信号监听;解决授权规则变动用户授权树没有即使刷新的问题 2022-12-22 18:56:54 +08:00
ibuler 370d3b350e Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-22 17:49:37 +08:00
ibuler f5f8a01131 perf: 修改 celery tasks 列表 2022-12-22 17:49:07 +08:00
Bai b851fd1069 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-22 17:44:28 +08:00
Bai c645ca9aea fix: 修改点击我的授权树节点报错的问题 2022-12-22 17:43:03 +08:00
“huailei000” 65387ebff4 perf: 调整登录页面布局 2022-12-22 15:42:45 +08:00
ibuler 6ff104c100 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-22 13:59:00 +08:00
ibuler 2e91aa8ce5 perf: 添加 celery 健康检测 2022-12-22 13:58:29 +08:00
fit2bot 1de51a2bfd
perf: asset xpack (#9234) 
Co-authored-by: feng <1304903146@qq.com>
 2022-12-22 13:50:22 +08:00
ibuler a377317d6e Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-22 12:53:26 +08:00
ibuler e0e57a71aa pref: 类型树支持资产 2022-12-22 11:34:18 +08:00
Bai 00c955e8c0 perf: 修改方法名 check_db_port_mapper 2022-12-21 21:08:28 +08:00
Bai 5d865ffd54 fix: 修改db_port_mapper策略; 启动时进行check校验; 2022-12-21 21:08:28 +08:00
feng f4b0ba43a2 perf: filter application 2022-12-21 20:19:13 +08:00
ibuler 7ca2fdca89 perf: 修改 platform 搜索 2022-12-21 20:04:49 +08:00
ibuler 0c2a5bc44a fix: 修复搜索资产平台 2022-12-21 19:59:56 +08:00
ibuler df1950d063 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-21 18:37:37 +08:00
ibuler b01ef1585c perf: account secret rbac permission 2022-12-21 18:37:05 +08:00
ibuler 17627390f8 perf: 修改 account 序列号字段 2022-12-21 18:36:15 +08:00
feng e347e05210 perf: terminal type remove ssh 2022-12-21 18:26:06 +08:00
Bai d4e215aeaa fix: 修复luna页面资产树加载不出来的问题 2022-12-21 18:00:50 +08:00
fit2bot 34cc3b233d
refactor: 重构用户授权资产查询工具(重构中..) (#9225) 
* refactor: 重构用户授权资产查询工具(重构中..)

* perf: 修改 get_perm_nodes_assets 名称

* refactor: 优化用户授权节点查询工具; 删除UnionQuerySet工具

Co-authored-by: Bai <baijiangjie@gmail.com>
 2022-12-21 17:36:44 +08:00
feng 510ca9a5b8 perf: k8s tree 2022-12-21 17:32:55 +08:00
fit2bot c304a58c05
perf: 修改k8s 树 (#9228) 
Co-authored-by: feng <1304903146@qq.com>
 2022-12-21 17:17:54 +08:00
Aaron3S 0e534f3251 feat: 优化api 2022-12-21 17:14:07 +08:00
Bai 5198ac1cc0 perf: 修改 UserAssetGrantedTreeNodeRelation id 为 AutoField 2022-12-21 15:16:54 +08:00
Aaron3S 560ff651c4 perf: 删除无用代码 2022-12-21 11:20:28 +08:00
Aaron3S 3ddeb97ea5 fix: 解决执行命令引号造成的问题 2022-12-21 11:20:28 +08:00
ibuler 327eb7a27d perf: 修改 migrations 2022-12-21 10:17:28 +08:00
ibuler 63d35ea8a6 perf: 修改资产 model 2022-12-20 20:39:48 +08:00
ibuler 10f4a0d67e Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-20 20:25:14 +08:00
ibuler 58909ee67d perf: 修改基础 model，继承同一个 2022-12-20 20:23:42 +08:00
Aaron3S 0c35205e31 feat: 增加作业版本历史 2022-12-20 19:46:48 +08:00
feng 21d6243b61 perf: api doc 2022-12-20 19:18:39 +08:00
fit2bot 6e467d9b67
perf: terminal connect method gui (#9224) 
Co-authored-by: feng <1304903146@qq.com>
 2022-12-20 18:50:04 +08:00
jiangweidong 55cee43f91 perf: 优化Sentinels配置参数 2022-12-20 18:37:28 +08:00
ibuler a7815dc9e5 perf: 修改 job log 2022-12-20 18:12:35 +08:00
ibuler a21cb32245 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-20 17:52:40 +08:00
ibuler 0748c32c5a perf: 修改 session type 序列🥱 2022-12-20 17:52:08 +08:00
Aaron3S e4b4f98362 feat: 作业审计添加字段 2022-12-20 17:28:27 +08:00
ibuler 88355f55bb Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-20 16:57:07 +08:00
ibuler 754f8131b4 perf: 内置 applets 自动安装 2022-12-20 16:48:18 +08:00
Aaron3S d8cccfd40f feat: 优化job execution 详情字段 2022-12-20 16:36:38 +08:00
Aaron3S 54f720e992 增加部分翻译 2022-12-20 16:36:38 +08:00
Bai 362cfb733c perf: 修改 su-from-accounts API 2022-12-20 16:13:44 +08:00
feng dddff03336 perf: asset tree 2022-12-20 14:53:25 +08:00
ibuler 5d31200368 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-20 13:49:56 +08:00
ibuler c040564dc2 fix: 修改显示 model 的错误 2022-12-20 13:47:12 +08:00
Bai 1b82f3fc6a Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-20 11:26:25 +08:00
Bai ba4d222eda fix: 解决 nodes-with-assets/tree/ API 异常的问题 2022-12-20 11:25:44 +08:00
ibuler 758453ae96 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-20 11:05:29 +08:00
ibuler 24da1e7d91 perf: 修改 connect token, 获取 applet info 2022-12-20 11:05:00 +08:00
feng cdb89ee2f2 perf: job executed fail api 2022-12-20 10:35:05 +08:00
fit2bot e82eb8f3d1
perf: 批量命令 (#9220) 
Co-authored-by: feng <1304903146@qq.com>
 2022-12-19 18:04:11 +08:00
fit2bot 92a198c00b
refactor: 重构重建用户授权树工具 (#9219) 
* perf: 优化 <UserGrantedTreeBuildUtils> 用户授权树构建工具

* feat: 完成计算授权节点资产数量

* refactor: 重构重建用户授权树工具

* merge: v3

Co-authored-by: Bai <baijiangjie@gmail.com>
 2022-12-19 16:04:58 +08:00
feng ff16260024 perf: remove OrganizationMember model 2022-12-19 15:44:02 +08:00
fit2bot 69b16e4754
perf: asset type xpack (#9218) 
Co-authored-by: feng <1304903146@qq.com>
 2022-12-19 11:35:50 +08:00
ibuler 675a41013e perf: connect methods xpack 2022-12-16 18:37:27 +08:00
ibuler 26794064b5 perf: session 添加类型 2022-12-16 17:16:14 +08:00
ibuler 26fa1f6f08 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-16 15:54:29 +08:00
ibuler d040162d86 perf: 修改 session 字段，添加 Comment 2022-12-16 15:53:59 +08:00
Aaron3S 009669febe feat: 增加作业审计api 2022-12-16 15:52:02 +08:00
Aaron3S bc47afb329 feat: 修改 inventory 名字生成规则 2022-12-16 15:20:36 +08:00
Aaron3S e969a01689 feat: 修改作业权限 2022-12-16 15:20:36 +08:00
吴小白 9d80abadd8 perf: 优化启动速度 2022-12-16 11:48:55 +08:00
halo 4f1d4ab71e fix: 导入翻译引用 2022-12-16 11:48:02 +08:00
halo cb8dc6c583 perf: 优化oauth2的服务地址参数拼接 2022-12-16 11:48:02 +08:00
feng 11a58dc7ad perf: k8s tree proxy 2022-12-16 10:52:08 +08:00
feng d7a793b4c4 perf: 修改k8s tree 2022-12-15 18:47:54 +08:00
fit2bot 69fe0b07fd
perf: k8s tree (#9214) 
Co-authored-by: feng <1304903146@qq.com>
 2022-12-15 16:08:19 +08:00
ibuler 615a1ddc96 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-15 16:03:21 +08:00
ibuler cb7b31e8b8 perf: perm account 返回 alias 2022-12-15 16:02:34 +08:00
feng 840ca02223 perf: del redundant macos 2022-12-15 15:21:51 +08:00
feng cbf91e4c29 perf: ticket help text 2022-12-15 11:59:14 +08:00
Eric acfce4961c fix: 修复用户组织树问题 2022-12-14 18:17:25 +08:00
Eric d60f9a7c69 perf: web selector 默认值修改 2022-12-14 17:39:22 +08:00
fit2bot 7b0d26bbff
perf: ticket applicant (#9205) 
Co-authored-by: feng <1304903146@qq.com>
 2022-12-14 15:24:36 +08:00
fit2bot f42c0f667d
perf: ticket applicant (#9202) 
Co-authored-by: feng <1304903146@qq.com>
 2022-12-13 17:36:00 +08:00
吴小白 b6d6c54d8f
Merge pull request #9201 from jumpserver/pr@v3@perf_support_openid_pkce 
perf: OpenID支持PKCE方式对接
 2022-12-13 16:16:11 +08:00
feng 1660362499 perf: validate ssh key 2022-12-13 15:50:47 +08:00
jiangweidong 6b33a54aef perf: OpenID支持PKCE方式对接 2022-12-13 15:31:53 +08:00
jiangweidong c121ac6b1d perf: OpenID支持PKCE方式对接 2022-12-13 15:30:08 +08:00
Eric 1af86ccdfe perf: change secret_type to LabeledChoiceField 2022-12-13 12:31:20 +08:00
feng 2f3b1d3b66 fix: ticket xss inject 2022-12-12 17:12:04 +08:00
feng 408c6c568a perf: account backup 2022-12-12 12:33:45 +08:00
fit2bot c861f390c7
perf: k8s account ignore (#9188) 
Co-authored-by: feng <1304903146@qq.com>
 2022-12-12 11:43:19 +08:00
Bai eba43f6a13 fix: 修改 db-listen-port.db_info API 返回的数据结构 2022-12-12 11:01:51 +08:00
Bai 26d9cdc50d perf: 优化用户授权树工具类存放目录 user_perm_tree 文件中 2022-12-09 14:03:00 +08:00
Bai 5e5061a825 perf: 优化 UserPermTreeExprireUtil 2022-12-09 13:38:30 +08:00
Bai 89f89532e7 perf: 优化 convert_to_queryset 方法 2022-12-09 13:38:30 +08:00