github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
7,587 Commits
66 Branches
247 Tags
108 MiB
Commit Graph

267 Commits (4fcbdfa3f40ed8be26968b1f53d3ecf968688377)

Author SHA1 Message Date
feng626 ca3d2271a8 merge v3 2022-08-29 19:53:04 +08:00
fit2bot 78133b0c60
fix: 修复后台手机号校验 (#8747) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-08-15 17:39:54 +08:00
Jiangjie.Bai 88d9078c43 fix: 修改 OAuth2.0 认证的字段的必填项 2022-08-15 16:56:34 +08:00
ibuler d402ba5d92 perf: 修改资产名称 2022-08-11 15:45:03 +08:00
jiangweidong abcd12f645
perf: 补充cmpp2翻译及部分报错提示 (#8717) 
* 修改CMPPv2.0翻译内容

* perf: 捕捉连接网关出错问题

* perf: 测试短信验证失败提示错误信息

* perf: 修改翻译
 2022-08-10 17:32:28 +08:00
jiangweidong 708a87c903
feat: 支持CMPPv2.0协议短信网关 (#8591) 
* feat: 支持CMPPv2.0协议短信网关

* 修改翻译

Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com>
 2022-08-09 16:09:20 +08:00
jiangweidong 2099baaaff
feat: 认证方式支持OAuth2.0协议 (#8686) 
* feat: 认证方式支持OAuth2.0协议

* perf: 优化 OAuth2 认证逻辑和Logo (对接 Github)

* perf: 优化 OAuth2 认证逻辑和Logo，支持上传图标

* perf: 优化 OAuth2 认证逻辑和Logo，支持上传图标

* perf: 优化 OAuth2 认证逻辑和Logo，支持上传图标

* perf: 优化 OAuth2 认证逻辑和Logo，支持上传图标

Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
 2022-08-04 14:40:33 +08:00
fit2bot ee1aff243c
feat: 新增ping、telnet系统工具 (#8666) 
* feat: 新增ping、telnet系统工具

* perf: 消息返回

Co-authored-by: halo <wuyihuangw@gmail.com>
 2022-07-29 10:02:23 +08:00
fit2bot d07a230ba6
feat: 添加默认工单授权时间 (#8649) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-07-22 15:23:16 +08:00
fit2bot 046356728a
perf: sso token 最小60秒 (#8642) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-07-21 13:51:15 +08:00
Jiangjie.Bai 41541a91b9 fix: 修复 public 和 smart API 权限包含 connection token 2022-07-15 15:01:20 +08:00
fit2bot 001e5d857f
pref: debug toolbar 太费时间 先禁用 (#8528) 
* perf: 修改主题色

* pref: debug toolbar 太费时间 先禁用

* perf: 修改颜色

* perf: 优化 interface

* perf: 修改 avartar

* perf: css color

Co-authored-by: ibuler <ibuler@qq.com>
 2022-07-05 14:43:56 +08:00
Jiangjie.Bai bbcf992531 feat: 添加 OmniDB Enabled 控制 
feat: 添加 OmniDB Enabled 控制
 2022-07-05 11:12:37 +08:00
Jiangjie.Bai e8363ddff8 perf: 优化 BASE_SITE_URL OIDC 可以为空，实现多个不同端点访问时回调为当前访问的地址 2022-06-29 18:46:05 +08:00
Jiangjie.Bai 2366f02d10 feat: 添加组件类型 razor 并替换 XRDP_ENABLED 2022-06-07 13:43:53 +08:00
Jiangjie.Bai af1150bb86 feat: OIDC 用户添加属性映射值 2022-05-31 16:03:39 +08:00
Jiangjie.Bai 42202bd528 fix: 修改 public settings API公告字段类型为 dict 2022-05-27 17:24:09 +08:00
fit2bot 1029556902
perf: remote app 字段也加密 (#8274) 
* perf: remote app 字段也加密

* perf: 修改一些加密字段

Co-authored-by: ibuler <ibuler@qq.com>
 2022-05-20 10:01:41 +08:00
fit2bot 07779c5a7a
perf: 工单启用 (#8254) 
Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com>
 2022-05-17 18:57:04 +08:00
ibuler 2c73611cb4 fix: 修复公告不显示的问题 2022-05-17 11:30:37 +08:00
fit2bot 3b253e276c
perf: 优化翻译 (#8244) 
Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com>
 2022-05-16 17:50:28 +08:00
ibuler 4f37b2b920 perf: 优化 setting 读取，避免遗漏 2022-05-12 11:52:44 +08:00
ibuler dab8828b03 perf: 优化 setting 获取 2022-05-11 17:57:33 +08:00
Jiangjie.Bai bf466a1ba2 feat: LDAP同步用户支持组织 2022-05-11 11:09:30 +08:00
fit2bot 031077c298
perf: password 等使用 rsa 加密传输 (#8188) 
* perf: 修改 model fields 路径

* stash it

* pref: 统一加密方式，密码字段采用 rsa 加密

* pref: 临时密码使用 rsa

* perf: 去掉 debug msg

* perf: 去掉 Debug

* perf: 去掉 debug

* perf: 抽出来

Co-authored-by: ibuler <ibuler@qq.com>
 2022-05-07 16:20:12 +08:00
Jiangjie.Bai 3f856e68f0 feat: public settings 区分 public 和 open 2022-05-07 11:09:24 +08:00
Jiangjie.Bai 00ed7bb025 perf: 优化 OIDC 支持选择认证方式 2022-04-29 14:28:07 +08:00
halo dc42d1caa2 perf: 修改ssh_client连接选项翻译 2022-04-28 19:09:44 +08:00
fit2bot d2dd487e2c
feat: 修改LDAP导入组织问题 (#8111) 
Signed-off-by: Jiangjie.Bai <bugatti_it@163.com>

Co-authored-by: BaiJiangJie <bugatti_it@163.com>
 2022-04-20 16:05:33 +08:00
Jiangjie.Bai f8fade4cf2 feat: 添加配置项 KoKo SSH Client 方式 2022-04-19 16:16:55 +08:00
Jiangjie.Bai ea478fc801 fix: Public Setting 添加 Magnus 2022-04-14 12:55:18 +08:00
fit2bot b610d71e11
feat: 添加 临时 password (#8035) 
* perf: 添加 template password

* perf: 修改id

* perf: 修改 翻译

* perf: 修改 tmp token

* perf: 修改 token

Co-authored-by: ibuler <ibuler@qq.com>
 2022-04-13 20:24:56 +08:00
fit2bot f481463c64
feat: 添加Endpoint (#8041) 
* feat: add Endpoint EndpointRule EndpointProtocol model

* feat: add Endpoint EndpointRule EndpointProtocol API

* feat: modify protocols field

* feat: 修改序列类

* feat: 获取connect-url连接地址

* feat: 获取connect-url连接地址

* feat: 优化后台获取smart-endpoint逻辑

* feat: 优化后台获取smart-endpoint逻辑

* feat: 删除配置KOKO、XRDP、MAGNUS

* feat: 删除配置KOKO、XRDP、MAGNUS

* feat: 修改翻译

* feat: 修改smart endpoint

* feat: 修改翻译

* feat: smart API 添加token解析

* feat: 删除 smart serializer

* feat: 修改迁移逻辑

* feat: 解决冲突

* feat: 修改匹配 endpoint

Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
 2022-04-12 17:45:10 +08:00
feng626 c8758f417d feat: ldap一键导入及设置用户组织 2022-04-06 17:13:34 +08:00
Eric ef36b2e662 perf: 完善 setting 的动态配置 2022-04-06 16:45:22 +08:00
fit2bot c58d245636
fix: 修复koko setting (#8005) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-30 19:51:56 +08:00
ibuler 59342a88c0 perf: 优化各种翻译 2022-03-29 19:33:38 +08:00
fit2bot b8e6bc932b
perf: 添加 mariadb port (#7989) 
* perf: 添加 mariadb port

* perf: 优化 mariadb 树上天津更多信息

* perf: remove mixin

Co-authored-by: ibuler <ibuler@qq.com>
 2022-03-29 17:22:59 +08:00
feng626 d856f1364a feat: 拉起ssh api 2022-03-29 13:23:58 +08:00
ibuler e303b4f571 perf: 修复 settings patch 问题 2022-03-28 13:40:36 +08:00
fit2bot e0fdfa52b9
feat: 支持 magnus (#7965) 
* feat: 支持 magnus

* perf: 添加 setting 到 api

* perf: 放出 mongodb

Co-authored-by: ibuler <ibuler@qq.com>
 2022-03-25 14:45:08 +08:00
Jiangjie.Bai d320443c9f fix: 去除change_setting权限位 2022-03-15 20:25:18 +08:00
fit2bot df51c82cfd
perf: 优化Migration，删掉原来的 content type (#7835) 
Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com>
 2022-03-14 17:10:34 +08:00
feng626 a7cc457f54 fix: 修复setting perm 2022-03-14 15:50:53 +08:00
ibuler 60564d1b4f perf: 修改 bug 2022-03-14 10:01:51 +08:00
Jiangjie.Bai 8423ae602f fix: 移除TICKET_ENABLED配置;系统设置API限制权限 2022-03-11 21:02:26 +08:00
Jiangjie.Bai 8e2471c1eb fix: 移除TICKET_ENABLED配置;系统设置API限制权限 2022-03-11 21:02:26 +08:00
ibuler 797b184c7f perf: 修改 perm tree 2022-03-11 20:31:38 +08:00
fit2bot b3632f6531
fix: dingtalk auth perm (#7814) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-11 19:32:23 +08:00
fit2bot 416d4bd0c3
fix: 修复tree (#7802) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-11 17:24:28 +08:00