github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
10,627 Commits
68 Branches
246 Tags
108 MiB
Commit Graph

70 Commits (006faac3264afb6c1e47df8658ee23c1bf75113d)

Author SHA1 Message Date
feng eca50874f0 feat: 同步删除远程机器账号 2023-12-08 14:13:55 +08:00
fit2bot 8291a81efd
perf: 支持全局的 labels (#12043) 
* perf: 支持全局的 labels

* perf: stash

* stash

* stash

* stash

* stash

* perf: 优化 labels

* stash

* perf: add debug sql

* perf: 修改 labels

* perf: 优化提交

* perf: 优化提交 labels

* perf: 基本完成

* perf: 完成 labels 搜索

* perf: 优化 labels

* perf: 去掉不用 debug

---------

Co-authored-by: ibuler <ibuler@qq.com>
 2023-12-05 11:16:34 +08:00
fit2bot b313598227
fix: 修复账号批量添加模版账号时name没同步过来，资产创建时使用模版账号没有切换自，资产克隆时生成的账号没有切换自 (#11877) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-17 19:15:46 +08:00
Bai 1de7af4984 fix: 解决 master 冲突 2023-09-21 16:51:54 +08:00
老广 4cb499953c Revert "perf: 修复事务中任务执行" 
This reverts commit cdbe5d31e9.
 2023-09-21 15:40:39 +08:00
ibuler cdbe5d31e9 perf: 修复事务中任务执行 2023-09-21 15:04:58 +08:00
fit2bot e5bfa29c7b
fix: 创建用户推送失败问题 (#11606) 
Co-authored-by: feng <1304903146@qq.com>
 2023-09-19 14:53:43 +08:00
fit2bot e6fe7c489e
perf: 修改账号生成 (#11591) 
* perf: 修改账号生成

* perf: 修改账号模版支持策略

* perf: 修改特殊字符数量

* perf: 修改 model 继承

* perf: 修改顺序

* perf: 修改 requirements

* perf: 修改翻译

* perf: 修改随机生成密码

* perf: 修改密钥生成

* perf: 修复 bug

---------

Co-authored-by: ibuler <ibuler@qq.com>
 2023-09-19 10:59:33 +08:00
Bryan 03273b2ec4
Merge pull request #11322 from jumpserver/dev 
v3.6.0
 2023-08-17 13:56:25 +05:00
fit2bot 362c2a9509
perf: 修改翻译 账号模版批量添加 config配置文件 (#11286) 
Co-authored-by: feng <1304903146@qq.com>
 2023-08-15 18:24:01 +08:00
fit2bot 3b615719fe
feat: 账号密钥用vault储存 (#10830) 
* feat: 账号密钥用vault储存

* perf: 优化 Vault

* perf: 重构 Vault Backend 设计架构 (未完成)

* perf: 重构 Vault Backend 设计架构 (未完成2)

* perf: 重构 Vault Backend 设计架构 (未完成3)

* perf: 重构 Vault Backend 设计架构 (未完成4)

* perf: 重构 Vault Backend 设计架构 (未完成5)

* perf: 重构 Vault Backend 设计架构 (已完成)

* perf: 重构 Vault Backend 设计架构 (已完成)

* perf: 重构 Vault Backend 设计架构 (已完成)

* perf: 小优化

* perf: 优化

---------

Co-authored-by: feng <1304903146@qq.com>
Co-authored-by: Bai <baijiangjie@gmail.com>
Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com>
 2023-07-31 17:39:30 +08:00
ibuler b4b9c805ff perf: 修改支持 Django4 2023-07-24 11:52:25 +08:00
Jiangjie.Bai 0a1b379dcd
Merge pull request #10731 from jumpserver/dev 
v3.4.0
 2023-06-15 14:16:39 +08:00
fit2bot b3c5674213
fix: 资产用模版创建账号无切换至 (#10662) 
Co-authored-by: feng <1304903146@qq.com>
 2023-06-09 16:23:44 +08:00
feng d4bb501ef9 fix: 账号导入500 2023-05-22 14:13:55 +08:00
Jiangjie.Bai 2f5d094abb
Merge pull request #10498 from jumpserver/dev 
v3.3.0
 2023-05-18 19:17:08 +08:00
fit2bot 0596b74fa1
fix: 账号创建ssh key 校验 (#10494) 
Co-authored-by: feng <1304903146@qq.com>
 2023-05-18 18:00:58 +08:00
Bai 04e95d378c perf: 优化账号列表-添加账号切换自用户字段必填的问题 2023-05-17 14:11:21 +08:00
fit2bot 9cc9600a4c
fix: 批量添加账号su_from 错乱 (#10463) 
Co-authored-by: feng <1304903146@qq.com>
 2023-05-16 15:44:02 +08:00
fit2bot ec10ee3298
fix: 模版批量添加提示异常（core 代码bug） (#10455) 
Co-authored-by: feng <1304903146@qq.com>
 2023-05-15 18:58:06 +08:00
fit2bot 1933e82587
feat: 账号模版切换至 (#10396) 
Co-authored-by: feng <1304903146@qq.com>
 2023-05-09 15:29:02 +08:00
Jiangjie.Bai b44e6c258f
Merge pull request #10284 from jumpserver/dev 
v3.2.0
 2023-04-20 18:23:12 +08:00
ibuler 12adf66f41 perf: 优化账号历史过滤 2023-04-19 11:13:29 +08:00
fit2bot fc4a77df1a
fix: 账号导入500 (#10255) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-19 10:57:38 +08:00
fit2bot 28f08251b3
perf: 修复创建资产时，account 的校验 (#10247) 
* perf: 修复创建资产时，account 的校验

* perf: 优化一下提示

---------

Co-authored-by: ibuler <ibuler@qq.com>
 2023-04-18 20:10:51 +08:00
ibuler 389f94d672 perf: 修改 assets serializer 支持 accounts template 2023-04-18 19:12:26 +08:00
老广 996690fc02
Merge pull request #10235 from jumpserver/pr@dev@perf_asset_set_default_nodes 
perf: custom fields 仅custom 类型资产支持
 2023-04-18 17:18:53 +08:00
fit2bot cf197f7efc
perf: 创建资产通过账号模版创建账号 (#10234) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-18 17:03:49 +08:00
ibuler 5921b2ee8f perf: 修改默认节点 2023-04-18 16:29:41 +08:00
fit2bot 5a34372ca5
perf: 批量创建账号 没解密 (#10226) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-17 17:46:10 +08:00
fit2bot b3b7575b0c
fix: 批量更新资产账号 错误 secret (#10221) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-17 15:07:34 +08:00
Jiangjie.Bai 9109a5e6a2
Merge pull request #10213 from jumpserver/dev 
v3.2.0 rc2
 2023-04-14 18:33:00 +08:00
feng 31653cab11 perf: 单独推送账号 2023-04-14 16:22:54 +08:00
Jiangjie.Bai 68351b1c39
Merge pull request #10196 from jumpserver/dev 
v3.2.0 rc1
 2023-04-13 19:21:05 +08:00
Bai 21da805e78 fix: fix conflicts 2023-04-13 19:20:18 +08:00
fit2bot 1eb8e40d3e
feat: 账号推送附加参数 (#10080) 
* feat: 账号推送附加参数

* perf: 通过节点 资产 过滤平台api

* perf: push automation params

* perf: 修改playbook

* perf: params serializer

* perf: 账号推送playbook 调整

* perf: Automation serializer add params field

* perf: params 非必填

* perf: 添加is_params 给前端判断

* perf: is_params bool

* perf: 修改push account ansible逻辑

* perf: 修改获取push_kwargs方法

* perf: platform migrate

* perf: 修改api

* perf: 单个推送

* perf: push account

* perf: 修改asset auto_config

---------

Co-authored-by: feng <1304903146@qq.com>
Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com>
 2023-04-13 19:02:04 +08:00
fit2bot 4654756966
fix: 修复账号克隆 500 (#10192) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-13 14:20:07 +08:00
fit2bot 30b89e5cc9
perf: 账号模版更新 (#10184) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-12 17:59:13 +08:00
fit2bot 1248458451
perf: 优化支持 choices (#10151) 
* perf: 支持自定义类型资产

* perf: 改名前

* perf: 优化支持 choices

* perf: 优化自定义资产

* perf: 优化资产的详情

* perf: 修改完成自定义平台和资产

---------

Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
 2023-04-10 10:57:44 +08:00
fit2bot e34fbce082
perf: patch account 400 (#10153) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-06 19:53:01 +08:00
fit2bot 7c1e92c787
fix: 更新账号 跳过name检查 (#10136) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-04 16:04:44 +08:00
fit2bot c5340b5adc
perf: 修改 account (#10088) 
* perf: 优化账号创建策略

* perf: 修改账号

* perf: 修改 account

* perf: 修改 account

* perf: 修改批量创建

* perf: 修改账号批量创建

* perf: 继续优化账号批量添加

* perf: 优化创建 accounts 的结果

* perf: 优化账号批量返回的格式

* perf: 优化账号

---------

Co-authored-by: ibuler <ibuler@qq.com>
 2023-04-03 18:18:31 +08:00
fit2bot f7ae23f7d9
perf: 导入资产账号模版api优化 (#10038) 
Co-authored-by: feng <1304903146@qq.com>
Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com>
 2023-03-22 18:35:23 +08:00
fit2bot ed4a4ceca1
perf: 批量创建账号 定义创建账号策略 忽略或抛出错误 (#10028) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-22 11:09:48 +08:00
fit2bot 69cd7bce17
perf: 批量创建账号时，跳过unique检查 不去创建 (#9966) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-20 15:45:21 +08:00
ibuler 12db64ea18 perf: 优化导入导出 2023-03-17 18:44:21 +08:00
Bai 0747cf7c5e fix: 修复导出账号历史翻译信息 2023-03-16 16:40:53 +08:00
Bai 93a7cee4de fix: 修复导出账号历史翻译信息 2023-03-16 11:18:41 +08:00
ibuler d1b807bd8b perf: 修改 account asset auto_info 返回 2023-02-23 16:14:24 +08:00
Bai d4435799ac fix: 授权规则账号列表返回asset.auto_info字段 2023-02-23 11:45:56 +08:00