github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
10,427 Commits
73 Branches
250 Tags
117 MiB
Commit Graph

6871 Commits (db9ee71ab383cd9289c0f381673de30aeeec2dcf)

Author SHA1 Message Date
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
fit2bot e1278360af
fix: 资产创建失败 (#11824) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-12 19:46:04 +08:00
fit2bot c0de27ff7a
perf: 资产批量更新平台字段，根据平台约束协议自动生效 (#11818) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-12 18:11:51 +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
Eric_Lee ce63ea7528
Merge pull request #11812 from jumpserver/pr@dev@fix_get_real_ip 
perf: 修改获取 ip
 2023-10-12 16:13:57 +08:00
ibuler 8b3fd2c117 perf: 修改获取 ip 2023-10-12 16:09:22 +08:00
ibuler 23ccd6df8c perf: mysql mariadb 数据库不再必填 2023-10-12 14:50:09 +08:00
Bai 614e019f14 fix: 修改迁移文件choices和翻译文件 2023-10-11 21:15:47 -05:00
ibuler 38aa828eb8 perf: passkey 只允许本地用户开启 2023-10-11 04:52:54 -05:00
Bai 7cd2736e82 perf: 优化用户传递的 phone 处理 2023-10-11 04:50:45 -05:00
ibuler 443f6d25e8 perf: Windows 默认使用 rdping 测试 2023-10-11 04:22:08 -05:00
Eric e8652af054 perf: 更新格式 2023-10-11 04:21:00 -05:00
Eric fd6a8dd807 perf: 增加错误类型 2023-10-11 04:21:00 -05:00
Eric 499eedd83e perf: 会话新增 error_reason 字段 2023-10-11 04:21:00 -05:00
feng ca7d164034 perf: 账号模版信息同步到所关联的账号 2023-10-11 04:20:11 -05:00
Bai 3ef8e9603a perf: 优化 otp windows 最小支持设置 0 2023-10-11 04:06:17 -05:00
Bai 09f71d80eb perf: 优化LDAP用户导入列表时任务状态设置 2023-10-11 04:05:51 -05:00
jiangweidong 73db1bf50c feat: 支持LDAP用户组变更时，JS同步变更 2023-10-10 06:37:28 -05:00
fit2bot 6017f804a6
perf: 用户 phone wechat 加密 (#11789) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-10 19:11:08 +08:00
ibuler affa562384 perf: 优化禁用用户 2023-10-10 19:00:00 +08:00
fit2bot 0d101bc5ad
perf: 不活跃了用户默认90天检测一下 (#11790) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-10 18:48:35 +08:00
jiangweidong 70f0f55ddb
feat: 支持自定义短信认证(文件) (#11784) 
* feat: 支持自定义短信认证(文件)

* perf: 翻译

* perf: 还原注释
 2023-10-10 05:23:54 -05:00
fit2bot 333746e7c4
perf: 优化用户 access key 的使用和创建 (#11776) 
* perf: 优化用户 access key 的使用和创建

* perf: 优化 access key api

---------

Co-authored-by: ibuler <ibuler@qq.com>
 2023-10-10 04:52:52 -05:00
fit2bot 30b19d31eb
fix: 账号批量更新失败 (#11785) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-10 17:24:56 +08:00
Eric a844ce23e4 perf: 调整格式 2023-10-10 07:40:48 +05:00
Eric d6c0139fef perf: 支持持久化设置个人终端主题 2023-10-10 07:40:48 +05:00
jiangweidong 11157563ba perf: 优化跳转接口参数 2023-10-09 16:00:36 +05:00
jiangweidong 95e7bde5d7 perf: 优化翻译 2023-10-09 16:00:36 +05:00
jiangweidong 814350ab80 perf: 翻译 2023-10-09 16:00:36 +05:00
jiangweidong 3ac35eec68 perf: 优化OIDC用户未激活时，会循环跳转登录页面 2023-10-09 16:00:36 +05:00
fit2bot 3d27986c96
perf: asset login 消息通知添加操作日志记录 (#11774) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-09 17:16:38 +08:00
fit2bot c981e9cd9f
perf: 主机名包含/ 可以执行ansible任务 (#11772) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-09 16:05:42 +08:00
Bai e00c804a5a perf: 优化校验登录城市名1 2023-10-09 14:43:48 +08:00
fit2bot ef2b7b464e
perf: ansible 用户切换至 (#11766) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-09 14:35:21 +08:00
feng ae5d4257ad fix: 修复账号批量更新失败问题 2023-10-09 10:05:50 +08:00
halo b42014d58e feat: 支持DB2数据库 2023-10-09 10:04:14 +08:00
feng e71e8cd595 perf: 优化清除日志天数系统配置校验逻辑 2023-10-08 07:39:19 +05:00
fit2bot dd50044b89
perf: 翻译 (#11748) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-07 17:58:42 +08:00
fit2bot 68707085fa
perf: 日志保存时间不少于6个月 (#11742) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-07 17:41:45 +08:00
fit2bot 60399fae29
feat: 登录资产消息提醒 (#11747) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-07 17:41:20 +08:00
ibuler f206d963a0 perf: 优化会话 api 2023-10-07 15:57:15 +08:00
fit2bot 42b4e7697d
feat: 资产登录acl动作增加操作日志 (#11741) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-07 15:50:28 +08:00
fit2bot 0c1f4d99f8
fix: 修复工单引入html错误问题 (#11744) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-07 15:28:40 +08:00
ibuler 2aed3fcaea perf: 修改随机数生成，避免使用 random 库 2023-10-07 11:30:45 +05:00
ibuler 28196573bb perf: 修改随机使用secrets 2023-10-07 11:30:45 +05:00
ibuler 27c505853b perf: 优化忘记密码 2023-10-07 11:18:55 +05:00
feng f79084c2df fix: 账号授权过滤指定账号api 失效问题 2023-09-27 13:11:48 +05:00
ibuler 15a5dda9e0 perf: 修改默认的邮箱地址 2023-09-27 15:15:15 +08:00
ibuler 2069fee795 perf: 优化发送邮件 2023-09-27 08:27:12 +05:00
feng 56a26481a4 perf: 账号模版 生成随机密码密钥及账号批量更新500 2023-09-26 12:55:54 +08:00
ibuler cbe3d66b39 fix: pubkey auth require svc sign 2023-09-25 23:29:42 +08:00
Bryan 7c67d882aa Revert "fix: pubkey auth require svc sign" 
This reverts commit 9bde2ff6e1.
 2023-09-25 23:24:52 +08:00
ibuler 9bde2ff6e1 fix: pubkey auth require svc sign 2023-09-25 23:08:55 +08:00
Bai 1f00c00183 fix: 修复验证码校验逻辑和报错信息 2023-09-25 23:03:32 +08:00
ibuler c369b5478c fix: 修复暴力校验验证码 2023-09-25 22:06:57 +08:00
fit2bot 10363dcc5b
fix: 修复用户username 中文 登录失败问题 (#11692) 
Co-authored-by: feng <1304903146@qq.com>
 2023-09-25 21:39:16 +08:00
jiangweidong 42bdb2cf14 perf: 优化找回密码时区号带加号无法匹配的问题 2023-09-25 16:42:30 +08:00
fit2bot d64e77db30
perf: 去掉print (#11687) 
Co-authored-by: feng <1304903146@qq.com>
 2023-09-25 16:37:00 +08:00
fit2bot 4065baf785
feat: 用户登录堡垒机时通知管理员 (#11686) 
Co-authored-by: feng <1304903146@qq.com>
 2023-09-25 16:25:44 +08:00
Bai 0f3ddc3bf1 fix: 修复系统用户同步同时包含pwd/ssh-key导致创建账号id冲突报错的问题 2023-09-25 16:22:47 +08:00
ibuler 0cf17310e1 fix: 修复 DOMAINS 添加 80和443 不生效的问题 2023-09-22 17:47:43 +08:00
Bai cefd9f4ab2 fix: 解决节点资产数量方法计算不准确的问题 2023-09-22 15:18:22 +08:00
fit2bot 7128593502
perf: CeleryTaskExecution 添加默认排序 (#11663) 
Co-authored-by: feng <1304903146@qq.com>
 2023-09-22 15:06:58 +08:00
fit2bot 91dce82b38
fix: 安全设置开启仅已存在用户登录，企业微信等扫描登录，如果用户不存在，还是会自动创建用户登录成功。 (#11651) 
Co-authored-by: feng <1304903146@qq.com>
 2023-09-21 17:01:03 +08:00
Bai 1de7af4984 fix: 解决 master 冲突 2023-09-21 16:51:54 +08:00
Aaron3S 9892ff7dd6 feat: 代码片段支持 oracle 和 mariadb 2023-09-21 16:37:16 +08:00
老广 4cb499953c Revert "perf: 修复事务中任务执行" 
This reverts commit cdbe5d31e9.
 2023-09-21 15:40:39 +08:00
老广 0397bdeb46 Revert "perf: 修复 task id 不对的问题" 
This reverts commit 1d6d92c160.
 2023-09-21 15:39:29 +08:00
ibuler 1d6d92c160 perf: 修复 task id 不对的问题 2023-09-21 15:20:16 +08:00
ibuler cdbe5d31e9 perf: 修复事务中任务执行 2023-09-21 15:04:58 +08:00
fit2bot b023ca0c69
fix: saml 用户没现在记录 (#11641) 
Co-authored-by: feng <1304903146@qq.com>
 2023-09-21 14:02:09 +08:00
ibuler 803d590096 perf: 修改生成 applet accounts 2023-09-21 13:06:02 +08:00
ibuler e11367088a perf: 修改 acl 登录限制问题 2023-09-21 11:33:28 +08:00
jiangweidong 1c74dd00ba
fix: 解决sqlserver无法推送和改密的问题 (#11637) 2023-09-20 21:45:21 +08:00
Aaron3S ed832af631 fix: 修复运行job 组织切换问题 2023-09-20 18:26:47 +08:00
fit2bot 948c499d9e
fix: 修复仪表板图表时间范围不准 (#11633) 
Co-authored-by: feng <1304903146@qq.com>
 2023-09-20 17:41:35 +08:00
fit2bot a51549cf1c
perf: ansible任务 未激活的时候关闭定时任务 (#11631) 
Co-authored-by: feng <1304903146@qq.com>
 2023-09-20 15:30:29 +08:00
fit2bot 39baf88055
fix: ansible postgresql (#11629) 
Co-authored-by: feng <1304903146@qq.com>
 2023-09-20 14:29:53 +08:00
fit2bot 90131db55a
perf: 修改任务检查 (#11609) 
* perf: 修改任务检查

* perf: 修改翻译

---------

Co-authored-by: ibuler <ibuler@qq.com>
 2023-09-20 11:12:15 +08:00
“huailei000” ea3ff1ebcb perf: 优化登录页面移动端布局 2023-09-19 20:20:28 +08:00
Aaron3S f3ca45aa74 perf: 优化 Playbook 文件创建逻辑 2023-09-19 18:49:16 +08:00
老广 74cc174d7a
Merge pull request #11622 from jumpserver/pr@dev@perf_random_error 
fix: 修复 random error
 2023-09-19 18:15:50 +08:00
ibuler 0eba6d2175 fix: 修复 random error 2023-09-19 18:11:27 +08:00
fit2bot 58592a13e3
fix: 解锁ip失败问题 (#11611) 
Co-authored-by: feng <1304903146@qq.com>
 2023-09-19 17:38:46 +08:00
fit2bot b8fb23a0a0
perf: user setting (#11610) 
Co-authored-by: feng <1304903146@qq.com>
 2023-09-19 16:30:48 +08:00
Bai f5c43488fd perf: 优化 es host 中包含 # 字符时提示错误 2023-09-19 15:31:02 +08:00
Eric 19c76ba01c perf: 删除发布机执行的任务目录 2023-09-19 15:02:02 +08:00
Eric 68c4cd5928 perf: 修复发布机安装应用的报错 2023-09-19 15:01:37 +08:00
fit2bot e5bfa29c7b
fix: 创建用户推送失败问题 (#11606) 
Co-authored-by: feng <1304903146@qq.com>
 2023-09-19 14:53:43 +08:00
fit2bot cbb772def7
fix: 修复connection token 获取user错误 (#11603) 
Co-authored-by: feng <1304903146@qq.com>
 2023-09-19 11:09:58 +08:00
fit2bot e6fe7c489e
perf: 修改账号生成 (#11591) 
* perf: 修改账号生成

* perf: 修改账号模版支持策略

* perf: 修改特殊字符数量

* perf: 修改 model 继承

* perf: 修改顺序

* perf: 修改 requirements

* perf: 修改翻译

* perf: 修改随机生成密码

* perf: 修改密钥生成

* perf: 修复 bug

---------

Co-authored-by: ibuler <ibuler@qq.com>
 2023-09-19 10:59:33 +08:00
fit2bot 0b30f5cf88
perf: 翻译 (#11602) 
Co-authored-by: feng <1304903146@qq.com>
 2023-09-19 10:36:03 +08:00
fit2bot 018f1a0e8d
perf: 删除管理用户错误提醒 (#11596) 
Co-authored-by: feng <1304903146@qq.com>
 2023-09-18 18:42:02 +08:00
fit2bot 24ed57b98a
fix: 三方登录用户无法下线 (#11592) 
Co-authored-by: feng <1304903146@qq.com>
 2023-09-18 16:20:55 +08:00
ibuler 04a790c4ee perf: 优化 account template platform required 2023-09-18 14:29:41 +08:00
ibuler 2d9a3ef7d4 perf: 修改 migrations，不生成新的迁移文件 2023-09-18 14:29:24 +08:00
ibuler 0d2adeccf2 perf: 优化 applet account delete 2023-09-18 14:18:24 +08:00