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

277 Commits (ffc057f844a85cac63ab5c0596eb2f96dc0ceb1f)

Author SHA1 Message Date
jiangweidong ff2aace569
feat: ssh_ping及custom_command支持sudo及su切换用户 (#11180) 2023-08-03 14:09:13 +08:00
fit2bot 6d2e7cf7f4
perf: 任务添加过滤项 (#11181) 
Co-authored-by: feng <1304903146@qq.com>
 2023-08-02 17:51:58 +08:00
fit2bot d486dfc7f7
fix: 修复因vault 改密500 问题 (#11168) 
Co-authored-by: feng <1304903146@qq.com>
 2023-08-02 13:11:46 +08:00
fit2bot d182d14e26
perf: 账号备份日志优化 (#11151) 
Co-authored-by: feng <1304903146@qq.com>
 2023-08-01 18:17:02 +08:00
fit2bot 1ad0a20627
fix: 启动500 (#11133) 
Co-authored-by: feng <1304903146@qq.com>
 2023-07-31 18:31:11 +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
fit2bot c201914bc8
perf: change secret perf (#11120) 
Co-authored-by: feng <1304903146@qq.com>
 2023-07-28 17:00:55 +08:00
ibuler b55eb1236f perf: 添加到默认组织中 2023-07-28 16:15:12 +08:00
fit2bot 99adb6ab7a
perf: 改造username_suggestions api 改为post请求 (#11110) 
Co-authored-by: feng <1304903146@qq.com>
 2023-07-27 14:04:29 +08:00
ibuler 7ae52eb941 perf: 修改 gettext 2023-07-24 14:09:22 +08:00
ibuler b4b9c805ff perf: 修改支持 Django4 2023-07-24 11:52:25 +08:00
Bryan e90e61e8dd
Merge pull request #11035 from jumpserver/dev 
v3.5.0
 2023-07-20 19:03:31 +08:00
老广 b8397e7db9
Merge pull request #11012 from jumpserver/pr@dev@perf_change_ui_route 
perf: 优化 url
 2023-07-19 11:37:51 +08:00
ibuler 8ed8d6f01c perf: 优化 url 2023-07-19 11:36:42 +08:00
Bai aa744c0fec fix: 修复账号模版切换时报错的问题 2023-07-19 07:34:55 +05:00
fit2bot 0436487bdb
fix: 替换ssh key 生成密钥方法 (#10995) 
Co-authored-by: feng <1304903146@qq.com>
 2023-07-18 15:01:47 +08:00
老广 b10623c970
Merge pull request #10879 from jumpserver/pr@dev@feat_chatgpt_support 
feat: 支持 chatgpt 资产
 2023-07-11 09:59:04 +08:00
feng 89492410aa fix: 推送账号 不填写home 推送失败 2023-07-06 10:33:36 +08:00
fit2bot f095998096
perf: 改密与推送保持一致 (#10812) 
* perf: 改密与推送保持一致

* perf: 增加 i18n

---------

Co-authored-by: feng <1304903146@qq.com>
Co-authored-by: Bai <baijiangjie@gmail.com>
 2023-07-04 17:34:31 +08:00
老广 d06e5d0001
Merge pull request #10826 from jumpserver/pr@dev@perf_account_template 
perf: 接口sql优化 /api/v1/accounts/account-templates/su-from-account-templates/
 2023-07-04 13:42:04 +08:00
ibuler d72ec653f4 merge: 合并 dev 2023-07-04 11:43:33 +08:00
ibuler 41e39c9614 perf: 修改 chatgpt 协议 2023-06-30 18:33:18 +08:00
fit2bot bbbd011cc2
perf: 修改 protocol setting (#10875) 
* feat: 新增账号配置

* perf: 修改 platform protocol define

* perf: 修改 account config

* perf: 修改协议设置

---------

Co-authored-by: ibuler <ibuler@qq.com>
 2023-06-30 15:54:06 +08:00
Bai ca1b82330e perf: 账号搜索支持通过 secret_type 过滤 2023-06-30 11:12:23 +08:00
ibuler a22f36a06a perf: 去掉 debug 2023-06-27 14:31:20 +08:00
ibuler 77bcb05d80 perf: web 和 自定义类型资产支持匿名账号 2023-06-27 11:23:56 +08:00
fangfang.dong 4e9012cc07 perf: 接口sql优化 /api/v1/accounts/account-templates/su-from-account-templates/ 2023-06-27 10:45:50 +08:00
cui fliter 471411a1aa fix some typos 
Signed-off-by: cui fliter <imcusg@gmail.com>
 2023-06-19 15:19:41 +08:00
feng ef4132d2c5 feat: 添加自动化任务rdp ping 2023-06-15 18:33:05 +08:00
Jiangjie.Bai 0a1b379dcd
Merge pull request #10731 from jumpserver/dev 
v3.4.0
 2023-06-15 14:16:39 +08:00
fit2bot 2333a29a56
perf: 优化数据库改密原子性 (#10663) 
Co-authored-by: feng <1304903146@qq.com>
 2023-06-09 16:52:54 +08:00
fit2bot b3c5674213
fix: 资产用模版创建账号无切换至 (#10662) 
Co-authored-by: feng <1304903146@qq.com>
 2023-06-09 16:23:44 +08:00
fit2bot bfd77aa1b0
feat: automation windows pyrdp ping (#10602) 
* feat: automation windows pyrdp ping

* perf: add pyfreerdp deps

---------

Co-authored-by: feng <1304903146@qq.com>
Co-authored-by: Eric <xplzv@126.com>
 2023-06-07 17:28:35 +08:00
fit2bot 9d8c1bb317
perf: 账号模版更新时, 优化同步更新账号逻辑 (#10611) 
Co-authored-by: feng <1304903146@qq.com>
 2023-06-02 10:56:00 +08:00
Bai 51d6090fdc perf: 优化支持账号列表搜索资产名称 2023-05-31 16:50:37 +08:00
ibuler f4c29a262a perf: 优化自动化任务在平台中的名称显示 2023-05-30 17:17:47 +08:00
halo b72f8a7241 perf: 优化账号收集，使用正则处理结果 2023-05-25 13:40:25 +08:00
fit2bot 653b996d84
perf: 账号推送支持设置推送账号的 home 目录 (#10541) 
Co-authored-by: feng <1304903146@qq.com>
 2023-05-24 17:35:14 +08:00
feng 20c1f4a293 perf: 改密过程原子性优化 2023-05-24 14:31:27 +08:00
jiangweidong 3eaed62186
验证账号可连接性(自定义ssh)使用的key值错误 (#10523) 2023-05-22 17:29:17 +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 2981bfffb1
fix: 给 view 增加 export 属性 (#10495) 
Co-authored-by: feng <1304903146@qq.com>
 2023-05-18 18:33:22 +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 4ce2d991dd
perf: 收集mysql账号username 优化 (#10470) 
Co-authored-by: feng <1304903146@qq.com>
 2023-05-16 18:15:42 +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 155c241ef7
fix: 修复账号模版更新时 添加密码密钥500 (#10454) 
Co-authored-by: feng <1304903146@qq.com>
 2023-05-15 18:47:39 +08:00
Bai f0cc64c74e perf: 优化账号用户名字段提示信息（null 的情况） 2023-05-09 18:41:28 +08:00
fit2bot 1933e82587
feat: 账号模版切换至 (#10396) 
Co-authored-by: feng <1304903146@qq.com>
 2023-05-09 15:29:02 +08:00
fit2bot 58d055f114
perf: 改密 推送 可以对自己操作 同时设置su_enabled 可提权 (#10349) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-26 18:50:30 +08:00
Bai 9eec2909ed fix: 修改'账号备份列表-执行次数'未翻译为英文的问题 2023-04-26 17:11:28 +08:00
fit2bot 917620736b
feat: 修改模版账号密码 同步更新关联的账号 (#10328) 
* feat: 修改模版账号密码 同步更新关联的账号

* feat: 同步多个账号

---------

Co-authored-by: feng <1304903146@qq.com>
 2023-04-25 10:28:19 +08:00
ibuler a105748a55 perf: 账号模版 protocols 过滤 2023-04-21 17:11:18 +08:00
fit2bot ede53d3b6b
perf: ssh key strategy translate (#10295) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-21 14:08:59 +08:00
ibuler eb9ac213d5 perf: 去掉 debug msg 2023-04-21 11:32:49 +08:00
Jiangjie.Bai f2e7845d4b
Merge pull request #10286 from jumpserver/dev 
v3.2.0
 2023-04-20 18:33:59 +08:00
fit2bot d75b7c014e
perf: 更新模版暂不同步修改账号 (#10285) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-20 18:29:31 +08:00
Jiangjie.Bai b44e6c258f
Merge pull request #10284 from jumpserver/dev 
v3.2.0
 2023-04-20 18:23:12 +08:00
老广 4b5d9d3a76
Merge pull request #10273 from jumpserver/pr@dev@account_auto_i18n 
perf: account auto i18n
 2023-04-20 14:44:54 +08:00
fit2bot 0de6c41406
perf: update templat account (#10274) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-20 14:43:40 +08:00
feng f030638ba4 perf: account auto i18n 2023-04-20 14:10:39 +08:00
老广 8e61dc8e02
Merge pull request #10267 from jumpserver/pr@dev@perf_yaml_support_i18n 
perf: yaml 文件支持 i18n
 2023-04-20 13:21:22 +08:00
fit2bot c9ee46c0fb
perf: windows 账号可连接性 ansible 刷新 (#10268) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-20 11:32:33 +08:00
ibuler 6b3665e8d0 perf: yaml 文件支持 i18n 2023-04-20 11:13:28 +08:00
jiangweidong 2ba32f6971 perf: 优化自定义改密时需要在命令中包含ssh登录用户的密码问题 2023-04-20 09:52:13 +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 3bc8eda66a
perf: 更新模版关联更新账号 (#10250) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-19 10:18:13 +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
jiangweidong 690e01cb78
feat: 支持部分资源的自定义自动化任务(Ping/VerifyAccount/ChangeSecret) (#9947) 
* feat: 支持部分资源的自定义自动化任务(Ping/VerifyAccount/ChangeSecret)

* perf: 去掉无用的属性

* perf: 优化自定义改密逻辑

* feat: 支持ssh_key认证

* perf: 去掉无用注释

* perf: 优化

* perf: 优化逻辑

* perf: 优化标题

* perf: 去掉一些无用的函数

* perf: 优化helptext
 2023-04-14 18:31:09 +08:00
fit2bot f07e4e53ec
perf: 推送成功后 设置账号可连接性 (#10211) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-14 17:53:21 +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 3c07667689
perf: 修改 account migrate (#10125) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-03 18:53:37 +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
jiangweidong 4c5e47cb99 perf: 普通用户工单申请时，选择指定账号，提示无权限 2023-03-30 16:26:12 +08:00
fit2bot 8d3319717e
perf: 开启安全模式后过滤root administrator (#10089) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-28 16:26:40 +08:00
jiangweidong 5b87470b5c perf: 优化账号活动日志界面的提示及操作日志的字段内容 2023-03-27 18:23:55 +08:00
feng 1ac2fec13f feat: 收集账号 可选同步表 2023-03-27 14:13:44 +08:00
fit2bot 55e1ef116b
perf: clear secret (#10053) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-23 16:04:09 +08:00
fit2bot f6c5c35a2c
feat: 账号收集批量同步账号 (#10051) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-23 15:24:19 +08:00
fit2bot 3b45ad0c61
feat: account remove secret (#10045) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-23 11:20:48 +08:00
fit2bot 0be3cb3c27
fix: account update (#10039) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-22 19:14:43 +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