github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
8,587 Commits
66 Branches
247 Tags
108 MiB
Commit Graph

5431 Commits (0deb093e7aa9a332f02392358b498eb962f61996)

Author SHA1 Message Date
Aaron3S ddca4dce41 feat: 支持pyhton脚本 2022-12-27 16:59:32 +08:00
ibuler 1b9aad594c perf: remove push account 2022-12-27 16:54:47 +08:00
ibuler 411d199e18 perf: 修改 asset serializer 2022-12-27 16:53:23 +08:00
Bai 825bea5ea5 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-27 16:21:38 +08:00
Bai ba9123b1c4 perf: 修改资产序列类字段翻译 2022-12-27 16:21:32 +08:00
ibuler 3336f2ba67 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-27 15:28:32 +08:00
ibuler 3da9efc3fd perf: 修改账号推送 2022-12-27 15:27:33 +08:00
fit2bot 1e0bfbf8a8
perf: permission (#9244) 
Co-authored-by: feng <1304903146@qq.com>
 2022-12-27 14:48:00 +08:00
ibuler 795e952dc1 perf: change tree api 2022-12-27 13:20:18 +08:00
Bai bb23c2a9fa perf: 修改翻译组织ID 2022-12-26 20:30:10 +08:00
Bai a7be8bf365 perf: 修改翻译组织ID 2022-12-26 20:29:56 +08:00
Bai ed35ac2930 perf: 修改 OPTION 获取字段 org_id label 为 Organization ID 2022-12-26 19:32:07 +08:00
Bai 7f6d13a5a6 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-26 19:16:18 +08:00
Bai d0f70f4316 perf: 修改用户序列类 can_public_key_auth 类型; 修改 OPTION 获取字段 id label 为 ID 2022-12-26 19:16:11 +08:00
Aaron3S 9ba792cf1c feat: ops 支持节点和资产 2022-12-26 19:03:59 +08:00
ibuler dd630f0e14 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-26 18:58:48 +08:00
ibuler 3145582f0b perf: 修改 accounts 2022-12-26 18:58:21 +08:00
Bai d2ba7a98ea perf: 修改授权序列类字段翻译信息 2022-12-26 16:15:44 +08:00
ibuler 3172e954a8 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-26 15:02:27 +08:00
ibuler 6d4914fbd5 perf: 修改翻译 2022-12-26 15:01:51 +08:00
fit2bot ed82249fd1
perf: asset perm (#9240) 
Co-authored-by: feng <1304903146@qq.com>
 2022-12-23 19:01:29 +08:00
Aaron3S e32d51253a feat: 批量命令api 2022-12-23 18:23:20 +08:00
ibuler 213ae65b9a Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-23 16:15:56 +08:00
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
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
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
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
jiangweidong 803d68f3fe feat: 增加clickhouse 2022-12-06 17:13:37 +08:00
Jiangjie.Bai 7842e3e5ab
Merge: v3 to dev (#9160) 
* fix: 修改 ConnectionTokenSecretSerializer

* perf: connect token secret (#9155)

Co-authored-by: feng <1304903146@qq.com>
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>

* feat: 作业迁移至个人级别

* perf: asset enabled (#9157)

Co-authored-by: feng <1304903146@qq.com>

* perf: 修改ConnectionTokenSecret Gateway数据结构; 修改Domain Gateway Model方法

* perf: ConnectionTokenSecret  返回 domain 信息

* refactor: 移动 Gateway Model 到 asset 目录下

* refactor: 移动 Gateway Model 单独到 gateway 文件中

* perf: 修改 GatewaySerializer 目录

* perf: 修改 GatewaySerializer 目录

Co-authored-by: fit2bot <68588906+fit2bot@users.noreply.github.com>
Co-authored-by: feng <1304903146@qq.com>
Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
 2022-12-06 11:03:14 +08:00
ibuler daf279304a perf: 修改完冲突了 2022-12-05 18:54:12 +08:00
ibuler 2168610ffe perf: 修改合并引起的 migrations 依赖问题 2022-12-05 16:07:14 +08:00
ibuler e91cbb9c97 merge: with v3 2022-12-05 15:03:21 +08:00
ibuler 873afd239e chore: relove conflict 2022-12-05 13:41:28 +08:00
ibuler 80e550b71a fix: 修复 supertoken 创建 2022-12-05 13:37:37 +08:00
Bai 1a9f520c1f Merge to local v3 2022-12-05 13:32:33 +08:00
Bai cc7424dbfe perf: 修改 CommandFilterACL, CommandGroup Model 的 Meta 内部类; 修改 Command Model 的 system_user -> account 字段; 修改 ConnectionToken 的 command_filter_acls 返回字段; 2022-12-05 13:27:51 +08:00
ibuler ca228074e3 perf: 修改 migrations 依赖 2022-12-05 12:58:09 +08:00
ibuler 0047af4584 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-05 12:42:39 +08:00
ibuler 38b1701b33 perf: 修改 migrations， 修改 Connect token 2022-12-05 12:42:15 +08:00
feng 03e62b5bc1 perf: asset mini 2022-12-05 11:48:41 +08:00
Aaron3S 74b783f62f perf: 合并迁移文件 2022-12-05 11:26:14 +08:00
fit2bot 8a7ecda4f6
perf: asset add automation_enabled_info (#9154) 
Co-authored-by: feng <1304903146@qq.com>
 2022-12-05 11:21:01 +08:00
ibuler d25d580ba4 perf: 合并 connect token 2022-12-05 11:06:50 +08:00
ibuler 669ccb502f perf: 修改 connect token 2022-12-05 10:48:19 +08:00
Bai 0cfcfacb6d perf: 修改 CommandFilterACL, CommandGroup __str__ 2022-12-04 22:46:47 +08:00
Bai 519e0eac01 perf: 修改 CommandGroupSerializer type 字段为 LabeledChoiceField 2022-12-04 20:51:22 +08:00
Bai 70fb00c4ee perf: 修改命令过滤ACL序列类和部分翻译 2022-12-04 18:48:48 +08:00
Bai 4d9344eb23 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-04 18:11:32 +08:00
Bai 229d36abb4 perf: 修改命令过滤 ACL 序列类 2022-12-04 18:01:35 +08:00
Eric 048be1782d fix: replay file data 2022-12-04 17:39:48 +08:00
Bai 5568c4c5df perf: 修改 CommandFilterACL Account 只匹配 username 字段 2022-12-04 14:44:30 +08:00
Bai a69b762f13 fix: 修改 ACL ActionChoices review, accept, reject 引用 2022-12-04 12:08:44 +08:00
Bai 2b5bd558f3 perf: 修改命令过滤相关的Model, CommandFilterACL, CommandGroup; 修改Model QuerySet 相关的方法; 2022-12-04 00:04:39 +08:00
Eric 6480b916d6 perf: parse ssh private key 2022-12-03 15:25:04 +08:00
ibuler 289ecbcc75 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-02 20:33:56 +08:00
ibuler 2cf3a21d27 perf: 修改校验权限 2022-12-02 20:33:32 +08:00
fit2bot 156a6c9dc5
perf: gateway test connective (#9152) 
Co-authored-by: feng <1304903146@qq.com>
 2022-12-02 20:28:49 +08:00
ibuler 052a4afef6 pref: 暂时修改 key fingerprint 2022-12-02 20:06:56 +08:00
ibuler fbea1f3480 perf: 修改一些拼写 2022-12-02 19:56:13 +08:00
Bai a70f85e346 fix: 修改 ConnectionToken Serializer 2022-12-02 18:09:07 +08:00
Bai 52e8082470 fix: 修改 LoginAssetACL 过滤 review 2022-12-02 17:52:51 +08:00
Bai c832f762a5 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-02 17:48:51 +08:00
Bai c8c5aca355 fix: 修改 ConnectionToken Serializer 命令过滤器 2022-12-02 17:48:44 +08:00
jiangweidong aa0dabfd10 fix: 删除不用migrations 2022-12-02 17:40:00 +08:00
fit2bot 0e0a9f4654
perf: gateway account (#9150) 
Co-authored-by: feng <1304903146@qq.com>
 2022-12-02 17:36:55 +08:00
Aaron3S 2f5e133558 perf: 优化celery任务 2022-12-02 17:18:11 +08:00
Aaron3S 6d0545f04f perf: 持续优化作业创建 2022-12-02 17:17:05 +08:00
老广 21f91358cf
Merge pull request #9147 from jumpserver/pr@v3@fix_withdraw_acl_unfinished 
fix: 删除掉连接方式控制半成品代码
 2022-12-02 14:57:38 +08:00
ibuler 2d771eedc1 perf: 优化用户授权 api 2022-12-02 13:15:03 +08:00
jiangweidong faf1dedfe2 fix: 删除掉连接方式控制半成品代码 2022-12-02 13:00:48 +08:00
Bai 563b9f77a6 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-02 12:41:05 +08:00
Bai 158d49b230 fix: 修复用户授权的资产 API 支持 id 过滤 2022-12-02 12:40:29 +08:00
ibuler 61e6ab20a2 perf: 修改 Connect acl 2022-12-02 12:27:26 +08:00
ibuler 6390b9c203 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-02 11:53:45 +08:00
ibuler a6aafaec05 perf: 修改 command filter 2022-12-02 11:53:07 +08:00
fit2bot 541358978d
fix: gateway (#9145) 
Co-authored-by: feng <1304903146@qq.com>
 2022-12-02 11:45:05 +08:00
ibuler 19c3f98e8f pref: 修改 migrations 冲突 2022-12-02 11:14:29 +08:00
ibuler fdbaa0afe1 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-02 11:12:25 +08:00