Commit Graph

354 Commits (94ee3169dc041883546bdd795b31f2c9f07267b6)

Author SHA1 Message Date
feng 6e7074ba40 fix: mysql 开始ssl后 再关闭测试失败 2023-11-20 15:38:53 +08:00
feng 2edcb2f2d3 fix: mysql 开启ssl 再关闭 测试可连接性失败 2023-11-20 10:52:23 +08:00
fit2bot 2630ea39a1
perf: windows 改密推送添加新的方式 最后测试可连接性的时候采用rdp的方式测试 (#12141)
Co-authored-by: feng <1304903146@qq.com>
2023-11-16 18:12:22 +08:00
fit2bot 1ef51563b5
perf: account 迁移文件 (#12128)
Co-authored-by: feng <1304903146@qq.com>
2023-11-16 10:18:54 +08:00
fit2bot d6aea54722
fix: 账号收集未同步资产时 变更数据错误 (#12123)
Co-authored-by: feng <1304903146@qq.com>
2023-11-15 16:44:35 +08:00
fit2bot b2327c0c5a
fix: 账号改密 root密钥无法替换 (#12121)
Co-authored-by: feng <1304903146@qq.com>
2023-11-15 15:33:10 +08:00
fit2bot b15c314384
fix: 资产多协议时 计算协议端口错误 (#12120)
Co-authored-by: feng <1304903146@qq.com>
2023-11-15 14:59:40 +08:00
fit2bot d63c4d6cc4
fix: mysql 测试可连接性失败 (#12104)
Co-authored-by: feng <1304903146@qq.com>
2023-11-14 17:03:20 +08:00
fit2bot 4e5a44bd98
fix: 账号收集通知 同步资产时 计算新增账号错误 (#12101)
Co-authored-by: feng <1304903146@qq.com>
2023-11-14 14:50:33 +08:00
fit2bot fcce03f7bd
fix: 改密记录搜索失败 (#12098)
Co-authored-by: feng <1304903146@qq.com>
2023-11-14 12:48:02 +08:00
fit2bot 5f121934a7
perf: 交换机切换至卡住 (#12096)
Co-authored-by: feng <1304903146@qq.com>
2023-11-14 10:58:57 +08:00
fit2bot d6b75ac700
perf: 修改默认 ansible_python_interpreter (#12093)
Co-authored-by: feng <1304903146@qq.com>
2023-11-13 18:09:09 +08:00
fit2bot 0ee14e6d85
perf: 修改翻译 (#12092)
Co-authored-by: feng <1304903146@qq.com>
2023-11-13 17:50:10 +08:00
wangruidong 9babe977d8 fix: 修改sftp账号备份文件名及任务日志提示 2023-11-13 17:05:21 +08:00
wangruidong c1f572df05 fix: 【账号备份】创建账号备份存储,选择SFTP,发送服务器为空。修改执行任务的日志提示 2023-11-09 14:22:04 +08:00
fit2bot 75bab70ccf
fix: 账号迁移文件 (#12059)
Co-authored-by: feng <1304903146@qq.com>
2023-11-08 10:33:49 +08:00
fit2bot f01bfc44b8
perf: 账号备份增加sftp方式 (#12032)
* perf: 添加sftp支持

* perf: 账号备份增加sftp方式

---------

Co-authored-by: wangruidong <940853815@qq.com>
Co-authored-by: Bryan <jiangjie.bai@fit2cloud.com>
2023-11-07 15:10:46 +08:00
fit2bot 54b89f6fee
feat: 账号收集添加资产账号信息变化通知 (#12009)
Co-authored-by: feng <1304903146@qq.com>
2023-11-07 13:00:09 +08:00
feng 7b86938b58 perf: 密码中支持特殊字符比如" 2023-11-06 17:53:18 +08:00
feng bc54685a31 feat: 改密记录 推送记录可单独执行 2023-10-31 00:57:47 -05:00
fit2bot 1239082649
fix: change secret perm 没有生成 (#11948)
Co-authored-by: feng <1304903146@qq.com>
2023-10-24 14:07:07 +08:00
fit2bot ff073185f1
fix: 改密切换至检测可连接性 失败 (#11946)
Co-authored-by: feng <1304903146@qq.com>
2023-10-24 11:30:26 +08:00
feng bf0d9f4b80 fix: 删除错误的改密权限 2023-10-23 04:32:00 -05:00
Bai 939b517e34 fix: 修复账号改密密码规则提交不生效的问题 2023-10-19 04:30:49 -05:00
fit2bot d3a283232f
perf: 优化 xpack license 检查 (#11885)
Co-authored-by: ibuler <ibuler@qq.com>
2023-10-18 01:10:24 -05:00
fit2bot b313598227
fix: 修复账号批量添加模版账号时name没同步过来,资产创建时使用模版账号没有切换自,资产克隆时生成的账号没有切换自 (#11877)
Co-authored-by: feng <1304903146@qq.com>
2023-10-17 19:15:46 +08:00
fit2bot ea0e852412
fix: rdp 测试可连接性失败 (#11837)
Co-authored-by: feng <1304903146@qq.com>
2023-10-13 16:21:20 +08:00
fit2bot ffc057f844
fix: 账号改密-执行列表-详情-任务记录:模糊搜索500 (#11835)
Co-authored-by: feng <1304903146@qq.com>
2023-10-13 15:33:35 +08:00
fit2bot c0de27ff7a
perf: 资产批量更新平台字段,根据平台约束协议自动生效 (#11818)
Co-authored-by: feng <1304903146@qq.com>
2023-10-12 18:11:51 +08:00
fit2bot 9f042cfa04
Merge branch 'dev' into pr@dev@change_import (#11815)
* perf: 修改获取 ip

* perf: 修改导入

---------

Co-authored-by: ibuler <ibuler@qq.com>
2023-10-12 03:17:32 -05:00
feng ca7d164034 perf: 账号模版信息同步到所关联的账号 2023-10-11 04:20:11 -05:00
fit2bot 30b19d31eb
fix: 账号批量更新失败 (#11785)
Co-authored-by: feng <1304903146@qq.com>
2023-10-10 17:24:56 +08:00
fit2bot c981e9cd9f
perf: 主机名包含/ 可以执行ansible任务 (#11772)
Co-authored-by: feng <1304903146@qq.com>
2023-10-09 16:05:42 +08:00
fit2bot ef2b7b464e
perf: ansible 用户切换至 (#11766)
Co-authored-by: feng <1304903146@qq.com>
2023-10-09 14:35:21 +08:00
feng ae5d4257ad fix: 修复账号批量更新失败问题 2023-10-09 10:05:50 +08:00
feng f79084c2df fix: 账号授权过滤指定账号api 失效问题 2023-09-27 13:11:48 +05:00
feng 56a26481a4 perf: 账号模版 生成随机密码密钥及账号批量更新500 2023-09-26 12:55:54 +08:00
fit2bot 7128593502
perf: CeleryTaskExecution 添加默认排序 (#11663)
Co-authored-by: feng <1304903146@qq.com>
2023-09-22 15:06:58 +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
jiangweidong 1c74dd00ba
fix: 解决sqlserver无法推送和改密的问题 (#11637) 2023-09-20 21:45:21 +08:00
fit2bot 39baf88055
fix: ansible postgresql (#11629)
Co-authored-by: feng <1304903146@qq.com>
2023-09-20 14:29:53 +08:00
fit2bot 90131db55a
perf: 修改任务检查 (#11609)
* perf: 修改任务检查

* perf: 修改翻译

---------

Co-authored-by: ibuler <ibuler@qq.com>
2023-09-20 11:12:15 +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
ibuler 04a790c4ee perf: 优化 account template platform required 2023-09-18 14:29:41 +08:00
fit2bot c32271ec6f
fix: mysql 没配置ssl ansible 连接失败问题 (#11574)
Co-authored-by: feng <1304903146@qq.com>
2023-09-15 16:16:04 +08:00
ibuler b9997b07db perf: 去掉不用的 backend 2023-09-13 17:22:50 +08:00
ibuler d0f79c2df2 perf: 添加 check api 避免未认证 2023-09-13 17:05:01 +08:00
fit2bot 578f66d5e2
fix: 账号推送定时任务不执行 (#11482)
Co-authored-by: feng <1304903146@qq.com>
2023-08-31 17:43:52 +08:00
fit2bot 1138cd3334
perf: 添加 session 在线数量 (#11464)
* perf: 添加 session 在线数量

* perf: 优化会话数量

* perf: 优化会话数量

---------

Co-authored-by: ibuler <ibuler@qq.com>
2023-08-31 17:00:03 +08:00
fit2bot 992e34d652
feat: mysql 证书 (#11465)
Co-authored-by: feng <1304903146@qq.com>
2023-08-30 15:15:49 +08:00
jiangweidong d4469aeaf7 feat: 查看/下载录像被记录在活动日志中 2023-08-29 14:21:06 +08:00
fit2bot 859268f7f3
perf: 优化账号创建 (#11440)
* feat: 支持账号模版自动推送
* perf: 修改模版
* perf: 优化账号创建

---------

Co-authored-by: ibuler <ibuler@qq.com>
2023-08-28 15:43:45 +08:00
ibuler 6f3871d5fe perf: 修改同名账号的提示 2023-08-28 11:24:54 +08:00
fit2bot 04f4ecb3d1
perf: 优化文案 (#11405)
Co-authored-by: ibuler <ibuler@qq.com>
2023-08-24 10:58:27 +08:00
ibuler 44b536a23b perf: 去掉 migrate 提示 2023-08-18 15:17:41 +05:00
feng 7506c7ea43 fix: 修复密钥校验ansible不支持{% 2023-08-17 16:16:34 +05:00
Bryan 03273b2ec4
Merge pull request #11322 from jumpserver/dev
v3.6.0
2023-08-17 13:56:25 +05:00
Bai 7b89055fbf fix: 账号备份参数控制 2023-08-17 11:50:17 +05:00
fit2bot b20abb494f
perf: 优化 vault 配置 (#11313)
Co-authored-by: feng <1304903146@qq.com>
2023-08-17 12:12:58 +08:00
fit2bot 362c2a9509
perf: 修改翻译 账号模版批量添加 config配置文件 (#11286)
Co-authored-by: feng <1304903146@qq.com>
2023-08-15 18:24:01 +08:00
fit2bot 12744a08af
perf: vault 日志 (#11282)
Co-authored-by: feng <1304903146@qq.com>
2023-08-15 15:09:25 +08:00
fit2bot 7ba261c4f0
perf: vault 同步日志 (#11278)
Co-authored-by: feng <1304903146@qq.com>
2023-08-15 10:32:03 +08:00
fit2bot 1f8428ac1c
perf: vault 同步速度问题 (#11277)
Co-authored-by: feng <1304903146@qq.com>
2023-08-14 22:32:53 +08:00
fit2bot c11ba16e4e
perf: oidc 替换原有的is_ajax方法,优化accountbackupexecution 迁移文件 (#11274)
Co-authored-by: feng <1304903146@qq.com>
2023-08-14 18:37:28 +08:00
Eric efe57b3ebe perf: 修复手动登陆账号密码无法赋值问题 2023-08-14 14:46:51 +05:00
fit2bot bd642a0281
perf: 翻译 (#11266)
Co-authored-by: feng <1304903146@qq.com>
2023-08-14 14:47:51 +08:00
fit2bot 237c71f921
perf: vault 同步日志优化 (#11261)
Co-authored-by: feng <1304903146@qq.com>
2023-08-14 10:57:59 +08:00
fit2bot e2de744398
perf: 优化vault 配置 (#11254)
Co-authored-by: feng <1304903146@qq.com>
2023-08-11 16:01:05 +08:00
Bai ab6d0d2484 perf: 优化账号 API 支持 comment 模糊搜索 2023-08-09 17:05:21 +08:00
fit2bot 8ea3c3288b
perf: 改密替换校验可连接性方法 (#11224)
Co-authored-by: feng <1304903146@qq.com>
2023-08-08 17:26:29 +08:00
ibuler a33540710e perf: 优化 applet 选择账号调度 2023-08-08 15:58:24 +08:00
Bai a297355a0d fix: 修复 accounts 迁移文件编号冲突 2023-08-08 14:07:08 +08:00
fit2bot b764827003
perf: 虚拟账号增加密码选项 (#11201)
* perf: 修改账号配置

* perf: 修改 account

* perf: 修改 virtual account

* perf: 虚拟账号增加密码选项

* perf: 修改获取虚拟账号

* perf: 修改 virtual account

* perf: 修改一些写法

* perf: 添加说明

---------

Co-authored-by: ibuler <ibuler@qq.com>
2023-08-08 10:16:23 +08:00
fit2bot 0a9726d845
feat: 账号备份密钥拆分 (#11199)
Co-authored-by: feng <1304903146@qq.com>
2023-08-07 15:50:09 +08:00
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