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

7045 Commits (006faac3264afb6c1e47df8658ee23c1bf75113d)

Author SHA1 Message Date
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