github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-22 11:58:29 +00:00
Code Issues Projects Releases Wiki Activity
11,168 Commits 89 Branches 264 Tags
v3
Commit Graph

759 Commits

Author SHA1 Message Date
Bai
1a9f520c1f Merge to local v3 2022-12-05 13:32:33 +08:00
Bai
cc7424dbfe perf: 修改 CommandFilterACL, CommandGroup Model 的 Meta 内部类; 修改 Command Model 的 system_user -> account 字段; 修改 ConnectionToken 的 command_filter_acls 返回字段; 2022-12-05 13:27:51 +08:00
ibuler
ca228074e3 perf: 修改 migrations 依赖 2022-12-05 12:58:09 +08:00
ibuler
38b1701b33 perf: 修改 migrations， 修改 Connect token 2022-12-05 12:42:15 +08:00
ibuler
d25d580ba4 perf: 合并 connect token 2022-12-05 11:06:50 +08:00
ibuler
669ccb502f perf: 修改 connect token 2022-12-05 10:48:19 +08:00
Bai
a69b762f13 fix: 修改 ACL ActionChoices review, accept, reject 引用 2022-12-04 12:08:44 +08:00
Bai
2b5bd558f3 perf: 修改命令过滤相关的Model, CommandFilterACL, CommandGroup; 修改Model QuerySet 相关的方法; 2022-12-04 00:04:39 +08:00
Bai
a70f85e346 fix: 修改 ConnectionToken Serializer 2022-12-02 18:09:07 +08:00
Bai
c8c5aca355 fix: 修改 ConnectionToken Serializer 命令过滤器 2022-12-02 17:48:44 +08:00
ibuler
a18f544cf8 perf: 修改 acl 2022-12-02 11:12:14 +08:00
fit2bot
edae6942ac perf: connection token client add protocol (#9134) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-30 20:02:13 +08:00
ibuler
0ffea3855b perf: 修改 connect token api 2022-11-30 16:39:27 +08:00
ibuler
ed77d05bd8 pref: conneect token 支持 su from 2022-11-30 16:33:22 +08:00
ibuler
4b61790a92 fix: 修复 connect token remote app 错误 2022-11-29 21:50:48 +08:00
ibuler
44ee80b05a perf: 去掉 connect token endpoint protocol 2022-11-29 21:41:33 +08:00
ibuler
6593648554 perf: 修改 connect token 2022-11-29 18:36:42 +08:00
Eric
426900145e perf: connect token asset add specific 2022-11-29 17:08:22 +08:00
ibuler
3ac952f735 perf: 修改 connect token 拉起 2022-11-29 15:47:35 +08:00
ibuler
9412c5d42d perf: 修改 connect token 数据结构 2022-11-29 14:45:29 +08:00
ibuler
0981cd1ed1 perf: 修改 Connect token 数据结构 2022-11-29 14:42:04 +08:00
feng
e4edf3be02 perf: migrate 2022-11-29 09:34:43 +08:00
ibuler
cb76cad6de Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-28 22:59:17 +08:00
ibuler
f6bdc7f81c pref: 暂存 客户端连接方式 2022-11-28 22:58:43 +08:00
fit2bot
11636dafd8 perf: history account secret perm (#9128) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-28 18:43:58 +08:00
Eric
3c5b459ab7 fix: connect token serializer 2022-11-28 15:31:00 +08:00
ibuler
a1d72a1746 pref: 修改 connect token 一些 Url 2022-11-28 15:01:16 +08:00
ibuler
211f560400 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-27 18:31:34 +08:00
ibuler
23f3f903f5 perf: 修改 connect token 2022-11-27 18:31:28 +08:00
Bai
8a3bc51faa 解决 authentication 迁移文件冲突 2022-11-26 09:52:04 +08:00
ibuler
5e503ec5b8 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-25 23:11:28 +08:00
ibuler
0f35b3dd58 pref: 修改 connect token 2022-11-25 23:09:55 +08:00
fit2bot
d44d475cae perf: gateway (#9115) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-23 18:39:05 +08:00
ibuler
abfd472a0a perf: 修改 connect token 2022-11-23 16:11:17 +08:00
ibuler
075cadb1ab merge: with remote 2022-11-22 21:56:30 +08:00
ibuler
779161d79a perf: 修改 connection token 2022-11-22 21:54:40 +08:00
fit2bot
1a204618f7 [v3] perf: migrate gateway to asset (#8928) 
* perf: migrate gateway to asset

* perf: asset discriminate gateway

Co-authored-by: feng626 <1304903146@qq.com>
 2022-11-22 17:33:09 +08:00
jiangweidong
b6f86e8fb6 perf: 优化忘记密码，用户无手机号时无法使用手机号重置密码 2022-11-14 18:01:07 +08:00
ibuler
8e1312e8ce pref: 修改 perm token 2022-11-14 14:44:18 +08:00
ibuler
4f135bc349 pref: 添加 perm token 2022-11-14 14:03:58 +08:00
jiangweidong
791b175465 perf: 优化找回密码页面 (#9045) 
* perf: 优化找回密码页面

* perf: 优化找回密码操作页面
 2022-11-14 09:48:55 +08:00
ibuler
f6e403fd8b pref: 修改 asset permission 2022-11-11 15:04:31 +08:00
Jiangjie.Bai
cd93de4c00 perf: 优化 Connection Token API 逻辑处理 2022-11-08 14:30:07 +08:00
ibuler
0fb96091cc perf: 优化代码速度 2022-11-04 20:15:31 +08:00
ibuler
4405064e78 pref: 添加 api debug timer 2022-11-04 20:14:19 +08:00
Jiangjie.Bai
8abf954015 fix: 处理一波迁移文件 2022-11-04 15:36:45 +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
Jiangjie.Bai
2797baa4e5 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-10-31 20:16:21 +08:00