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

709 Commits (5f2f38d8155ec62522eed8b8064d90dfa96152df)

Author SHA1 Message Date
Bai 0eb550f39b fix: flower db file 持久化存储flower信息 2022-11-18 15:36:45 +08:00
ibuler a42641ca9a fix: 修复 redis 连接导致的 pub sub 错误 2022-11-17 14:07:43 +08:00
feng ec462e09e0 fix: action 2022-11-16 19:35:16 +08:00
Jiangjie.Bai 21d24ae4bc fix: 修复创建授权规则时不包含actions报错的问题 2022-11-16 16:23:39 +08:00
Aaron3S b12f83dbea Merge remote-tracking branch 'origin/v3' into v3 2022-11-15 17:22:54 +08:00
Aaron3S c63c000b10 perf: 优化异步认识显示名称 2022-11-15 16:29:40 +08:00
ibuler 989c338002 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-15 15:27:02 +08:00
ibuler 8e123304ad pref: 修改 perms accounts 2022-11-15 15:26:31 +08:00
Jiangjie.Bai 582a8e0c52 fix: 修改 BitChoicesField to_representation swagger 调用报错的问题 2022-11-15 14:59:22 +08:00
jiangweidong 6411642ced perf: 优化操作日志一些内容 2022-11-14 09:50:42 +08:00
ibuler 9c5b3a03c6 pref: 优化 permission actionss 2022-11-11 17:28:13 +08:00
ibuler 1cd551e692 merge: with remote 2022-11-11 15:11:10 +08:00
ibuler f6e403fd8b pref: 修改 asset permission 2022-11-11 15:04:31 +08:00
feng ba3f2099e6 perf: audits 2022-11-10 14:44:23 +08:00
ibuler afe6c8ebbd pref: 修改 applet host api 2022-11-07 20:41:18 +08:00
ibuler 2705c38ba1 pref: 添加命令启动失败 debug 2022-11-07 10:47:06 +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
ibuler b0ae9b47ca pref: 修改 applet host 2022-11-03 16:55:38 +08:00
ibuler 23e44c49b5 pref: 修改 applet deployments 2022-11-02 19:07:07 +08:00
ibuler cf81f08b7a perf: 优化部署 host 2022-11-01 11:52:51 +08:00
ibuler c0540e6787 pref: 修改 celery 2022-10-27 18:34:25 +08:00
ibuler 8f88b898d0 pref: 修改 migrations 2022-10-26 17:38:32 +08:00
Aaron3S c10d7f554e Merge remote-tracking branch 'origin/v3' into v3 2022-10-25 20:05:47 +08:00
ibuler 82aca6b843 pref: 修改 applet 2022-10-25 19:31:13 +08:00
Aaron3S 64e03a4412 feat: 增加异步任务api 2022-10-24 20:14:18 +08:00
ibuler 943b130035 feat: 添加远程应用 2022-10-22 11:17:02 +08:00
ibuler d6e36c873d pref: 修改 filter 2022-10-19 10:21:05 +08:00
ibuler 9b44ed55c2 pref: 修改 secret encrypt 2022-10-18 20:37:17 +08:00
Jiangjie.Bai 62c57d2fdf fix: 修复创建目录时指定权限为 755 2022-10-18 18:09:57 +08:00
Jiangjie.Bai 4711813af8 fix: 修复创建目录时指定权限为 755 2022-10-18 18:09:57 +08:00
ibuler 4e8e4e4bb7 pref: 修改添加 gather facts 2022-10-14 19:40:51 +08:00
ibuler 75ec9d4173 perf: 添加 gather facts automation 2022-10-14 18:59:28 +08:00
Jiangjie.Bai df99067ee3 perf: 删除消息订阅时 websocket 重连的 redis 断开日志 2022-10-11 16:40:12 +08:00
ibuler 9a0bae5bfd perf: 修改 ansible 执行 2022-10-10 16:56:32 +08:00
Jiangjie.Bai 145814f1e8 perf: 统一后台定时任务的crontab表达式, 对于后台定时执行的任务更加清晰 2022-10-10 16:31:45 +08:00
feng626 a487d30001 perf: 密码首位不包含特殊字符 2022-10-09 20:21:26 +08:00
Aaron3S bb25bf7621 fix: 修改解密异常抛出范围 2022-09-27 15:46:36 +08:00
Aaron3S f6cc7046a2 fix: 修复空字符串加密报错的问题 2022-09-27 11:28:11 +08:00
ibuler 72b0fb4274 perf: 修改 platform 支持设置 ansible 2022-09-26 18:03:48 +08:00
Aaron3S 1bc6e50b06 perf: 优化去除结尾空字节的写法 2022-09-26 15:29:53 +08:00
吴小白 1d3135d2d7 perf: flower 开启持久化 2022-09-26 14:42:08 +08:00
Aaron3S a7cd0bc0fe fix: 修复密码后空格的问题 2022-09-26 14:39:15 +08:00
ibuler 6ed3b51928 perf: 优化 serailizer 统一到 drf 目录中 2022-09-26 10:43:18 +08:00
ibuler 234acd6317 perf: 修改 accounts 2022-09-23 18:59:19 +08:00
ibuler ee1ec6aeee fix: 修复 celery 丢失心跳不会重连的问题 2022-09-21 18:33:35 +08:00
ibuler 1b0195cb82 perf: 修改 asset 结构 2022-09-21 11:17:14 +08:00
feng626 615f36c6f6 perf: 收集账号 2022-09-20 16:18:23 +08:00
feng626 7b4c2ce97e perf: xpack problem 2022-09-19 19:04:57 +08:00
fit2bot 8c277e8875
fix: 修复mfa失效日期 失效问题 (#8862) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-09-14 16:17:51 +08:00
fit2bot 5e16b6387a
fix: 修复配置mfa失效日期 失效问题 (#8856) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-09-13 17:20:09 +08:00
Jiangjie.Bai a2c006f01b perf: 整理用户授权资产的API 2022-09-13 15:41:39 +08:00
jiangweidong 556bd3682e feat: 支持对开启SSL/TLS的MongoDb数据库改密 2022-09-13 15:27:54 +08:00
ibuler 3e794ec41a perf: 修改 serializer 2022-09-13 10:41:49 +08:00
jiangweidong fa54a98d6c fix: 修复华为短信配置错误，前端提示不对的问题 2022-09-08 18:55:01 +08:00
ibuler 706488d293 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-09-08 10:04:32 +08:00
feng626 b910180a12 自动化策略 表 2022-09-07 19:49:42 +08:00
jiangweidong 409d254a2e feat: 支持MFA可配置华为云平台短信对接 2022-09-06 15:48:33 +08:00
ibuler 984b8dfb28 perf: 修改 m2m 日志记录 2022-09-06 13:27:47 +08:00
ibuler deba0c9057 feat: 支持 py3.9 2022-09-05 20:25:37 +08:00
ibuler 7ae395f7e8 perf: 修改 metadata 2022-09-01 21:00:04 +08:00
ibuler d7d9fe2718 perf: 修改 model 2022-09-01 14:46:31 +08:00
ibuler 2ede152663 Merge remote-tracking branch 'origin/v3' into v3 
# Conflicts:
#	apps/assets/api/platform.py
 2022-08-31 11:55:30 +08:00
feng626 60eb385c1e 账号过滤 2022-08-31 11:42:20 +08:00
ibuler 728dc43b6c perf: 修改 fields 支持 display choices 2022-08-31 10:06:16 +08:00
ibuler 951d4e4e0d perf: 合并冲突 2022-08-30 10:07:03 +08:00
ibuler c950508873 Merge remote-tracking branch 'origin/v3' into v3 2022-08-29 20:11:21 +08:00
feng626 ca3d2271a8 merge v3 2022-08-29 19:53:04 +08:00
ibuler a0b6849ccb perf: 优化 platform 2022-08-29 15:50:25 +08:00
Jiangjie.Bai f0dc519423 perf: 优化 windows ad帮助链接地址 2022-08-25 15:24:33 +08:00
ibuler cd8adc6d3d perf: 修改 migrations 2022-08-24 10:57:44 +08:00
Aaron3S 51820f23bf perf: 优化代码表达 2022-08-23 20:19:53 +08:00
Aaron3S 8772cd8c71 feat: 支持 piico 设备国密加密 2022-08-23 17:40:01 +08:00
ibuler 60cb1f8136 fix: 修复默认 gcm key padding 2022-08-22 14:26:11 +08:00
feng626 a7d193464e 添加 choices 获取 label方法 2022-08-22 11:47:45 +08:00
ibuler 05f913ab18 perf: 修改 platform 2022-08-18 17:58:59 +08:00
Jiangjie.Bai 9a4b32cb3c perf: 优化 metadata 类型添加 float 2022-08-15 16:08:56 +08:00
Jiangjie.Bai 795d6e01dc fix: 修改测试IP地址工具的默认超市时间为 0.5s 2022-08-10 19:07:22 +08:00
jiangweidong abcd12f645
perf: 补充cmpp2翻译及部分报错提示 (#8717) 
* 修改CMPPv2.0翻译内容

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

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

* perf: 修改翻译
 2022-08-10 17:32:28 +08:00
ibuler 1ca0bdf843 perf: 修改 category 2022-08-09 16:53:43 +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
Jiangjie.Bai 05e2f8aaf6 fix: 修改 EncryptMixin get_prep_value 和 默认关闭 XPACK 2022-08-09 10:42:35 +08:00
ibuler 87df92ea92 perf: 修改脚本 2022-08-08 14:34:57 +08:00
fit2bot 4ecb0b760f
perf: 支持配置文件加密 (#8699) 
* crypto

* perf: 暂存一下

* perf: 支持配置文件加密

* perf: 修改位置

* perf: 优化拆分出去

* stash

* perf: js 强制 key 最大 16

* pref: 修改语法

* fix: 修复启用 gm 后，又关闭导致的用户无法登录

Co-authored-by: ibuler <ibuler@qq.com>
 2022-08-05 14:53:23 +08:00
fit2bot b27b02eb9d
feat: Cloud 支持局域网 IP 扫描 (#8589) 
* feat: Cloud 支持局域网 IP 扫描

* feat: Cloud 支持局域网 IP 扫描

Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
 2022-08-05 14:45:25 +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
ibuler b22aed0cc3 feat: 用户密码 hash 采用 gmsm3 2022-08-03 15:05:22 +08:00
Jiangjie.Bai 40f8b99242 fix: 修复更新资产账号不成功的问题(末尾:) 2022-08-02 16:42:25 +08:00
ibuler 9d17f27fb3 fix: 修复密码可能解密失败报错 2022-07-21 15:37:32 +08:00
feng626 358460e7f0 fix: 如配置SECURITY_VIEW_AUTH_NEED_MFA 跳过校验 2022-07-19 16:24:55 +08:00
fit2bot 62d403bf21
fix: reverse console (#8615) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-07-18 19:24:17 +08:00
ibuler 93a89509d6 perf: merge with dev 2022-07-17 14:28:55 +08:00
Jiangjie.Bai 41541a91b9 fix: 修复 public 和 smart API 权限包含 connection token 2022-07-15 15:01:20 +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 bf7c05f753
fix: 调整confirm (#8554) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-07-07 17:07:57 +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
Jiangjie.Bai 62a2a74c27 perf: 会话列表显示终端名称；修复启动 warning 问题 2022-07-01 19:21:13 +08:00
Jiangjie.Bai 011e9ffec4 fix: 修复导入导出文件时对于bool类型字段的判断问题 2022-06-30 18:28:07 +08:00
fit2bot de41747bb2
perf: 添加 debug tool bar (#8504) 
* perf: 添加 debug tool bar

* perf: 修改 config name

Co-authored-by: ibuler <ibuler@qq.com>
 2022-06-29 14:48:54 +08:00
fit2bot c3c99cc5e8
perf: 优化 redis (#8484) 
* perf: 优化 redis

* perf: 优化 redis 时间

* perf: 优化时间

* perf: 修改 ssl

* perf: 修改 ssl

* perf: 修改 ssl name

* perf: 修改名称

Co-authored-by: ibuler <ibuler@qq.com>
 2022-06-28 17:23:20 +08:00