github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
11,869 Commits
72 Branches
249 Tags
112 MiB
Commit Graph

815 Commits (54726f0a2da8b401e99d26bc105663ae1169f49f)

Author SHA1 Message Date
wangruidong 237b4a82c9 fix: handle 500 error when re-binding DingTalk user to another user 2024-07-01 18:03:47 +08:00
ibuler e712e8ccfc perf: ansible version and set user lang 2024-06-28 18:59:44 +08:00
ibuler 772c9b385c perf: lang setting from core 2024-06-28 16:40:25 +08:00
ibuler bca9bdf619 perf: translate some word 2024-06-26 19:29:56 +08:00
ibuler ee258707c8 perf: change initial passwd to ChangeMe 2024-06-24 20:11:49 +08:00
Bai dfde50c768 Merge v4 to dev 2024-06-24 15:43:40 +08:00
ibuler 11b125655d perf: passkey help msg 2024-06-24 11:05:41 +08:00
ibuler 8cf900f9de perf: 生产授权树 2024-06-20 11:10:57 +08:00
jiangweidong 496903dfb2 fix: 解决获取用户登录后端的session_key有两种的问题 2024-06-13 17:49:56 +08:00
Bai 40a4efc992 fix: 修复用户登录报错刷新浏览器后依旧报错的问题(登录超时，请重新登录) 2024-06-04 16:33:06 +08:00
jiangweidong cdfb11549e fix: 解决OAuth2可以跳过不存在用户不允许登录的规则 2024-05-31 10:43:01 +08:00
feng 91a1da57e9 perf: mfa interface optimization, mobile phone number can be empty 2024-05-28 17:27:17 +08:00
wangruidong 0ea2339ad5 perf: notification i18n 2024-05-27 15:24:31 +08:00
Bai 564ad40b99 perf: i18n System Settings End 2024-05-24 14:41:28 +08:00
fit2bot 313202fe41
perf: 合并 migrations (#13187) 
* perf: 修改 Migrations

* perf: 合并 migrations

* perf: remove unuse

* perf: change to file

---------

Co-authored-by: ibuler <ibuler@qq.com>
 2024-05-11 11:22:01 +08:00
Bai cb4402c610 merge: into dev from v4 2024-04-29 11:07:43 +08:00
feng626 fbc4cb9046
Revert "perf: remove ticket model" (#13145) 
This reverts commit 94567b86f0.
 2024-04-28 18:26:49 +08:00
feng 94567b86f0 perf: remove ticket model 2024-04-28 18:02:57 +08:00
jiangweidong 95f29a584e perf: 优化会话过期500问题 2024-04-23 13:11:41 +08:00
Eric 2cc67634a4 perf: 发布机支持平台连接参数 2024-04-22 16:40:41 +08:00
jiangweidong ef7329a721 perf: 优化频繁发送短信，将后端的频繁发送警告提示到页面上来提醒用户 2024-04-22 13:20:51 +08:00
ibuler 9dbdd6ac60 perf: change i18n 2024-04-18 20:12:01 +08:00
ibuler 5a9815481a perf: 修改 token expire 逻辑 2024-04-17 14:23:56 +08:00
fit2bot 7ba876eb0a
fix: 登录复核 审批后 刷新页面工单没清除 (#13031) 
Co-authored-by: feng <1304903146@qq.com>
 2024-04-16 14:04:18 +08:00
fit2bot f0d1279a42
perf: 修改user session 权限判断 (#13019) 
Co-authored-by: feng <1304903146@qq.com>
 2024-04-15 11:26:22 +08:00
fit2bot f3d19ad9f4
fix: 【Lark】绑定时，一些报错信息优化 (#13004) 
Co-authored-by: feng <1304903146@qq.com>
 2024-04-12 10:39:49 +08:00
fit2bot 3e46d72ba3
fix: 修复lark登录 Backend错误问题 (#12981) 
Co-authored-by: feng <1304903146@qq.com>
 2024-04-10 17:07:48 +08:00
feng 6502adb772 perf: 切换zh hant 2024-04-10 14:39:58 +08:00
ibuler f0e87ef3f8 perf: rdp token 复用 
perf: connection token
 2024-04-08 19:03:47 +08:00
fit2bot 0aeea414f5
fix: 支持 SSO 用户登录时校验 (#12923) 
Co-authored-by: feng <1304903146@qq.com>
 2024-04-07 14:57:38 +08:00
fit2bot 611d0b71e8
fix: 修复用户下线失败问题 SESSION_EXPIRE_AT_BROWSER_CLOSE 可配置 (#12936) 
Co-authored-by: feng <1304903146@qq.com>
 2024-04-03 16:41:37 +08:00
fit2bot f11852c60d
perf: lark logo (#12878) 
Co-authored-by: feng <1304903146@qq.com>
 2024-03-26 17:46:16 +08:00
feng 470a088a9f feat: 拆分 feishu lark 2024-03-26 17:10:25 +08:00
ibuler 6c0299b05a perf: 优化语言更改 2024-03-21 19:13:00 +08:00
fit2bot 02c2ee8c54
perf: 登录界面文案优化 (#12849) 
Co-authored-by: feng <1304903146@qq.com>
 2024-03-21 16:21:44 +08:00
feng 73a4ce0943 perf: 优化user secret key 处理逻辑 2024-03-15 11:39:59 +08:00
fit2bot b50f1a662d
fix: 优化手动输入的账号username遵循登录资产的ACL控制 (#12774) 
Co-authored-by: feng <1304903146@qq.com>
 2024-03-11 15:10:51 +08:00
wangruidong 6de524c797 perf: 不满足自动登录勾选条件时从禁用修改为隐藏 2024-03-08 18:35:18 +08:00
jiangweidong 670eac49b6 perf: 优化oauth2登录未激活用户时，会重复跳转登录问题 2024-03-06 15:03:58 +08:00
Bai c8b274031f perf: i18n settings-Auth done. 2024-02-27 11:25:42 +08:00
fit2bot 35448eea9f
perf: 翻译 (#12690) 
Co-authored-by: feng <1304903146@qq.com>
 2024-02-22 17:46:12 +08:00
fit2bot d7b1903fb7
perf: 修改登录页面定期 check 的时间 (#12660) 
Co-authored-by: feng <1304903146@qq.com>
 2024-02-19 10:57:40 +08:00
feng 6e506e3146 fix: 【登录超时】修复登录页面提示 <登录超时，请重新登录> 问题 2024-02-19 10:21:13 +08:00
wangruidong 2062778ab8 fix: 资产登录未发送提醒 2024-02-06 15:24:41 +08:00
ibuler b284bb60f5 merge: with dev 2024-02-05 09:49:43 +08:00
fit2bot 31b0d345ad
perf: 使用新的钉钉登录接口 (#12635) 
* perf: 暂存

* perf: 使用新的钉钉登录接口

---------

Co-authored-by: halo <wuyihuangw@gmail.com>
 2024-02-04 17:05:11 +08:00
feng 8cb74976e1 perf: 优化用户session 会话过期 2024-02-02 17:52:50 +08:00
fit2bot 00256f86df
perf: OAuth2协议获取token支持配置json或者data (#12602) 
* perf: OAuth2协议获取token支持配置json或者data

* perf: 优化注释

---------

Co-authored-by: jiangweidong <weidong.jiang@fit2cloud.com>
 2024-01-25 14:00:13 +08:00
Bryan 1dea424104 Revert "fix: 修复 OAuth2 认证时 POST 方式获取 access_token API 使用 json 传递数据" 2024-01-24 18:23:29 +08:00
Bai 1f5554d945 fix: 修复 OAuth2 认证时 POST 方式获取 access_token API 使用 json 传递数据 2024-01-24 16:53:11 +08:00
ibuler 0303408be8 perf: 优化授权树的刷新，同步解决同步异步的问题 2024-01-24 16:44:19 +08:00
wangruidong 3853d0bcc6 fix:绑定的端点Default下载RDP文件中的地址是空的 2024-01-19 10:38:52 +00:00
Eric f74f8b7d8c perf: 优化 delay_run 执行 2024-01-19 12:56:46 +08:00
fit2bot 9968617758
perf: 修改优化结构 (#12554) 
* perf: 修改优化结构

* perf: 修改结构

---------

Co-authored-by: ibuler <ibuler@qq.com>
 2024-01-17 11:08:39 +08:00
wangruidong 000a3038e1 fix: 终端输入错误的MFA无日志记录 2024-01-14 18:32:33 -08:00
wangruidong df655f304a fix: 登录日志不显示 2024-01-10 11:21:29 +05:00
jiangweidong 814dbeb749 fix: 解决手机号加密导致忘记密码判断总是失败问题 2024-01-08 16:24:28 +05:00
jiangweidong 630bb56601 fix: 解决手机号加密导致忘记密码判断总是失败问题 2024-01-08 16:24:28 +05:00
feng 81b4909016 fix: 【用户登录会话失效问题】SESSION_COOKIE_AGE 配置不生效的问题 2023-12-25 13:10:58 +05:00
halo 006faac326 perf: 配置xpack后logo没有修改 2023-12-18 14:51:28 +08:00
Bai 3c9239eb09 fix: 修复 Release 应用账号的逻辑,解决首次连接远程应用可能出现没有可用账号的问题 2023-12-14 19:35:05 +08:00
fit2bot c4fef5899c
perf: 连接 RDP 协议会话时，高级选项支持 session bpp:i 参数配置；默认 32； (#12319) 
Co-authored-by: feng <1304903146@qq.com>
 2023-12-13 15:51:22 +08:00
fit2bot 81de527e32
perf: 解决Slack解绑用户404问题 (#12283) 
Co-authored-by: jiangweidong <weidong.jiang@fit2cloud.com>
 2023-12-08 15:11:49 +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
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
ibuler ba38852354 perf: 优化跳转页 2023-11-24 17:00:39 +08:00
ibuler 07e1918fa1 perf: 优化延迟运行 
fix: 延迟执行设置超时

perf: 修改 delay run

perf: 优化 delay_run 执行

perf: 修改 delay run
 2023-11-20 10:29:51 +08:00
ibuler ded1b4bba1 perf: 优化 api key 认证记录用户的时间 2023-11-16 18:17:22 +08:00
wangruidong 9babe977d8 fix: 修改sftp账号备份文件名及任务日志提示 2023-11-13 17:05:21 +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
halo 30683ed859 perf: 优化连接信息超长，客户端拉起无响应问题 2023-11-07 15:47:22 +08:00
Bai c0de0b0d8e fix: Remove repetition code 2023-11-07 11:30:53 +08:00
wangruidong 9b8c817a16 perf: 修改字段翻译 2023-11-03 10:45:17 +08:00
fit2bot eee119eba1
feat: 个人设置 rdp smart size可配置 (#12021) 
Co-authored-by: feng <1304903146@qq.com>
 2023-11-02 18:51:17 +08:00
“huailei000” 49b3df218e perf: 优化登录页样式 2023-11-01 17:01:14 +08:00
wangruidong dc841650cf perf: AKSK添加访问IP控制 2023-10-31 02:43:33 -05:00
ibuler f93979eb2d perf: 资产授权添加协议 2023-10-27 16:15:59 +08:00
jiangweidong 08a2d96213 perf: 优化OAuth2.0获取Access_token的content_type 2023-10-24 10:26:38 +08:00
fit2bot db2331521d
fix: 修复工单复合通知无账号信息 (#11912) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-19 15:56:14 +08:00
fit2bot 6870df6d75
fix: cas ldap 登录失败 (#11908) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-19 12:24:56 +08:00
fit2bot a2fcc47436
fix: cas oidc 登录失败 (#11899) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-18 18:51:28 +08:00
ibuler e713bdab0b perf: 企业微信绑定后退出 2023-10-18 16:09:17 +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
fit2bot 0a28c5650c
perf: 三方用户登录通知 (#11846) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-16 11:28:53 +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
ibuler ce976f215f Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2023-10-13 16:10:40 +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
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
ibuler 8b3fd2c117 perf: 修改获取 ip 2023-10-12 16:09:22 +08:00
ibuler 38aa828eb8 perf: passkey 只允许本地用户开启 2023-10-11 04:52:54 -05:00