github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
7,699 Commits
86 Branches
258 Tags
128 MiB
Commit Graph

7699 Commits (024beca69000cb57b5210d77fb938e4eb577c94d)

Author SHA1 Message Date
吴小白 024beca690
Merge pull request #9200 from jumpserver/pr@v2.28@perf_support_openid_pkce 
perf: OpenID支持PKCE方式对接
 2022-12-13 16:12:17 +08:00
jiangweidong 5c0359e394 perf: OpenID支持PKCE方式对接 2022-12-13 15:11:21 +08:00
feng 4ce4bde368 fix: ticket xss inject 2022-12-12 17:03:29 +08:00
halo 809bad271a fix: 密钥指纹参数 2022-12-09 13:41:38 +08:00
Eric d3bfc03849 fix: 替换解析公钥的方式 2022-12-08 16:57:22 +08:00
Bai 04c0121b37 fix: 降级 Djanog==3.2.15 2022-12-08 14:53:40 +08:00
jiangweidong b97b50ab31 perf: 支持sentinel开启ssl(Sentinel和Redis公用一套证书，无额外增加配置项) 2022-12-08 12:54:58 +08:00
Eric d8a8c8153b fix: TraditionalOpenSSL private ssh key 2022-12-08 11:03:52 +08:00
Eric a68ad7be68 perf: support ed25519 SSH Key 
fix: codacy ci
fix: password use bytes
 2022-12-08 11:03:52 +08:00
Bai 4041f1aeec fix: 修改 random_string 方法，支持只生成随机数字 2022-12-01 20:13:47 +08:00
feng 59388655ea fix: es 默认存储500 2022-11-18 17:04:43 +08:00
Bai ef7463c588 fix: flower db file 持久化存储flower信息 2022-11-18 15:36:21 +08:00
Bryan 7e7d6d94e6 fix: 修复 channels-redis 库升级导致 ws 查看任务日志失败的问题; 修改 REDIS_LAYERS_HOST 变量; 修改 Channel SSL 配置项; 2022-11-18 15:26:44 +08:00
Jiangjie.Bai 6febc104de
Merge pull request #9096 from jumpserver/dev 
v2.28.0
 2022-11-17 17:43:44 +08:00
Jiangjie.Bai e629e6fb3f fix: i18n 2022-11-17 17:40:35 +08:00
halo 1b99a7e06f fix: 账户备份邮件发送找不到文件bug 2022-11-17 17:39:53 +08:00
Jiangjie.Bai 733b95ee99
Merge pull request #9089 from jumpserver/dev 
v2.28.0-rc5
 2022-11-17 14:14:18 +08:00
ibuler a42641ca9a fix: 修复 redis 连接导致的 pub sub 错误 2022-11-17 14:07:43 +08:00
halo 90c48d303e fix: celery任务时间字段差8小时问题 2022-11-17 14:06:31 +08:00
jiangweidong 949166eaed fix: Redis哨兵切换时导致core和celery组件监听线程异常退出 2022-11-17 12:19:35 +08:00
Jiangjie.Bai b179264127
Merge pull request #9080 from jumpserver/dev 
v2.28.0-rc4
 2022-11-16 21:05:05 +08:00
