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

8293 Commits (cb7b31e8b80b41bdedc3046f30c2593249fc530d)

Author SHA1 Message Date
ibuler cb7b31e8b8 perf: perm account 返回 alias 2022-12-15 16:02:34 +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
Bai a767c208b3 perf: 优化 get_all_node_keys 方法 2022-12-09 13:38:30 +08:00
Bai 1679efe2c9 refactor: 重构优化用户授权树工具类和用户授权树过期条件处理逻辑 <UserPermTreeRefreshUtil> <UserPermTreeExpireUtil> 2022-12-09 13:38:30 +08:00
Bai 4f5cc56b00 perf: 优化 UserPermTreeUtil 逻辑(进行中) 2022-12-09 13:38:30 +08:00
Bai 8beb1b81cf fix: 修改 AssetSerializer 继承 BulkOrgResourceSerializerMixin 序列类 2022-12-09 11:12:56 +08:00
吴小白 0940eab6c8
Merge pull request #9183 from jumpserver/pr@v3@fix_health_check 
fix: 修正健康检查失败
 2022-12-09 11:09:19 +08:00
吴小白 a7354d949d fix: 修正健康检查失败 2022-12-09 11:06:58 +08:00
吴小白 ddb731c5cd chore: 更新 python3.9 2022-12-09 10:40:55 +08:00
fit2bot 0ae9b76f04
perf: 优化构建 (#9179) 
* perf: 优化构建

* fix: 修正构建错误

* perf: 优化构建依赖包

* fix: 修正构建判断

* perf: 现阶段还需要 debug 工具

Co-authored-by: 吴小白 <296015668@qq.com>
 2022-12-09 10:21:36 +08:00
Bai beac2a1514 perf: 优化获取账号 su-from-accounts 时，不包含自己和以自己为 su-from 的账号 2022-12-08 13:37:35 +08:00
fit2bot e5afbd4118
perf: k8s tree api (#9169) 
Co-authored-by: feng <1304903146@qq.com>
 2022-12-07 23:55:56 +08:00
Aaron3S c14b97419d feat: 增加跳过的主机统计， 增加每台主机执行情况api 2022-12-07 20:13:26 +08:00
Bai 66bdc375df Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-07 19:30:48 +08:00
Bai 58131a2b68 fix: 修复 su-from-accounts API; 前端 Select2 组件初始化时 API 报错的问题； 
修改原因:
前端使用 Select2 组件渲染更新账号的表单页面时，会默认先创建 spm 值，
后端调用 get_object 方法时，使用的queryset，就是spm所对应的queryset，
而 detail=True， 查询的值是当前 account_id，不在 queryset 中，
所以会导致调用父类的 get_object 方法报错，对象找不到
 2022-12-07 19:26:28 +08:00
ibuler a27b43107c Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-07 18:59:28 +08:00
ibuler 0c7de50708 perf: 修改 display field 2022-12-07 18:58:57 +08:00
Bai d252ee41ed Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-07 18:38:12 +08:00
Bai 6cda28c63d perf: 优化授权规则 user-permission 用户授权相关的 API; 包括 assets, nodes, tree-asset, tree-node, tree-node-with-asset; 2022-12-07 18:38:03 +08:00
ibuler 6a1c5aba12 perf: 修改一些翻译 2022-12-07 17:24:30 +08:00
ibuler 02a03e1a28 perf: merge i18n 2022-12-07 16:02:18 +08:00
ibuler da36ce9dfd perf: merge connect token rdp option 2022-12-07 15:13:32 +08:00
ibuler dbee3ed30d feat: connect token 添加 Rdp options 2022-12-07 15:09:01 +08:00
jiangweidong e7e3b603a9 perf: 清理无用的依赖包 2022-12-07 10:53:54 +08:00
Bai 1cab84bb62 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-06 19:54:15 +08:00
Bai bf5da83008 perf: 修改授权 API Name 2022-12-06 19:53:36 +08:00
Aaron3S 07b3774d3d feat: 增加运行的内置变量,优化self资源的代码 2022-12-06 19:48:31 +08:00
Aaron3S d92b198a12 perf: 优化ops代码 2022-12-06 19:48:28 +08:00
Bai 6233e2b3de perf: Account su_from 返回使用 ObjectRelatedField allow_null allow_empty 2022-12-06 19:41:26 +08:00
Bai 29fd6ee8c9 perf: Account su_from 返回使用 ObjectRelatedField 2022-12-06 18:54:13 +08:00
Bai c9bf99468c feat: 添加 command-review API 2022-12-06 18:27:53 +08:00
Bai 71e76e5075 feat: 添加su-from-accountsAPI 2022-12-06 17:43:33 +08:00
“huailei000” b6afe77bc0 perf: 调整登录页样式 2022-12-06 17:43:08 +08:00
老广 b89720017b
Merge pull request #9162 from jumpserver/pr@dev@feat_clickhouse 
feat: 增加clickhouse
 2022-12-06 17:25:24 +08:00
jiangweidong 803d68f3fe feat: 增加clickhouse 2022-12-06 17:13:37 +08:00