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

7255 Commits (3336a4526b5607d9af976d0c9274dd0aedd9a6b6)

Author SHA1 Message Date
Bai 47cb6b1ec0 perf: 优化资产列表支持通过 创建日期 进行排序 2023-12-08 16:39:13 +08:00
huailei 79b5dff210
Merge pull request #12286 from jumpserver/pr@dev@password_rule 
fix: 改密计划创建更新失败
 2023-12-08 16:36:04 +08:00
feng b08e1f6a47 fix: 改密计划创建更新失败 2023-12-08 16:34:46 +08:00
Bai 2e3184cbd6 fix: 修复 Endpoint 获取错误问题 2023-12-08 16:33:27 +08:00
feng cc7220a4ad perf: 翻译 2023-12-08 16:17:20 +08:00
fit2bot 81de527e32
perf: 解决Slack解绑用户404问题 (#12283) 
Co-authored-by: jiangweidong <weidong.jiang@fit2cloud.com>
 2023-12-08 15:11:49 +08:00
feng 9a2da98bd4 perf: 修改迁移文件 2023-12-08 14:21:10 +08:00
feng eca50874f0 feat: 同步删除远程机器账号 2023-12-08 14:13:55 +08:00
fit2bot 8f82ca9856
perf: 优化操作日志 (#12249) 
* perf: 优化操作日志

* perf: 修改migrations中关于Nodes的verbose_name

* perf: 优化代码逻辑

* perf: 优化日志详情展示逻辑

* perf: 代码优雅一下

---------

Co-authored-by: jiangweidong <weidong.jiang@fit2cloud.com>
 2023-12-05 17:26:47 +08:00
Eric e193d7a942 perf: 完善 yaml 加载 2023-12-05 17:25:25 +08:00
fit2bot d2429f7883
feat: 支持 virtual app (#12199) 
* feat: 支持 virtual app

* perf: 增加 virtual host

* perf: 新增 virtual app 上传接口

* perf: 更名为 app provider

* perf: 优化代码

---------

Co-authored-by: Eric <xplzv@126.com>
 2023-12-05 16:52:11 +08:00
ibuler a43bb25b5a perf: 优化 applet 账号选择 2023-12-05 16:19:56 +08:00
ibuler ffe3e8a70c perf: 优化 for tidb 2023-12-05 16:13:16 +08:00
ibuler 0e7e499a1e perf: 修改 labels 创建 2023-12-05 15:22:47 +08:00
ibuler e812e3ff89 fix: 优化 endpoint 的 ipv6 支持 2023-12-05 14:56:05 +08:00
halo d2eacad97b perf: 更新客户端 v2.1.0 2023-12-05 14:02:33 +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 a91cb1afd5
feat: 系统设置可配置gpt (#12207) 
* feat: 系统设置可配置gpt

* perf: 添加gpt的terminal config

---------

Co-authored-by: feng <1304903146@qq.com>
 2023-12-05 10:58:19 +08:00
wangruidong 2cad97065f feat: 资产详情页面添加历史执行命令列表页面 2023-12-04 16:38:28 +08:00
wangruidong 3cd22f05d2 perf: 优化工单处理提示消息页面 2023-11-30 10:15:26 +08:00
fit2bot 0fdae00722
perf: 支持slack通知和认证 (#12193) 
* perf: 支持slack通知和认证

* perf: 生成迁移文件

* perf: 优化获取access_token逻辑

---------

Co-authored-by: jiangweidong <weidong.jiang@fit2cloud.com>
 2023-11-29 17:45:44 +08:00
fit2bot d2498c0d53
fix: sftp不能设置为默认存储 (#12213) 
Co-authored-by: wangruidong <940853815@qq.com>
 2023-11-28 15:21:40 +08:00
huailei 01e40fd238
Merge pull request #12211 from jumpserver/pr@dev@random 
perf: 随机密码生成规则添加可排除字符选项
 2023-11-28 14:49:35 +08:00
feng 370ef11486 perf: 随机密码生成规则添加可排除字符选项 2023-11-28 14:46:51 +08:00
ibuler 089cadeae3 perf: 优化 queryset count 2023-11-28 12:54:04 +08:00
wangruidong 6b748e5ac5 feat: 用户详情展示所有会话 2023-11-28 12:52:11 +08:00
fit2bot 6d611bbbbd
feat: 作业中心数据库支持网域命令执行 (#12117) 
Co-authored-by: jiangweidong <weidong.jiang@fit2cloud.com>
 2023-11-27 11:22:34 +08:00
wangruidong 18670d493e perf: 优化工单处理提示消息页面 2023-11-27 11:14:27 +08:00
ibuler ba38852354 perf: 优化跳转页 2023-11-24 17:00:39 +08:00
wangruidong 64f3509c8c feat: 支持备案配置 2023-11-24 13:55:47 +08:00
huailei 805c78c0de
Merge pull request #12188 from jumpserver/pr@dev@perf_ldap_user_websocket 
perf: ldap接口请求换成websocket连接
 2023-11-23 15:09:15 +08:00
feng 18f6ffe0ce perf: 国际化翻译 2023-11-22 18:30:56 +08:00
wangruidong 6b7119ea74 perf: ldap接口请求换成websocket连接 2023-11-22 16:56:31 +08:00
feng a6de9bdde6 perf: 修改翻译 2023-11-22 11:09:16 +08:00
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
ibuler 07e1918fa1 perf: 优化延迟运行 
fix: 延迟执行设置超时

perf: 修改 delay run

perf: 优化 delay_run 执行

perf: 修改 delay run
 2023-11-20 10:29:51 +08:00
feng 452b383278 fix: redis 开启 ssl websocket连接失败 2023-11-20 10:23:21 +08:00
ibuler ed92f10208 fix: 修复自动禁用非活跃用户任务 2023-11-17 15:41:16 +08:00
Aaron3S 814130204a fix: 删除debug信息 2023-11-17 10:45:44 +08:00
ibuler ded1b4bba1 perf: 优化 api key 认证记录用户的时间 2023-11-16 18:17:22 +08:00
fit2bot 2630ea39a1
perf: windows 改密推送添加新的方式 最后测试可连接性的时候采用rdp的方式测试 (#12141) 
Co-authored-by: feng <1304903146@qq.com>
 2023-11-16 18:12:22 +08:00
Bryan 9e10029bdd
Revert "fix: 修复平台自动化翻译 (#12078)" (#12138) 
This reverts commit 69c0eb2f50.
 2023-11-16 16:35:08 +08:00
Aaron3S d1391cb5d5 fix: 修复 sqlserver 命令执行问题 2023-11-16 16:24:39 +08:00
Aaron3S 44f029774d fix: 修复playbook部分不可执行问题 2023-11-16 16:07:31 +08:00
fit2bot 23fce9e426
perf: 翻译 (#12135) 
Co-authored-by: feng <1304903146@qq.com>
 2023-11-16 15:35:34 +08:00
fit2bot 0778a39894
perf: 在线会话添加活跃状态过滤 (#12134) 
Co-authored-by: feng <1304903146@qq.com>
 2023-11-16 14:41:35 +08:00
fit2bot 8f309dee92
fix: 资产测试可连接性选错账号 (#12130) 
Co-authored-by: feng <1304903146@qq.com>
 2023-11-16 11:26:05 +08:00
Bai d166b26252 perf: 优化处理telnet协议资产端点的端口问题 2023-11-16 11:13:37 +08:00
fit2bot 1ef51563b5
perf: account 迁移文件 (#12128) 
Co-authored-by: feng <1304903146@qq.com>
 2023-11-16 10:18:54 +08:00
老广 3e7b4682e4
Merge pull request #12124 from jumpserver/pr@dev@perf_device_icon 
perf: 修改 tree 硬件设备的 icon
 2023-11-15 17:02:05 +08:00
ibuler 994b42aa93 perf: 修改 tree 硬件设备的 icon 2023-11-15 17:00:12 +08:00
fit2bot d6aea54722
fix: 账号收集未同步资产时 变更数据错误 (#12123) 
Co-authored-by: feng <1304903146@qq.com>
 2023-11-15 16:44:35 +08:00
ibuler 88afabdd1d perf: 设置 winrm 用户端不可以连接 2023-11-15 15:34:38 +08:00
fit2bot b2327c0c5a
fix: 账号改密 root密钥无法替换 (#12121) 
Co-authored-by: feng <1304903146@qq.com>
 2023-11-15 15:33:10 +08:00
Aaron3S 7610f64433 perf: 优化获取当前 python 执行路径的方式 2023-11-15 15:21:56 +08:00
fit2bot b15c314384
fix: 资产多协议时 计算协议端口错误 (#12120) 
Co-authored-by: feng <1304903146@qq.com>
 2023-11-15 14:59:40 +08:00
wangruidong 7a5cffac91 fix: 对象存储下拉无法自动加载 2023-11-15 14:58:33 +08:00
feng 8667943443 fix: celery事物 数据库未保存 2023-11-14 19:42:21 +08:00
Aaron3S 7c51d90a3d fix: 修复快捷命令找不到mssql module 的问题 2023-11-14 19:28:46 +08:00
wangruidong 9996b200f9 fix: 作业执行历史日志未按配置天数清理 2023-11-14 19:22:14 +08:00
wangruidong ae364ac373 fix: 录像存储下载报错 2023-11-14 19:21:33 +08:00
wangruidong fef4a97931 fix: 作业日志筛选用户出错 2023-11-14 19:20:52 +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 521c1f0dfa
perf: 修改授权动作翻译 (#12095) 
Co-authored-by: feng <1304903146@qq.com>
 2023-11-14 10:41:00 +08:00
ibuler 5673698a57 perf: 修改账号选择 2023-11-14 10:18:24 +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
fit2bot 0f9223331c
perf: 修改 m2m json filter (#12087) 
* perf: 修改 m2m json filter

* perf: 修复 json 过滤问题

---------

Co-authored-by: ibuler <ibuler@qq.com>
 2023-11-13 15:04:27 +08:00
fit2bot f8a4a0e108
fix: 修复UserOtpDisableView 视图函数获取模版错误 (#12084) 
Co-authored-by: feng <1304903146@qq.com>
 2023-11-10 17:59:28 +08:00
ibuler ba76f30af9 perf: 修改 applet option 2023-11-10 17:18:40 +08:00
Eric_Lee e5e0c841a2 Revert "perf: 调整 secret 长度为32位" 
This reverts commit c41fdf1786.
 2023-11-10 15:27:57 +08:00
Eric c41fdf1786 perf: 调整 secret 长度为32位 2023-11-10 15:03:51 +08:00
fit2bot 69c0eb2f50
fix: 修复平台自动化翻译 (#12078) 
Co-authored-by: feng <1304903146@qq.com>
 2023-11-09 17:25:32 +08:00
wangruidong c1f572df05 fix: 【账号备份】创建账号备份存储，选择SFTP，发送服务器为空。修改执行任务的日志提示 2023-11-09 14:22:04 +08:00
fit2bot d60fe464ca
fix:修复es6.8查询不到数据问题 (#12069) 
Co-authored-by: feng <1304903146@qq.com>
 2023-11-09 14:18:49 +08:00
fit2bot f47895b8a8
perf: 优化仪表盘查询sftp数量sql (#12075) 
Co-authored-by: feng <1304903146@qq.com>
 2023-11-09 14:16:41 +08:00
Eric 3eb1583c69 perf: 增加分享权限位 2023-11-08 19:05:51 +08:00
feng 5ab8ff4fde perf: 在线用户根据websocket添加用户是否活跃状态 2023-11-08 17:02:47 +08:00
feng 7746491e19 perf: 在线用户添加是否活跃的属性 2023-11-08 17:02:47 +08:00
Eric 5e54792d94 perf: 优化发布机终端名称 2023-11-08 13:53:24 +08:00
Eric 621c7a31fe fix: 修复发布机名称因含特殊字符部署失败的问题 2023-11-08 13:26:04 +08:00
fit2bot 75bab70ccf
fix: 账号迁移文件 (#12059) 
Co-authored-by: feng <1304903146@qq.com>
 2023-11-08 10:33:49 +08:00
halo 30683ed859 perf: 优化连接信息超长，客户端拉起无响应问题 2023-11-07 15:47:22 +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
Bai c0de0b0d8e fix: Remove repetition code 2023-11-07 11:30:53 +08:00
huailei 06275a09ac
Merge pull request #12042 from jumpserver/pr@dev@ansible 
perf: 密码中支持特殊字符比如"
 2023-11-06 18:19:34 +08:00
feng 7b86938b58 perf: 密码中支持特殊字符比如" 2023-11-06 17:53:18 +08:00
fit2bot 44624d0ce0
feat: 工作台支持配置显示系统工具 (#12013) 
Co-authored-by: halo <wuyihuangw@gmail.com>
 2023-11-03 17:33:44 +08:00
wangruidong 9b8c817a16 perf: 修改字段翻译 2023-11-03 10:45:17 +08:00
ibuler 927fe1f128 perf: 修改资产协议 xpack 2023-11-03 10:43:34 +08:00
fit2bot eee119eba1
feat: 个人设置 rdp smart size可配置 (#12021) 
Co-authored-by: feng <1304903146@qq.com>
 2023-11-02 18:51:17 +08:00
老广 53d8f716eb
Merge pull request #12007 from jumpserver/pr@dev@json_field_support_m2m_all 
perf: JSONManyToMany 中的 m2m 方式支持包含所有
 2023-11-02 10:35:28 +08:00
吴小白 78e9f51786 perf: 移除旧版本 Chrome 文件 2023-11-01 18:49:38 +08:00
吴小白 af33ad6631 perf: 移除 python3 环境变量 2023-11-01 18:35:10 +08:00
吴小白 864da49ae6 perf: 更新 chrome 和 chromedriver 2023-11-01 18:10:03 +08:00
“huailei000” 49b3df218e perf: 优化登录页样式 2023-11-01 17:01:14 +08:00
ibuler 0858d67098 fix: 修改可能迁移的问题 2023-11-01 03:11:47 -05:00
ibuler ffa242e635 perf: JSONManyToMany 中的 m2m 方式支持包含所有 2023-11-01 15:38:03 +08:00
wangruidong 4021b1955e fix: 组件启动失败 2023-10-31 19:18:35 +08:00
wangruidong dc841650cf perf: AKSK添加访问IP控制 2023-10-31 02:43:33 -05:00
feng bc54685a31 feat: 改密记录 推送记录可单独执行 2023-10-31 00:57:47 -05:00
ibuler ee586954f8 feat: 发布机支持使用同名账号连接 2023-10-31 10:18:30 +08:00
ibuler e56a37afd2 fix: 优化选择发布机 2023-10-30 16:07:02 +08:00
老广 7669744312
Merge pull request #11981 from jumpserver/pr@dev@feat_perm_add_protocols 
perf: 资产授权添加协议
 2023-10-30 10:12:45 +08:00
ibuler ad8aba88a3 perf: 资产授权添加协议 2023-10-30 10:11:36 +08:00
wangruidong 7659846df4 perf: 兼容SERVER_NAME值多种情况 2023-10-27 16:45:42 +08:00
ibuler f93979eb2d perf: 资产授权添加协议 2023-10-27 16:15:59 +08:00
fit2bot badf83c560
perf: 命令存储为本地数据库时 搜索资产时支持模糊搜索 (#11978) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-26 17:10:27 +08:00
halo f6466a3a20 fix: 修复DB2平台已经存在的问题 2023-10-26 01:25:47 -05:00
ibuler 996394ba29 perf: 优化 profile field 2023-10-25 05:09:15 -05:00
fit2bot 09f8470d34
fix: 改密校验可连接性失败 (#11964) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-25 16:21:45 +08:00
Bai fdb3f6409c fix: 修复登录日志和在线用户会话的 IP 地址获取方式 2023-10-25 01:40:16 -05:00
ibuler 73b0b23910 perf: 修改rsa key 默认长度 2023-10-25 10:05:58 +08:00
ibuler c1185e989a perf: 修复资产类型的 bug 2023-10-24 16:19:08 +08: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
老广 d7a682b462
Merge pull request #11945 from jumpserver/pr@dev@perf_oauth2_access_token_content_type 
perf: 优化OAuth2.0获取Access_token的content_type
 2023-10-24 11:29:10 +08:00
吴小白 2437072768 perf: 清理旧版本 chromedriver PATH 2023-10-24 10:29:14 +08:00
jiangweidong 08a2d96213 perf: 优化OAuth2.0获取Access_token的content_type 2023-10-24 10:26:38 +08:00
吴小白 de7d7b41c0 perf: 更新 tinker python 版本 2023-10-24 08:46:17 +08:00
jiangweidong b04c7f022f perf: 使用scan命令扫描在线用户 2023-10-23 04:34:12 -05:00
feng bf0d9f4b80 fix: 删除错误的改密权限 2023-10-23 04:32:00 -05:00
wangruidong 314257f790 perf: 作业中心执行历史增加保留天数配置 2023-10-23 04:13:35 -05:00
ibuler 6d2a62e413 fix: 优化替换 DOMAINS 中端口 的问题 2023-10-22 22:32:04 -05:00
feng 7c796e8201 fix: 资产数据库 不分页时list接口错误 2023-10-20 16:35:39 +08:00
fit2bot 32461078fe
perf: ticket 迁移文件 (#11920) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-19 20:00:47 +08:00
Bai 939b517e34 fix: 修复账号改密密码规则提交不生效的问题 2023-10-19 04:30:49 -05:00
jiangweidong 66eac762ff fix: 可以清空云同步中的策略 2023-10-19 03:57:00 -05:00
fit2bot db9ee71ab3
perf: 翻译 (#11913) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-19 16:24:25 +08:00
fit2bot db2331521d
fix: 修复工单复合通知无账号信息 (#11912) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-19 15:56:14 +08:00
fit2bot 4aa4c6854b
perf: 更新ops ticket announcement settings 权限 (#11911) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-19 15:15:02 +08:00
fit2bot 26a18a1f5c
perf: 批量创建资产 账号格式错误提醒 (#11909) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-19 13:44:24 +08:00
fit2bot 6870df6d75
fix: cas ldap 登录失败 (#11908) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-19 12:24:56 +08:00
jiangweidong 03d1a187df
perf: 工单直接审批者访问链接无认证跳转到登录页面 (#11902) 
* perf: 工单直接审批者访问链接无认证跳转到登录页面

* perf: 修改重定向登录地址

* perf: 跳转字段标识更新
 2023-10-18 22:21:08 -05:00
Eric 25a1989157 perf: 完善僵尸会话清理 2023-10-18 19:13:42 +08:00
ibuler fef26c38fe perf: 去掉创建记录报错 2023-10-18 06:06:50 -05:00
fit2bot a2fcc47436
fix: cas oidc 登录失败 (#11899) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-18 18:51:28 +08:00
fit2bot 00450121bc
perf: 命令组加命令过滤搜索 (#11898) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-18 18:46:49 +08:00
ibuler bdd885069f perf: 优化登录时创建 activity 的问题 2023-10-18 04:10:20 -05:00
老广 25d0c021e1
Merge pull request #11894 from jumpserver/pr@dev@perf_window_default_verify_account_by_rdp 
perf: 修改windows校验账号的默认方式
 2023-10-18 03:46:08 -05:00
ibuler 095c23ea4f perf: 修改windows校验账号的默认方式 2023-10-18 16:44:38 +08:00
fit2bot 3c3c112b07
perf: 更新appletpublication applethostdeployment 权限位 (#11893) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-18 16:35:08 +08:00
老广 d95a44fe44
Merge pull request #11892 from jumpserver/pr@dev@perf_bind_wecom_logout 
perf: 企业微信绑定后退出
 2023-10-18 03:10:41 -05:00
ibuler e713bdab0b perf: 企业微信绑定后退出 2023-10-18 16:09:17 +08:00
fit2bot 78f1b2b002
perf: user session 表去掉过期时间字段 (#11890) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-18 16:04:02 +08:00
fit2bot e0762573ae
perf: 在线用户动态过期时间 (#11889) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-18 15:50:38 +08:00
ibuler 9b019e45ae perf: 修复协议丢失的问题 2023-10-18 15:40:52 +08:00
fit2bot 71d70501d6
perf: 优化数据库必填 (#11887) 
Co-authored-by: ibuler <ibuler@qq.com>
 2023-10-18 02:22:17 -05:00
老广 5cd44ebfce
Merge pull request #11865 from jumpserver/pr@dev@fix_corntab 
fix: 修复crontab语义
 2023-10-18 01:13:15 -05:00
老广 03c27ab5b8
Merge pull request #11875 from jumpserver/pr@dev@perf_update_clients_version 
perf: 更新clients版本
 2023-10-18 01:12:36 -05:00
fit2bot d3a283232f
perf: 优化 xpack license 检查 (#11885) 
Co-authored-by: ibuler <ibuler@qq.com>
 2023-10-18 01:10:24 -05:00
fit2bot f088bbce12
perf: 连接方式，动作去掉: 通知 (#11878) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-17 19:21:59 +08:00
fit2bot b313598227
fix: 修复账号批量添加模版账号时name没同步过来，资产创建时使用模版账号没有切换自，资产克隆时生成的账号没有切换自 (#11877) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-17 19:15:46 +08:00
halo 3a118b6753 perf: 更新clients版本 2023-10-17 17:13:30 +08:00
Eric b5ef239c6c perf: 增加针对 ip 的获取 2023-10-17 15:57:15 +08:00
fit2bot e88e4438ba
fix: acl 记录操作日志 账号信息为空 (#11869) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-17 15:01:21 +08:00
fit2bot 73b75df524
perf: 资产acl拒绝后没记录操作日志 (#11868) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-17 14:28:19 +08:00
Bai 772684d24c fix: 修复crontab语义 2023-10-17 11:19:13 +08:00
fit2bot 741705b85b
perf: 修改定期清理日志默认时间180天 (#11864) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-17 11:11:55 +08:00
fit2bot f5176bcc6f
perf: 修改迁移文件 (#11863) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-17 11:04:05 +08:00
fit2bot c917d8f346
fix: 系统设置 安全设置权限为错误 (#11860) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-16 19:33:13 +08:00
fit2bot 5c0905b3b5
fix: 操作日志全局组织数量不对 (#11859) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-16 18:51:26 +08:00
fit2bot bda23b3d2a
fix: 调API创建与父节点同名的子节点报错：同级别节点名称不能重复 (#11858) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-16 18:15:53 +08:00
fit2bot 8b6526211c
perf: 工单动作添加操作日志 (#11857) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-16 16:40:21 +08:00
fit2bot 86e8f3a80b
fix: 组织管理员不能创建用户 (#11856) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-16 15:06:47 +08:00
fit2bot 70661242c1
fix: 在线用户 下线权限错误 导致审计员无权限下线用户 (#11853) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-16 14:22:20 +08:00
fit2bot 7dcae1e05a
perf: 命令过滤中 去掉通知动作 (#11851) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-16 13:27:37 +08:00
fit2bot 0a28c5650c
perf: 三方用户登录通知 (#11846) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-16 11:28:53 +08:00
fit2bot f55c84ce3b
fix: 发布机500 (#11841) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-13 17:19:05 +08:00
fit2bot ac11790192
perf: 替换iphone mfa 二维码图片 (#11839) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-13 16:51:34 +08:00
老广 f80ff279d0
perf: 用户确认和access key 
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
 2023-10-13 16:37:45 +08:00
ibuler d7ac08f6d9 perf: 去掉 debug 2023-10-13 16:36:23 +08:00
ibuler d6b450f32a perf: 修改 ak 2023-10-13 16:33:25 +08:00
ibuler 1daf1acaf3 perf: 修改 access key 2023-10-13 16:31:05 +08:00
fit2bot ea0e852412
fix: rdp 测试可连接性失败 (#11837) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-13 16:21:20 +08:00
ibuler ce976f215f Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2023-10-13 16:10:40 +08:00
fit2bot ffc057f844
fix: 账号改密-执行列表-详情-任务记录：模糊搜索500 (#11835) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-13 15:33:35 +08:00
fit2bot 588723a76c
perf: 优化资产登录通知信息 (#11834) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-13 15:08:56 +08:00
ibuler 452ee1224c perf: 修改用户确认 2023-10-13 14:40:40 +08:00
fit2bot 7eb497f9d3
fix: 资产登录被限制，没有记录到当前组织的操作日志，而是记录到全局组织 (#11827) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-12 20:13:21 +08:00
fit2bot 58fd578ddd
perf: 资产登录提示添加账号信息 (#11826) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-12 20:04:28 +08:00
fit2bot e1278360af
fix: 资产创建失败 (#11824) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-12 19:46:04 +08:00
fit2bot c0de27ff7a
perf: 资产批量更新平台字段，根据平台约束协议自动生效 (#11818) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-12 18:11:51 +08:00
ibuler 116d0ba5c6 perf: 优化任务记录 activity 2023-10-12 17:06:12 +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
Eric_Lee ce63ea7528
Merge pull request #11812 from jumpserver/pr@dev@fix_get_real_ip 
perf: 修改获取 ip
 2023-10-12 16:13:57 +08:00
ibuler 8b3fd2c117 perf: 修改获取 ip 2023-10-12 16:09:22 +08:00
ibuler 23ccd6df8c perf: mysql mariadb 数据库不再必填 2023-10-12 14:50:09 +08:00
Bai 614e019f14 fix: 修改迁移文件choices和翻译文件 2023-10-11 21:15:47 -05:00
ibuler 38aa828eb8 perf: passkey 只允许本地用户开启 2023-10-11 04:52:54 -05:00
Bai 7cd2736e82 perf: 优化用户传递的 phone 处理 2023-10-11 04:50:45 -05:00
ibuler 443f6d25e8 perf: Windows 默认使用 rdping 测试 2023-10-11 04:22:08 -05:00
Eric e8652af054 perf: 更新格式 2023-10-11 04:21:00 -05:00
Eric fd6a8dd807 perf: 增加错误类型 2023-10-11 04:21:00 -05:00
Eric 499eedd83e perf: 会话新增 error_reason 字段 2023-10-11 04:21:00 -05:00
feng ca7d164034 perf: 账号模版信息同步到所关联的账号 2023-10-11 04:20:11 -05:00
Bai 3ef8e9603a perf: 优化 otp windows 最小支持设置 0 2023-10-11 04:06:17 -05:00
Bai 09f71d80eb perf: 优化LDAP用户导入列表时任务状态设置 2023-10-11 04:05:51 -05:00
jiangweidong 73db1bf50c feat: 支持LDAP用户组变更时，JS同步变更 2023-10-10 06:37:28 -05:00
fit2bot 6017f804a6
perf: 用户 phone wechat 加密 (#11789) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-10 19:11:08 +08:00
ibuler affa562384 perf: 优化禁用用户 2023-10-10 19:00:00 +08:00
fit2bot 0d101bc5ad
perf: 不活跃了用户默认90天检测一下 (#11790) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-10 18:48:35 +08:00
jiangweidong 70f0f55ddb
feat: 支持自定义短信认证(文件) (#11784) 
* feat: 支持自定义短信认证(文件)

* perf: 翻译

* perf: 还原注释
 2023-10-10 05:23:54 -05:00
fit2bot 333746e7c4
perf: 优化用户 access key 的使用和创建 (#11776) 
* perf: 优化用户 access key 的使用和创建

* perf: 优化 access key api

---------

Co-authored-by: ibuler <ibuler@qq.com>
 2023-10-10 04:52:52 -05:00
fit2bot 30b19d31eb
fix: 账号批量更新失败 (#11785) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-10 17:24:56 +08:00
Eric a844ce23e4 perf: 调整格式 2023-10-10 07:40:48 +05:00
Eric d6c0139fef perf: 支持持久化设置个人终端主题 2023-10-10 07:40:48 +05:00
jiangweidong 11157563ba perf: 优化跳转接口参数 2023-10-09 16:00:36 +05:00
jiangweidong 95e7bde5d7 perf: 优化翻译 2023-10-09 16:00:36 +05:00
jiangweidong 814350ab80 perf: 翻译 2023-10-09 16:00:36 +05:00
jiangweidong 3ac35eec68 perf: 优化OIDC用户未激活时，会循环跳转登录页面 2023-10-09 16:00:36 +05:00
fit2bot 3d27986c96
perf: asset login 消息通知添加操作日志记录 (#11774) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-09 17:16:38 +08:00
fit2bot c981e9cd9f
perf: 主机名包含/ 可以执行ansible任务 (#11772) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-09 16:05:42 +08:00
Bai e00c804a5a perf: 优化校验登录城市名1 2023-10-09 14:43:48 +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
halo b42014d58e feat: 支持DB2数据库 2023-10-09 10:04:14 +08:00
feng e71e8cd595 perf: 优化清除日志天数系统配置校验逻辑 2023-10-08 07:39:19 +05:00
fit2bot dd50044b89
perf: 翻译 (#11748) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-07 17:58:42 +08:00
fit2bot 68707085fa
perf: 日志保存时间不少于6个月 (#11742) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-07 17:41:45 +08:00
fit2bot 60399fae29
feat: 登录资产消息提醒 (#11747) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-07 17:41:20 +08:00
ibuler f206d963a0 perf: 优化会话 api 2023-10-07 15:57:15 +08:00
fit2bot 42b4e7697d
feat: 资产登录acl动作增加操作日志 (#11741) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-07 15:50:28 +08:00
fit2bot 0c1f4d99f8
fix: 修复工单引入html错误问题 (#11744) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-07 15:28:40 +08:00
ibuler 2aed3fcaea perf: 修改随机数生成，避免使用 random 库 2023-10-07 11:30:45 +05:00
ibuler 28196573bb perf: 修改随机使用secrets 2023-10-07 11:30:45 +05:00
ibuler 27c505853b perf: 优化忘记密码 2023-10-07 11:18:55 +05:00
feng f79084c2df fix: 账号授权过滤指定账号api 失效问题 2023-09-27 13:11:48 +05:00
ibuler 15a5dda9e0 perf: 修改默认的邮箱地址 2023-09-27 15:15:15 +08:00
ibuler 2069fee795 perf: 优化发送邮件 2023-09-27 08:27:12 +05:00
feng 56a26481a4 perf: 账号模版 生成随机密码密钥及账号批量更新500 2023-09-26 12:55:54 +08:00
ibuler cbe3d66b39 fix: pubkey auth require svc sign 2023-09-25 23:29:42 +08:00
Bryan 7c67d882aa Revert "fix: pubkey auth require svc sign" 
This reverts commit 9bde2ff6e1.
 2023-09-25 23:24:52 +08:00
ibuler 9bde2ff6e1 fix: pubkey auth require svc sign 2023-09-25 23:08:55 +08:00
Bai 1f00c00183 fix: 修复验证码校验逻辑和报错信息 2023-09-25 23:03:32 +08:00
ibuler c369b5478c fix: 修复暴力校验验证码 2023-09-25 22:06:57 +08:00
fit2bot 10363dcc5b
fix: 修复用户username 中文 登录失败问题 (#11692) 
Co-authored-by: feng <1304903146@qq.com>
 2023-09-25 21:39:16 +08:00
jiangweidong 42bdb2cf14 perf: 优化找回密码时区号带加号无法匹配的问题 2023-09-25 16:42:30 +08:00
fit2bot d64e77db30
perf: 去掉print (#11687) 
Co-authored-by: feng <1304903146@qq.com>
 2023-09-25 16:37:00 +08:00
fit2bot 4065baf785
feat: 用户登录堡垒机时通知管理员 (#11686) 
Co-authored-by: feng <1304903146@qq.com>
 2023-09-25 16:25:44 +08:00
Bai 0f3ddc3bf1 fix: 修复系统用户同步同时包含pwd/ssh-key导致创建账号id冲突报错的问题 2023-09-25 16:22:47 +08:00
ibuler 0cf17310e1 fix: 修复 DOMAINS 添加 80和443 不生效的问题 2023-09-22 17:47:43 +08:00
Bai cefd9f4ab2 fix: 解决节点资产数量方法计算不准确的问题 2023-09-22 15:18:22 +08:00
fit2bot 7128593502
perf: CeleryTaskExecution 添加默认排序 (#11663) 
Co-authored-by: feng <1304903146@qq.com>
 2023-09-22 15:06:58 +08:00
fit2bot 91dce82b38
fix: 安全设置开启仅已存在用户登录，企业微信等扫描登录，如果用户不存在，还是会自动创建用户登录成功。 (#11651) 
Co-authored-by: feng <1304903146@qq.com>
 2023-09-21 17:01:03 +08:00
Bai 1de7af4984 fix: 解决 master 冲突 2023-09-21 16:51:54 +08:00
Aaron3S 9892ff7dd6 feat: 代码片段支持 oracle 和 mariadb 2023-09-21 16:37:16 +08:00
老广 4cb499953c Revert "perf: 修复事务中任务执行" 
This reverts commit cdbe5d31e9.
 2023-09-21 15:40:39 +08:00
老广 0397bdeb46 Revert "perf: 修复 task id 不对的问题" 
This reverts commit 1d6d92c160.
 2023-09-21 15:39:29 +08:00
ibuler 1d6d92c160 perf: 修复 task id 不对的问题 2023-09-21 15:20:16 +08:00
ibuler cdbe5d31e9 perf: 修复事务中任务执行 2023-09-21 15:04:58 +08:00
fit2bot b023ca0c69
fix: saml 用户没现在记录 (#11641) 
Co-authored-by: feng <1304903146@qq.com>
 2023-09-21 14:02:09 +08:00
ibuler 803d590096 perf: 修改生成 applet accounts 2023-09-21 13:06:02 +08:00
ibuler e11367088a perf: 修改 acl 登录限制问题 2023-09-21 11:33:28 +08:00
jiangweidong 1c74dd00ba
fix: 解决sqlserver无法推送和改密的问题 (#11637) 2023-09-20 21:45:21 +08:00
Aaron3S ed832af631 fix: 修复运行job 组织切换问题 2023-09-20 18:26:47 +08:00
fit2bot 948c499d9e
fix: 修复仪表板图表时间范围不准 (#11633) 
Co-authored-by: feng <1304903146@qq.com>
 2023-09-20 17:41:35 +08:00
fit2bot a51549cf1c
perf: ansible任务 未激活的时候关闭定时任务 (#11631) 
Co-authored-by: feng <1304903146@qq.com>
 2023-09-20 15:30:29 +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
“huailei000” ea3ff1ebcb perf: 优化登录页面移动端布局 2023-09-19 20:20:28 +08:00
Aaron3S f3ca45aa74 perf: 优化 Playbook 文件创建逻辑 2023-09-19 18:49:16 +08:00
老广 74cc174d7a
Merge pull request #11622 from jumpserver/pr@dev@perf_random_error 
fix: 修复 random error
 2023-09-19 18:15:50 +08:00
ibuler 0eba6d2175 fix: 修复 random error 2023-09-19 18:11:27 +08:00
fit2bot 58592a13e3
fix: 解锁ip失败问题 (#11611) 
Co-authored-by: feng <1304903146@qq.com>
 2023-09-19 17:38:46 +08:00
fit2bot b8fb23a0a0
perf: user setting (#11610) 
Co-authored-by: feng <1304903146@qq.com>
 2023-09-19 16:30:48 +08:00
Bai f5c43488fd perf: 优化 es host 中包含 # 字符时提示错误 2023-09-19 15:31:02 +08:00
Eric 19c76ba01c perf: 删除发布机执行的任务目录 2023-09-19 15:02:02 +08:00
Eric 68c4cd5928 perf: 修复发布机安装应用的报错 2023-09-19 15:01:37 +08:00
fit2bot e5bfa29c7b
fix: 创建用户推送失败问题 (#11606) 
Co-authored-by: feng <1304903146@qq.com>
 2023-09-19 14:53:43 +08:00
fit2bot cbb772def7
fix: 修复connection token 获取user错误 (#11603) 
Co-authored-by: feng <1304903146@qq.com>
 2023-09-19 11:09:58 +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
fit2bot 0b30f5cf88
perf: 翻译 (#11602) 
Co-authored-by: feng <1304903146@qq.com>
 2023-09-19 10:36:03 +08:00
fit2bot 018f1a0e8d
perf: 删除管理用户错误提醒 (#11596) 
Co-authored-by: feng <1304903146@qq.com>
 2023-09-18 18:42:02 +08:00
fit2bot 24ed57b98a
fix: 三方登录用户无法下线 (#11592) 
Co-authored-by: feng <1304903146@qq.com>
 2023-09-18 16:20:55 +08:00
ibuler 04a790c4ee perf: 优化 account template platform required 2023-09-18 14:29:41 +08:00
ibuler 2d9a3ef7d4 perf: 修改 migrations，不生成新的迁移文件 2023-09-18 14:29:24 +08:00
ibuler 0d2adeccf2 perf: 优化 applet account delete 2023-09-18 14:18:24 +08:00
Eric 886f977311 perf: 修复 chrome 部分元素定位失败的问题 2023-09-18 14:10:24 +08:00
fit2bot 9367e79bcf
perf: 翻译 (#11583) 
Co-authored-by: feng <1304903146@qq.com>
 2023-09-18 11:11:12 +08:00
fit2bot af733ecbad
fix: 修改平台id序列化属性 改为非只读 (#11581) 
Co-authored-by: feng <1304903146@qq.com>
 2023-09-17 16:07:05 +08:00
fit2bot 09f9775eab
fix: 平台无category type 过滤 (#11580) 
Co-authored-by: feng <1304903146@qq.com>
 2023-09-17 12:50:31 +08:00
feng 1c2a362beb perf: 修改usersession 模块位置 2023-09-15 17:25:06 +08:00
Eric a75677ab08 perf: 修复发布机历史执行任务日志无法查看的问题 2023-09-15 17:15:12 +08:00
fit2bot b1daa4d357
fix: 修改不常登录用户锁定逻辑 (#11576) 
Co-authored-by: feng <1304903146@qq.com>
 2023-09-15 16:39:49 +08:00
fit2bot c32271ec6f
fix: mysql 没配置ssl ansible 连接失败问题 (#11574) 
Co-authored-by: feng <1304903146@qq.com>
 2023-09-15 16:16:04 +08:00
Aaron3S beb4f14be9 perf: 优化 jobexecution 创建 2023-09-15 14:39:16 +08:00
fit2bot e719904874
fix: 修复工单回复报500 (#11571) 
Co-authored-by: feng <1304903146@qq.com>
 2023-09-15 11:26:13 +08:00
Eric_Lee 664bc2a4d9
Merge pull request #11568 from jumpserver/pr@dev@perf_deplay_task 
perf: 优化推送部署任务，事务提交后再执行
 2023-09-14 18:30:16 +08:00
ibuler b91db8c146 perf: 优化推送部署任务，事务提交后再执行 2023-09-14 18:17:22 +08:00
feng 3abc8bddfa feat: 用户在线session控制 2023-09-14 16:21:57 +08:00
老广 5cbbf9e737
Merge pull request #11561 from jumpserver/pr@dev@perf_i18n 
perf: 优化翻译
 2023-09-14 14:30:53 +08:00
ibuler 7204a86f87 perf: 优化翻译 2023-09-14 14:26:17 +08:00
老广 829194420a
Merge pull request #11559 from jumpserver/pr@dev@limit_super_privilege 
feat: 限制超级权限
 2023-09-14 13:54:20 +08:00