Jiangjie.Bai a2b9a5cee3 fix: 修复删除数据库由于端口数量限制导致不能删除的问题 2022-11-16 21:04:12 +08:00
Jiangjie.Bai 9e80b70c12 fix: 修改用户前一文件 2022-11-16 20:48:56 +08:00
jiangweidong 2454a07d38 feat: 支持具有超级工单权限的用户申请工单可以指定申请人 2022-11-16 20:42:46 +08:00
Jiangjie.Bai ad7647c0cc fix: 修复第三方用户忘记密码页面的提示，不允许修改 2022-11-16 20:40:46 +08:00
jiangweidong 18986bc805 perf: 增加clickhouse端口帮助文案及注释 2022-11-16 10:53:20 +08:00
fit2bot 157d81f117
fix: 翻译 (#9067) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-15 18:09:06 +08:00
fit2bot 8558204450
perf: 修改工单授权过期时间 (#9065) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-15 17:30:29 +08:00
Jiangjie.Bai c18388e27a
Merge pull request #9060 from jumpserver/dev 
v2.28.0-rc3
 2022-11-14 18:02:44 +08:00
jiangweidong b6f86e8fb6 perf: 优化忘记密码，用户无手机号时无法使用手机号重置密码 2022-11-14 18:01:07 +08:00
fit2bot 7280c6726e
fix: 删除用户 record 500 (#9058) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-14 17:00:10 +08:00
Jiangjie.Bai 6f135c34c1 fix: 修复测试邮箱服务器字段为null的问题 2022-11-14 16:24:05 +08:00
Jiangjie.Bai 52830db500
Merge pull request #9052 from jumpserver/dev 
v2.28.0-rc2
 2022-11-14 09:54:50 +08:00
jiangweidong 6411642ced perf: 优化操作日志一些内容 2022-11-14 09:50:42 +08:00
jiangweidong 791b175465
perf: 优化找回密码页面 (#9045) 
* perf: 优化找回密码页面

* perf: 优化找回密码操作页面
 2022-11-14 09:48:55 +08:00
jiangweidong d29e8317e5 feat: 添加操作日志ES默认的配置信息 2022-11-14 09:40:12 +08:00
jiangweidong a868751edd perf: 补充reids ssl配置项 2022-11-14 09:40:12 +08:00
jiangweidong e03f49e52b perf: 添加Redis哨兵配置的默认值 2022-11-14 09:40:12 +08:00
Jiangjie.Bai 2324cdc14e
Merge pull request #9040 from jumpserver/dev 
v2.28.0-rc1
 2022-11-10 17:48:40 +08:00
feng f3c90c6bbd perf: login mfa style 2022-11-10 17:38:10 +08:00
jiangweidong ac6ffb24ee feat: 云资产同步支持选择IP类型-补充翻译 2022-11-10 17:35:16 +08:00
jiangweidong 6f3ae4f73f perf: 修改Redis哨兵配置参数名称 2022-11-10 17:13:46 +08:00
fit2bot 1345998acd
perf: download add open ssh (#8886) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-11-10 16:00:06 +08:00
Jiangjie.Bai 6812cbe314 perf: 优化优先使用系统设置中的 rdp_resolution 配置 2022-11-07 18:47:06 +08:00
Jiangjie.Bai 3bba8e4043 fix: 修改翻译文件 2022-11-04 15:50:38 +08:00
Jiangjie.Bai 8abf954015 fix: 处理一波迁移文件 2022-11-04 15:36:45 +08:00
Jiangjie.Bai 1a77dc44cd fix: django.mo 2022-11-04 15:00:58 +08:00
fit2bot 13ae50f5d0
feat: 自定义MFA认证逻辑 (#8891) 
* feat: 自定义MFA认证

* feat: 修改翻译信息

Co-authored-by: halo <wuyihuangw@gmail.com>
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
 2022-11-04 14:29:15 +08:00
jiangweidong 2029e9f8df
feat: 重构操作日志 (#8941) 
* feat：重构操作日志模块

* feat: 改密计划增加操作日志记录

* feat: 支持操作日志接入ES，且接口limit支持自定义限制大小

* feat：翻译

* feat: 生成迁移文件

* feat: 优化迁移文件

* feat: 优化多对多日志记录

* feat: 命令存储ES部分和日志存储ES部分代码优化

* feat: 优化敏感字段脱敏

Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
 2022-11-04 14:22:38 +08:00
jiangweidong 1e97a23bc5
feat: 忘记密码支持手机短信找回，并修改邮箱方式和手机方式统一 (#8960) 
* feat: 忘记密码支持通过手机找回，邮箱方式修改为和手机方式一致

* feat: 翻译

* feat: 修改翻译

* fix: 还原

Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
 2022-11-04 13:56:55 +08:00