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

616 Commits (3f264ae999c7c171d36d1c80054ee43d507a9981)

Author SHA1 Message Date
ibuler fd94713583 Merge branch 'dev' into pr@dev@refactor_system_user_account 2022-07-17 14:17:18 +08:00
ibuler 29c9c6d680 perf: 优化 accounts 2022-07-15 18:03:32 +08:00
fit2bot 4fd82b9946
fix: 修改翻译 (#8602) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-07-15 17:17:56 +08:00
fit2bot ce2f6fdc84
feat: Endpoint 支持 oracle 版本 (#8585) 
* feat: Endpoint 支持 oracle 版本

* feat: Endpoint 支持 oracle 版本

* feat: Endpoint 支持 oracle 版本

Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
 2022-07-13 16:29:05 +08:00
Jiangjie.Bai 602192696c feat: 添加翻译信息 2022-07-12 18:31:18 +08:00
fit2bot b5cfc6831b
feat: 工单支持审批时修改资产 (#8549) 
Co-authored-by: feng626 <1304903146@qq.com>
Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com>
 2022-07-12 15:28:42 +08:00
fit2bot 27cbbfbc79
refactor: 重构 Connection Token 模块 (完成获取 Super connection token API 逻辑) (#8559) 
* refactor: 重构 Connection Token 模块 (完成 Model 设计和创建 Token 的API逻辑)

* refactor: 重构 Connection Token 模块 (完成获取 Token 详细信息的 API 逻辑)

* refactor: 重构 Connection Token 模块 (完成获取 RDP 文件 API 逻辑)

* refactor: 重构 Connection Token 模块 (完成获取 Client url API 逻辑)

* refactor: 重构 Connection Token 模块 (完成获取 Super connection token API 逻辑)

* refactor: 重构 Connection Token 模块 (完成删除原 Connection token 逻辑)

* refactor: 重构 Connection Token 模块 (完成删除原 Connection)

* refactor: 重构 Connection Token 模块 (完善序列类字段)

* refactor: 重构 Connection Token 模块 (完善expire API)

* refactor: 重构 Connection Token 模块 (完善迁移文件)

* refactor: 重构 Connection Token 模块 (完善翻译文件)

* refactor: 重构 Connection Token 模块 (拆分Connection ViewSet)

* refactor: 重构 Connection Token 模块 (修改翻译)

* refactor: 重构 Connection Token 模块 （优化)

Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
 2022-07-11 18:09:06 +08:00
feng626 7047e445a3 feat: 下载页面添加离线播放器 2022-07-11 17:21:07 +08:00
fit2bot 0f11ca9c37
perf: 修改翻译 (#8543) 
* perf: 修改翻译

* perf: 优化 flash msg page

* perf: 修改 i18n

* perf: 修改 i18n

Co-authored-by: ibuler <ibuler@qq.com>
 2022-07-06 17:26:09 +08:00
fit2bot 0aad0b7279
feat: 账号历史信息 (#8500) 
* feat: 账号历史信息

* del app

Co-authored-by: feng626 <1304903146@qq.com>
 2022-07-04 18:54:47 +08:00
fit2bot 8ebcb4b73a
fix: translate (#8529) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-07-04 15:14:59 +08:00
fit2bot 88f60b58dd
fix: 修复翻译 (#8527) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-07-04 14:57:45 +08:00
fit2bot a6cc8a8b05
perf: 优化confirm接口 (#8451) 
* perf: 优化confirm接口

* perf: 修改 校验

* perf: 优化 confirm API 逻辑

* Delete django.po

Co-authored-by: feng626 <1304903146@qq.com>
Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com>
 2022-07-04 11:29:39 +08:00
fit2bot 927ae43af2
perf: 优化工单 (#8524) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-07-01 19:07:55 +08:00
Jiangjie.Bai 011e9ffec4 fix: 修复导入导出文件时对于bool类型字段的判断问题 2022-06-30 18:28:07 +08:00
Jiangjie.Bai 05826abf9d feat: Endpoint 支持标签匹配 
feat: Endpoint 支持标签匹配

feat: Endpoint 支持标签匹配

feat: Endpoint 支持标签匹配

feat: Endpoint 添加帮助信息

feat: Endpoint 添加帮助信息
 2022-06-29 18:50:27 +08:00
ibuler ba6b1bf692 perf: 修改翻译 2022-06-22 14:30:52 +08:00
feng626 298f6ba41d fix: 修改翻译 2022-06-16 18:03:16 +08:00
Jiangjie.Bai adc8a8f7d3 fix: 修改翻译 2022-06-16 17:10:21 +08:00
ibuler e2f199606e stash it 2022-06-16 11:32:36 +08:00
Jiangjie.Bai 4c2274b14e fix: 修改翻译 2022-06-16 11:19:26 +08:00
feng626 a024f26768 fix: 授权过期消息提示 2022-06-16 11:19:26 +08:00
feng626 f91bfedc50 perf: 授权过期通知 2022-06-14 18:33:49 +08:00
fit2bot 6c0d0c3e92
feat: OIDC 用户添加属性映射值 (#8327) 
* feat: OIDC 用户添加属性映射值

* feat: OIDC 用户添加属性映射值

Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
 2022-05-31 16:09:31 +08:00
ibuler 26cf64ad2d perf: 修改 i18 2022-05-20 11:41:33 +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
feng626 99e1b2cf92 fix: 不支持es8 提示 2022-05-18 20:14:31 +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
Jiangjie.Bai 2a5497de14 fix: 修改工单审批文案 2022-05-16 17:52:27 +08:00
fit2bot 6409b7deee
feat: Endpoint添加Redis Port (#8225) 
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com>
 2022-05-12 14:47:35 +08:00
ibuler d692188a34 perf: 修改 i18n 2022-05-11 16:03:26 +08:00
jiangweidong b44fa64994
perf: 企业微信、钉钉工单审批增加拒绝功能 (#8208) 
* perf: 工单直接审批增加拒绝功能

* feat: 翻译

* perf: 修改动作名词

* perf: 修改翻译
 2022-05-10 16:30:25 +08:00
jiangweidong 64eda5f28b
perf: 命令存储ES可根据日期动态建立索引 (#8180) 
* perf: 命令存储ES可根据日期动态建立索引

* perf: 优化合并字段

* feat: 修改逻辑
 2022-05-09 16:37:31 +08:00
jiangweidong e151548701
perf: 账号管理中查看密码记录日志 (#8157) 2022-05-05 14:42:09 +08:00
jiangweidong c56179e9e4
feat: 支持企业微信、钉钉直接审批工单 (#8115) 2022-05-05 13:07:48 +08:00
ibuler 7e6964e0fc perf: 修改 platform 2022-04-30 23:19:43 +08:00
ibuler 246710128e perf: stash 2022-04-29 18:28:12 +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 b0b379e5a9
fix: del org check ldap (#8114) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-04-20 16:38:42 +08:00
fit2bot 415521a003
fix: 删除组织时检测ldap同步组织 (#8112) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-04-20 16:32:33 +08:00
Jiangjie.Bai 3b9cb2a99c fix: 修改翻译临时密码 2022-04-19 16:26:33 +08:00
Jiangjie.Bai f8fade4cf2 feat: 添加配置项 KoKo SSH Client 方式 2022-04-19 16:16:55 +08:00
ibuler 516cb05d69 perf: 修改翻译 2022-04-19 13:33:28 +08:00
feng626 7aa0c9bf19 feat: download 2022-04-14 15:00:59 +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
fit2bot 1f8ded49fa
feat: 工作台区分组织 (#8040) 
* perf: 工作台受组织角色控制

* perf: workspace => workbench

* perf: 修改 workspace codename

Co-authored-by: ibuler <ibuler@qq.com>
 2022-04-12 14:25:49 +08:00
jiangweidong fe8527fd07 feat: 修改翻译 2022-04-02 16:04:13 +08:00
Jiangjie.Bai 3121b4e3ff feat: 更新翻译 2022-03-31 13:05:55 +08:00
Jiangjie.Bai eff562505e feat: 更新翻译 2022-03-31 13:05:55 +08:00
ibuler 59342a88c0 perf: 优化各种翻译 2022-03-29 19:33:38 +08:00
feng626 d856f1364a feat: 拉起ssh api 2022-03-29 13:23:58 +08:00
jiangweidong 03fdaa03e4 feat: 支持日语 2022-03-28 10:06:54 +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
jiangweidong e993f31b6d
feat: 支持纳管百度云资产 (#7921) 
Co-authored-by: ibuler <ibuler@qq.com>
 2022-03-21 10:39:47 +08:00
Jiangjie.Bai b8c083af7e fix: 工单权限位放到sys角色中 2022-03-18 17:36:22 +08:00
Jiangjie.Bai ac6052546a fix: 修改翻译 2022-03-17 19:20:39 +08:00
Jiangjie.Bai 0265adcc72 fix: 修改翻译 2022-03-17 19:20:39 +08:00
Jiangjie.Bai 9654083662 fix: 修改站内信权限位 2022-03-17 19:06:44 +08:00
fit2bot 5c7bfcff1c
perf: 修改 i18n (#7904) 
* perf: some perm to xpack

* perf: 修改 i18n

* perf: 修改 i18n

* perf: 修改 i18n

Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com>
 2022-03-17 15:23:22 +08:00
fit2bot 34e75099a3
perf: 设置默认的角色，系统用户角色添加权限 (#7898) 
* perf: 修改 role handler

* perf: 设置默认的角色，系统用户角色添加权限

* perf: authentication 还是放到系统中吧

Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com>
 2022-03-17 14:08:16 +08:00
fit2bot aa022a02c1
fix: 修复用户认证失败的详细信息显示 (#7886) 
* fix: 修复用户认证失败的详细信息显示

* fix: 更新授权树翻译

Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com>
 2022-03-16 20:41:54 +08:00
fit2bot 3b507dc795
perf: 优化英文下树的显示 (#7883) 
* perf: 优化英文下树的显示

* perf: 修改翻译

* perf: 修改翻译

Co-authored-by: ibuler <ibuler@qq.com>
 2022-03-16 20:27:38 +08:00
ibuler 1ce2706f20 perf: 修改翻译 2022-03-16 18:26:16 +08:00
ibuler bbdeba3659 perf: 修复 org admin all 2022-03-16 18:26:16 +08:00
ibuler 995c9a6c19 perf: 修复一些bug， rolebingding 找到合适的 2022-03-16 14:08:54 +08:00
Jiangjie.Bai aedd8ba589 fix: 修复查看我的应用翻译 2022-03-15 19:51:59 +08:00
Jiangjie.Bai 172b492bc3 fix: 修复存储测试权限位 2022-03-15 19:41:25 +08:00
Jiangjie.Bai c4280d259a fix: 修复翻译/权限设置 2022-03-15 19:18:01 +08:00
Jiangjie.Bai b25ec559bb fix: 修复翻译/权限设置 2022-03-15 19:18:01 +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
ibuler 4eb7b50b52 perf: 修改设置 2022-03-10 20:30:41 +08:00
fit2bot 29b9adb684
perf: 修复一把数据 (#7789) 
* fix: 优化 perm exclude

* perf: 修复一把数据

perf: 修复一些数据

Co-authored-by: ibuler <ibuler@qq.com>
 2022-03-10 17:40:31 +08:00
ibuler 9934007397 fix: 优化 perm exclude 2022-03-10 16:56:32 +08:00
Jiangjie.Bai b017e68a56
Perf: 优化RBAC权限树 (#7782) 
* fix: 优化权限树(1)

* fix: 优化权限树(2)

* fix: 优化权限树(3)

* fix: 优化权限树(4)

* fix: 优化权限树(5)

* fix: 优化权限树(添加迁移文件)

* fix: 优化权限树(6)

* fix: 优化权限树(7)

* fix: 优化权限树(8)

* fix: 优化权限树(9)
 2022-03-10 11:25:33 +08:00
ibuler 4c31b5ec0f perf: 去掉一些 perm 2022-03-08 17:33:06 +08:00
fit2bot 1b007c8c5c
perf: 修改权限树 (#7757) 
* perf: 修改 rbac tree

* perf: 修改权限树

* perf:  修改用户默认权限

Co-authored-by: ibuler <ibuler@qq.com>
 2022-03-07 19:02:37 +08:00
fit2bot a20884e2ad
perf: 修改 rbac tree (#7743) 
* perf: 修改 rbac tree

* perf: 修改verbose name

* fix: 修复系统用户

* fix: 还原 xpack

Co-authored-by: ibuler <ibuler@qq.com>
 2022-03-07 11:19:03 +08:00
fit2bot dafc416783
Fix rbac (#7728) 
* perf: 重命名 signal handlers

* fix: 修复 ticket processor 问题

* perf: 修改 ticket 处理人api

* fix: 修复创建系统账号bug

* fix: 升级celery_beat==2.2.1和flower==1.0.0;修改celery进程启动参数先后顺序

* perf: 修改 authentication token

* fix: 修复上传权限bug

* fix: 登录页面增加i18n切换;

* fix: 系统角色删除限制

* perf: 修改一下 permissions tree

* perf: 生成 i18n

* perf: 修改一点点

Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: feng626 <1304903146@qq.com>
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
 2022-03-02 20:48:43 +08:00
ibuler c6ece550a9 perf: 修改翻译 2022-02-22 19:53:00 +08:00
xinwen a806a2d3e6 fix: 翻译 2022-02-16 19:16:45 +08:00
Jiangjie.Bai 3325867f8f fix: 修改LDAP SYNC相关参数设置 2022-02-15 17:57:56 +08:00
Jiangjie.Bai 764d70ea4f fix: 修改用户组名称翻译 2022-02-14 19:27:41 +08:00
Michael Bai 8085db7acc feat: 增加系统设置(安全)控制第三方认证用户是否进行MFA认证 2022-02-08 17:48:40 +08:00
Michael Bai b3397c6aeb feat: 命令过滤规则增加忽略大小写选项 2022-02-08 12:31:15 +08:00
Michael Bai b07f532a71 fix: 修复导出应用账号会包含attrs字段的问题 2022-01-20 12:00:18 +08:00
feng626 83c5344307 fix: 获取命令规则过滤不准 2022-01-19 19:07:43 +08:00
fit2bot 0b16d70c0c
fix: 修改翻译 (#7526) 
* fix: 修改翻译

* fix: 修改保存数据库翻译

* fix: 修复翻译为none问题

Co-authored-by: feng626 <1304903146@qq.com>
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com>
 2022-01-18 19:31:01 +08:00
Michael Bai b8aaa7d249 fix: 修改命令过滤器翻译 2022-01-18 14:27:22 +08:00
Michael Bai c9f63a3f4a fix: 修改审计日志中的i18n翻译问题 2022-01-18 13:21:31 +08:00
xinwen ec68fc9562 fix: 绑定三方登录消息翻译 2022-01-18 10:39:35 +08:00
Michael Bai de74477fd6 fix: 修改翻译文件 2022-01-17 19:11:01 +08:00
fit2bot c43ad981bd
perf: 优化写法 (#7498) 
* fix: 修复登录页输入 mfa 时不支持 某 mfa 的错误提示

fix tapd 1145454465001008371

* perf: 优化 send code api，避免暴力常识

* perf: 优化写法

* Update mfa.py

Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com>
 2022-01-17 19:05:01 +08:00
fit2bot def9bedd30
perf: 账号备份优化 (#7503) 
* perf: 账号备份优化

* feat: 优化账号备份获取有序备份字段列表

Co-authored-by: feng626 <1304903146@qq.com>
Co-authored-by: Michael Bai <baijiangjie@gmail.com>
 2022-01-17 15:58:39 +08:00
fit2bot 4343b6487d
fix: 修复登录页输入 mfa 时不支持 某 mfa 的错误提示 (#7495) 
* fix: 修复登录页输入 mfa 时不支持 某 mfa 的错误提示

fix tapd 1145454465001008371

* perf: 优化 send code api，避免暴力常识

Co-authored-by: ibuler <ibuler@qq.com>
 2022-01-13 19:01:12 +08:00
ibuler 145c7952c9 perf: 优化 ops 任务，支持 i18n 
- 内置任务名称支持了 i18n，数据库存英文，返回是翻译一下
- 任务执行中，添加 language 上下文
 2022-01-13 15:03:48 +08:00
feng626 e5659a1d07 fix: 修复翻译及迁移文件 2022-01-12 20:55:58 +08:00
feng626 b0932e5137 feat: 逃生通道 2022-01-12 20:22:36 +08:00
feng626 11fd9a6567 feat: 配置私钥密码 2021-12-31 14:47:01 +08:00