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

6677 Commits (a41909ec8dcff80a0371ead4f3625028b48e5f35)

Author SHA1 Message Date
ibuler 873afd239e chore: relove conflict 2022-12-05 13:41:28 +08:00
ibuler 80e550b71a fix: 修复 supertoken 创建 2022-12-05 13:37:37 +08:00
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 0047af4584 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-05 12:42:39 +08:00
ibuler 38b1701b33 perf: 修改 migrations， 修改 Connect token 2022-12-05 12:42:15 +08:00
feng 03e62b5bc1 perf: asset mini 2022-12-05 11:48:41 +08:00
Aaron3S 74b783f62f perf: 合并迁移文件 2022-12-05 11:26:14 +08:00
fit2bot 8a7ecda4f6
perf: asset add automation_enabled_info (#9154) 
Co-authored-by: feng <1304903146@qq.com>
 2022-12-05 11:21:01 +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 0cfcfacb6d perf: 修改 CommandFilterACL, CommandGroup __str__ 2022-12-04 22:46:47 +08:00
Bai 519e0eac01 perf: 修改 CommandGroupSerializer type 字段为 LabeledChoiceField 2022-12-04 20:51:22 +08:00
Bai 70fb00c4ee perf: 修改命令过滤ACL序列类和部分翻译 2022-12-04 18:48:48 +08:00
Bai 4d9344eb23 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-04 18:11:32 +08:00
Bai 229d36abb4 perf: 修改命令过滤 ACL 序列类 2022-12-04 18:01:35 +08:00
Eric 048be1782d fix: replay file data 2022-12-04 17:39:48 +08:00
Bai 5568c4c5df perf: 修改 CommandFilterACL Account 只匹配 username 字段 2022-12-04 14:44:30 +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
Eric 6480b916d6 perf: parse ssh private key 2022-12-03 15:25:04 +08:00
ibuler 289ecbcc75 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-02 20:33:56 +08:00
ibuler 2cf3a21d27 perf: 修改校验权限 2022-12-02 20:33:32 +08:00
fit2bot 156a6c9dc5
perf: gateway test connective (#9152) 
Co-authored-by: feng <1304903146@qq.com>
 2022-12-02 20:28:49 +08:00
ibuler 052a4afef6 pref: 暂时修改 key fingerprint 2022-12-02 20:06:56 +08:00
ibuler fbea1f3480 perf: 修改一些拼写 2022-12-02 19:56:13 +08:00
Bai a70f85e346 fix: 修改 ConnectionToken Serializer 2022-12-02 18:09:07 +08:00
Bai 52e8082470 fix: 修改 LoginAssetACL 过滤 review 2022-12-02 17:52:51 +08:00
Bai c832f762a5 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-02 17:48:51 +08:00
Bai c8c5aca355 fix: 修改 ConnectionToken Serializer 命令过滤器 2022-12-02 17:48:44 +08:00
jiangweidong aa0dabfd10 fix: 删除不用migrations 2022-12-02 17:40:00 +08:00
fit2bot 0e0a9f4654
perf: gateway account (#9150) 
Co-authored-by: feng <1304903146@qq.com>
 2022-12-02 17:36:55 +08:00
Aaron3S 2f5e133558 perf: 优化celery任务 2022-12-02 17:18:11 +08:00
Aaron3S 6d0545f04f perf: 持续优化作业创建 2022-12-02 17:17:05 +08:00
老广 21f91358cf
Merge pull request #9147 from jumpserver/pr@v3@fix_withdraw_acl_unfinished 
fix: 删除掉连接方式控制半成品代码
 2022-12-02 14:57:38 +08:00
ibuler 2d771eedc1 perf: 优化用户授权 api 2022-12-02 13:15:03 +08:00
jiangweidong faf1dedfe2 fix: 删除掉连接方式控制半成品代码 2022-12-02 13:00:48 +08:00
Bai 563b9f77a6 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-02 12:41:05 +08:00
Bai 158d49b230 fix: 修复用户授权的资产 API 支持 id 过滤 2022-12-02 12:40:29 +08:00
ibuler 61e6ab20a2 perf: 修改 Connect acl 2022-12-02 12:27:26 +08:00
ibuler 6390b9c203 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-02 11:53:45 +08:00
ibuler a6aafaec05 perf: 修改 command filter 2022-12-02 11:53:07 +08:00
fit2bot 541358978d
fix: gateway (#9145) 
Co-authored-by: feng <1304903146@qq.com>
 2022-12-02 11:45:05 +08:00
ibuler 19c3f98e8f pref: 修改 migrations 冲突 2022-12-02 11:14:29 +08:00
ibuler fdbaa0afe1 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-02 11:12:25 +08:00
ibuler a18f544cf8 perf: 修改 acl 2022-12-02 11:12:14 +08:00
老广 1165ea817f
Merge pull request #9035 from jumpserver/pr@v3@feat_db_automations 
[v3] feat: 支持Oracle、MongoDB、SQLServer数据库自动化操作部分功能
 2022-12-02 10:53:29 +08:00
jiangweidong 85aad7ba62 feat: 解决冲突 2022-12-02 10:52:31 +08:00
老广 017a674f63
Merge pull request #9143 from jumpserver/pr@v3@perf_gunicorn 
perf: 去掉 gunicorn threads
 2022-12-02 10:47:16 +08:00
吴小白 709b6e5b0d perf: 去掉 gunicorn threads 2022-12-02 10:45:12 +08:00
老广 11a786d858
Merge pull request #9076 from jumpserver/v3_async_ws 
perf: asyncio ws task log
 2022-12-02 10:44:24 +08:00
老广 07f2e66546
Merge pull request #9138 from jumpserver/pr@dev@fix_csrf_403_error 
fix: 增加CSRF_TRUSTED_ORIGINS参数，解决CSRF报错
 2022-12-02 10:40:55 +08:00
老广 a6b1052767
Merge pull request #9139 from jumpserver/pr@v3@perf_gunicorn 
perf: 控制 gunicorn 启动进程
 2022-12-02 10:40:09 +08:00
老广 bcf509ab07
Merge branch 'v3' into pr@v3@feat_support_clear_private_key 2022-12-02 10:35:20 +08:00
Eric 10e3100d3c fix: LoginAssetACL confirm action 2022-12-01 22:09:16 +08:00
Bai 2401c241f2 fix: 修改 random_string 方法，支持只生成随机数字 2022-12-01 20:12:51 +08:00
ibuler 1fb0b0849d Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-01 19:41:42 +08:00
ibuler cb3877bbda perf: 修改 acl 添加命令过滤 acl 2022-12-01 19:41:18 +08:00
feng fa0382fc5e perf: gateway manager 2022-12-01 18:22:41 +08:00
吴小白 2bc47c87d1 perf: 修正错误 2022-12-01 16:12:10 +08:00
ibuler 8162a1b17e perf: 优化 gateway 2022-12-01 15:21:53 +08:00
吴小白 7a475fc029 perf: 控制 gunicorn 启动进程 2022-12-01 14:54:57 +08:00
halo 269c087bac fix: 增加CSRF_TRUSTED_ORIGINS参数，解决CSRF报错 2022-12-01 13:47:25 +08:00
fit2bot d1461b33c5
perf: gather account mysql (#9136) 
Co-authored-by: feng <1304903146@qq.com>
 2022-12-01 13:12:31 +08:00
Bai d5d770e4ac Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-01 12:03:08 +08:00
Bai b55b755e8e fix: 修复 LoginAssetACL Check API 获取 account_username 失败的问题 2022-12-01 12:03:01 +08:00
Bai 592d79c0f8 perf: 合并授权规则用户相关的 API URL，统一使用 /<str:user>/ 格式 2022-12-01 12:02:20 +08:00
feng 26efc42e8b perf: type to assets 2022-12-01 10:23:04 +08:00
Eric d198dfcba9 perf: granted asset add specific field 2022-12-01 00:36:02 +08:00
Bai a430b0f1a9 perf: 优化 Login Asset ACL Serializer reviewers 字段 2022-11-30 23:05:20 +08:00
Bai 3b1c8a2327 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-30 21:13:56 +08:00
Bai 2aa1d664a6 perf: 处理 acl filter 逻辑放到 queryset 中 2022-11-30 21:13:50 +08:00
feng a0df39ad28 fix: 修改connection token 对接client的username 2022-11-30 20:38:22 +08:00
feng 314b63cec8 perf: connection token launch command 2022-11-30 20:21:23 +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
Eric 142348b055 perf: 增加资产过滤 2022-11-30 18:16:52 +08:00
fit2bot 4083df07cc
perf: audit navigation (#9133) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-30 18:13:15 +08:00
Bai d524e9885d Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-30 17:11:43 +08:00
Bai 2dea891b15 perf: 处理 acl 后台 check 逻辑 2022-11-30 17:11:36 +08:00
ibuler 0ffea3855b perf: 修改 connect token api 2022-11-30 16:39:27 +08:00
ibuler 6f02b239db Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-30 16:33:52 +08:00
ibuler ed77d05bd8 pref: conneect token 支持 su from 2022-11-30 16:33:22 +08:00
Aaron3S dcbdb0af4d feat: 支持执行目录切换,修改字段显示 2022-11-30 16:25:31 +08:00
Bai 25b9739ce3 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-30 16:24:21 +08:00
Bai 48d2949404 perf: 修改 acl assets name/address 2022-11-30 16:21:27 +08:00
ibuler 307cf97ccb perf: 授权的资产支持过滤 2022-11-30 15:39:27 +08:00
ibuler 21b1dd076a Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-30 15:34:31 +08:00
ibuler d46f321f1a perf: 修改连接方式 2022-11-30 15:24:32 +08:00
Bai 99e126f515 perf: 修改 Acl accounts serializer 2022-11-30 15:08:55 +08:00
ibuler 0f1e19ba41 perf: 修改数据库添加 ssl 字段 2022-11-30 11:28:51 +08:00
ibuler 47c405dee5 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-29 21:50:59 +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
Aaron3S 82a8118ca0 feat: 增加comment 字段 2022-11-29 19:52:48 +08:00
Aaron3S d741f14342 feat: merge migrations 2022-11-29 19:47:45 +08:00
Aaron3S e191a197c6 feat: 完成剩余流程, 修改部分模型 2022-11-29 19:44:42 +08:00
feng cc5b37350c perf: domain del nodes 2022-11-29 19:37:11 +08:00
feng dd207016b2 perf: del domain node 2022-11-29 19:14:12 +08:00
feng 52541d1dad perf: push dynamic user 2022-11-29 19:05:45 +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
fit2bot d849fd52bd
perf: domian add node (#9130) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-29 17:01:03 +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
feng 3052aa759c perf: ticket login asset acl 2022-11-28 21:54:20 +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
ibuler 742cac1e90 pref: 修改数据库连接方式 2022-11-28 17:57:33 +08:00
feng d0b9dd457f perf: navigation date metrics 2022-11-28 16:12:06 +08:00
fit2bot 4f718f9b1f
perf: account template secret api (#9127) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-28 15:54:16 +08:00
Eric 3c5b459ab7 fix: connect token serializer 2022-11-28 15:31:00 +08:00
ibuler 2c26f96e28 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-28 15:01:50 +08:00
ibuler a1d72a1746 pref: 修改 connect token 一些 Url 2022-11-28 15:01:16 +08:00
feng 0212e32ab2 perf: navigation api 2022-11-28 14:53:27 +08:00
fit2bot 072c44974e
perf: navigation page (#9125) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-28 11:47:40 +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 61c96baeae fix: 修复获取UserLoginLog对象org失败的问题 2022-11-27 14:36:16 +08:00
feng 7d0c480a13 Merge remote-tracking branch 'origin/v3' into v3 2022-11-27 12:57:31 +08:00
feng eec463774a perf: user login logs 2022-11-27 12:53:38 +08:00
吴小白 392ae18d85 feat: 使用 uvicorn 取代 daphne 2022-11-27 05:56:53 +08:00
feng 0b802b1782 perf: navigation page 2022-11-26 19:20:04 +08:00
Bai 8a3bc51faa 解决 authentication 迁移文件冲突 2022-11-26 09:52:04 +08:00
Aaron3S 2c8f51940a feat: 修改ops api 2022-11-26 03:13:57 +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
Eric 608e0c9f26 feat: support ed25519 key 2022-11-25 18:06:22 +08:00
fit2bot 276f644794
perf: gateway (#9121) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-24 21:21:25 +08:00
Bai 99f5c02d84 perf: 获取用户授权的账号返回 has_username 字段 2022-11-24 17:04:27 +08:00
Bai 4574161009 fix: 修复获取授权规则的账号列表为空的问题 2022-11-24 16:44:15 +08:00
jiangweidong 69d8dc4bb3 perf: 增加DB_USE_SSL配置和redis配置统一 2022-11-24 16:01:26 +08:00
jiangweidong 2d86c8c843 Merge branch 'v3' of http://github.com/jumpserver/jumpserver into pr@v3@feat_support_clear_private_key 2022-11-24 15:25:17 +08:00
jiangweidong 9e41ad0764 feat: 支持账号更新界面清空存在的秘钥信息 2022-11-24 15:25:09 +08:00
Aaron3S d977013dc6 Merge remote-tracking branch 'origin/v3' into v3 2022-11-24 00:52:45 +08:00
Aaron3S fa948f7327 feat: job 增加组织限制 2022-11-24 00:50:37 +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
feng 873b81e639 perf: ticket migrate 2022-11-22 11:36:48 +08:00
Jiangjie.Bai d543c3efe7 fix: 修复 favorite-assets Serializer 缺少 protocols 字段的问题 2022-11-22 11:05:52 +08:00
feng 4b26fb3e6e fix: jms upgrade_db bug 2022-11-21 19:54:00 +08:00
jiangweidong c316ad2dbd perf: 支持sentinel开启ssl 2022-11-21 18:27:20 +08:00
feng f39a3a34e4 perf: change secret ignore secret type 2022-11-21 16:23:32 +08:00
feng 94526e44f1 perf: change secret timedelta 2022-11-21 15:18:09 +08:00
ibuler 6d5be66b5e Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-18 19:29:52 +08:00
ibuler fc1b6c9db2 pref: 修改 endpoint api 2022-11-18 19:29:19 +08:00
Aaron3S d0de36358c feat: 支持定时任务 2022-11-18 18:47:48 +08:00
feng c785225ff2 fix: es 默认存储500 2022-11-18 17:05:15 +08:00
Bai 0eb550f39b fix: flower db file 持久化存储flower信息 2022-11-18 15:36:45 +08:00
Bryan 264c97888f fix: 修复 channels-redis 库升级导致 ws 查看任务日志失败的问题; 修改 REDIS_LAYERS_HOST 变量; 修改 Channel SSL 配置项; 2022-11-18 15:25:27 +08:00
fit2bot 223814f897
perf: migrate (#9098) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-18 11:30:31 +08:00
ibuler b1bd57cd76 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-17 20:49:31 +08:00
ibuler 04ee7ee0e7 pref: 后端返回 connect types 2022-11-17 20:48:50 +08:00
Aaron3S 24ed11e2a5 feat: 运行job 支持动态参数 2022-11-17 20:10:13 +08:00
feng 49a4ceba85 perf: ticket 2022-11-17 19:20:54 +08:00
feng 543d61442c perf: ticket accounts 2022-11-17 18:04:38 +08:00
Jiangjie.Bai e629e6fb3f fix: i18n 2022-11-17 17:40:35 +08:00
halo 1b99a7e06f fix: 账户备份邮件发送找不到文件bug 2022-11-17 17:39:53 +08:00
fit2bot 71122312cf
perf: ticket optimization (#9094) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-17 17:34:52 +08:00
Eric 30f37d9ebf perf: deployment task log order by date 2022-11-17 16:39:49 +08:00
Eric ef3654ffa4 perf: update applet delopyment task 2022-11-17 16:03:26 +08:00
fit2bot 3a62abf381
perf: ticket action (#9090) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-17 15:07:23 +08:00
ibuler a42641ca9a fix: 修复 redis 连接导致的 pub sub 错误 2022-11-17 14:07:43 +08:00
halo 90c48d303e fix: celery任务时间字段差8小时问题 2022-11-17 14:06:31 +08:00
fit2bot 73c2155864
perf: ticket serializer (#9075) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-17 13:52:10 +08:00
jiangweidong 949166eaed fix: Redis哨兵切换时导致core和celery组件监听线程异常退出 2022-11-17 12:19:35 +08:00
ibuler 4591b03e17 pref: 修改 terminal methods 2022-11-17 11:46:35 +08:00
Eric 8a1a7d9e13 fix: remove unused serializer_class 2022-11-17 11:04:50 +08:00
Aaron3S 12816d49f6 Merge remote-tracking branch 'origin/v3' into v3 2022-11-17 10:50:50 +08:00
Aaron3S 43fee40c46 feat: 作业支持增加参数和执行路径超时时间等 2022-11-16 21:06:14 +08:00
ibuler e2001d7779 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-16 21:06:08 +08:00
ibuler fb653f93db pref: 修改添加 connect methods 2022-11-16 21:05:15 +08:00
Jiangjie.Bai a2b9a5cee3 fix: 修复删除数据库由于端口数量限制导致不能删除的问题 2022-11-16 21:04:12 +08:00
Jiangjie.Bai 9e80b70c12 fix: 修改用户前一文件 2022-11-16 20:48:56 +08:00
jiangweidong 2454a07d38 feat: 支持具有超级工单权限的用户申请工单可以指定申请人 2022-11-16 20:42:46 +08:00
Jiangjie.Bai ad7647c0cc fix: 修复第三方用户忘记密码页面的提示，不允许修改 2022-11-16 20:40:46 +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
Jiangjie.Bai 2a8d63e9cd Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-16 15:07:46 +08:00
Jiangjie.Bai 896b59b1bd fix: 修复获取用户收藏的资产API失败的问题 2022-11-16 15:07:35 +08:00
Aaron3S e7dde616c0 Merge remote-tracking branch 'origin/v3' into v3 2022-11-16 15:05:38 +08:00
Aaron3S 0959b55b53 perf: 优化字段名称 2022-11-16 15:04:46 +08:00
Eric 7ac9681f0d perf: asyncio ws task log 2022-11-16 14:34:56 +08:00
Jiangjie.Bai 0dec61368c Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-16 11:29:10 +08:00
Jiangjie.Bai e118ed655b perf: 优化授权规则获取用户授权的账号API 2022-11-16 11:29:02 +08:00
jiangweidong 18986bc805 perf: 增加clickhouse端口帮助文案及注释 2022-11-16 10:53:20 +08:00
ibuler e34aa0e084 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-15 19:24:14 +08:00
ibuler fd54cbc777 fix: action choices 2022-11-15 19:23:44 +08:00
fit2bot 157d81f117
fix: 翻译 (#9067) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-15 18:09:06 +08:00
Jiangjie.Bai aa9e5d2432 fix: merge v3 2022-11-15 17:50:48 +08:00
Jiangjie.Bai 3e31c9ed7f fix: 修改用户授权的资产账号 2022-11-15 17:49:28 +08:00
fit2bot 8558204450
perf: 修改工单授权过期时间 (#9065) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-15 17:30:29 +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 7061ce7c97 fix: 修改 user granted asset account 2022-11-15 16:29:31 +08:00
ibuler ed26c7f575 perf: reslove conflict 2022-11-15 16:27:56 +08:00
ibuler 7f0744961d pref: 修改 accounts 2022-11-15 16:26:18 +08:00
ibuler 73290f4ed0 pref: 修改 accounts 2022-11-15 16:24:53 +08:00
Jiangjie.Bai 0d3c5dddf9 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-15 16:08:16 +08:00
Jiangjie.Bai a5fa5fd262 fix: 修改用户授权的资产账号API 2022-11-15 16:07:42 +08:00
Eric ef637e91b9 perf: add host deployment task 2022-11-15 16:01:51 +08:00
ibuler 9d0e2b2872 pref: 修改 accounts list url 2022-11-15 15:47:32 +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
ibuler 22dd9906c7 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-15 10:43:51 +08:00
ibuler 63b32ae903 pref: 修改授权 api，去掉不用的 2022-11-15 10:43:21 +08:00
Jiangjie.Bai 83ef013708 fix: 修改 actions bit 从1开始 2022-11-14 20:25:54 +08:00
Eric d554e92d02 perf: add applets deployment 2022-11-14 19:01:18 +08:00
jiangweidong b6f86e8fb6 perf: 优化忘记密码，用户无手机号时无法使用手机号重置密码 2022-11-14 18:01:07 +08:00
fit2bot 7280c6726e
fix: 删除用户 record 500 (#9058) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-14 17:00:10 +08:00
Jiangjie.Bai 6f135c34c1 fix: 修复测试邮箱服务器字段为null的问题 2022-11-14 16:24:05 +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 6411642ced perf: 优化操作日志一些内容 2022-11-14 09:50:42 +08:00
jiangweidong 791b175465
perf: 优化找回密码页面 (#9045) 
* perf: 优化找回密码页面

* perf: 优化找回密码操作页面
 2022-11-14 09:48:55 +08:00
jiangweidong d29e8317e5 feat: 添加操作日志ES默认的配置信息 2022-11-14 09:40:12 +08:00
jiangweidong a868751edd perf: 补充reids ssl配置项 2022-11-14 09:40:12 +08:00
jiangweidong e03f49e52b perf: 添加Redis哨兵配置的默认值 2022-11-14 09:40:12 +08:00
Aaron3S 0044f11262 feat: 执行adhoc和playbook 2022-11-11 19:20:17 +08:00
fit2bot b100bbf838
perf: change secret (#9048) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-11 19:15:43 +08:00
Eric 8b351f49e5 perf: update applet host deployment 2022-11-11 18:16:11 +08:00
ibuler 3abf2592d1 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-11 17:29:03 +08:00
ibuler 9c5b3a03c6 pref: 优化 permission actionss 2022-11-11 17:28:13 +08:00
fit2bot cb82b53791
perf: automation celery task (#9046) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-11 16:13:16 +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
fit2bot cd3c3eeaf2
perf: code (#9044) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-10 19:11:56 +08:00
Eric 5494d2fd60 perf: update applet host deploy 2022-11-10 18:20:39 +08:00
feng f3c90c6bbd perf: login mfa style 2022-11-10 17:38:10 +08:00
jiangweidong ac6ffb24ee feat: 云资产同步支持选择IP类型-补充翻译 2022-11-10 17:35:16 +08:00
jiangweidong 6f3ae4f73f perf: 修改Redis哨兵配置参数名称 2022-11-10 17:13:46 +08:00
fit2bot 1345998acd
perf: download add open ssh (#8886) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-11-10 16:00:06 +08:00
feng ba3f2099e6 perf: audits 2022-11-10 14:44:23 +08:00
ibuler 644f3f1783 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-09 20:59:28 +08:00
ibuler 1ffcf8f39c pref: 修改授权规则 2022-11-09 20:58:45 +08:00
feng 2f611009dc perf: acl 2022-11-09 20:51:43 +08:00
feng becb10a453 perf: changr secret record api 2022-11-09 18:31:35 +08:00
jiangweidong be875638ed Merge branch 'v3' of https://github.com/jumpserver/jumpserver into pr@v3@feat_db_automations 2022-11-09 18:23:10 +08:00
jiangweidong 8e2c048f0c feat: 支持Oracle、MongoDB、SQLServer数据库的自动化脚本部分功能 2022-11-09 18:23:00 +08:00
fit2bot a5cef74356
perf: serializer (#9034) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-09 18:15:21 +08:00
Eric 1b2eda51e3 perf: get host applet by name 2022-11-09 16:14:25 +08:00
feng cf4744791a fix: automation execution bug 2022-11-09 15:55:48 +08:00
feng 3b4e388ed0 perf: gather account api adjustment 2022-11-09 15:42:21 +08:00
fit2bot 6ef5154d4d
fix: swagger (#9031) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-09 13:34:29 +08:00
ibuler 2d479d1ffa Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-09 11:44:38 +08:00
ibuler 71846241ae pref: 优化授权 api 返回字段 2022-11-09 11:43:55 +08:00
fit2bot 0ff8758ea8
perf: gather account automation api (#9029) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-08 20:33:55 +08:00
ibuler d040b4cfe0 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-08 19:19:28 +08:00
ibuler 5730265183 pref: 修改 account secret_type 类型 2022-11-08 19:18:04 +08:00
fit2bot ce9ebd94ec
perf: change secret automation api (#9028) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-08 17:54:51 +08:00
Eric e69bb9f83e perf: applet host accounts should be inactive by default 2022-11-08 17:54:04 +08:00
Jiangjie.Bai 5e52d04df3 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-08 14:30:16 +08:00
Jiangjie.Bai cd93de4c00 perf: 优化 Connection Token API 逻辑处理 2022-11-08 14:30:07 +08:00
ibuler ba38771d1a perf: 修改 applets related 2022-11-08 13:55:06 +08:00
ibuler df14d01859 pref: 修改信号创建 accounts 2022-11-08 10:41:06 +08:00
ibuler 2e784311d3 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-07 20:41:55 +08:00
ibuler afe6c8ebbd pref: 修改 applet host api 2022-11-07 20:41:18 +08:00
Eric 43e1417a25 perf: update tinker playbook 2022-11-07 19:18:12 +08:00
feng a13527c5c8 perf: platform charset 2022-11-07 19:17:02 +08:00
Jiangjie.Bai 6812cbe314 perf: 优化优先使用系统设置中的 rdp_resolution 配置 2022-11-07 18:47:06 +08:00
feng b4f511a7ff perf: account backup 2022-11-07 17:01:28 +08:00
fit2bot 1cc983b2eb
perf: automation button (#9023) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-07 16:10:26 +08:00
ibuler 2705c38ba1 pref: 添加命令启动失败 debug 2022-11-07 10:47:06 +08:00
ibuler 045bc3661a Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-04 20:16:29 +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
fit2bot dca92a1e04
perf: push account (#9020) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-04 19:18:15 +08:00
Jiangjie.Bai a255bd21b4 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-04 18:47:00 +08:00
Jiangjie.Bai 5447ee6c39 feat: 修改获取用户-资产授权的账号列表目录结构; 2022-11-04 18:46:49 +08:00
Jiangjie.Bai 3bba8e4043 fix: 修改翻译文件 2022-11-04 15:50:38 +08:00
Jiangjie.Bai 8abf954015 fix: 处理一波迁移文件 2022-11-04 15:36:45 +08:00
Jiangjie.Bai 1a77dc44cd fix: django.mo 2022-11-04 15:00:58 +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
ibuler 037cd90f09 pref: 修改 migrations 2022-11-04 13:29:28 +08:00
ibuler fbf65f437a merge: with merge remote 2022-11-04 11:43:34 +08:00
jiangweidong 262d070f3c feat: 支持纳管 clickhouse[Web Terminal] 2022-11-04 11:41:54 +08:00
ibuler 30106bdbbb perf: 修改组件状态 2022-11-04 11:40:16 +08:00
feng 1981bdd3ac perf: account serializer 2022-11-04 11:39:34 +08:00
feng 8b05bc4b82 perf: 多节点发送文件失败 2022-11-04 11:15:34 +08:00
feng e995e3b35a perf: change secret adjustment 2022-11-04 11:09:56 +08:00
jiangweidong 04cda3da0b feat: 云同步支持金山云 2022-11-04 11:09:02 +08:00
fit2bot ebfc3b7b38
perf: change secret (#9014) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-03 22:39:48 +08:00
Eric 7560a5cd1f perf: deploy applet host 2022-11-03 18:03:46 +08:00
Jiangjie.Bai ba1ce5fadb Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-03 16:58:41 +08:00
fit2bot 54f92e100e
perf: account backup (#9013) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-03 16:57:34 +08:00
ibuler b0ae9b47ca pref: 修改 applet host 2022-11-03 16:55:38 +08:00
Jiangjie.Bai 340d39d7f7 feat: 添加授权给用户所有账号列表的API 2022-11-03 16:41:51 +08:00
Eric 4bf147a93f perf: add remote app installer 2022-11-03 15:11:20 +08:00
feng 7087d5a74e perf: account specific 2022-11-03 12:42:57 +08:00
feng 0fdc30bed3 perf: account 2022-11-02 20:36:40 +08:00
ibuler 9b3b3d09da Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-02 20:36:28 +08:00
ibuler 0d2bfaa768 pref: 添加 applet host actions 2022-11-02 20:33:27 +08:00
feng 651c7ca152 perf: playbook specific 2022-11-02 19:25:39 +08:00
ibuler cb57ae104b Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-02 19:07:17 +08:00
ibuler 23e44c49b5 pref: 修改 applet deployments 2022-11-02 19:07:07 +08:00
Eric ab6ffda435 perf: terminal status 2022-11-02 19:06:08 +08:00
feng 0c259730ca perf: del surplus code 2022-11-02 17:45:30 +08:00
fit2bot 697b3fb860
perf: 自动化按钮 (#9008) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-02 17:27:47 +08:00
ibuler 956367cfed pref: applet detail api 支持 slug name 2022-11-02 15:01:52 +08:00
ibuler f6fe673b28 perf: 修改 applet publications 2022-11-02 14:13:45 +08:00
ibuler c8881d56ea pref: 修改 applets api 2022-11-02 11:08:13 +08:00
ibuler 60d07cb3e1 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-01 20:37:53 +08:00
ibuler 6ba4b750f2 perf: 修改 publications 2022-11-01 20:37:04 +08:00
Jiangjie.Bai 792686d7ae Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-01 19:55:59 +08:00
Jiangjie.Bai 0728868af2 feat: 添加API获取授权规则授权的所有账号列表 2022-11-01 19:55:49 +08:00
feng 0e5ebfad1c perf: gather asset info and test asset connectivity 2022-11-01 19:37:50 +08:00
Eric 1c9f754e27 perf: applet 添加 setup.yml 校验 2022-11-01 19:06:35 +08:00
ibuler b159f16513 pref: 添加 applet download 2022-11-01 18:40:42 +08:00
jiangweidong 1951c595ed fix: 修改数据类型 2022-11-01 17:07:52 +08:00
jiangweidong c74584f63c fix: Redis Sentinel参数类型问题，导致报错 2022-11-01 17:07:52 +08:00
ibuler 3bacd626e8 pref: 基本完成部署 2022-11-01 17:04:44 +08:00
ibuler 52662252a8 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-01 16:19:41 +08:00
ibuler e6d845ae55 fix: 修复空库 migrate 的问题 2022-11-01 16:18:46 +08:00
feng 8231f727c2 perf: history account 2022-11-01 15:04:13 +08:00
jiangweidong c295f44d9c perf: 支持部署在开启认证的Redis Sentinel 2022-11-01 14:55:33 +08:00
Jiangjie.Bai 0c15ac71f6 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-01 14:46:48 +08:00
Jiangjie.Bai 5c9d744094 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-01 14:30:56 +08:00
ibuler c9b8c087c7 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-01 11:53:51 +08:00
ibuler cf81f08b7a perf: 优化部署 host 2022-11-01 11:52:51 +08:00
feng 796758cbb2 perf: histories account 2022-11-01 11:43:29 +08:00
Jiangjie.Bai 2797baa4e5 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-10-31 20:16:21 +08:00
Aaron3S 41ee6a64bd Merge remote-tracking branch 'origin/v3' into v3 2022-10-31 19:29:50 +08:00
Aaron3S 5fa852c61d fix: 删除不管用的序列化字段 2022-10-31 19:28:15 +08:00
feng 5bd40fcd22 fix: swagger 2022-10-31 19:27:45 +08:00
Jiangjie.Bai a5244ee68f Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-10-31 18:50:14 +08:00
Jiangjie.Bai 81e3809435 refactor: 修改 ConnectionToken API 结构 2022-10-31 18:47:12 +08:00
feng 4f2250b7a8 perf: gather account windows 2022-10-31 18:32:07 +08:00
feng 094e144a51 perf: history secret 2022-10-31 17:37:54 +08:00
jiangweidong ead824a03c feat: 支持部署在Redis哨兵集群上 2022-10-31 14:34:53 +08:00
ibuler 8df15cb564 fix: 修复饮用 2022-10-31 14:29:42 +08:00
ibuler db07cadd6e merge: with rmote 2022-10-31 11:22:47 +08:00
ibuler d123c7f105 pref: 修改执行部署 2022-10-31 10:57:19 +08:00
feng a11770e96d fix: automiation 2022-10-31 10:42:12 +08:00
ibuler 16e3604fcb merge: with remote 2022-10-28 19:12:37 +08:00
ibuler f5fd674f08 pref: 修改 v3 2022-10-28 19:10:19 +08:00
feng 121ba1df07 perf: automations push ping verify 2022-10-28 18:34:12 +08:00
ibuler 12b74093e2 pref: 修改 applet host deploy 2022-10-28 18:19:44 +08:00
Eric 8f9eb64c8d perf: update playbook.yml 2022-10-28 17:32:47 +08:00
halo 50be7c6fc8 fix: rdp客户端拉起后窗口标题中文乱码 2022-10-28 16:29:28 +08:00
吴小白 85574b43ee perf: update playbook.yml 2022-10-28 16:28:55 +08:00
ibuler 994a484adb Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-10-28 16:26:00 +08:00
ibuler 084dcc7b44 pref: 修改 inventory 2022-10-28 16:25:16 +08:00
Jiangjie.Bai bcd1d5585b refactor: ConnectionToken 修改 Model 和序列类 2022-10-28 15:58:05 +08:00
Jiangjie.Bai 2b5b4ad605 refactor: ConnectionToken 修改表字段名称 account -> account_username 2022-10-28 15:01:17 +08:00
ibuler bd9afaba1e Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-10-27 20:24:01 +08:00
ibuler a9eb4fa7dd pref: 修改 applet 2022-10-27 20:20:40 +08:00
Jiangjie.Bai c80ef1afb1 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-10-27 20:06:27 +08:00
Jiangjie.Bai 3d616b01b0 refactor: ConnectionToken 添加 protocol 字段 2022-10-27 20:01:50 +08:00
Aaron3S 53b0041b09 feat: celery task api 2022-10-27 19:25:48 +08:00
Aaron3S da911651aa feat: celery task api 2022-10-27 19:23:15 +08:00
feng 4ab14b4a59 perf: migrat 2022-10-27 19:08:51 +08:00
feng 2355d1af83 perf: gather accounts 2022-10-27 18:53:10 +08:00
ibuler 097ebc2362 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-10-27 18:34:34 +08:00
ibuler c0540e6787 pref: 修改 celery 2022-10-27 18:34:25 +08:00
Jiangjie.Bai bb01a60fc1 refactor: 修改 authentication models 目录 2022-10-27 17:20:31 +08:00
Jiangjie.Bai e4d372be32 fix: 修改默认组织 builtin 字段处理问题 2022-10-27 16:49:22 +08:00
ibuler 28f4905a81 pref: 修改 applet host 2022-10-27 16:26:15 +08:00
Jiangjie.Bai 5d37d1b7b1 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-10-27 15:48:02 +08:00
Jiangjie.Bai a260da6cec refactor: 修改 ConnectionToken 关联的逻辑(1) 2022-10-27 15:47:05 +08:00
ibuler 1239247b5a pref: 修改删掉 connection token type 2022-10-26 17:56:37 +08:00
ibuler 8f88b898d0 pref: 修改 migrations 2022-10-26 17:38:32 +08:00
ibuler 651228795e pref: 修改 migrations 2022-10-26 17:25:57 +08:00
ibuler c55f068258 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-10-26 17:22:39 +08:00
ibuler 99e4836311 pref: 添加 deploy playbook 2022-10-26 17:21:52 +08:00
Aaron3S 3977b81ea1 Merge remote-tracking branch 'origin/v3' into v3 2022-10-26 17:20:55 +08:00
Jiangjie.Bai bd001bb262 refactor: 修改 ConnectionToken 表结构 2022-10-26 16:16:12 +08:00
Jiangjie.Bai fb6f51b9cb merge: dev 2022-10-26 16:15:22 +08:00
Jiangjie.Bai 13279c9d2a refactor: 修改 ConnectionToken 表结构 2022-10-26 16:09:07 +08:00
Aaron3S 77436724b4 Merge remote-tracking branch 'origin/v3' into v3 2022-10-25 20:10:06 +08:00
ibuler e327c97170 pref: 修改迁移文件 2022-10-25 20:09:05 +08:00
Aaron3S c10d7f554e Merge remote-tracking branch 'origin/v3' into v3 2022-10-25 20:05:47 +08:00
Aaron3S e7a114a31d feat: celery 任务api 2022-10-25 20:02:23 +08:00
ibuler c018055d5f pref: 修改migrations 2022-10-25 19:58:14 +08:00
ibuler 350c9e4a80 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-10-25 19:38:40 +08:00
ibuler 82aca6b843 pref: 修改 applet 2022-10-25 19:31:13 +08:00
Jiangjie.Bai 11eb505c78 refactor: 修改 ConnectionToken 表结构 2022-10-25 19:10:12 +08:00
Jiangjie.Bai 901270e6ad Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-10-25 18:45:33 +08:00
Jiangjie.Bai 6ed946541d merge: local 2022-10-25 18:45:13 +08:00
feng 4dd4c29e12 perf: gather facts 2022-10-25 18:43:34 +08:00
Aaron3S 2509b801c6 Merge remote-tracking branch 'origin/v3' into v3 
# Conflicts:
#	apps/rbac/const.py
 2022-10-25 18:09:26 +08:00
feng a445e47f3d perf: account add platform_id 2022-10-25 15:07:51 +08:00
feng d95ced5109 fix: 修复change account perm 问题 2022-10-25 14:26:56 +08:00
ibuler 8fd6cabcab Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-10-25 13:00:20 +08:00
ibuler 5606082ca3 pref: 添加 applet 创建 api 2022-10-25 12:57:34 +08:00
feng f743dea1fd perf: mysql postgresql 2022-10-24 20:24:56 +08:00
Aaron3S 64e03a4412 feat: 增加异步任务api 2022-10-24 20:14:18 +08:00
ibuler 1372d6322d perf: 合并代码 2022-10-22 11:37:51 +08:00
ibuler 943b130035 feat: 添加远程应用 2022-10-22 11:17:02 +08:00
feng 64daacce63 fix: 修复自动化修改密码bug 2022-10-21 18:19:09 +08:00
feng 091bffa626 perf: automation change secret linux 2022-10-21 11:24:05 +08:00
ibuler 3e7004d784 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-10-20 20:35:34 +08:00
ibuler c6dfc06003 perf: 修改翻译 2022-10-20 20:34:44 +08:00
feng 7255cf68a9 perf: automation change secret linux 2022-10-20 20:34:15 +08:00
ibuler 168de45da5 pref: 优化 device api 2022-10-20 20:06:58 +08:00
Jiangjie.Bai 104dd9721b perf: 优化smart匹配数据库端口数量失败时的错误提示信息 2022-10-20 17:38:15 +08:00
Jiangjie.Bai cdcfdeefc5 perf: 优化smart匹配数据库端口数量失败时的错误提示信息 2022-10-20 17:38:15 +08:00
ibuler a450ceee91 pref: 修改 migrations 名称 2022-10-20 16:44:15 +08:00
ibuler ef04e6ffcc Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-10-20 16:39:55 +08:00
ibuler c55d3c0b6c perf: 添加 histories 2022-10-20 16:39:11 +08:00
Jiangjie.Bai c6a3a141bb perf: 优化Magnus Ports端口映射配置项 2022-10-19 20:14:20 +08:00
feng 26278cc9e0 perf: change secret automation 2022-10-19 18:58:45 +08:00
ibuler 1a2193d091 perf: 资产 api 返回特有属性 2022-10-19 18:56:46 +08:00
Jiangjie.Bai 93e5a0ba5c fix: 修改初始化 DB Port Mapper 时的日志输出 2022-10-19 17:54:10 +08:00
ibuler eb16e3c7cb perf: 修改翻译 2022-10-19 14:56:27 +08:00
ibuler 076afb2b8b pref: 修改 automations 2022-10-19 11:39:11 +08:00
ibuler d6e36c873d pref: 修改 filter 2022-10-19 10:21:05 +08:00
ibuler 8c92a9934b Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-10-18 20:38:03 +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
Jiangjie.Bai 152749c872 refactor: 重构资产授权工具、资产授权账号工具类;删除Model中的处理逻辑;增加用户组、资产授权账号的获取方式 2022-10-18 16:42:32 +08:00
Jiangjie.Bai 2c04ad6465 refactor: 重构资产授权工具、资产授权账号工具类 2022-10-18 16:04:45 +08:00
Jiangjie.Bai c41e0148d9 refactor: 重构资产授权工具、资产授权账号工具类 2022-10-18 15:21:44 +08:00
fit2bot 33860bb955
fix: 修复资产详情 查看授权用户500问题 (#8963) 
Co-authored-by: 小冯 <xiaofeng@xiaofengdeMacBook-Pro.local>
 2022-10-18 10:51:51 +08:00
feng 1b795791de fix: swagger 500 2022-10-18 10:43:51 +08:00
feng 4f16c1f92c fix: account init 500 2022-10-17 17:56:19 +08:00
ibuler 6a33129349 pref: 完成收集资产信息任务 2022-10-17 11:22:21 +08:00
ibuler 4e8e4e4bb7 pref: 修改添加 gather facts 2022-10-14 19:40:51 +08:00
ibuler 10c0cc7abf Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-10-14 19:01:15 +08:00
ibuler 75ec9d4173 perf: 添加 gather facts automation 2022-10-14 18:59:28 +08:00
Jiangjie.Bai 6a32ac4699 refactor: 继续授权添加授权账号工具 2022-10-14 17:53:54 +08:00
Jiangjie.Bai c79c3f8aec Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-10-14 17:01:44 +08:00
Jiangjie.Bai 0e67739173 refactor: 授权添加授权账号工具，实现获取授权用户某个资产账号的功能 2022-10-14 17:01:36 +08:00
ibuler 37d845390b Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-10-14 16:34:14 +08:00
ibuler 4e2aebde6c perf: 修改改密 2022-10-14 16:33:24 +08:00
Jiangjie.Bai 2d893c4a6a refactor: 获取授权规则授权的所有账号对象 2022-10-14 14:56:38 +08:00
Jiangjie.Bai 18e525c943 fix: 修改命令过滤器权限 2022-10-14 10:58:06 +08:00
ibuler f2f75add8e Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-10-13 20:36:42 +08:00
ibuler 0a65b9de8e perf: 重构 playbook base runner 2022-10-13 20:28:18 +08:00
Jiangjie.Bai 0f8668fee9 refactor: 删除资产授权Model中不使用的方法 2022-10-13 20:14:04 +08:00
Jiangjie.Bai 8fdd89e67c fix: 修复初始化DB port mapper的逻辑 2022-10-13 19:01:09 +08:00
Jiangjie.Bai d52baf0af5 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-10-13 18:19:56 +08:00
Jiangjie.Bai b74ec48393 refacotr: 拆分授权模块的目录结构 2022-10-13 18:19:18 +08:00
ibuler 52fb55e806 pref: 修改改密 2022-10-13 17:52:25 +08:00
ibuler 8c91cd7eb6 perf: 修改改密 2022-10-13 17:47:29 +08:00
“huailei000” 3bd7410ab8 perf: update jquery 2022-10-13 14:44:36 +08:00
ibuler 85a6f29a0a perf: 修改 playbook 任务执行 2022-10-12 18:08:57 +08:00
Jiangjie.Bai 188a2846ed fix: 修复 OAuth2 用户本地被禁用后,页面一直跳转的问题. 2022-10-11 18:46:05 +08:00
Jiangjie.Bai df99067ee3 perf: 删除消息订阅时 websocket 重连的 redis 断开日志 2022-10-11 16:40:12 +08:00
feng626 22e211625e fix: platform 500 2022-10-11 10:50:39 +08:00
ibuler 21816e3a39 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-10-10 20:56:55 +08:00
ibuler 9198c93fcf perf: 修改 ansible change password 2022-10-10 20:56:13 +08:00
feng626 6e0d211645 perf: automation migrate 2022-10-10 17:08:06 +08:00
ibuler 1d757ec19a pref: 修改改密 2022-10-10 16:56:32 +08:00
ibuler 9a0bae5bfd perf: 修改 ansible 执行 2022-10-10 16:56:32 +08:00
ibuler 4e5a7a0a25 perf: 修改改密 2022-10-10 16:56:32 +08:00
ibuler f921f12171 perf: 修改 adhoc 2022-10-10 16:56:32 +08:00
ibuler a543a2ee37 perf: 基本完成 adhoc runner 2022-10-10 16:56:32 +08:00
ibuler 0fb4b52232 perf: 修改 ansible 表结构 2022-10-10 16:56:32 +08:00
ibuler df5e63b3be perf: 修改 ansible 逻辑 2022-10-10 16:56:32 +08:00
ibuler 41589c5305 perf: 修改 ansible 2022-10-10 16:56:32 +08:00
feng626 ca17faaf01 fix: 修复创建工单无备注信息bug 2022-10-10 16:55:56 +08:00
Jiangjie.Bai cd847c483a Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-10-10 16:31:55 +08:00
Jiangjie.Bai 145814f1e8 perf: 统一后台定时任务的crontab表达式, 对于后台定时执行的任务更加清晰 2022-10-10 16:31:45 +08:00
feng626 e330776ab1 fix: ticket nothing comment bug 2022-10-10 15:17:51 +08:00
feng626 a487d30001 perf: 密码首位不包含特殊字符 2022-10-09 20:21:26 +08:00
Jiangjie.Bai fae5d07df6 feat: 优化命令过滤器支持关联节点; 2022-10-09 19:53:34 +08:00
Jiangjie.Bai df31f47c68 feat: 命令过滤器支持关联节点; 添加端点规则迁移文件 2022-10-09 19:01:11 +08:00
feng626 cd98ec4cac perf: account history record only secret 2022-10-09 17:52:41 +08:00
Jiangjie.Bai 237e7b22fb feat: 优化账号actions设置逻辑 2022-09-30 16:28:44 +08:00
Jiangjie.Bai 881c0a6042 feat: 修复获取用户授权的资产账号列表 2022-09-30 16:08:28 +08:00
Jiangjie.Bai 79a21bbc08 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-09-29 20:42:08 +08:00
Jiangjie.Bai 14f48c459c feat: 授权规则创建 2022-09-29 20:41:40 +08:00
feng626 b2991362f1 perf: 查看用户授权 2022-09-29 18:01:23 +08:00
Jiangjie.Bai 76747642c4 feat: 删除授权模块中关于系统用户的API 2022-09-29 17:38:27 +08:00
Jiangjie.Bai fd0ce0d1c6 feat: 添加一些注释信息 2022-09-29 16:36:28 +08:00
Jiangjie.Bai ba3af280d5 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-09-29 16:18:20 +08:00
Jiangjie.Bai 4a1aeefb82 feat: 完成用户、用户组对于授权账号的API获取 2022-09-29 16:18:12 +08:00
feng626 ec0c334acc perf: account search 2022-09-29 14:44:27 +08:00
feng626 da35e931a2 perf: 更新平台username passwd submit selector可为空 2022-09-29 14:19:14 +08:00
Jiangjie.Bai 15c8c035aa Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-09-28 18:47:44 +08:00
Jiangjie.Bai 351d3b297d fix: 修复用户授权资产账号API及Model处理逻辑 2022-09-28 18:40:33 +08:00
Jiangjie.Bai 65269db849 fix: 修复es存储失效时，会话命令列表页面报错的问题 2022-09-28 17:03:22 +08:00
Jiangjie.Bai df2858470a fix: 修复命令存储es失效时, 会话、命令记录列表创建和查看失败的问题 2022-09-28 17:03:22 +08:00
ibuler 2a9613d90a perf: 修改 asset serializer 2022-09-28 12:10:39 +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 308d87d021 feat: 增加PIICO设备配置项 2022-09-26 14:40:48 +08:00
Aaron3S db04f6ca18 feat: 增加国密配置项 2022-09-26 14:40:48 +08:00
Aaron3S a7cd0bc0fe fix: 修复密码后空格的问题 2022-09-26 14:39:15 +08:00
ibuler 00e1dd6996 fix: remote gateway filter address 2022-09-26 11:01:21 +08:00
ibuler 6ed3b51928 perf: 优化 serailizer 统一到 drf 目录中 2022-09-26 10:43:18 +08:00
ibuler f223cf43cc Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-09-23 19:00:09 +08:00
ibuler 234acd6317 perf: 修改 accounts 2022-09-23 18:59:19 +08:00
Jiangjie.Bai 399c6285f8 feat: 获取 用户、资产授权的所有账号API, 返回@INPUT、@USER等内部账号 2022-09-23 15:59:37 +08:00
Jiangjie.Bai 65b942ffa4 feat: 修改 Permission filter 方法名 2022-09-23 14:45:09 +08:00
ibuler 286d0e4ac1 perf: 修改 migrations 2022-09-23 10:53:44 +08:00
ibuler 3a884388cd perf: 修改名称 2022-09-23 10:38:28 +08:00
ibuler 8f31a25fda perf: 优化迁移文件 2022-09-23 10:15:07 +08:00
Jiangjie.Bai 24708a6c5e feat: 优化 端口范围显示为 30000-30999 2022-09-22 19:23:39 +08:00
Jiangjie.Bai 55a10a8d1d feat: 优化 DBPortManger 处理 port 的数据类型 2022-09-22 19:23:39 +08:00
Jiangjie.Bai 32b6a1f1a4 feat: 修改翻译信息 2022-09-22 19:23:39 +08:00
Jiangjie.Bai c1c70849e9 feat: 修改 DBPortMapper 异常处理问题; DBListenPort API 迁移至 terminal app 中 2022-09-22 19:23:39 +08:00
Jiangjie.Bai 7a6ed91f62 feat: 添加翻译信息 2022-09-22 19:23:39 +08:00
Jiangjie.Bai 497a52a509 feat: 修改 DBPortManager 处理逻辑 2022-09-22 19:23:39 +08:00
Jiangjie.Bai 57e12256e7 feat: 修改 Endpoint 获取 Manugs DB listen port 的逻辑 2022-09-22 19:23:39 +08:00
Jiangjie.Bai b8ec60dea1 feat: 优化 DB Listen Port 映射规则逻辑 2022-09-22 19:23:39 +08:00
Jiangjie.Bai c9afd94714 feat: 优化 DB Listen Port 映射规则逻辑 2022-09-22 19:23:39 +08:00
Jiangjie.Bai a0c61ab8cb feat: 增加 DB Listen Port 映射规则 2022-09-22 19:23:39 +08:00
ibuler a35e0c5efa perf: 创建内置 platforms 2022-09-22 16:39:41 +08:00
ibuler 68ed3ac1a8 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-09-22 15:25:12 +08:00
ibuler cc859f302a perf: 优化 asset migrations 2022-09-22 15:24:32 +08:00
feng626 33948d614b perf: ip -> address 2022-09-22 15:14:55 +08:00
ibuler 21a60bf55e perf: change cateogory data strucature 2022-09-21 20:13:28 +08:00
ibuler ea1cb158b5 perf: add charset control 2022-09-21 19:03:06 +08:00
feng626 567b62516a fix: reset ssh url problem 2022-09-21 18:35:06 +08:00
feng626 ffdb3f3b83 perf: ticket 2022-09-21 18:34:51 +08:00
吴小白 404fadd899 fix: 修复 redis 异常后 celery 旧任务不执行的问题 2022-09-21 18:33:35 +08:00
ibuler ee1ec6aeee fix: 修复 celery 丢失心跳不会重连的问题 2022-09-21 18:33:35 +08:00
ibuler 584ce0afe3 perf: 修改迁移文件 2022-09-21 13:42:12 +08:00
ibuler 1b0195cb82 perf: 修改 asset 结构 2022-09-21 11:17:14 +08:00
ibuler cf5c50b343 perf: 优化平台协议 2022-09-20 21:19:05 +08:00
ibuler 79ce1215f5 merge: with remote branch 2022-09-20 17:47:40 +08:00
ibuler d0999dd1ef perf: 优化平台创建约束 2022-09-20 17:33:15 +08:00
feng626 615f36c6f6 perf: 收集账号 2022-09-20 16:18:23 +08:00
ibuler 8c72bab82d perf: 优化 account 结构 2022-09-20 13:54:25 +08:00
ibuler 9e84989bbe merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-09-19 20:12:23 +08:00
ibuler 5d48d1ab15 perf: stash it 2022-09-19 20:11:55 +08:00
feng626 7b4c2ce97e perf: xpack problem 2022-09-19 19:04:57 +08:00
feng626 108ccf5a8b perf: 账号管理api 2022-09-19 17:00:03 +08:00
ibuler 762d84b5c3 merge: with remote 2022-09-19 09:59:43 +08:00
ibuler fa28bfc659 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-09-19 09:55:41 +08:00
ibuler b50d28ff9c perf: 暂存修改 2022-09-19 09:52:09 +08:00
ibuler 65331e13ac pref: 优化平台 2022-09-19 00:07:59 +08:00
Quentin Machu 61ff3db0f1 fix: address issue #8287 with blank SAML's RelayState 2022-09-16 13:51:40 -04:00
feng626 389094f615 perf: 账号备份 2022-09-16 17:24:27 +08:00
ibuler a86d5c1456 perf: 修改 models 2022-09-16 11:45:50 +08:00
ibuler 1d1b252e58 perf: 解决冲突 2022-09-15 21:23:00 +08:00
ibuler 9b2acfe4a4 perf: 优化平台 2022-09-15 21:20:56 +08:00
feng626 a4d0ef3706 perf: verify ansible linux 2022-09-15 21:14:14 +08:00
feng626 139540fafe perf: 修改change password linux ansible yaml 2022-09-15 19:53:26 +08:00
ibuler e0e14a2fe1 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-09-15 16:44:29 +08:00
ibuler 9edd786bb4 perf: 修改 platform 表结构 2022-09-15 16:22:01 +08:00
Jiangjie.Bai f86d045c01 fix: 更新翻译 2022-09-15 16:12:12 +08:00
Jiangjie.Bai 572f03d844 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-09-15 10:47:05 +08:00
Jiangjie.Bai d23446016d refactor: 添加授权相关的获取资产账号API、Model method 2022-09-15 10:46:57 +08:00
ibuler 37bbf75f66 perf: 修改数据库迁移文件 2022-09-14 20:55:14 +08:00
jiangweidong 305a1b10ed feat: 补充翻译 2022-09-14 20:43:21 +08:00
fit2bot 8c277e8875
fix: 修复mfa失效日期 失效问题 (#8862) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-09-14 16:17:51 +08:00
ibuler ae189ebdfe perf: 修改 account serializer 2022-09-13 21:18:04 +08:00
ibuler 4fcbdfa3f4 perf: 优化 account 添加 name 2022-09-13 21:07:20 +08:00
fit2bot 5e16b6387a
fix: 修复配置mfa失效日期 失效问题 (#8856) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-09-13 17:20:09 +08:00
ibuler c1ad072736 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-09-13 16:39:49 +08:00
Jiangjie.Bai a2c006f01b perf: 整理用户授权资产的API 2022-09-13 15:41:39 +08:00
feng626 93e1adf376 perf: 工单新增相关过滤 2022-09-13 15:28:46 +08:00
jiangweidong 556bd3682e feat: 支持对开启SSL/TLS的MongoDb数据库改密 2022-09-13 15:27:54 +08:00
ibuler 6bbbe312a2 perf: 优化加密，没有rsa则不加密 2022-09-13 15:27:20 +08:00
Jiangjie.Bai 4a21f86cd1 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-09-13 14:23:35 +08:00
ibuler 9a734e7069 perf: 修改结构 2022-09-13 14:06:25 +08:00
ibuler 3e794ec41a perf: 修改 serializer 2022-09-13 10:41:49 +08:00
ibuler 6bf7f7cb48 perf: 修改 migrations 2022-09-09 19:17:25 +08:00
ibuler 910eaf1228 perf: 修改 web 表结构 2022-09-09 19:07:45 +08:00
fit2bot 1ac64db0ba
fix: 修复账号备份失败问题 (#8852) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-09-09 16:01:08 +08:00
ibuler f6fdc258b1 perf: 修改 playbook 目录结构 2022-09-09 15:47:40 +08:00
ibuler 894f153638 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-09-09 11:00:18 +08:00
ibuler aed7b32d6c perf: 修改 assets api 2022-09-09 11:00:09 +08:00
Jiangjie.Bai 6f71989553 perf: 下一步整理授权模块所有 API 的继承关系 2022-09-08 20:46:56 +08:00
Jiangjie.Bai da772b572a fix: 授权 API 顺序整理 2022-09-08 20:31:57 +08:00
ibuler 25bded69ab perf: 修改平台和资产 2022-09-08 20:31:04 +08:00
jiangweidong fa54a98d6c fix: 修复华为短信配置错误，前端提示不对的问题 2022-09-08 18:55:01 +08:00
halo 697270e3e6 perf: 优化清理任务偶发错误 2022-09-08 15:40:23 +08:00
Jiangjie.Bai ca6b8ee960 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-09-08 10:43:29 +08:00
ibuler 706488d293 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-09-08 10:04:32 +08:00
ibuler 50cf40eaeb perf: 完美解决 accounts 创建 2022-09-07 20:24:48 +08:00
ibuler e9bb5223eb perf: 修改 platforms 2022-09-07 20:01:04 +08:00
feng626 b910180a12 自动化策略 表 2022-09-07 19:49:42 +08:00
Jiangjie.Bai 746c6e4242 fix: 修改资产、授权创建时的小问题 2022-09-07 18:33:34 +08:00
halo 56c324b04e perf: utf-8编码忽略报错 2022-09-07 17:50:34 +08:00
Jiangjie.Bai f633a50f8e Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-09-07 17:36:24 +08:00
Jiangjie.Bai a27aeca2fd refactor: 修改授权相关Model,Serializer,API结构 2022-09-07 17:35:23 +08:00
ibuler 56abf0da23 pref: 修改平台协议配置 2022-09-07 17:12:53 +08:00
jiangweidong 984b94c874
perf: 修改数据库应用ssl相关字段名 (#8840) 
* 修改变量名

* 修改变量名
 2022-09-07 16:08:37 +08:00
jiangweidong 50df7f1304 perf: 支持连接开启ssl且自签证书的db时 2022-09-07 11:23:18 +08:00
ibuler 585ce6b46a perf: 修改表结构 2022-09-06 19:57:03 +08:00
jiangweidong 409d254a2e feat: 支持MFA可配置华为云平台短信对接 2022-09-06 15:48:33 +08:00
halo e6d30fa77d perf: telnet系统工具输出使用utf-8编码 2022-09-06 14:59:16 +08:00
jiangweidong b25404cac1 feat: 支持OAuth2协议自定义注销功能 2022-09-06 14:58:48 +08:00
feng626 ef4cc5f646 perf: 优化账号备份 2022-09-06 14:40:59 +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 0011823789 perf: 去掉 pymysql, mysqlclie已支持 m1 2022-09-05 20:06:41 +08:00
ibuler d9663036f8 perf: revert csrf token project 2022-09-05 13:07:20 +08:00
ibuler 305e9bd0ea Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-09-05 12:49:49 +08:00
ibuler 2354650b82 perf: 暂时去掉 csrf token 2022-09-05 12:47:01 +08:00
feng626 757e688ab3 账号备份优化 2022-09-04 16:33:36 +08:00
ibuler 7ae395f7e8 perf: 修改 metadata 2022-09-01 21:00:04 +08:00
ibuler 81219e1e7c pref: 添加各种 field 2022-09-01 17:42:48 +08:00
ibuler d7d9fe2718 perf: 修改 model 2022-09-01 14:46:31 +08:00
ibuler 4947b0d8fd Merge remote-tracking branch 'origin/v3' into v3 2022-09-01 10:41:23 +08:00
feng626 94f898b55d login asset acl 2022-09-01 10:37:22 +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 ffd08eef74 Merge remote-tracking branch 'origin/v3' into v3 2022-08-30 19:48:10 +08:00
feng626 d5c13df6be 补全资产api 2022-08-30 17:29:54 +08:00
ibuler 8020881e22 Merge remote-tracking branch 'origin/v3' into v3 2022-08-30 16:09:43 +08:00
Jiangjie.Bai f81805f361 fix: 删除perms application多余文件 2022-08-30 15:43:29 +08:00
ibuler 9e7435f1c0 perf: 解决冲突 2022-08-30 14:15:41 +08:00
ibuler 5c73cb9b4e perf: 修改 v3 2022-08-30 14:13:33 +08:00
feng626 62f8fac392 修复迁移文件 2022-08-30 14:09:45 +08:00
ibuler b16e8ef1a5 Merge remote-tracking branch 'origin/v3' into v3 
# Conflicts:
#	apps/tickets/migrations/0018_applyapplicationticket_apply_actions.py
#	apps/tickets/migrations/0018_auto_20220728_1125.py
 2022-08-30 14:09:42 +08:00
feng626 28541c48f7 修复迁移文件 2022-08-30 14:00:20 +08:00
ibuler 8921dc9ac3 Merge remote-tracking branch 'origin/v3' into v3 2022-08-30 13:33:08 +08:00
feng626 3ee8cdbe88 修复迁移文件 2022-08-30 12:50:01 +08:00
ibuler 585f0c64cd perf: 修改 v3 2022-08-30 11:56:56 +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 794ec39446 修复备份bug 2022-08-29 19:59:00 +08:00
feng626 ca3d2271a8 merge v3 2022-08-29 19:53:04 +08:00
feng626 3e1c832964 账号备份 2022-08-29 19:49:45 +08:00
ibuler f35cef7abb perf: 修改校验方式 2022-08-29 16:19:37 +08:00
ibuler a0b6849ccb perf: 优化 platform 2022-08-29 15:50:25 +08:00
ibuler 5358f35c08 perf: 修改 host info 2022-08-29 10:49:53 +08:00
Jiangjie.Bai f0dc519423 perf: 优化 windows ad帮助链接地址 2022-08-25 15:24:33 +08:00
Jiangjie.Bai 1819083a25 perf: 优化 custom 认证模块加载逻辑，判断MD5值，启动时只加载一次 2022-08-25 15:04:45 +08:00
ibuler b7075b5378 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-08-24 19:34:32 +08:00
ibuler bb6b9e6f6e pref: 修改创建 platform 2022-08-24 19:32:49 +08:00
老广 bdeec0d3cb
Merge pull request #8803 from jumpserver/pr@dev@feat_customauthbackend 
feat: 支持自定义认证 backend；统一其他认证方式的信号触发逻辑；
 2022-08-24 18:44:05 +08:00
Jiangjie.Bai 8fc5c4cf9e feat: 支持自定义认证 backend；统一其他认证方式的信号触发逻辑；通过配置文件控制 2022-08-24 18:41:47 +08:00
Jiangjie.Bai 89051b2c67 feat: 支持自定义认证 backend；统一其他认证方式的信号触发逻辑； 2022-08-24 18:04:22 +08:00
Jiangjie.Bai 9123839b48 feat: 支持自定义认证 backend；统一其他认证方式的信号触发逻辑； 2022-08-24 17:38:17 +08:00
feng626 d441f04a6c Merge remote-tracking branch 'origin/v3' into v3 2022-08-24 16:39:25 +08:00
feng626 76390d013e 账号模版 2022-08-24 16:36:42 +08:00
ibuler 063c42b94d perf: 修改 terminal session 2022-08-24 16:14:32 +08:00
老广 258c8a30d1
Merge pull request #8800 from jumpserver/pr@dev@feat_support_piico_gm 
feat: 支持 piico 设备国密加密
 2022-08-24 14:58:24 +08:00
jiangweidong af75b5269c ca_cert不做大小限制 2022-08-24 14:51:38 +08:00
jiangweidong 0a66693a41 feat: MongoDB支持连接SSL类型 2022-08-24 14:51:38 +08:00
ibuler dca1388a67 perf: 修改依赖 2022-08-24 14:23:42 +08:00
Jiangjie.Bai 7151201d58 feat: 支持自定义认证 backend；统一其他认证方式的信号触发逻辑； 2022-08-24 11:41:48 +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
ibuler 83bd8b600e perf: 添加 __init__.py 2022-08-23 19:26:47 +08:00
ibuler b1c563b309 fix: 修改 perms tasks 引用的 application 2022-08-23 19:15:48 +08:00
Aaron3S 8772cd8c71 feat: 支持 piico 设备国密加密 2022-08-23 17:40:01 +08:00
ibuler 1e57a0eb1f perf: merge v3 2022-08-23 10:26:43 +08:00
ibuler ab46194039 perf: 修改 导入 2022-08-23 10:23:48 +08:00
feng626 97c6e2c0b2 修复migrate bug 2022-08-22 18:48:07 +08:00
ibuler 09607a1885 perf: 修改 perms 2022-08-22 18:32:33 +08:00
ibuler 60cb1f8136 fix: 修复默认 gcm key padding 2022-08-22 14:26:11 +08:00
ibuler dd0b8e988c perf: stash it 2022-08-22 13:25:57 +08:00
feng626 a7d193464e 添加 choices 获取 label方法 2022-08-22 11:47:45 +08:00
feng626 fe4df4b179 fix: 修复swagger 2022-08-19 19:01:26 +08:00
feng626 37b150bc04 fix: 表单提交csrftoken问题 2022-08-19 17:22:59 +08:00
Jiangjie.Bai 8ae98887ee
Revert "fix: 修复服务端渲染请求缺少csrf token 问题" (#8780) 
This reverts commit 24a1738e73.
 2022-08-19 14:19:47 +08:00
feng626 24a1738e73 fix: 修复服务端渲染请求缺少csrf token 问题 2022-08-19 10:52:59 +08:00
ibuler 05f913ab18 perf: 修改 platform 2022-08-18 17:58:59 +08:00
ibuler a9bf4eddea perf: 修改 migrations 2022-08-18 13:02:10 +08:00
fit2bot 382112ee33
perf: 批量命令搜索优化 (#8772) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-08-18 11:48:58 +08:00
ibuler 2c3239e238 perf: 修改数据库 migrations 2022-08-18 11:15:17 +08:00
fit2bot 3e69e6840b
fix: oauth2不属于密码认证 (#8771) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-08-18 10:30:20 +08:00
Jiangjie.Bai ccd6b01020 fix: 修复开启仅允许已存在用户登录并且是第三方用户认证时报错instance没有id的问题 2022-08-17 18:47:36 +08:00
Jiangjie.Bai 3ab634d88e fix: 翻译 2022-08-17 16:43:47 +08:00
ibuler 8282a6869a perf: remove system users 2022-08-17 15:44:59 +08:00
Jiangjie.Bai 867ad94a30 fix: 修改认证重定向地址 scheme 取值逻辑 2022-08-17 15:23:35 +08:00
fit2bot 7d0a19635a
fix: 修复登录符合拒绝时 登录日志类型异常问题 (#8758) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-08-17 14:45:02 +08:00
ibuler 3f47e63080 perf: remove system user 2022-08-17 11:54:18 +08:00
fit2bot d405bae205
fix: 修复认证失败后错误信息总是 IP block 的问题 (#8755) 
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
 2022-08-16 17:46:17 +08:00
fit2bot 68841d1f15
fix: 配置仅已存在用户登录后 cas用户首次登录报403 (#8752) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-08-16 17:24:58 +08:00
fit2bot 4cad5affec
fix: 修复工单火狐浏览器上页面展示 (#8753) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-08-16 17:15:21 +08:00
ibuler 2948d5af7f perf: 删除一部分 system user 2022-08-16 16:34:16 +08:00
ibuler b8f8c2a264 perf: remove application permission 2022-08-16 16:05:08 +08:00
ibuler 34c8cfc20a perf: 迁移 app permission 2022-08-16 15:51:19 +08:00
fit2bot 2f8a07e665
perf: 批量命令新增过滤选项 (#8749) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-08-16 13:56:19 +08:00
ibuler 85acd4b2ac perf: 修改 command filter 2022-08-16 11:09:30 +08:00
ibuler 31eadd3dc9 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 
t po v3# 以 '#' 开始的行将被忽略，而空的提交说明将终止提交。
 2022-08-15 18:45:56 +08:00
ibuler 0bf8878228 perf: 添加 token 2022-08-15 18:31:57 +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
fit2bot 5559f112db
fix: 用户登录复合500 (#8743) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-08-15 16:21:27 +08:00
Jiangjie.Bai 9a4b32cb3c perf: 优化 metadata 类型添加 float 2022-08-15 16:08:56 +08:00
feng626 ddf4b61c9f fix: 修复全局组织批量删除资产500 2022-08-15 16:08:23 +08:00
feng626 0eaaa7b4f6 fix: 用户异地登陆bug 2022-08-15 10:45:22 +08:00
fit2bot 18af5e8c4a
fix: 【登录日志】登录复核用户被拒绝，登录日志无登录日志记录】 (#8739) 
* fix: 【登录】第三方用户登录复核，拒绝状态，未真正拦截

* fix: 【登录日志】登录复核用户被拒绝，登录日志无登录日志记录】

* fix: 【登录日志】用户设置登录复核，登录。此时不处理工单，管理员全局组织下查看登录日志，日志无限新增，且无记录用户名】

Co-authored-by: huangzhiwen <zhiwen.huang@fit2cloud.com>
 2022-08-12 18:01:04 +08:00
fit2bot 1ed388459b
fix: 工单流 全局组织不能更新 (#8735) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-08-12 14:29:13 +08:00
feng626 a748f5d57d account template model 2022-08-11 17:39:44 +08:00
feng626 2e944c6898 perf: 修改下载版本号 2022-08-11 16:25:32 +08:00
ibuler d402ba5d92 perf: 修改资产名称 2022-08-11 15:45:03 +08:00
ibuler 4021baf758 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-08-11 14:10:01 +08:00
吴小白 16634907b4 perf: ldap 支持客户端证书认证 2022-08-11 14:09:57 +08:00
feng626 cfa5de13ab feat: 节点树搜索 2022-08-11 14:08:45 +08:00
ibuler 497204d777 perf: account remove protocol 2022-08-11 14:05:45 +08:00
feng626 28c8ec1fab feat: 添加app 获取对应actions接口 2022-08-10 19:34:29 +08:00
huangzhiwen a14ebc5f0f fix: 解决第三方登录无限重定向问题 2022-08-10 19:32:39 +08:00
ibuler 9d4a828c53 perf: 修改平台 2022-08-10 19:27:08 +08:00
Jiangjie.Bai 6af20d298d perf: 修改翻译 2022-08-10 19:07:22 +08:00
Jiangjie.Bai 795d6e01dc fix: 修改测试IP地址工具的默认超市时间为 0.5s 2022-08-10 19:07:22 +08:00
Eric acf8b5798b perf: 优化rdp文件名的显示 2022-08-10 18:41:38 +08:00
Jiangjie.Bai 839099c97c perf: 资产授权Model整理 2022-08-10 17:58:30 +08:00
jiangweidong abcd12f645
perf: 补充cmpp2翻译及部分报错提示 (#8717) 
* 修改CMPPv2.0翻译内容

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

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

* perf: 修改翻译
 2022-08-10 17:32:28 +08:00
fit2bot 30fe5214c7
fix: 增加上了第三方用户登录失败的原因 (#8714) 
* feat: OAuth2.0登录方式加上用户登录规则校验

* fix: 修复第三方用户登录规则（复核）问题

* fix: 增加上了第三方用户登录失败的原因

* fix: 修改变量名称

Co-authored-by: huangzhiwen <zhiwen.huang@fit2cloud.com>
 2022-08-10 11:03:51 +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
ibuler 3011b18eaa perf: 干掉 applications 2022-08-09 15:42:06 +08:00
huangzhiwen 6a30e0739d feat: OAuth2.0登录方式加上用户登录规则校验 2022-08-09 11:38:59 +08:00
fit2bot 3951b8b080
fix(auth): 第三方用户（saml2）登录规则设置无效 (#8648) 
* fix: 修复 OpenID、CAS、SAML2登录规则设置无效

* refactor: auth_third_party_required写到一个地方和优化代码结构

* refactor: 优化代码结构

* refactor: 修改变量名称

Co-authored-by: huangzhiwen <zhiwen.huang@fit2cloud.com>
 2022-08-09 11:24:28 +08:00
Jiangjie.Bai 05e2f8aaf6 fix: 修改 EncryptMixin get_prep_value 和 默认关闭 XPACK 2022-08-09 10:42:35 +08:00
feng626 a7c82f94cc perf: 修复接口文档 修复迁移文件 2022-08-08 19:18:45 +08:00
Jiangjie.Bai c295f1451a fix: 修复登录失败日志的原因信息 2022-08-08 15:49:03 +08:00
Jiangjie.Bai c4a94876cc fix: 增加配置项 SECURE_PROXY_SSL_HEADER request build url 时获取对应的 scheme 2022-08-08 15:00:26 +08:00
ibuler 87df92ea92 perf: 修改脚本 2022-08-08 14:34:57 +08:00
feng626 dcab934d9f fix: 修复用户自动登录bug 2022-08-08 11:42:45 +08:00
ibuler 11d9a0e9cc perf: 支持嵌套创建 2022-08-08 11:39:55 +08:00
ibuler c0cb58c001 perf: 添加 tree api 2022-08-08 10:41:37 +08:00
ibuler 698ea3f2ea perf: 添加 category node view 2022-08-05 19:11:17 +08:00
ibuler 8dfb8eeb75 perf: 修改权限 2022-08-05 18:31:57 +08:00
ibuler 88d4bf932c perf: change asset 2022-08-05 16:17:45 +08:00
ibuler 196e38897f perf: 修改 protcols 2022-08-05 15:46:36 +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 6c57db0897 stash it 2022-08-04 10:44:11 +08:00
ibuler d43acd8612 perf: v3 2022-08-03 16:21:34 +08:00
ibuler 65423ea893 perf: 优化migrations 2022-08-03 15:58:06 +08:00
ibuler b22aed0cc3 feat: 用户密码 hash 采用 gmsm3 2022-08-03 15:05:22 +08:00
“huailei000” 3e7f83d44e fix：修复忘记密码页布局错位问题 2022-08-02 16:42:55 +08:00
Jiangjie.Bai 40f8b99242 fix: 修复更新资产账号不成功的问题(末尾:) 2022-08-02 16:42:25 +08:00
Jiangjie.Bai 9ff345747b fix: 修复系统平台不能导入的问题 2022-08-02 14:55:32 +08:00
Jiangjie.Bai 9319c4748c perf: 修改用户登录 ACL 翻译信息 2022-08-02 14:54:09 +08:00
fit2bot 429e838973
perf: 优化用户登录ACL根据规则优先级进行匹配 (#8672) 
* perf: 优化用户登录ACL根据规则优先级进行匹配

* perf: 修改冲突

Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com>
 2022-07-29 11:37:16 +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
ibuler 109db8886b perf: 还原回 model 2022-07-28 19:27:42 +08:00
ibuler 0dc3d43ee5 perf: 修改系统用户 2022-07-28 19:12:27 +08:00
ibuler fb0fb71ea3 perf: 修改系统用户 2022-07-28 18:50:58 +08:00
fit2bot ea7133dea0
fix: translate (#8664) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-07-28 13:47:32 +08:00
ibuler 43d3791ddc stash 2022-07-27 16:51:39 +08:00
feng626 0f7b41d177 fix: super ticket close bug 2022-07-26 18:34:35 +08:00
fit2bot c4146744e5
perf: 优化授权过期提醒 (#8654) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-07-25 14:02:07 +08:00
fit2bot dc32224294
feat: 应用工单支持选择动作 (#8651) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-07-22 16:24:57 +08:00
fit2bot d07a230ba6
feat: 添加默认工单授权时间 (#8649) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-07-22 15:23:16 +08:00
ibuler 9d17f27fb3 fix: 修复密码可能解密失败报错 2022-07-21 15:37:32 +08:00
feng626 36d0b8d085 fix: 组件角色绑定错误 2022-07-21 15:37:06 +08:00
fit2bot 046356728a
perf: sso token 最小60秒 (#8642) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-07-21 13:51:15 +08:00
ibuler 12036f8c96 perf: 修改 django 版本 2022-07-20 17:01:06 +08:00
ibuler d176ccde4b perf: stash 2022-07-20 16:52:01 +08:00
Jiangjie.Bai 60e455bea2 fix: 修改theme_info默认值为{} 2022-07-20 16:13:20 +08:00
fit2bot e7dd731139
fix: 授权过期url 404 -> /console/ (#8634) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-07-20 15:44:00 +08:00
Jiangjie.Bai 88ae8ac67a fix: 会话列表修改翻译为终端ID 2022-07-20 13:54:43 +08:00
feng626 626b6da9c4 fix cmd为空时bug 2022-07-20 13:43:04 +08:00
fit2bot cb8690dd63
fix: 处理组件获取connection token获取不到的问题 (#8629) 
* fix: 处理组件获取connection token获取不到的问题

* fix: ViewSet 显示获取资源用户

* fix: ViewSet 显示获取资源用户

Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
 2022-07-20 13:23:43 +08:00
ibuler 2b2aa8f072 perf: 优化 换行 2022-07-20 13:19:39 +08:00
ibuler 772e540527 perf: 修改 connect token 换行 2022-07-20 13:19:39 +08:00
ibuler ca5f6f3c6f perf: 修改 windows ansible shell 2022-07-20 13:17:45 +08:00
ibuler c9becca633 stash 2022-07-20 12:56:41 +08:00
Jiangjie.Bai 29656b1630 fix: 修改获取 rdp-file / client-url / smart-endpoint 时endpoint host后台处理为当前请求的host 2022-07-19 19:05:15 +08:00
吴小白 bdf59da0f6
Merge pull request #8625 from jumpserver/pr@dev@fix_perms_asset-user-permission 
fix: 管理员与用户资产列表排序不统一
 2022-07-19 18:06:40 +08:00
Jiangjie.Bai 7b6eeb2e3d fix: 清除 ftp 日志 2022-07-19 17:57:09 +08:00
huangzhiwen fed0732c1e fix: 管理员与用户资产列表排序不统一 2022-07-19 17:28:10 +08:00
feng626 358460e7f0 fix: 如配置SECURITY_VIEW_AUTH_NEED_MFA 跳过校验 2022-07-19 16:24:55 +08:00
fit2bot cc2b858769
fix: 修复获取令牌信息的remote app资产信息 (#8619) 
* fix: 修复连接令牌只获取自己的令牌信息；修复连接令牌系统用户角色权限问题（普通用户看不到）；

* fix: 修复获取令牌信息的remote app资产信息

* fix: 修复获取用户个人信息时使用连接令牌

* fix: 修复获取profile时的连接令牌问题

* fix: 修复连接令牌问题

* fix: 修复连接令牌问题

Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
 2022-07-19 15:57:02 +08:00
fit2bot 585ddeb25b
fix: 授权过期天数修改 (#8618) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-07-19 11:15:56 +08:00
fit2bot 0eab83f73b
fix: 修改翻译 (#8616) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-07-19 10:49:15 +08:00
fit2bot 62d403bf21
fix: reverse console (#8615) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-07-18 19:24:17 +08:00
ibuler bb9d32dc18 perf: 修改所有组织名称 2022-07-18 14:31:50 +08:00
feng626 5055d140fd fix: 修复host为空情况 2022-07-18 11:32:38 +08:00
Eric 2ca72a4bff fix: 修复未选择用户，无法创建共享会话的问题 2022-07-18 11:32:06 +08:00
Eric de61e780e3 fix: 修复错误提示的翻译问题 2022-07-18 11:31:02 +08:00
ibuler b961d1f9ee perf: 修改 accounts 2022-07-18 11:12:21 +08:00
ibuler 93a89509d6 perf: merge with dev 2022-07-17 14:28:55 +08:00
halo e1b3851be3 perf: 优化资产节点搜索，查询全路径 2022-07-17 14:18:20 +08:00
ibuler fd94713583 Merge branch 'dev' into pr@dev@refactor_system_user_account 2022-07-17 14:17:18 +08:00
ibuler 8b188f020d perf: 修改备注 2022-07-17 14:17:16 +08:00
ibuler 008b18eced perf: 修改为账号模版 2022-07-17 13:57:13 +08:00
ibuler 0d46834fbf pref: 修改暂存 2022-07-15 18:57:52 +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
feng626 1b1b70e7bd fix: 处理应用账号脏数据 2022-07-15 17:03:26 +08:00
Jiangjie.Bai 41541a91b9 fix: 修复 public 和 smart API 权限包含 connection token 2022-07-15 15:01:20 +08:00
fit2bot 93537c07a1
fix: 修复工单授权组织问题 (#8599) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-07-15 11:38:50 +08:00
Jiangjie.Bai 395636296d fix: 修改连接token secret长度为16 2022-07-14 17:43:57 +08:00
fit2bot 9967d52416
perf: 暂时去掉历史账号权限 (#8594) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-07-14 15:37:00 +08:00
Jiangjie.Bai dec8e3459a feat: 添加 Oracle 数据库 version 迁移文件默认 12c 版本 
feat: 添加 Oracle 数据库 version 迁移文件默认 12c 版本
 2022-07-14 11:18:26 +08:00
ibuler d3c67d2f04 perf: 暂存一下 2022-07-14 10:56:09 +08:00
fit2bot 4a3d7a8524
perf: history account model queryset (#8588) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-07-13 17:13:02 +08:00
fit2bot f758414844
fix: 审批时 来着不同组织的资产校验 (#8586) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-07-13 16:54:44 +08:00
ibuler dac0b44b99 perf: 优化重构 2022-07-13 16:36:49 +08:00
ibuler f0fbc73f73 perf: 工作台支持 root 2022-07-13 16:31:35 +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
fit2bot 2abca39597
fix: ticket bug (#8584) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-07-13 15:48:55 +08:00
fit2bot 11e538d417
fix: 工单三方审批不支持修改资产 (#8582) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-07-13 11:31:53 +08:00
fit2bot 5155b3c184
fix: 修复bluk_create root 组织下判断 (#8581) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-07-13 11:00:12 +08:00
feng626 e724cdf53d fix: OrgManager add bulk_create method 2022-07-13 10:47:12 +08:00
halo 191d37dd56 feat: 支持session存储方式可配置，可选cache或db 2022-07-13 10:21:20 +08:00
Jiangjie.Bai 602192696c feat: 添加翻译信息 2022-07-12 18:31:18 +08:00
Jiangjie.Bai b262643f0a fix: 连接令牌添加 expire_time 和 is_valid 字段 2022-07-12 18:29:48 +08:00
fit2bot cd119a2999
fix: 飞书登录登录日志不记录认证方式 (#8574) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-07-12 17:36:40 +08:00
fit2bot d789810984
fix: condirm (#8572) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-07-12 16:02:41 +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
Jiangjie.Bai b64727e04c fix: 修改用户自更新失败的问题 2022-07-12 14:22:07 +08:00
fit2bot c7c0374c78
perf: 修改主题 (#8569) 
* perf: 优化登录 backend

* perf: 修改主题

Co-authored-by: ibuler <ibuler@qq.com>
 2022-07-12 13:45:48 +08:00
ibuler e89765a9ad refactor: 重构系统用户 2022-07-12 10:54:23 +08:00
Jiangjie.Bai f3cf071362 feat: 修改connection token secret不显示 2022-07-11 19:37:55 +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 06375110b9
fix: 修改mfa check 判断 (#8561) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-07-11 10:48:01 +08:00
Jiangjie.Bai 0e6dbb3e5d fix: 修复 ES 存储 config 被修改的问题 2022-07-08 11:00:22 +08:00
fit2bot bf7c05f753
fix: 调整confirm (#8554) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-07-07 17:07:57 +08:00
Jiangjie.Bai 1b4d389f2b fix: 修复创建共享会话链接时 created_by 字段长度问题 2022-07-07 15:44: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
ibuler 4537e30e4a perf: 修改颜色 2022-07-05 20:28:42 +08:00
ibuler 98644eeb61 perf: 修改 logo 2022-07-05 20:07:24 +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
fit2bot 75aacd0da6
fix: 用户登录错误处理bug (#8531) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-07-05 11:08:35 +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
halo ca19e45905 perf: 优化截取方法 2022-07-04 11:00:41 +08:00
halo c5bf4075e7 perf: 优化截取方法 2022-07-04 11:00:41 +08:00
halo 04ceca1b83 perf: 修复命令表系统用户字段长度问题，截取成64字符 2022-07-04 11:00:41 +08:00
Jiangjie.Bai 90228e69e0 perf: 会话列表显示终端名称；修复启动 warning 问题 2022-07-01 19:21:13 +08:00
Jiangjie.Bai 62a2a74c27 perf: 会话列表显示终端名称；修复启动 warning 问题 2022-07-01 19:21:13 +08:00
fit2bot 927ae43af2
perf: 优化工单 (#8524) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-07-01 19:07:55 +08:00
feng626 272f64d743 fix: get_target_ip bug 2022-07-01 14:16:54 +08:00
feng626 af2d927c1f perf: del pandas 2022-06-30 20:20:09 +08:00
Jiangjie.Bai 011e9ffec4 fix: 修复导入导出文件时对于bool类型字段的判断问题 2022-06-30 18:28:07 +08:00
Jiangjie.Bai 8e65975cd7 fix: 修改会话共享可以指定用户的一些问题 2022-06-30 14:22:40 +08:00
fit2bot 9465138faf
fix: 修复工单迁移文件 (#8513) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-06-30 11:44:54 +08:00
fit2bot 081089d636
fix: 修复工单命令复合迁移问题 (#8512) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-06-30 11:23:53 +08:00
jiangweidong 5d80933e7b
feat: 会话分享可设置1、5分钟时限，且可分享给指定人 (#8227) 
* perf: 完成会话分享可设置1、5分钟时限，且可分享给指定人

* perf: 完成会话分享可设置1、5分钟时限，且可分享给指定人

* perf: 完成会话分享可设置1、5分钟时限，且可分享给指定人

* feat: 完成会话分享可设置1、5分钟时限，且可分享给指定人
 2022-06-30 11:21:26 +08:00
fit2bot 067a90ff9a
fix: 修复工单数据库命令复合bug (#8511) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-06-30 11:17:12 +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
Jiangjie.Bai e8363ddff8 perf: 优化 BASE_SITE_URL OIDC 可以为空，实现多个不同端点访问时回调为当前访问的地址 2022-06-29 18:46:05 +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
ibuler 77067f18d5 stash tdsql 
pref: 测试完成

perf: 修改支持 tdsql 5.7

revert: 欢迎之前的内容

revert: some

perf: 修改 tdsql

pref: 修改 。
 2022-06-28 18:05:20 +08:00
fit2bot 3cbce63c54
perf: 拆分登录 View (#8502) 
* perf: 拆分登录 View

* perf: 修改 code

Co-authored-by: ibuler <ibuler@qq.com>
 2022-06-28 17:39:13 +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
fit2bot b33e376c90
fix: 解决一些工单已知问题 (#8501) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-06-28 17:19:33 +08:00
ibuler b619ebf423 perf: 修改 jumpserver 版本号，避免缓存 2022-06-28 10:49:02 +08:00
fit2bot fd7f73a18e
fix: 修复工单权限问题 (#8493) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-06-27 14:02:28 +08:00
fit2bot 8247f24d3f
fix: 修复工单bug (#8488) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-06-27 10:15:29 +08:00
ibuler 3749a0c6a1 perf: 修复 middleware 导致的内存增长 2022-06-25 10:34:18 +08:00
Jiangjie.Bai fd41fd78cf fix: 修改 private_key 的序列类长度为 16384 2022-06-24 19:24:21 +08:00
feng626 9388f37c39 fix: ticket bug 2022-06-23 18:35:53 +08:00
feng626 b264db3e7e fix: 修复工单迁移文件 2022-06-23 17:45:34 +08:00
ibuler ac20bc05ba perf: 优化 css 2022-06-23 15:55:33 +08:00
fit2bot 7e2f81a418
perf: 重构 ticket (#8281) 
* perf: 重构 ticket

* perf: 优化 tickets

* perf: 暂存

* perf: 建立 ticket model

* perf: 暂存一下

* perf: 修改 tickets

* perf: 修改 import

* perf: 修改model

* perf: 暂存一波

* perf: 修改...

* del process_map field

* 工单重构

* 资产 应用对接前端

* perf: 修改 ticket

* fix: bug

* 修改迁移文件

* 添加其他api

* 去掉process_map

* perf: 优化去掉 signal

* perf: 修改这里

* 修改一点

* perf: 修改工单

* perf: 修改状态

* perf: 修改工单流转

* step 状态切换

* perf: 修改 ticket open

* perf: 修改流程

* perf: stash it

* 改又改

* stash it

* perf: stash

* stash

* migrate

* perf migrate

* 调整一下

* 修复bug

* 修改一点

* 修改一点

* 优化一波

* perf: ticket migrations

Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: feng626 <1304903146@qq.com>
 2022-06-23 13:52:28 +08:00
Jiangjie.Bai 2471787277
Merge pull request #8457 from jumpserver/pr@dev@perf_redis 
perf: redis AND login page
 2022-06-23 10:39:22 +08:00
Jiangjie.Bai 5ed65ca2ff fix: 修复post方法调用AuthBook接口时500的问题 2022-06-22 17:11:35 +08:00
ibuler ba6b1bf692 perf: 修改翻译 2022-06-22 14:30:52 +08:00
ibuler fa51465485 perf: 修改去掉 导入 certs 2022-06-21 19:23:29 +08:00
ibuler 8f59bb2a48 perf: 优化登陆 2022-06-21 19:06:06 +08:00
ibuler 2366da1485 perf: redis AND login page 2022-06-21 18:43:48 +08:00
ibuler f1a22575d3 perf: 优化登录页面 2022-06-21 16:18:13 +08:00
ibuler 7c1882bb53 perf: login 2022-06-21 10:08:14 +08:00
ibuler 97baeebb2a perf: 修改 redis scan counter 2022-06-20 19:40:07 +08:00
ibuler 8b819f3779 perf: 优化登录 2022-06-20 19:22:48 +08:00
Jiangjie.Bai d1420de4c2 fix: 修复es类型的命令存储更新忽略证书字段不成功的问题 2022-06-20 14:47:30 +08:00
Eric 710cd0fb3b fix：修复es日期索引忽略证书的问题 2022-06-20 14:06:56 +08:00
Jiangjie.Bai 3fde31f2e0 fix: 修复工单自定义搜索时500的问题 2022-06-17 15:26:23 +08:00
Jiangjie.Bai 81598a5264 perf: 推送系统用户用户名提示信息 2022-06-16 18:04:03 +08:00
feng626 298f6ba41d fix: 修改翻译 2022-06-16 18:03:16 +08:00
feng626 8e43e9ee2b fix: 授权过期通知 2022-06-16 17:52:33 +08:00
Jiangjie.Bai adc8a8f7d3 fix: 修改翻译 2022-06-16 17:10:21 +08:00
Jiangjie.Bai 1e3da50979 fix: 修复会话加入记录更新失败的问题 2022-06-16 16:50:51 +08:00
Jiangjie.Bai 2be74c4b84 fix: 修复命令列表模糊搜索报错500的问题 
fix: 修复命令列表模糊搜索报错500的问题
 2022-06-16 13:45:24 +08:00
ibuler e2f199606e stash it 2022-06-16 11:32:36 +08:00
feng626 75a72fb182 fix: user confirm bug 2022-06-16 11:31:27 +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
Jiangjie.Bai 9e16b79abe fix: 修复openid用户登录时默认邮件后缀使用配置项 2022-06-15 19:32:36 +08:00
ibuler 8c839784fb pref: 优化没有获取到节点的问题 2022-06-15 15:31:33 +08:00
ibuler 10adb4e6b7 perf: 优化签名认证 2022-06-15 15:30:51 +08:00
feng626 75c011f1c5 feat: add client linux arm64 version 2022-06-15 15:30:13 +08:00
Jiangjie.Bai a882ca0d51 fix: 修改推送系统用户提示文案 2022-06-15 15:20:08 +08:00
fit2bot e0a2d03f44
fix: 修复授权过期通知bug (#8404) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-06-15 15:01:56 +08:00
ibuler cc167f1b49 xxx 2022-06-14 19:49:07 +08:00
Jiangjie.Bai 2aebfa51b2 fix: 过滤系统用户密码过滤ansible不支持的字符 2022-06-14 18:49:35 +08:00
feng626 f91bfedc50 perf: 授权过期通知 2022-06-14 18:33:49 +08:00
ibuler 556ce0a146 perf: 继续优化一波 2022-06-13 16:46:14 +08:00
Jiangjie.Bai 95f8b12912 fix: 修复部分 password encrypted field extra kwargs 参数不生效问题 2022-06-13 16:44:01 +08:00
fit2bot 25ae790f7d
fix: 修改client 版本 (#8375) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-06-13 15:45:10 +08:00
ibuler 0464b1a9e6 perf: 优化迁移 rbac 速度 
perf: migrate
 2022-06-13 15:18:15 +08:00
Jiangjie.Bai 3755f8f33a fix: 修复推送动态用户 comment 中包含空格导致推送失败的问题 2022-06-13 14:54:29 +08:00
Jiangjie.Bai 9d1e94d3c2 fix: 修复手动登录系统用户连接RemoteApp应用获取不到认证信息的问题 2022-06-10 18:35:39 +08:00
ibuler a5c6ba6cd6 perf: 优化 perm app node 2022-06-09 10:48:48 +08:00
fit2bot 81ef614820
fix: relogin重置MFA_VERIFY_TIME (#8348) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-06-08 19:32:50 +08:00
ibuler c6949b4f68 perf: 去掉 remote app 的加密 2022-06-08 10:04:14 +08:00
fit2bot a5acdb9f60
perf: 统一校验当前用户api (#8324) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-06-07 19:26:07 +08:00
Jiangjie.Bai 2366f02d10 feat: 添加组件类型 razor 并替换 XRDP_ENABLED 2022-06-07 13:43:53 +08:00
Jiangjie.Bai dade0cadda feat: 克隆角色权限 2022-06-06 16:13:12 +08:00
ibuler e096244e75 pref: app tree 添加 icon 2022-06-06 14:00:34 +08:00
Jiangjie.Bai 3bc307d666
perf: 设置Connection Token 默认最少5分钟 (#8331) 2022-06-01 18:00:22 +08:00
Jiangjie.Bai 810c500402 feat: 添加配置项 CONNECTION_TOKEN_EXPIRATION 2022-05-31 18:23:48 +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
Jiangjie.Bai af1150bb86 feat: OIDC 用户添加属性映射值 2022-05-31 16:03:39 +08:00
Jiangjie.Bai 15423291cc fix: 修复ldap用户登录时用户组不设置 2022-05-30 16:02:50 +08:00
Jiangjie.Bai 42202bd528 fix: 修改 public settings API公告字段类型为 dict 2022-05-27 17:24:09 +08:00
fit2bot b24d2f628a
perf: update download (#8304) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-05-27 14:14:47 +08:00
fit2bot 041302d5d2
fix: 修复获取 city 时可能的报错 (#8294) 
Co-authored-by: ibuler <ibuler@qq.com>
 2022-05-24 12:31:16 +08:00
feng626 a08dd5ee72 fix: 修复用户更新自己密码 url 不准确问题 2022-05-24 11:16:13 +08:00
ibuler 09ef72a4a8 fix: 修复 Migrations 错误 2022-05-24 11:01:26 +08:00
ibuler 26cf64ad2d perf: 修改 i18 2022-05-20 11:41:33 +08:00
ibuler 0a04f0f351 perf: 下载 ip 数据库 2022-05-20 10:03:13 +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 c8d7c7c56f
fix: 修复oidc认证不区分大小写 (#8267) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-05-18 18:32:53 +08:00
ibuler aa7540045b feat: 添加 session guard 2022-05-18 14:55:58 +08:00
ibuler e5f4b8000e stash 2022-05-18 14:55:58 +08:00
ibuler 44ffd09924 fix: 修复可能的 decode error 2022-05-18 10:17:15 +08:00
ibuler fe3059c1fd fix: 修复获取密码失败 2022-05-17 23:50:30 +08:00
Jiangjie.Bai b76920a4bf fix: 修改组织资源统计时 org 为None的问题 2022-05-17 22:11:42 +08:00
ibuler c3c0f87c01 perf: domain gateway 也添加 2022-05-17 21:32:31 +08:00
fit2bot 0c71190337
fix: 修改 EncryptedField 字段的 write_only 属性 (#8259) 
* fix: 修改 EncryptedField 字段的 write_only 属性

fix: 修改 EncryptedField 字段的 write_only 属性

* fix: 修改 EncryptedField 字段的 write_only 属性

Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com>
 2022-05-17 21:12:59 +08:00
feng626 14710e9c9e feat: 工单审批人中去除申请人 2022-05-17 20:56:53 +08:00
ibuler 7eec50804c perf: 优化 encrypted field 2022-05-17 20:04:46 +08:00
Jiangjie.Bai 0fc5a33983 fix: 修复企业微信、钉钉、飞书登录跳转问题 2022-05-17 18:57:49 +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
fit2bot d675b1d4fc
fix: k8s token 解密 (#8252) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-05-17 16:53:15 +08:00
ibuler 2c73611cb4 fix: 修复公告不显示的问题 2022-05-17 11:30:37 +08:00
jiangweidong e80b6936a2 perf: 兼容AWS上redis[ssl]无证书无法部署的问题 2022-05-16 18:03:47 +08:00
Jiangjie.Bai 2c4f937e0b fix: 解决LDAP同步用户仪表盘总数没有刷新的问题 2022-05-16 17:52:49 +08:00
Jiangjie.Bai 2a5497de14 fix: 修改工单审批文案 2022-05-16 17:52:27 +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
feng626 525538e775 fix: 修复密码密钥翻译问题 2022-05-16 17:48:28 +08:00
ibuler 2a8f8dd709 perf: 优化使用两个 ip 库 2022-05-16 15:24:38 +08:00
ibuler 475678e29b fix: 修复密码 write only 2022-05-16 12:19:52 +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 4f37b2b920 perf: 优化 setting 读取，避免遗漏 2022-05-12 11:52:44 +08:00
fit2bot c692eed3c6
perf: 修改client 版本 (#8223) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-05-12 10:59:19 +08:00
ibuler dab8828b03 perf: 优化 setting 获取 2022-05-11 17:57:33 +08:00
ibuler d692188a34 perf: 修改 i18n 2022-05-11 16:03:26 +08:00
Jiangjie.Bai bc8df72603 fix: 修改创建更新用户的密码字段 2022-05-11 16:02:56 +08:00
Jiangjie.Bai bf466a1ba2 feat: LDAP同步用户支持组织 2022-05-11 11:09:30 +08:00
fit2bot aff5b0035d
perf: 优化加密 (#8206) 
* perf: 优化加密

* perf: 优化加密

* perf: 优化加密传输

Co-authored-by: ibuler <ibuler@qq.com>
 2022-05-10 17:28:10 +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
Jiangjie.Bai ab737ae09b fix: 修复获取类型为null的命令显示不支持的问题 
fix: 修复获取类型为null的命令显示不支持的问题
 2022-05-07 17:56:50 +08:00
jiangweidong 55e04e8e9f feat: 内置AIX系统，根据系统选择算法加密密码 2022-05-07 16:25:03 +08:00
jiangweidong 5e70a8af15 feat: 支持平台关联算法，支持AIX改密 2022-05-07 16:25:03 +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
fit2bot 56862a965d
fix: 修复system-role获取users失败的问题 (#8196) 
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
 2022-05-07 10:40:12 +08:00
ibuler e53aa9696b perf: 修改 serializer 2022-05-05 16:18:05 +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
feng626 d23953932f perf: connection token 分api权限 2022-05-05 11:45:26 +08:00
Jiangjie.Bai 2493647e5c fix: 修复windows执行ansible显示sudo失败的问题 2022-05-05 11:40:12 +08:00
ibuler 8de57773aa stash it 2022-05-04 09:57:45 +08:00
ibuler 7025d46070 perf: 控制平台创建 2022-05-02 21:37:42 +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
xiaziheng b1aadf1ee9 Fix oidc (#8165) 2022-04-29 10:59:29 +08:00
ibuler 69f3c85195 perf: 添加 category api 2022-04-28 22:54:18 +08:00
feng626 86e6982383 fix: 组织管理员 添加 view platform perm 2022-04-28 19:10:58 +08:00
halo dc42d1caa2 perf: 修改ssh_client连接选项翻译 2022-04-28 19:09:44 +08:00
ibuler e3f2878b0f perf: 修改迁移 2022-04-28 12:50:41 +08:00
ibuler ba0a017aa4 perf: 修改迁移 2022-04-28 12:47:39 +08:00
ibuler 770d2508d7 perf: 其他 asset model 2022-04-26 21:30:11 +08:00
ibuler 0a2b2ad127 perf: 其他 asset model 2022-04-26 21:30:01 +08:00
ibuler cb5d8fa13f fix: 去掉自动生成的map文件 2022-04-26 16:46:47 +08:00
ibuler 44d192cbe7 perf: stash 2022-04-26 11:24:08 +08:00
jiangweidong 3a3f7eaf71 feat: 优化SAML2生成的metadata文件内容及属性映射 2022-04-26 10:00:53 +08:00
fit2bot 9804ca5dd0
fix: workbench_orgs 去重 (#8150) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-04-25 11:38:15 +08:00
feng626 104d672634 perf: client download 2022-04-24 15:09:33 +08:00
ibuler d25cde1bd5 fix: 修复社区版跳转问题 2022-04-21 22:48:59 +08:00
Jiangjie.Bai a6d61721dd fix: 修改csrftoken获取问题 2022-04-21 16:17:33 +08:00
fit2bot c3de7b78c2
fix: 远程应用授权时 有些资产已经不存在了 导致授权失败 (#8127) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-04-21 15:36:40 +08:00
Jiangjie.Bai 63ee2dd8fb fix: 修复获取权限树权限控制 2022-04-20 20:14:44 +08:00
feng626 74f88d842d fix: 修改replay download perm 2022-04-20 19:14:42 +08:00
fit2bot e61bae5ee4
perf: 优化权限位 (#8110) 
* perf: 优化权限位

* perf: 优化返回的组织

* perf: 保证结果是 ok

* perf: 去掉 distinct

* perf: tree count

Co-authored-by: ibuler <ibuler@qq.com>
 2022-04-20 18:50:53 +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 c29d133776 feat: 修改LDAP导入定时任务interval/crontab优先级 
Signed-off-by: Jiangjie.Bai <bugatti_it@163.com>
 2022-04-20 16:31:56 +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
ibuler f1bd4ea91f perf: 修改 系统级别用户角色的 perms 2022-04-20 11:50:11 +08:00
fit2bot 7647438792
perf: 账号备份log (#8106) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-04-20 11:18:50 +08:00
fit2bot af9248ef7c
fix: 还原connection token 逻辑 (#8101) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-04-20 10:24:08 +08:00
ibuler 54e772741b perf: 修改 base 2022-04-20 10:15:20 +08:00
feng626 611a00a5fa fix: 修复super user perm bug 2022-04-19 21:52:01 +08:00
Jiangjie.Bai 57969a4e23 fix: 修改获取smart endpoint的逻辑 2022-04-19 19:50:18 +08:00
Jiangjie.Bai 5f370c1c04 perf: 优化内置系统用户角色权限 2022-04-19 19:19:47 +08:00
Jiangjie.Bai f026b86a20 fix: 修复获取组织用户 2022-04-19 18:09:07 +08:00
ibuler 0addba7c14 perf: 修改 command 命令执行 2022-04-19 17:21:27 +08:00
ibuler e4b0ab6a45 perf: 修改命令执行区分组织 2022-04-19 17:21:27 +08:00
Jiangjie.Bai b4ac24ad6d fix: 修改endpoint/rule权限树位置 2022-04-19 17:21:09 +08:00
halo 500477fad1 fix: ftp日志清理bug 2022-04-19 17:13:17 +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 832228e184 stash 2022-04-19 15:30:56 +08:00
Jiangjie.Bai be2708f83d fix: 修复ajax请求携带csrftoken问题 2022-04-19 14:29:23 +08:00
ibuler 516cb05d69 perf: 修改翻译 2022-04-19 13:33:28 +08:00
ibuler 3e3835dc28 perf: 修改用户权限 2022-04-19 10:42:36 +08:00
ibuler f4ed4e1176 perf: 添加 temp token 排序 2022-04-18 19:55:16 +08:00
feng626 7b2d51f343 fix: 修复角色过滤失败 2022-04-18 19:54:44 +08:00
feng626 fe47e40588 fix: es6 create index fail 2022-04-18 19:44:54 +08:00
fit2bot 4362f8d5af
perf: 优化组织 (#8080) 
* perf: 优化用户的orgs

* perf: 优化组织

Co-authored-by: ibuler <ibuler@qq.com>
 2022-04-18 17:17:23 +08:00
Jiangjie.Bai 3eab621b28 feat: 优化Endpoint迁移逻辑，增加XRDP规则和Endpoint 
fix: 修改Endpoint迁移文件
 2022-04-18 15:29:40 +08:00
jiangweidong 548a374c6d fix: 修复部署在没有密码的redis上时，站内信数量不更新问题 2022-04-18 11:39:20 +08:00
feng626 10c146b07d fix: 修复远程应用无资产下载xrdp file 500 问题 2022-04-18 11:38:31 +08:00
fit2bot a647e73c02
feat: 设置SessionCookieNamePrefix (#8071) 
* feat: 设置SessionCookieNamePrefix

* feat: 设置SessionCookieNamePrefix

Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
 2022-04-15 21:33:15 +08:00
Jiangjie.Bai 7b02777f1e fix: 修改endpoint smart API允许有效用户访问 2022-04-15 16:33:41 +08:00
Jiangjie.Bai 97e59384e0 fix: connection token API 返回有效时间 2022-04-15 16:33:20 +08:00
jiangweidong 70a07539af perf: 优化部分云厂商的redis连接的问题 2022-04-15 10:00:49 +08:00
fit2bot 0b94d7414a
feat: download (#8062) 
Co-authored-by: feng626 <1304903146@qq.com>
Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com>
 2022-04-14 19:51:10 +08:00
feng626 7aa0c9bf19 feat: download 2022-04-14 15:00:59 +08:00
Jiangjie.Bai 6d8e8856ac fix: 修改命令timestamp_display只读 2022-04-14 14:45:19 +08:00
Jiangjie.Bai c240a471dc fix: Public Setting 添加 Magnus 2022-04-14 14:16:02 +08:00
Jiangjie.Bai ea478fc801 fix: Public Setting 添加 Magnus 2022-04-14 12:55:18 +08:00
fit2bot 5127214375
feat: 站内信一键已读 (#8057) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-04-14 12:18:11 +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
Jiangjie.Bai 10b033010e feat: 优化命令导出时间戳可读性 2022-04-13 19:50:17 +08:00
fit2bot c630b11bd5
fix: port str (#8055) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-04-13 19:48:31 +08:00
ibuler b0f7c114fc perf: 修改 csrf token domain 2022-04-13 16:08:07 +08:00
ibuler 5101aae5ae perf: 修改.. 2022-04-12 19:24:59 +08:00
ibuler 9f927f9703 stash 2022-04-12 17:53: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
ibuler 4cf90df17c perf: 默认角色添加 created by 2022-04-12 16:20:46 +08:00
ibuler ffd98c6e3f fix: 修改 import 2022-04-12 16:20:46 +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
fit2bot 7c7d7d52b2
perf: asset number 扩容 (#8045) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-04-12 14:01:57 +08:00
feng626 f769d5a9bb fix: 修复用户数据不同步问题 2022-04-08 15:47:14 +08:00
ibuler d418c28e98 perf: 修改 base 2022-04-07 18:51:35 +08:00
ibuler 1b9efff6c7 perf: 添加 types 2022-04-06 18:14:51 +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
ibuler ce13b194a5 perf: 修改 asset info 2022-04-06 11:29:16 +08:00
ibuler 8688781e15 perf: 修改 asset 结构 2022-04-06 10:15:06 +08:00
ibuler 3de881fa19 perf: 打算重构 asset application 2022-04-02 18:35:46 +08:00
jiangweidong fe8527fd07 feat: 修改翻译 2022-04-02 16:04:13 +08:00
feng626 2cb08b4785 fix: user is common user 2022-04-02 16:02:57 +08:00
fit2bot a936092020
perf: es相关代码格式优化 (#8020) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-04-02 13:26:18 +08:00
fit2bot e602bc0341
fix: 修复网关翻译 (#8016) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-04-01 16:52:50 +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
Jiangjie.Bai 73cb5e10b4 fix: 添加用户不能自更新字段逻辑 & 修复用户is_active创建失败的问题 
fix: 添加用户不能自更新字段逻辑 & 修复用户is_active创建失败的问题

fix: 添加用户不能自更新字段逻辑 & 修复用户is_active创建失败的问题
 2022-03-30 19:52:45 +08:00
fit2bot c58d245636
fix: 修复koko setting (#8005) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-30 19:51:56 +08:00
fit2bot e7af037513
perf: 修改命令command input 长度问题 (#7996) 
* perf: 修改命令command input max_length 1024

* perf: 修改命令command input 长度问题

* perf: 修改命令command input 长度问题

* perf: 修改命令command input 长度问题

* perf: 修改命令command input 长度问题

Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
 2022-03-30 19:07:49 +08:00
Jiangjie.Bai 54d1996507 feat: 支持续期Connection Token 2022-03-30 11:20: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
Jiangjie.Bai cddff9fd19 feat: 改密计划支持su切换用户执行 
feat: 改密计划支持su切换用户执行

feat: 改密计划支持su切换用户执行

feat: 改密计划支持su切换用户执行

feat: 改密计划支持su切换用户执行

feat: 改密计划支持su切换用户执行

feat: 改密计划支持su切换用户执行
 2022-03-29 15:32:33 +08:00
feng626 d856f1364a feat: 拉起ssh api 2022-03-29 13:23:58 +08:00
fit2bot 52709d2efa
feat: 企业微信、钉钉 工作台免密登录(飞书已实现) (#7855) 
* feat: 添加oauth接口

* feat: 企业微信支持OAuth认证，工作台免密登录

* feat: 钉钉支持OAuth认证，工作台免密登录

* fix: 修复参数错误

Co-authored-by: halo <wuyihuangw@gmail.com>
 2022-03-29 13:19:13 +08:00
ibuler a20de3df16 perf: app tree 添加attrs，luna 使用 2022-03-29 12:44:36 +08:00
ibuler e303b4f571 perf: 修复 settings patch 问题 2022-03-28 13:40:36 +08:00
jiangweidong 03fdaa03e4 feat: 支持日语 2022-03-28 10:06:54 +08:00
fit2bot b7b1d81ea0
fix: magenus bug (#7977) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-25 16:46: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
Eric fc06295d04 perf: 优化 windows rdp 窗口显示 2022-03-25 10:50:34 +08:00
fit2bot 9b73727bbc
fix: 修复系统组件绑定角色bug (#7962) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-23 10:56:23 +08:00
Jiangjie.Bai 6bde31cdd0 fix: 修复获取远程应用认证信息问题 2022-03-22 18:54:25 +08:00
ibuler 2721793b8f fix: 修复权限 view 没有 Model 的问题 2022-03-22 16:59:01 +08:00
feng626 2ec0cb8a2c fix: 修复用户绑定角色重大bug 2022-03-22 16:55:53 +08:00
feng626 d01d44b48d fix: api docs 2022-03-22 13:05:44 +08:00
老广 0ef7a9571c
Merge pull request #7800 from jumpserver/pr@dev@feat_core_redis_support_ssl 
feat: JumpServer支持部署在使用了ssl的redis上
 2022-03-22 10:34:32 +08:00
ibuler 54fd1fb0c8 perf: 移动到信号中 2022-03-21 19:27:23 +08:00
ibuler 87c6eec619 perf: 优化 role bingding，优化 is_superuser 2022-03-21 19:27:23 +08:00
jiangweidong e35fbfc7e9
Update session.py 2022-03-21 19:02:30 +08:00
fit2bot 3345456dc2
fix: 修复wateway api (#7947) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-21 17:53:16 +08:00
Jiangjie.Bai 9ae74120ed fix: 修复用户API权限 2022-03-21 12:00:15 +08:00
Jiangjie.Bai 9e5c132485 fix: 修复用户API权限 2022-03-21 11:58:29 +08:00
fit2bot 5cc2fdae4f
fix: 修复api docs打不开的问题 (#7938) 
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
 2022-03-21 11:14:49 +08:00
jiangweidong e993f31b6d
feat: 支持纳管百度云资产 (#7921) 
Co-authored-by: ibuler <ibuler@qq.com>
 2022-03-21 10:39:47 +08:00
Jiangjie.Bai 60edbb36a1 fix: 应用树隐藏mongodb节点 2022-03-18 18:02:15 +08:00
fit2bot 5da1ec55a7
perf: org del ticket perm (#7932) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-18 17:44:20 +08:00
Jiangjie.Bai b8c083af7e fix: 工单权限位放到sys角色中 2022-03-18 17:36:22 +08:00
Jiangjie.Bai 996621f303 fix: 移除权限dashboard 2022-03-18 17:10:34 +08:00
fit2bot ec9e5da653
fix: 修复apikey perm (#7918) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-18 15:53:34 +08:00
Jiangjie.Bai d4e4015d91 fix: 修复去除rolebiding change 权限 2022-03-18 15:38:33 +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 08ff8fa285
fix: login confirm bug (#7914) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-17 18:50:37 +08:00
Jiangjie.Bai f82f7eba2b fix: 修改一些权限 2022-03-17 17:51:02 +08:00
Jiangjie.Bai a8cee26874 fix: 修复资产详情授权用户tab页的权限位 2022-03-17 17:25:20 +08:00
ibuler 3ed7477057 perf: 修改 default role 2022-03-17 16:53:29 +08:00
ibuler a3cddd5d34 fix: 修复批量命令的bug 2022-03-17 16:26:22 +08:00
Jiangjie.Bai 26b3c60e5c fix: 删除一些perms相关的权限位 2022-03-17 16:26:00 +08:00
ibuler b5dea38164 perf: 修改bug 2022-03-17 16:09:51 +08:00
ibuler 7addb881f6 fix: 修复系统用户Perms 2022-03-17 16:09:51 +08:00
fit2bot 9c395b674f
fix: command log search (#7906) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-17 15:39:05 +08:00
Jiangjie.Bai b297ebe973 fix: 修改应用category 2022-03-17 15:37:57 +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 76796f249d
fix: user match (#7903) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-17 14:47:24 +08:00
Jiangjie.Bai 55a63477ed fix: 去除系统用户资产相关权限 2022-03-17 14:38:19 +08:00
ibuler 5942037d81 perf: some perm to xpack 2022-03-17 14:24:52 +08:00
Jiangjie.Bai 5882b8a682 fix: 去除application secret change perm 2022-03-17 14:24:25 +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
feng626 8fe84345e4 fix: 工单默认权限 2022-03-17 14:06:34 +08:00
Jiangjie.Bai a31c3ccc30 fix: 去除application account delete perm 2022-03-17 14:05:08 +08:00
Jiangjie.Bai e13e34098a fix: 站内信命令告警中的会话地址 2022-03-17 14:05:08 +08:00
feng626 e8653c74cd fix: ticket URL type 2022-03-17 12:35:08 +08:00
feng626 1433c35ff9 fix: test gateway 2022-03-17 12:33:59 +08:00
Jiangjie.Bai a237b5a63d fix: 去掉terminal task add/delete 权限位 2022-03-17 11:40:54 +08:00
feng626 2587c8693e fix: account_change_pwd 2022-03-17 11:36:48 +08:00
feng626 dfe5e2bce3 fix: 修改rbac permission 2022-03-17 11:36:48 +08:00
Jiangjie.Bai 1a05a942c2 fix: 更新资产详情授权用户权限 2022-03-16 20:49:29 +08:00
Jiangjie.Bai 30556023d1 fix: 修复会话录像播放权限 2022-03-16 20:42:38 +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 433d829c29
fix: 添加profile myorgs (#7887) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-16 20:36:12 +08:00
fit2bot 3b507dc795
perf: 优化英文下树的显示 (#7883) 
* perf: 优化英文下树的显示

* perf: 修改翻译

* perf: 修改翻译

Co-authored-by: ibuler <ibuler@qq.com>
 2022-03-16 20:27:38 +08:00
Jiangjie.Bai 8233c69038 fix: 修复adhoc权限 2022-03-16 19:26:40 +08:00
ibuler 0fbc548c02 fix: 修复访问 flower 错误 2022-03-16 19:05:06 +08:00
Jiangjie.Bai aa9ae14e46 fix: 修复view action获取 2022-03-16 18:33:55 +08:00
Jiangjie.Bai 04b35ba520 fix: 修复批量命令权限位 2022-03-16 18:33:13 +08:00
ibuler 580d2cd80b perf: 修改 org admin 2022-03-16 18:26:16 +08:00
ibuler da9136f7af perf: 修改 org role 2022-03-16 18:26:16 +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
feng626 3a26b9d102 fix: 修复工单相应bug 2022-03-16 17:40:51 +08:00
ibuler ee757e261d perf: 修改写法 2022-03-16 17:14:42 +08:00
ibuler f41e6db007 perf: sso token 只能超级管理员 2022-03-16 17:14:42 +08:00
ibuler 7eed7b32cc perf: 修复 org role binding 在root组织下看到的可能不对 2022-03-16 17:14:42 +08:00
Jiangjie.Bai efb26132f6 fix: 修复sso用户登录失败的问题 2022-03-16 17:11:22 +08:00
Jiangjie.Bai 572c5b6925 fix: 修改工单管理权限位 2022-03-16 14:54:50 +08:00
ibuler 8a1cd7e2a9 perf: fix some bug 2022-03-16 14:18:01 +08:00
Jiangjie.Bai c065f82d30 fix: 排除收集用户执行的更新、删除权限位 2022-03-16 14:17:35 +08:00
ibuler 995c9a6c19 perf: 修复一些bug， rolebingding 找到合适的 2022-03-16 14:08:54 +08:00
Jiangjie.Bai 5ec970fab4 fix: 全局组织受权限位控制 2022-03-16 14:07:00 +08:00
Jiangjie.Bai d320443c9f fix: 去除change_setting权限位 2022-03-15 20:25:18 +08:00
ibuler 4bfa88f01f perf: 修改 app tree 2022-03-15 20:09:30 +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
ibuler cd46c8c78e perf: 发送验证码，不再提示 2022-03-15 18:47:12 +08:00
ibuler 8839e6293b perf: 修改 mfa 地址 2022-03-15 18:47:12 +08:00
ibuler 4f887b1b11 perf: 优化 tree node icon 2022-03-15 18:46:11 +08:00
fit2bot 90840a4417
fix: 工单创建bug (#7858) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-15 18:22:13 +08:00
fit2bot a18b9bad0a
fix:  修复ticketsession (#7857) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-15 17:32:54 +08:00
feng626 e1a238b778 fix: 删除资产授权缓存接口 2022-03-15 16:55:45 +08:00
fit2bot d77e84e6f8
fix: ticket comment bug (#7854) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-15 16:50:51 +08:00
Jiangjie.Bai 2042c7a6e5 fix: 云同步权限显示创建执行 2022-03-15 14:18:37 +08:00
Jiangjie.Bai 40aca26155 fix: 暂时排除会话分享的权限位 2022-03-15 13:13:16 +08:00
Jiangjie.Bai e18e76002c fix: 暂时排除会话分享的权限位 2022-03-15 13:00:56 +08:00
Jiangjie.Bai 3924ff0114 fix: 修改查看会话录像权限位 2022-03-15 11:37:09 +08:00
Jiangjie.Bai 2d7349d596 fix: 删除权限位connect_myasset/myapp 2022-03-15 11:11:37 +08:00
feng626 c41a81c8d0 fix: 修改授权权限 2022-03-15 11:06:48 +08:00
feng626 7ba19ab1a1 fix: exclude adhoc change delete 2022-03-14 20:36:02 +08:00
Jiangjie.Bai 72247d1df3 fix: 修复批量命令权限 2022-03-14 20:35:43 +08:00
feng626 faf82d7cfb fix: del connect my asset 2022-03-14 20:34:35 +08:00
feng626 4e8defc647 fix: 修复上传bug 2022-03-14 19:15:12 +08:00
Jiangjie.Bai 2f18208874 fix: 修复资产改密计划权限控制 2022-03-14 19:01:26 +08:00
Jiangjie.Bai b37e8cdc3f fix: 修复更新资产账号权限控制 2022-03-14 17:51:03 +08:00
Jiangjie.Bai 5b960fc46b fix: 修复测试资产账号权限 2022-03-14 17:51:03 +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 e9deb6fc7a fix: app relation api 2022-03-14 17:05:47 +08:00
Jiangjie.Bai cca49fa9cd fix: 修复授权树显示 2022-03-14 16:47:29 +08:00
feng626 a7cc457f54 fix: 修复setting perm 2022-03-14 15:50:53 +08:00
feng626 567c1b0124 fix: node test refresh perm 2022-03-14 14:37:59 +08:00
fit2bot 2da541c127
fix: 修改授权树(账号备份) (#7830) 
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
 2022-03-14 14:23:13 +08:00
jiangweidong 794139782f feat: JumpServer支持部署在使用了ssl的redis上，可使用证书连接 2022-03-14 11:35:14 +08:00
Jiangjie.Bai 307b739a03 fix: 修改授权树(收集用户) 2022-03-14 11:34:14 +08:00
feng626 ca5708988a fix: 修复saml2 auth 2022-03-14 11:17:15 +08:00
ibuler 90d84f4d69 perf: 修改消息订阅 2022-03-14 11:16:54 +08:00
ibuler 60564d1b4f perf: 修改 bug 2022-03-14 10:01:51 +08:00
fit2bot 017710c056
perf: 修改perms (#7822) 
* perf: 修改 perm tree

* perf: 修改perms

Co-authored-by: ibuler <ibuler@qq.com>
 2022-03-11 21:24:07 +08:00
Jiangjie.Bai a876a82a76 fix: 从组织移除用户 2022-03-11 21:20:44 +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
Jiangjie.Bai 224a9fbdb3 fix: 修复创建授权时actions为空保存时报错的问题 2022-03-11 21:00:37 +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 e3bc54e764
fix: 修复用户组添加用户 (#7809) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-11 19:31:55 +08:00
fit2bot f0325c48df
fix: 工单权限 (#7808) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-11 19:31:29 +08:00
fit2bot 416d4bd0c3
fix: 修复tree (#7802) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-11 17:24:28 +08:00
fit2bot 10c877c120
fix: 修复工单ticket exclude perm (#7799) 
* fix: 修复工单ticket exclude perm

* fix: 修复perm tree

Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-11 13:30:14 +08:00
jiangweidong f04378eaf8 feat: JumpServer支持部署在使用了ssl的redis上 2022-03-11 12:56:22 +08:00
fit2bot b644c47173
perf: 排除工单流权限 (#7798) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-11 11:04:21 +08:00
ibuler 8a565b9eef perf: 修改设置 2022-03-10 20:30:41 +08:00
ibuler 4eb7b50b52 perf: 修改设置 2022-03-10 20:30:41 +08:00
Jiangjie.Bai fd64bd03b4 fix: 修改LDAP配置API权限 2022-03-10 19:03:51 +08:00
Jiangjie.Bai 9c75147179 fix: 修改LDAP配置API权限 2022-03-10 19:03:51 +08:00
fit2bot 147e4cce94
perf: 修改 migrations (#7794) 
* perf: 优化 auditor 权限

* perf: 修改 migrations

Co-authored-by: ibuler <ibuler@qq.com>
 2022-03-10 18:55:53 +08:00
fit2bot d1e25e1fef
fix: 删除应用/授权应用相关权限 (#7792) 
* fix: 删除应用/授权应用相关权限

* fix: 删rbac清除code的一些迁移文件;增加到utils目录下

Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
 2022-03-10 18:51:45 +08:00
fit2bot af2ba07338
fix: exclude (#7791) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-10 18:11:33 +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
fit2bot 64e0860d24
fix: 修复app suggestion perm bug (#7788) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-10 17:24:24 +08:00
ibuler 9934007397 fix: 优化 perm exclude 2022-03-10 16:56:32 +08:00
Jiangjie.Bai 4044a71aea revert: 回滚权限树 2022-03-10 15:27:15 +08:00
fit2bot 9725f0c963
fix: 修复工单流500bug (#7784) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-10 11:26:34 +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
fit2bot 9ca0eaf7ce
fix: 修改校对资产数量permbug (#7777) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-09 15:01:44 +08:00
fit2bot 94e60e180e
fix: 修复新建组织用户列表获取到是全局用户bug (#7776) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-09 11:17:28 +08:00
fit2bot 8ed221ea5a
fix: org role perm (#7775) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-08 20:22:10 +08:00
fit2bot 42ebb1f82f
fix: 删除组织角色时 判断全局绑定用户数量 (#7774) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-08 20:00:19 +08:00
ibuler 9492518773 perf: 修改 redis conn 2022-03-08 18:49:50 +08:00
feng626 1cca9c10fb perf: 修改perm判断逻辑 2022-03-08 18:41:50 +08:00
feng626 c4a6715eb8 fix: 命令存储 or 命令权限 2022-03-08 17:43:26 +08:00
ibuler 4c31b5ec0f perf: 去掉一些 perm 2022-03-08 17:33:06 +08:00
fit2bot 9fd7fa9339
fix: add auditor perm (#7768) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-08 15:53:02 +08:00
feng626 a930f3aab3 fix: 修复创建更新用户给定默认权限 2022-03-08 14:07:02 +08:00
ibuler 5081fb5fe7 perf: 优化perm tree, 并添加缓存 2022-03-08 13:46:25 +08:00
fit2bot cb072123d6
fix: 修复org admin ticket flow perm (#7765) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-08 12:42:46 +08:00
fit2bot 761265dec5
fix: 修复index api perm (#7761) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-08 10:43:01 +08:00
fit2bot 89de111acc
fix: 修复特殊用户过滤 (#7759) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-07 20:09:52 +08:00
ibuler 14327ee398 perf: 优化账号备份api path 2022-03-07 19:56:27 +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 3222687aaa
fix: 修复应用授权权限bug (#7756) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-07 18:42:22 +08:00
feng626 79994f5ddc fix: 资产授权权限bug 2022-03-07 18:25:06 +08:00
fit2bot 8271492ec1
fix: 修复查看资产密钥bug (#7754) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-07 17:55:35 +08:00
fit2bot 27560793f8
fix: 修复系统用户任务权限bug (#7753) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-07 16:01:02 +08:00
Jiangjie.Bai 615929dd43 fix: 修复可以删除已关联用户角色的问题 2022-03-07 15:05:58 +08:00
feng626 a1c1b128e9 fix: 修复relation_systemuser_perm问题 2022-03-07 14:53:38 +08:00
ibuler fa2c70c6be perf: 修改 perm node title 2022-03-07 14:39:07 +08:00
Jiangjie.Bai 46e119db1f fix: 后台不限制roles的必填项 2022-03-07 13:56:13 +08:00
ibuler 0afff45bae fix: validate app perm error 2022-03-07 11:42:39 +08:00
fit2bot 31d219524b
fix: 修复创建用户roles必填问题 (#7745) 
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
 2022-03-07 11:21:25 +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
feng626 eb6bddc599 fix: 拆分角色权限树router 2022-03-04 18:13:59 +08:00
Jiangjie.Bai 8a8ed90eef fix: 保留之前的jms_oidc_rp包 2022-03-04 18:12:46 +08:00
Jiangjie.Bai 75825f5baa fix: 删除jms_oidc_rp包中的表jms_oidc_rp_oidcuser 2022-03-04 18:12:46 +08:00
fit2bot 0141fce27d
fix: 审计员add工作台 (#7738) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-04 10:46:45 +08:00
老广 3f9f9351f3
Fix rbac (#7737) 
* perf: 修改 rbac role bingding

* fix: suggestion perm

* perf: 修改 requirements

* perf: 修改 rbac

* fix: auditor_perms

Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-04 10:16:21 +08:00
ibuler 390b8693df perf: 修改 signal handler 2022-03-03 10:03:06 +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
halo 04e46e4b1c fix: 修复节点创建不能指定id问题，兼容api 2022-03-02 16:24:03 +08:00
fit2bot ab1024fbf4
perf: 优化 super ticket 的状态 (#7714) 
* fix: token 系统用户增加 protocol

* fix: 修复清除orphan session时同时清除对应的 session_task

* perf: 修改 connection token api

* fix: 修复无法获取系统角色绑定的问题

* perf: 增加 db terminal 及 magnus 组件

* perf: 修改 migrations

* fix: 修复AUTHENTICATION_BACKENDS相关的逻辑

* fix: 修改判断backend认证逻辑

* fix: 修复资产账号查看密码跳过mfa

* fix: 修复用户组授权权限错误

* feat: 支持COS对象存储

* feat: 升级依赖 jms_storage==0.0.42

* fix: 修复 koko api 问题

* feat: 修改存储翻译信息

* perf: 修改 ticket 权限

* fix: 修复获取资产授权系统用户 get_queryset

* perf: 抽取 ticket

* perf: 修改 cmd filter 的权限

* fix: 修改 ticket perm

* perf: 修改工单的api

Co-authored-by: Eric <xplzv@126.com>
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: 小冯 <xiaofeng@xiaofengdeMacBook-Pro.local>
Co-authored-by: feng626 <1304903146@qq.com>
 2022-02-28 20:22:14 +08:00
Jiangjie.Bai 03afa4f974
Fix rbac (#7713) 
* fix: token 系统用户增加 protocol

* fix: 修复清除orphan session时同时清除对应的 session_task

* perf: 修改 connection token api

* fix: 修复无法获取系统角色绑定的问题

* perf: 增加 db terminal 及 magnus 组件

* perf: 修改 migrations

* fix: 修复AUTHENTICATION_BACKENDS相关的逻辑

* fix: 修改判断backend认证逻辑

* fix: 修复资产账号查看密码跳过mfa

* fix: 修复用户组授权权限错误

* feat: 支持COS对象存储

* feat: 升级依赖 jms_storage==0.0.42

* fix: 修复 koko api 问题

* feat: 修改存储翻译信息

* perf: 修改 ticket 权限

* fix: 修复获取资产授权系统用户 get_queryset

* perf: 抽取 ticket

* perf: 修改 cmd filter 的权限

* fix: 修改 ticket perm

* fix: 修复oidc依赖问题

Co-authored-by: Eric <xplzv@126.com>
Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: 小冯 <xiaofeng@xiaofengdeMacBook-Pro.local>
Co-authored-by: feng626 <1304903146@qq.com>
 2022-02-28 19:28:58 +08:00
Jiangjie.Bai edfca5eb24
Fix rbac (#7699) 
* perf: 优化 suggesstion

* perf: 修改 migrations

* feat: 添加OIDC认证逻辑

* perf: 修改 backend

* perf: 优化认证backends

* perf: 优化认证backends

* perf: 优化CAS认证, 用户多域名进行访问时回调到各自域名

Co-authored-by: ibuler <ibuler@qq.com>
 2022-02-25 19:23:59 +08:00
老广 02ca473492
Fix rbac (#7690) 
* perf: 优化 suggesstion

* perf: 修改 migrations
 2022-02-24 12:03:40 +08:00
老广 484b75bb53
Merge pull request #7687 from jumpserver/fix_rbac 
fix: rbac
 2022-02-24 10:06:47 +08:00
xinwen 9c3fd59ef4 fix: 删除用户最近登录的资产接口 2022-02-23 18:35:53 +08:00
feng626 bbf3250161 fix: 优化用户列表接口性能 2022-02-23 18:35:10 +08:00
feng626 8604b9019f fix: 添加迁移文件 2022-02-23 18:32:30 +08:00
Jiangjie.Bai 966b4250b8 Merge branch 'fix_rbac' of github.com:jumpserver/jumpserver into fix_rbac 2022-02-23 18:28:47 +08:00
Jiangjie.Bai 291f2b0e13 fix: 修复用户列表出现服务账号的问题 2022-02-23 18:28:23 +08:00
Eric a1d15ef206 fix: 修复管理员终断会话API 2022-02-23 17:10:02 +08:00
ibuler e76eec530f perf: 添加migrations 2022-02-23 17:06:07 +08:00
ibuler add4d8d2cd fix: 修改上传录像 api 权限 2022-02-23 15:47:12 +08:00
ibuler c6ece550a9 perf: 修改翻译 2022-02-22 19:53:00 +08:00
xinwen e3b620089a feat: 个人页面接口 2022-02-22 18:29:49 +08:00
Jiangjie.Bai 64f721875b fix: 修复用户页面点击资产树节点提示对象找不到的问题 2022-02-22 18:29:49 +08:00
feng626 09494193ab fix: 修复批量操作权限bug 2022-02-22 18:29:49 +08:00
feng626 702111f578 fix: 修复系统用户sudo tab权限 2022-02-22 18:29:49 +08:00
feng626 e08db7423f fix: 修复资产账号测试可连接性权限问题 2022-02-22 18:29:49 +08:00
ibuler 0c95faac04 fix: 修复 cache set 2022-02-22 18:29:49 +08:00
fit2bot 534cbf1281 perf: 修改依赖版本 (#7666) 
* perf: 修复一些错误权限位

* Pr@fix rbac@fix rbac permissions (#7648)

* fix: 确保每次 migrate 执行更新 role permissions

* perf: 修改 choices

* feat: 兼容apple m1

* perf: 修改 migrations role permissions

* perf: pymysql 导入

* perf: admin 判断

* perf: 修改依赖版本

Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
 2022-02-22 18:29:49 +08:00
feng626 2a2f05e51c fix: 删除组织关联删除工单 工单流 2022-02-22 18:29:49 +08:00
xinwen f460916e84 fix: swagger 2022-02-22 18:29:49 +08:00
jiangweidong ad2cb233d7
feat: 支持 MongoDB 数据库的纳管 (#7631) 2022-02-22 10:09:48 +08:00
halo 0dbf035146 perf: 优化代码 2022-02-21 16:52:21 +08:00
halo ea124fd0db fix: 修复keycloak配置转换为openid不生效问题,持久化到数据库 2022-02-21 16:52:21 +08:00
Jiangjie.Bai 83ff8dbf26
fix: rbac 合并 (#7658) 
* perf: 修复一些错误权限位

* Pr@fix rbac@fix rbac permissions (#7648)

* fix: 确保每次 migrate 执行更新 role permissions

* perf: 修改 choices

* feat: 兼容apple m1

* perf: 修改 migrations role permissions

* perf: pymysql 导入

* perf: admin 判断

* fix: 修复消息订阅权限

Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
Co-authored-by: feng626 <1304903146@qq.com>
 2022-02-21 16:24:03 +08:00
Jiangjie.Bai 783c163324 fix: 修复获取命令过滤规则时按照有组织的资源进行组织过滤 2022-02-19 11:44:03 +08:00
Jiangjie.Bai 3deced4ade fix: 修复登录系统用户temp_auth保存时构建的key和获取时不一致的问题 2022-02-18 20:07:19 +08:00
fit2bot 63de4e1806
perf: 添加 is_org_admin (#7644) 
* fix: 修复 org members 的问题

* perf: 修改 org member

* perf: 修改 is sa

* perf: 修改 active

* perf: 修复写法

* perf: is_sa to is_service_account

Co-authored-by: ibuler <ibuler@qq.com>
 2022-02-18 16:25:54 +08:00
ibuler 48d0c7b6cc fix: 修复 org members 的问题 2022-02-18 14:37:38 +08:00
ibuler 20cc8a124f perf: 修改connection token domain 
perf: 添加 org_id
 2022-02-18 14:10:22 +08:00
ibuler db050e405d fix: 修改 migrations 2022-02-17 23:02:32 +08:00
fit2bot e259d2a9e9
fix: fix rbac to dev (#7636) 
* feat: 添加 RBAC 应用模块

* feat: 添加 RBAC Model、API

* feat: 添加 RBAC Model、API 2

* feat: 添加 RBAC Model、API 3

* feat: 添加 RBAC Model、API 4

* feat: RBAC

* feat: RBAC

* feat: RBAC

* feat: RBAC

* feat: RBAC

* feat: RBAC 整理权限位

* feat: RBAC 整理权限位2

* feat: RBAC 整理权限位2

* feat: RBAC 整理权限位

* feat: RBAC 添加默认角色

* feat: RBAC 添加迁移文件；迁移用户角色->用户角色绑定

* feat: RBAC 添加迁移文件；迁移用户角色->用户角色绑定

* feat: RBAC 修改用户模块API

* feat: RBAC 添加组织模块迁移文件 & 修改组织模块API

* feat: RBAC 添加组织模块迁移文件 & 修改组织模块API

* feat: RBAC 修改用户角色属性的使用

* feat: RBAC No.1

* xxx

* perf: 暂存

* perf: ...

* perf(rbac): 添加 perms 到 profile serializer 中

* stash

* perf: 使用init

* perf: 修改migrations

* perf: rbac

* stash

* stash

* pref: 修改rbac

* stash it

* stash: 先去修复其他bug

* perf: 修改 role 添加 users

* pref: 修改 RBAC Model

* feat: 添加权限的 tree api

* stash: 暂存一下

* stash: 暂存一下

* perf: 修改 model verbose name

* feat: 添加model各种 verbose name

* perf: 生成 migrations

* perf: 优化权限位

* perf: 添加迁移脚本

* feat: 添加组织角色迁移

* perf: 添加迁移脚本

* stash

* perf: 添加migrateion

* perf: 暂存一下

* perf: 修改rbac

* perf: stash it

* fix: 迁移冲突

* fix: 迁移冲突

* perf: 暂存一下

* perf: 修改 rbac 逻辑

* stash: 暂存一下

* perf: 修改内置角色

* perf: 解决 root 组织的问题

* perf: stash it

* perf: 优化 rbac

* perf: 优化 rolebinding 处理

* perf: 完成用户离开组织的问题

* perf: 暂存一下

* perf: 修改翻译

* perf: 去掉了 IsSuperUser

* perf: IsAppUser 去掉完成

* perf: 修改 connection token 的权限

* perf: 去掉导入的问题

* perf: perms define 格式，修改 app 用户 的全新啊

* perf: 修改 permission

* perf: 去掉一些 org admin

* perf: 去掉部分 org admin

* perf: 再去掉点 org admin role

* perf: 再去掉部分 org admin

* perf: user 角色搜索

* perf: 去掉很多 js

* perf: 添加权限位

* perf: 修改权限

* perf: 去掉一个 todo

* merge: with dev

* fix: 修复冲突

Co-authored-by: Bai <bugatti_it@163.com>
Co-authored-by: Michael Bai <baijiangjie@gmail.com>
Co-authored-by: ibuler <ibuler@qq.com>
 2022-02-17 20:13:31 +08:00
feng626 b088362ae3 perf: 账号备份性能优化 2022-02-17 11:02:49 +08:00
xinwen c7f8ebb613 fix: 站内信 ServerPerformanceCheck redis 订阅报错 2022-02-17 10:53:36 +08:00
xinwen a806a2d3e6 fix: 翻译 2022-02-16 19:16:45 +08:00
ibuler f548abcb87 perf: 用户临时密码支持加密传输 2022-02-16 16:31:57 +08:00
xinwen 35c6b581e2 feat: 远程应用支持磁盘挂载 2022-02-16 16:29:06 +08:00
feng626 ff9347e344 fix: 工单流需要超级管理员配置 2022-02-16 14:37:26 +08:00
feng626 da0bbcee57 fix: 修复资产账号过滤重复问题 2022-02-16 11:35:53 +08:00
ibuler 824d10ce93 pref: connection token 添加 secret 2022-02-16 11:33:25 +08:00
feng626 1d6dcf9fb5 fix: 修复命令报警翻译 2022-02-15 18:33:52 +08:00
Jiangjie.Bai 3325867f8f fix: 修改LDAP SYNC相关参数设置 2022-02-15 17:57:56 +08:00
xinwen 2f43aeee5d fix: Authbook 修改秘钥不生效 2022-02-15 11:14:51 +08:00
Jiangjie.Bai 764d70ea4f fix: 修改用户组名称翻译 2022-02-14 19:27:41 +08:00
feng626 7f36958683 perf: 工单流只需组织管理员权限 2022-02-14 18:15:11 +08:00
xinwen fa5921cd86 fix: 去掉 can_replay 兼容代码 2022-02-14 18:14:37 +08:00
feng626 540679df11 fix: 修复operatelog add remove 翻译问题 2022-02-14 14:04:59 +08:00
fit2bot 597b022905
fix: 修复历史会话文件不能被清理的bug (#7604) 
* fix: 修复历史会话文件不能被清理的bug

* perf: 删除调试日志

Co-authored-by: halo <wuyihuangw@gmail.com>
 2022-02-14 10:58:30 +08:00
jiangweidong ab34b9906e perf: 切割一次就可以了 2022-02-10 18:34:09 +08:00
jiangweidong 755fa8efa8 perf: 兼容不同版本间JumpServer获取的SAML2协议用户属性 2022-02-10 18:34:09 +08:00
feng626 889713f00e fix: 修复工单流程设置显示其它组织问题 2022-02-10 14:07:32 +08:00
xinwen 333bb64b8b fix: Authbook 取认证信息bug 2022-02-10 11:20:40 +08:00
Michael Bai 67a49dc5e9 feat: syslog 记录的数据来源于序列类 2022-02-08 19:22:08 +08:00
Michael Bai 8085db7acc feat: 增加系统设置(安全)控制第三方认证用户是否进行MFA认证 2022-02-08 17:48:40 +08:00
Michael Bai 6adeafd1d2 fix: 修复创建命令过滤规则失败的问题 2022-02-08 14:21:43 +08:00
xinwen 1faba95a48 fix: 修复 xrdp 连接资产时会生成用户登录日志 2022-02-08 12:38:27 +08:00
xinwen f994f5d776 fix: redis 订阅 bug 2022-02-08 12:35:16 +08:00
ibuler 55fae1667d fix: 修复 redis 连接过多的问题 2022-02-08 12:35:16 +08:00
Michael Bai b3397c6aeb feat: 命令过滤规则增加忽略大小写选项 2022-02-08 12:31:15 +08:00
feng626 acdde5a236 fix: 密钥密码翻译 2022-01-27 18:19:44 +08:00
feng626 a81f6bf97b fix: 应用账号attrs字段问题 2022-01-20 13:20:45 +08:00
Michael Bai b07f532a71 fix: 修复导出应用账号会包含attrs字段的问题 2022-01-20 12:00:18 +08:00
feng626 46270fd91c fix: authbook load asset queryset bug 2022-01-20 11:03:18 +08:00
feng626 9e47bf6ec5 fix: 批量命令bug 2022-01-19 19:34:32 +08:00
ibuler 89c7e514eb perf: 修复登录和推送系统用户是密码选择 2022-01-19 19:08:38 +08:00
feng626 83c5344307 fix: 获取命令规则过滤不准 2022-01-19 19:07:43 +08:00
feng626 2beec1a03b
Merge pull request #7530 from jumpserver/pr@dev@ssh_passphrase_bug 
fix: 修改 修改ssh密钥时报500问题
 2022-01-19 11:11:49 +08:00
feng626 69d4a0a250 fix: 修改 修改ssh密钥时报500问题 2022-01-19 10:39:17 +08:00
feng626 e33a67daf6 fix: 修复工单审批后审批人与记录人不一致问题 2022-01-19 10:33:41 +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 59d0f53725 fix: 修改审计日志操作日志动作翻译问题 2022-01-18 15:21:35 +08:00
Michael Bai 518caa4f7a fix: 修改应用账号APP名称的VerboseName 2022-01-18 15:03:23 +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
xinwen 561ce53413 fix: 空的 es 存储，指定 timestamp 排序报错 2022-01-18 10:14:51 +08:00
feng626 005032ea00 fix: 修复账号备份存在外键search 500 bug 2022-01-17 19:21:13 +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
xinwen 088676d998 fix: 计算工单序号的时候切换到root组织 2022-01-17 16:22:04 +08:00
jiangweidong 106bb9b63d perf: SAML2属性映射去掉域名前缀 2022-01-17 16:06:37 +08:00
ibuler 451e61bb61 perf: 优化 celery 任务中的数据库连接问题 
perf: add comment
 2022-01-17 16:04:50 +08:00
halo e1de210585 feat: 创建用户邮件内容支持html标签 2022-01-17 16:03:04 +08:00
xinwen cce34f4939 fix: 用户登录失败时，登陆日志中的认证方式不准确 2022-01-17 16:02:28 +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
feng626 6a4ffcc9ad fix: 修复工单审批后state不准问题 2022-01-16 17:49:17 +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
Michael Bai ba695c4600 fix: 抽象permissions-serializer的actions字段值设置 2022-01-13 18:58:10 +08:00
Michael Bai 21a34ddc03 feat: 返回License信息 2022-01-13 18:55:44 +08:00
ibuler 145c7952c9 perf: 优化 ops 任务，支持 i18n 
- 内置任务名称支持了 i18n，数据库存英文，返回是翻译一下
- 任务执行中，添加 language 上下文
 2022-01-13 15:03:48 +08:00
xinwen 43c4c78378 fix: 工单序号添加排序 2022-01-13 14:37:02 +08:00
Michael Bai 620834c817 fix: 修改工单迁移文件warining问题 
Any fields that are stored with VARCHAR column types may have their max_length restricted to 255 characters if you are using unique=True for the field.
See: https://docs.djangoproject.com/en/3.1/ref/databases/#mysql-character-fields
 2022-01-13 14:36:30 +08:00
xinwen 4b44a54d97 fix: 腾讯验证码测试不通过 2022-01-12 20:57:22 +08:00
feng626 e5659a1d07 fix: 修复翻译及迁移文件 2022-01-12 20:55:58 +08:00
xinwen 414137cd73 fix: 三方认证绑定发通知文案 2022-01-12 20:34:19 +08:00
xinwen 1e3a15a3d0 feat: 三方认证绑定发通知 2022-01-12 20:23:25 +08:00
ibuler dde7559f47 feat: node api 支持使用 full_value 递归创建 2022-01-12 20:23:16 +08:00
feng626 b0932e5137 feat: 逃生通道 2022-01-12 20:22:36 +08:00
xinwen 5cdc4c3c28 feat: 工单添加序号 2022-01-12 10:38:07 +08:00
Michael Bai 4405abbedf feat: 2022 2022-01-04 12:54:12 +08:00
halo 3f6c9d519e fix: 修复通知用户过期时间bug 2021-12-31 17:26:23 +08:00
xinwen bd84edea62 feat: 资产登录工单页面增加监控与中断 2021-12-31 17:23:39 +08:00
feng626 100bfe0304 feat: 新增获取k8s pod namespace container接口 2021-12-31 15:54:59 +08:00
feng626 11fd9a6567 feat: 配置私钥密码 2021-12-31 14:47:01 +08:00
Michael Bai 90299a508c fix: 授权actions serializer 设置default值 2021-12-30 17:25:00 +08:00
Michael Bai de9516dee5 feat: 应用授权增加Action动作控制 2021-12-30 14:47:58 +08:00
jiangweidong db01a6d48d fix: 因为admin_user表中有历史数据，导致组织无法删除 2021-12-30 10:48:07 +08:00
halo c2d271f00b feat: rdp协议新增username表达式，匹配更多特殊字符 2021-12-30 10:01:26 +08:00
halo 90de229631 feat: rdp协议username支持输入中文和$ 2021-12-30 10:01:26 +08:00
xinwen 35a10fdd62 feat: 命令记录接口增加 remote_addr 字段 2021-12-28 18:26:21 +08:00
xinwen 89cad224c5 fix: SSO 限制用户删除 2021-12-28 18:24:32 +08:00
jiangweidong 9b2e1e08d8 feat: 将redis_acl协议合并到redis协议中 2021-12-28 18:15:00 +08:00
jiangweidong aaaa87dd60 feat: 增加数据库redis的纳管功能 2021-12-28 18:15:00 +08:00
Eric d76ef788d2 perf: 修改 Jmservisor 的下载地址名称 2021-12-24 11:35:47 +08:00
feng626 38c870a0b5 perf: 工单流对应受理人懒加载 2021-12-21 18:20:02 +08:00
Michael Bai ac9e7e9b40 fix: 下载页面添加Jmservisor拉起脚本 2021-12-17 15:54:32 +08:00
Michael Bai 5aed04d58b fix: 修改SAML2.0 Logo 2021-12-17 15:25:15 +08:00
ibuler b92530f0b9 perf: 优化通知，对支持 markdown 的发 markdown 2021-12-15 20:58:33 +08:00
ibuler b113eeb1d6 perf: 修复基本设置中的 base_site 可能带 / 的问题 2021-12-15 20:55:06 +08:00
ibuler eb3165f8e7 perf: 优化 saml 2021-12-15 20:54:34 +08:00
xinwen 93d77b2312 fix: 执行 ansible 任务日志记录错误 2021-12-15 18:02:14 +08:00
Michael Bai ae1d419f70 fix: 修复用户组命令过滤规则获取不到的问题 2021-12-15 16:34:33 +08:00
feng626 022e93d7a2 feat: translate 2021-12-15 16:15:21 +08:00
Michael Bai ac14790960 fix: 修改命令过滤规则动作允许值1->9 2021-12-15 14:57:44 +08:00
feng626 facc231e3f
Merge pull request #7394 from jumpserver/pr@dev@ticket_filter_bug 
perf: ticket filter
 2021-12-15 14:40:28 +08:00
feng626 e4178849ba perf: ticket filter 2021-12-15 14:23:07 +08:00
xinwen 27588f48d8 fix: authbook 创建的时候没有自动推送 2021-12-14 20:07:16 +08:00
Michael Bai 303102d40b fix: 删除一些启动时大量输出的debug日志 2021-12-14 20:06:49 +08:00
xinwen ff9632d6da fix: LDAP 测试连接报错 2021-12-14 20:04:41 +08:00
Michael Bai 4cbf6dd5e6 fix: 修复获取系统用户认证信息API 2021-12-14 19:12:22 +08:00
xinwen 4f889cfe36 fix: 带 ad_domain 的系统用户不应该支持推送 2021-12-14 18:05:34 +08:00
ibuler 0c2e5f3f2a perf: 优化 saml2 i18n 2021-12-14 18:01:08 +08:00
ibuler 19ecc7fef6 fix: 修复 otp 返回时报错 2021-12-14 17:50:33 +08:00
ibuler fa5c433c7c perf: 优化启动脚本，避免启动超时 2021-12-14 17:47:10 +08:00
jiangweidong 5139f9c4b9 feat: saml2认证支持https协议 2021-12-14 17:12:43 +08:00
xinwen b3acc0d451 fix: 去掉 get_docker_mem_usage_if_limit 日志 2021-12-13 18:09:55 +08:00
ibuler 330917df4c fix: 修复 saml2 登陆的问题 2021-12-13 17:52:18 +08:00
ibuler 21d4ffa33b perf: 优化 cas 回调地址翻译 2021-12-13 16:33:00 +08:00
xinwen 1bc14c53d4 fix: 企业微信发送报错 2021-12-13 16:32:09 +08:00
ibuler 5024d0d739 perf: 优化 saml2 log 2021-12-13 16:30:38 +08:00
jiangweidong c5013dcbd6
feat: saml2协议单点登录支持在页面上配置saml2协议的高级配置 (#7362) 2021-12-13 10:54:14 +08:00
halo 84924bc3f6 fix: 修复会话详情页命令列表排序失效bug 2021-12-13 10:52:37 +08:00
feng626 ab68aed98f
Merge pull request #7363 from jumpserver/pr@dev@ticket_bug 
perf: 工单根据选择组织自动选择流
 2021-12-13 10:25:48 +08:00
feng626 9b9e32d2f4 perf: 工单根据选择组织自动选择流 2021-12-11 12:50:30 +08:00
ibuler b6249e9a63 fix: 修复登录时跳转问题 2021-12-10 17:49:29 +08:00
Michael Bai 74fe9dddb7 fix: 修改i18n 2021-12-09 20:35:52 +08:00
ibuler ade3f3ae6c fix: 修复需要设置 mfa 的 bug 2021-12-09 20:24:02 +08:00
Michael Bai 1c3b574c46 fix: 修复系统用户命令过滤规则必填的问题 2021-12-09 20:23:26 +08:00
Michael Bai 92aeae4a2a fix: 修改i18n 
fix: 修改i18n
 2021-12-09 20:23:07 +08:00
xinwen ea6c28fa0d fix: 修改 cgroup memory log 2021-12-09 20:22:34 +08:00
fit2bot f44acc923b
perf: 修改 otp 的显示，避免误会 (#7345) 
perf: 还是用 OTP 吧

Co-authored-by: ibuler <ibuler@qq.com>
 2021-12-09 19:33:11 +08:00
Michael Bai bbf2aff96c feat: 命令过滤器支持多维度绑定 
feat: 修改命令过滤规则校验

feat: 修改系统用户命令过滤器迁移文件
 2021-12-09 19:06:28 +08:00
ibuler 3ea4a9fbe6 chore: 修改 html 中 license 文案 2021-12-09 17:33:56 +08:00
fit2bot 3962af7c4f
feat: 支持saml2协议的单点登录，合并代码 (#7347) 
* fix: 支持saml2协议的单点登录

* feat: 支持saml2协议的单点登录，合并代码

Co-authored-by: jiangweidong <weidong.jiang@fit2cloud.com>
 2021-12-09 15:47:21 +08:00
fit2bot c7f2afc3c1
fix: redis lock bug (#7338) 
Co-authored-by: feng626 <1304903146@qq.com>
 2021-12-08 17:55:32 +08:00
xinwen 16fae00e0e feat: xrdp 远程应用 2021-12-08 15:55:49 +08:00
Eric_Lee 0afeed0ff1
feat: 录像增加 cast 格式 (#7259) 
* feat: 录像增加 cast 格式

* perf: 优化一下写法

* perf: 修改一点点

Co-authored-by: ibuler <ibuler@qq.com>
 2021-12-08 15:35:22 +08:00
Michael Bai d72aa34513 fix: 修改命令过滤规则生成正则表达式的逻辑，提高命令过滤准确性 2021-12-08 10:24:33 +08:00
feng626 adb9f01231 feat: 密码计划邮件提醒 2021-12-07 17:00:33 +08:00
xinwen 24bbe7c31f fix: 计算docker limit 内存使用率时区分 cgroup v1 v2 2021-12-06 11:22:45 +08:00
xinwen 36c6299a03 fix: redis 锁在redis集群环境报错 2021-12-03 19:23:44 +08:00
feng626 ac4b6e5b96 feat: 工单创建资产添加节点 2021-11-30 16:38:30 +08:00
ibuler c85249be36 perf: 优化订阅处理，形成框架 2021-11-29 15:01:37 +08:00
ibuler de006bc664 perf: 资产添加标签显示，更加易读 
pref: 添加翻译
 2021-11-29 14:57:50 +08:00
xinwen a313e011ef perf: 内存使用率兼顾 docker cgroup limit 2021-11-29 14:53:04 +08:00
Michael Bai 3076b7a5e1 fix: 修复migrations序号重复问题 2021-11-29 11:24:12 +08:00
ibuler 7f61c49db2 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2021-11-25 20:00:34 +08:00
ibuler c8a76c9afb fix: 修复 close connection 的问题 2021-11-25 18:29:01 +08:00
ibuler 3e85a9a079 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2021-11-25 18:05:18 +08:00
ibuler 62cbca7eb2 fix: 修复重置 mfa 的提示问题 2021-11-25 17:50:47 +08:00
ibuler 434793bc41 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2021-11-25 17:44:51 +08:00
xinwen 85a017b2c4 fix: 按资产ip搜索数据不全 2021-11-25 17:29:47 +08:00
ibuler 84bce19a92 perf: 去掉登录页面更好 2021-11-25 16:02:40 +08:00
ibuler 3874b8ed67 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 
repr@dev_v2.16_v2.15@2ee26971c9b152@fix_xxxx
merges an updated upstream into a topic branch.
 2021-11-25 15:58:33 +08:00
ibuler 7f0ad7e27f fix: 修复 oidc cas 登录时跳转问题 
perf: 优化一波，容易debug

perf: 还原回来的世界
 2021-11-25 15:01:42 +08:00
ibuler 2ee26971c9 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2021-11-24 20:41:41 +08:00
ibuler 5ace5a752e fix: 修复 cas/oidc 登录 MFA 产生的bug 
perf: 优化更严谨
 2021-11-24 19:05:15 +08:00
Michael Bai e838d974c3 fix: 修复根据节点/资产查询授权时报错的问题 2021-11-24 19:04:42 +08:00
ibuler 9dd93ea3b8 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2021-11-24 16:15:57 +08:00
ibuler 1132c6a4e4 fix: 修复 mfa radius 登录的bug 2021-11-24 12:51:12 +08:00
ibuler 0762f87ba5 Merge branch 'master' into dev 2021-11-24 11:25:51 +08:00
chenqiao cb98b4f80a feat:新增对sqlserver数据库托管 2021-11-24 11:21:04 +08:00
feng626 599d58e9f2 fix: 修复重置mfa 500 bug 2021-11-23 16:11:54 +08:00
ibuler 5c6f1730d5 perf: 系统用户密码不再trim空格 2021-11-23 10:41:58 +08:00
feng626 67d084fc43 perf: ip list 优化 2021-11-19 16:36:58 +08:00
feng626 24d0d52a0a perf: 优化ip黑白名单 2021-11-19 11:48:45 +08:00
xinwen d94c515cfc fix: 验证码逻辑错误 2021-11-19 10:46:59 +08:00
Michael Bai cae956f9a5 fix(i18n): 修改翻译文件 2021-11-18 19:07:14 +08:00
ibuler 70e8a03888 fix: 修复 mfa 登录时的 focus 错误 2021-11-18 18:49:22 +08:00
fit2bot d2df8acd84
fix: 修复数据库连接没有关闭问题 (#7227) 
* fix: 修复数据库连接没有关闭的bug

perf: websocket 断开也添加关闭数据库连接

* fix: 修复数据库连接没有关闭问题

Co-authored-by: ibuler <ibuler@qq.com>
 2021-11-18 18:47:01 +08:00
Michael Bai 6e5dcc738e fix: 修改ldap分页日志为debug模式 2021-11-18 18:07:51 +08:00
fit2bot 086ecfc046
perf: 优化全局ip限制逻辑 (#7220) 
* perf: 优化全局ip限制逻辑

* perf: 优化全局ip限制逻辑 2

* perf: 优化全局ip限制逻辑 3

Co-authored-by: feng626 <1304903146@qq.com>
Co-authored-by: Michael Bai <baijiangjie@gmail.com>
 2021-11-18 16:55:23 +08:00
Michael Bai 2d6610b133 fix(settings): 修复LDAP系统设置中使用search_ou查询前执行strip操作 2021-11-18 13:01:20 +08:00
Michael Bai dac45f234a fix: 终端列表指标数值保留一位小数 2021-11-17 19:36:52 +08:00
Michael Bai 096b2cf8b8 fix: 修改翻译 2021-11-17 19:36:10 +08:00
fit2bot 0ed0f69be0
fix: 登录日志字段翻译 (#7211) 
Co-authored-by: xinwen <coderWen@126.com>
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com>
 2021-11-17 19:28:58 +08:00
fit2bot 8af88cd2c6
fix: 修复otp verify msg引起的500 (#7210) 
Co-authored-by: ibuler <ibuler@qq.com>
 2021-11-17 16:43:04 +08:00
feng626 2a9f0f8dcf perf: help信息迁移到public中 2021-11-17 15:44:50 +08:00
ibuler cc2d47e6dc perf: 修复首页登录mfa错误提示 2021-11-16 11:33:40 +08:00
xinwen 22c9dfc0f2 fix: 系统用户 actions 2021-11-16 11:33:00 +08:00
fit2bot ed01f2f1fb
fix: 修复xrdp连接时报错 (#7202) 
* fix: 修复xrdp连接时报错

perf: 添加注释

* perf: 去掉import

Co-authored-by: ibuler <ibuler@qq.com>
 2021-11-16 11:32:25 +08:00
ibuler c5ff0d972b perf: 去掉mfa input 的required，以为用户可能没有设置 2021-11-15 17:01:12 +08:00
ibuler 7d9da9ff66 perf: 修改名称 2021-11-15 17:01:12 +08:00
fit2bot d6395b64fa
merge: with dev (#7195) 
* fix: 修复登录mfa时，选择了禁用的

* fix: mfa focus

Co-authored-by: ibuler <ibuler@qq.com>
 2021-11-15 16:51:05 +08:00
xinwen 9bfbdea508 fix: 终端删除后，录像存储不能删除问题 2021-11-15 16:35:02 +08:00
ibuler cb1c906db4 fix: 修复登录时没有绑定mfa，没有跳转的问题 
fix: 首页登录如果没有则后续登录
 2021-11-15 16:20:58 +08:00
ibuler 12a0096963 fix: 修复重置mfa的bug 2021-11-15 16:19:30 +08:00
ibuler a315e8888b perf: 优化一下 win2016 不再内置 2021-11-15 16:18:31 +08:00
ibuler 454d3cba96 fix: 修复登录mfa时，选择了禁用的 2021-11-15 16:17:02 +08:00
feng626 4a786baf4e perf: 工单提示信息优化 2021-11-12 18:00:32 +08:00
xinwen 187977c04a fix: 修改 CPU info 字段 2021-11-12 17:09:42 +08:00
xinwen 4260fe1424 fix: 资产 cpu_info 翻译不对 2021-11-12 16:56:19 +08:00
Michael Bai 7286b1b09e fix: 移动【会话设置保留时间】至定期清理设置页面 2021-11-12 16:54:17 +08:00
xinwen 9a7919f3ac fix: 更新公钥消息不对 2021-11-12 16:44:23 +08:00
xinwen 43cbf4f6a9 fix: 创建存储时名称重复报错 2021-11-12 16:31:14 +08:00
Eric e9dc1ad86a fix: 修复 ssh 工具连接无法二级登录的问题 2021-11-12 16:14:14 +08:00
feng626 90477146ed feat: 添加全局ip黑名单 2021-11-12 14:56:25 +08:00
ibuler 353b66bf8f fix: 修复创建token的问题 2021-11-11 19:10:28 +08:00
ibuler 8761ed741c pref: 资产的硬件信息可以更改 2021-11-11 13:31:18 +08:00
ibuler 0facd8a25e perf: 去掉官网的链接 2021-11-11 13:03:35 +08:00
xinwen b28ce9de7a feat: xrdp session bpp 读取环境变量 2021-11-11 10:42:17 +08:00
jiangweidong f2b72aae37 feat: 支持管理员配置导航栏上帮助中的url 2021-11-10 17:06:16 +08:00
ibuler b001443f34 pref: 修改为内置 2021-11-10 16:59:08 +08:00
fit2bot 17303c0550
pref: 优化MFA (#7153) 
* perf: 优化mfa 和登录

* perf: stash

* stash

* pref: 基本完成

* perf: remove init function

* perf: 优化命名

* perf: 优化backends

* perf: 基本完成优化

* perf: 修复首页登录时没有 toastr 的问题

Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com>
 2021-11-10 11:30:48 +08:00
xinwen bac974b4f2 feat: 异地登录提醒可配置是否启用 2021-11-09 14:35:54 +08:00
Michael Bai f9e970f4ed fix: 修改文案 切换用户 -> 用户切换 2021-11-05 16:41:45 +08:00
Jiangjie.Bai 07c60ca75d
feat: 支持二级登录资产 (#7143) 
* feat: 支持su切换系统用户

* feat: 支持su切换系统用户

* feat: 支持su切换系统用户
 2021-11-05 16:11:29 +08:00
ibuler bbe2678df3 perf: 优化用户创建邮件信息，支持部分标签 2021-11-04 13:45:15 +08:00
ibuler d57f52ee24 feat: 添加 window RDP TLS 平台 2021-11-04 11:05:50 +08:00
feng626 55775f0deb perf: 异地登陆去掉本地判断 2021-11-02 21:11:17 +08:00
xinwen fde118021e fix: Radius 配置 2021-11-02 20:13:14 +08:00
ibuler d484885762 perf: 修复ansible stdout 中非utf8的问题 2021-11-02 20:12:48 +08:00
feng626 8071f45f92 fix: 修复xpack引入包问题 2021-10-29 16:23:49 +08:00
feng626 d44f90ea3d fix: acl xpack 2021-10-28 17:38:55 +08:00
ibuler d44656aa10 fix: 修复修改用户信息后，绑定丢失 
perf: 还原提示文案
 2021-10-28 15:29:55 +08:00
feng626 09d4228182
Merge pull request #7102 from jumpserver/pr@dev@ticket_tips 
perf: 工单错误提示优化
 2021-10-28 15:25:42 +08:00
feng626 3ae8da231a perf: 工单错误提示优化 2021-10-28 15:16:52 +08:00
feng626 2e4b6d150a fix: 登录复合浏览器不兼容 2021-10-28 15:02:54 +08:00
Michael Bai 8542d53aff fix: 修复ldap用户导入时字段进行strip 2021-10-28 15:02:33 +08:00
Michael Bai 141dafc8bf fix: 创建授权/添加资产到节点；不再自动更新资产的管理用户 2021-10-28 13:39:27 +08:00
Michael Bai 28a6024b49 fix: 修改工单列表默认按照创建日志倒叙排序，修改翻译 2021-10-28 13:38:10 +08:00
ibuler 6cf2bc4baf pref: 优化工单验证 2021-10-28 13:37:24 +08:00
xinwen 631f802961 fix: 钉钉报错的时取得字段不对 2021-10-28 13:31:27 +08:00
feng626 0eedda748a perf: acl username unified 2021-10-28 13:31:05 +08:00
feng626 c93ab15351 fix: acl migrate bug 2021-10-27 11:31:16 +08:00
Michael Bai 3fffd667dc fix: 修改系统用户、工单列表排序字段 2021-10-27 11:16:01 +08:00
fit2bot 11fd2afa3a
perf: 优化下载页面 (#7082) 
Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com>
 2021-10-26 17:27:01 +08:00
Michael Bai 1eb59b11da fix: 添加Model的verbose_name属性 2021-10-26 17:22:05 +08:00
feng626 8a413563be fix: 命令记录-导出选择项命令：却导出了所有命令 2021-10-26 16:50:14 +08:00
feng626 da79f8beab fix: 【【账号管理】应用账号导出字段存在英文】 2021-10-26 13:34:59 +08:00
ibuler 3f72c02049 perf: 添加命令org 2021-10-26 11:49:56 +08:00
feng626 380226a7d2 fix: 用户登陆mfa code为空限制 2021-10-26 11:01:12 +08:00
fit2bot f88e5de3c1
perf: 优化用户创建邮件 (#7072) 
* perf: 优化通知中的连接点击

* perf: 优化用户创建邮件

* perf: 优化时间日期

Co-authored-by: ibuler <ibuler@qq.com>
 2021-10-26 10:52:23 +08:00
Michael Bai 7c149fe91b fix: 修复系统用户applications_amount字段只读 2021-10-25 16:25:12 +08:00
Michael Bai 84326cc999 fix: 系统用户列表添加 应用数量 字段 2021-10-25 15:01:29 +08:00
xinwen 7d56678a8e fix: 修复登录次数出现 0 2021-10-25 14:30:48 +08:00
feng626 25d1b71448 fix: 修复分时登陆bug 2021-10-25 14:26:47 +08:00
feng626 d3920a0cc9
Merge pull request #7065 from jumpserver/pr@dev@ticket_bug 
fix: 修复工单发邮件及授权资产备注信息修改
 2021-10-25 11:32:01 +08:00
feng626 52889cb67a fix: 修复工单发邮件及授权资产备注信息修改 2021-10-25 11:30:37 +08:00
feng626 0b67c7a953 fix: 修复登陆复合acl时 未添加规则bug 2021-10-25 10:49:00 +08:00
ibuler 1f50a2fe33 perf: 优化签名 2021-10-25 10:48:27 +08:00
ibuler cd5094f10d perf: 优化通知中的连接点击 2021-10-25 10:48:03 +08:00
fit2bot c244cf5f43
pref: 修改使用的消息内容 (#7061) 
* perf:  再次优化通知

* pref: 修改使用的消息内容

* perf: 修复url地址

Co-authored-by: ibuler <ibuler@qq.com>
 2021-10-22 20:06:16 +08:00
feng626 ea485c3070 fix: 修复工单结束重复发送受理人消息bug 2021-10-22 16:38:14 +08:00
feng626 705f352cb9
Merge pull request #7057 from jumpserver/pr@dev@acl_bug 
fix: 修复acl 选择时间段为空bug
 2021-10-22 16:12:40 +08:00
feng626 dc13134b7b fix: 修复acl 选择时间段为空bug 2021-10-22 16:09:22 +08:00
Michael Bai 06de6c3575 fix: 修复资产系统用户auth-info获取流程及创建时手动登录方式的校验 2021-10-22 15:19:58 +08:00
ibuler c341d01e5a perf: 修改工单信息 2021-10-21 20:04:27 +08:00
feng626 d1a3d31d3f feat: 客户端协议内容添加rdp文件名 2021-10-21 19:16:04 +08:00
ibuler 10f4ff4eec fix: 修复工单通知内容bug 2021-10-21 18:36:29 +08:00
ibuler 25ea3ba01d perf: 修改sdk位置 2021-10-21 17:39:28 +08:00
ibuler 072865f3e5 perf: 优化修改 sdk 位置 2021-10-21 17:39:28 +08:00
ibuler d5c9ec1c3d perf: 优化位置 2021-10-21 17:39:28 +08:00
ibuler 487c945d1d perf: 修改代码位置，用户sugestion增加到6个 2021-10-21 17:39:28 +08:00
feng626 a78b2f4b62 fix: 修复工单发消息报错 2021-10-21 17:31:59 +08:00
ibuler a1f1dce56b perf: 修改格式错误 2021-10-21 16:22:08 +08:00
xinwen a1221a39fd fix: 会话管理翻译 2021-10-21 16:21:49 +08:00
xinwen 8c118b6f47 fix: 组织删除报错未翻译 2021-10-21 16:21:11 +08:00
feng626 526928518d perf: acl filter 2021-10-21 15:00:29 +08:00
feng626 c5f6c564a7 fix: 系统启动bug 2021-10-21 13:05:07 +08:00
fit2bot 00d434ceea
perf: 优化消息通知 (#7024) 
* perf: 优化系统用户列表

* stash

* perf: 优化消息通知

* perf: 修改钉钉

* perf: 修改优化消息通知

* perf: 修改requirements

* perf: 优化datetime

Co-authored-by: ibuler <ibuler@qq.com>
 2021-10-20 19:45:37 +08:00
fit2bot 9acfd461b4
feat: user login acl (#6963) 
* feat: user login acl

* 添加分时登陆

* acl 部分还原

* 简化acl判断逻辑

Co-authored-by: feng626 <1304903146@qq.com>
Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com>
 2021-10-20 17:56:59 +08:00
feng626 9424929dde fix: sms bug 2021-10-19 20:23:06 +08:00
Michael Bai b95d3ac9be fix: 修改终端status翻译 2021-10-19 16:16:48 +08:00
Michael Bai af2a9bb1e6 fix: 修复用户登录失败未记录日志的问题 2021-10-19 15:28:39 +08:00
fit2bot 63638ed1ce
feat: 首页的 chanlege 和 MFA 统一 (#6989) 
* feat: 首页的 chanlege 和 MFA 统一

* 登陆样式调整

* mfa bug

* q

* m

* mfa封装组件 前端可修改配置

* perf: 添加翻译

* login css bug

* perf: 修改一些风格

* perf: 修改命名

* perf: 修改 mfa code 不是必填

* mfa 前端统一组件

* stash

* perf: 统一验证码

Co-authored-by: feng626 <1304903146@qq.com>
Co-authored-by: ibuler <ibuler@qq.com>
 2021-10-18 18:41:41 +08:00
fit2bot fa68389028
perf: 去掉单独的flash msg (#7013) 
* perf: 去掉单独的flash msg

perf: 修改使用库

* fix: guangbug

* pref: 修改 context

Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: xinwen <coderWen@126.com>
 2021-10-18 11:25:39 +08:00
halo 63b338085a feat: 修改username校验，telnet协议支持输入中文 2021-10-15 15:36:29 +08:00
fit2bot 5d8818e69e
feat: 添加资产授权用户API、资产授权用户的授权规则API (#7008) 
* feat: 添加资产授权用户API、资产授权用户的授权规则API

* feat: 添加资产授权用户组API、资产授权用户组的授权规则API

* feat: 抽象API类

Co-authored-by: Michael Bai <baijiangjie@gmail.com>
 2021-10-15 14:02:32 +08:00
xinwen 77521119b9 fix: 修改 oauth 认证提示信息 2021-10-15 11:32:20 +08:00
ibuler 6459c20516 perf: Django语言文件推送到lfs 
perf: 修改mac依赖，添加安装 git lfs

perf: 修改添加 mac 开发环境依赖
 2021-10-14 16:30:18 +08:00
ibuler 0207fe60c5 perf: 修改ip城市获取算法 
perf: 优化使用lfs
 2021-10-14 10:35:18 +08:00
Eric b8c43f5944 fix: 修复获取系统用户密码问题 2021-10-13 14:34:57 +08:00
xinwen 63ca2ab182 fix: 修复 traceback 问题 2021-10-13 11:42:54 +08:00
ibuler f9ea119928 perf: 不再需要 tls 类型，any 方式都可以 2021-10-12 17:45:38 +08:00
xinwen.xu d4bdc74bd8 feat: 授权过期通知 2021-10-11 15:41:13 +08:00
ibuler 42e7ca6a18 perf: 资产编号允许api更改 2021-10-11 15:26:31 +08:00
xinwen 6e0341b7b1 feat: xrdp挂载受授权的上传下载控制 2021-10-11 15:24:34 +08:00
jiangweidong 2f25e2b24c fix: 系统用户认证方式从托管密码更新到手动输入模式后，不填写用户名报错 2021-10-11 10:02:48 +08:00
halo 87dcd2dcb7 feat: 增加关闭第三方登录跳转配置参数 2021-09-29 16:04:59 +08:00
ibuler e96aac058f fix: 修复跳转msg页面，取消button太小的问题 2021-09-29 15:30:17 +08:00
ibuler 913b1a1426 perf: 修改翻译 2021-09-29 14:55:14 +08:00
ibuler 0213154a19 merge: with dev 2021-09-29 14:53:42 +08:00
ibuler 8f63b488b2 perf: 修改翻译 2021-09-29 14:43:00 +08:00
feng626 5588eab57e feat: 用户异地登陆 2021-09-29 14:33:52 +08:00
ibuler e0a8f91741 perf: 修改翻译 2021-09-28 18:57:21 +08:00
ibuler 467ebfa650 perf: 添加公告id 2021-09-28 18:17:10 +08:00
ibuler 0533b77b1b perf: 支持公告 2021-09-28 17:01:47 +08:00
ibuler 8c3ab31e4e fix: 修复由于修改filter引起的问题 2021-09-27 18:50:29 +08:00
Jiangjie.Bai 476e6cdc2f
Merge pull request #6932 from jumpserver/pr@dev@perf_remove_djangopo 
perf: 去掉django.po
 2021-09-27 14:12:26 +08:00
ibuler 0b593f4555 perf: 优化drf filter, 修改terminal filter 
perf: 去掉debug

perf: 去掉debug
 2021-09-27 14:09:22 +08:00
ibuler 456116938d perf: 优化数据迁移，性能提升50倍 2021-09-27 14:05:21 +08:00
ibuler 76b24f62d4 perf: merge with dev 2021-09-27 14:03:19 +08:00
Michael Bai e1eef0a3f3 fix: 修复authbook systemuser字段问题 2021-09-24 20:24:25 +08:00
Michael Bai 2c74727b65 fix: 修复邮件测试序列类及API 2021-09-24 14:13:55 +08:00
ibuler 08cd91c426 perf: 修改应用授权树，没有的时候不显示 2021-09-24 14:12:31 +08:00
Michael Bai a9ddbcc0cd fix: 修复系统用户和资产/节点关联时资产特权用户更新的问题 2021-09-24 12:48:35 +08:00
Michael Bai aec31128cf perf: 修改翻译 2021-09-23 11:14:53 +08:00
ibuler b415ee051d perf: 去掉django.po 2021-09-23 10:26:39 +08:00
ibuler 082a5ae84c perf: 修改不再添加编译后的翻译文件 2021-09-22 18:53:04 +08:00
老广 6b7554d69a
Merge pull request #6929 from jumpserver/pr@dev@ticket_comment 
perf: 工单优化
 2021-09-22 15:51:10 +08:00
feng626 5923562440 perf: 工单优化 2021-09-22 15:17:57 +08:00
老广 d144e7e572
Merge pull request #6922 from jumpserver/pr@dev@fix_tokensmsoptions 
fix: 修复KoKo登录时，未开启SMS服务出现了SMS选项的问题
 2021-09-22 11:24:03 +08:00
ibuler cafbd08986 perf: 修改啊 2021-09-22 11:18:38 +08:00
ibuler b436fc9b44 perf: 优化登录 2021-09-22 11:18:38 +08:00
ibuler 26fc56b4be perf: 优化登录html 2021-09-22 11:18:38 +08:00
Michael Bai 3b1d199669 fix: 修复KoKo登录时，未开启SMS服务出现了SMS选项的问题 2021-09-22 03:17:14 +00:00
ibuler e7edbc9d84 perf: 修改啊 2021-09-18 15:46:41 +08:00
ibuler 41f81bc0bf merge: with dev 2021-09-18 15:29:29 +08:00
ibuler 75d2c81d33 perf: 优化登录 2021-09-18 15:24:04 +08:00
ibuler da2dea5003 perf: 登录错误提示颜色 2021-09-18 15:07:05 +08:00
ibuler e686f51703 perf: 优化登录html 2021-09-17 16:00:23 +08:00
feng626 f2d743ec2b perf: 工单优化 2021-09-17 15:46:33 +08:00
ibuler 7099aef360 perf: 登录错误提示颜色 2021-09-17 14:35:05 +08:00
feng626 743c9bc3f1 fix: 过滤其它类型app 2021-09-16 19:30:32 +08:00
ibuler f963c5ef9d perf: 修改翻译 2021-09-16 19:29:05 +08:00
ibuler 2c46072db2 fix: 修复serializer问题 2021-09-16 19:08:21 +08:00
xinwen b375cd3e75 fix: otp 绑定问题 2021-09-16 19:04:19 +08:00
fit2bot c26ca20ad8
fix: 更新OIDC配置时，将keycloak配置转换为openid (#6893) 
* fix: 修改磁盘使用等key值

* fix: 更新OIDC配置时，将keycloak配置转换为openid

Co-authored-by: Michael Bai <baijiangjie@gmail.com>
 2021-09-16 18:57:09 +08:00
xinwen a784a33203 fix: 去掉手动系统用户提示输入密码 2021-09-16 16:47:15 +08:00
xinwen a452f3307f fix: 组件监控的消息 2021-09-16 16:29:56 +08:00
Michael Bai b7a6287925 fix: 修改磁盘使用等key值 2021-09-16 16:29:19 +08:00
feng626 3cba8648cb fix: 工单日期bug 2021-09-16 16:12:42 +08:00
ibuler ef7b2b7980 perf: 优化登录错误提示 2021-09-16 14:07:51 +08:00
xinwen 1ab247ac22 fix: 用户密码过期提醒 2021-09-16 13:43:09 +08:00
Michael Bai ef8a027849 fix: 修改翻译，链接过期 2021-09-16 11:16:21 +08:00
Michael Bai 7890e43f5a fix: 修改网关测试可连接性报错提示信息 2021-09-16 11:00:10 +08:00
fit2bot 2030cbd19d
fix: 修复authbook信号监听；添加翻译文件.mo (#6882) 
Co-authored-by: Michael Bai <baijiangjie@gmail.com>
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com>
 2021-09-16 10:36:24 +08:00
feng626 0f7c8c2570 fix: 工单复核bug 2021-09-16 10:35:19 +08:00
ibuler f129f99faa perf: 优化修改获取Hostname 2021-09-15 21:04:56 +08:00
fit2bot 43f30b37da
fix: 用户手机号没有校验 (#6875) 
Co-authored-by: xinwen <coderWen@126.com>
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com>
 2021-09-15 21:00:54 +08:00
xinwen 45aefa6b75 fix: 修改一些翻译 2021-09-15 20:59:50 +08:00
xinwen b30123054b fix: xrdp 手动登录系统用户仍然不需要输入密码 2021-09-15 20:58:56 +08:00
wojiushixiaobai b456e71ec4 perf: 更新 client 链接 2021-09-15 20:57:04 +08:00
xinwen 7560b70c4d feat: 用户详情页面显示 手机号，钉钉，企业微信，飞书 2021-09-15 19:42:24 +08:00
Michael Bai 0c96df5283 fix: 系统用户序列类返回nodes 2021-09-15 19:41:45 +08:00
fit2bot 9dda19b8d7
fix: 修改LDAP同步提示信息 (#6872) 
* fix: 修改资产和特权用户发生变化时，更新资产的admin_user

* fix: 修改资产和特权用户发生变化时，更新资产的admin_user

* fix: 修改资产和特权用户发生变化时，更新资产的admin_user

* fix: 修改LDAP同步提示信息

Co-authored-by: Michael Bai <baijiangjie@gmail.com>
 2021-09-15 19:16:44 +08:00
fit2bot fbe5f9a63a
fix: 修改资产和特权用户发生变化时，更新资产的admin_user (#6871) 
* fix: 修改资产和特权用户发生变化时，更新资产的admin_user

* fix: 修改资产和特权用户发生变化时，更新资产的admin_user

* fix: 修改资产和特权用户发生变化时，更新资产的admin_user

Co-authored-by: Michael Bai <baijiangjie@gmail.com>
 2021-09-15 19:11:19 +08:00
xinwen 1c4b4951dc fix: 一些提示 2021-09-15 18:06:57 +08:00
ibuler 8e12399058 perf: 资产序列类优化，改为只读 2021-09-15 18:05:55 +08:00
ibuler 741b96ddee perf: 优化设置中的数字大小 2021-09-15 17:22:23 +08:00
xinwen 8c3f89ee51 fix: 高危命令告警偶发 session 不存在 2021-09-15 17:21:36 +08:00
xinwen dee45ce2e0 fix: 用户离开组织命令复核没有删除 2021-09-15 17:19:37 +08:00
ibuler cfab30f7f7 perf: 修改 i18n 2021-09-15 17:18:17 +08:00
Michael Bai 02e9a96792 fix: 修改翻译 2021-09-15 17:09:48 +08:00
feng626 5a6b64eebd fix: 工单失效日期小于开始日期 2021-09-15 16:25:43 +08:00
feng626 6507f0982c fix: 登陆复核返回后 删除工单 2021-09-15 15:39:34 +08:00
ibuler c115ef7b47 perf: 优化ttl 2021-09-15 15:27:04 +08:00
xinwen bf68ddf09e fix: 腾讯短信检测是否发送成功 2021-09-15 15:26:35 +08:00
xinwen f3906ff998 fix: 用户导出 can_public_key_auth 没翻译 2021-09-15 15:25:52 +08:00
Michael Bai e47ee43631 fix: 修改默认es doc_type 为 _doc 2021-09-15 15:25:09 +08:00
xinwen d22bb2c92f fix: 重置密码连接生成多个token 2021-09-15 11:58:26 +08:00
xinwen 870dac37b9 fix: 重置密码成功的消息里有 br 标签 2021-09-15 11:10:57 +08:00
feng626 a6b40510d0 fix: ticket_notice_bug 2021-09-14 22:32:13 +08:00
feng626 f762fe73ff fix: 工单拒绝清除mfa 2021-09-14 19:36:03 +08:00
xinwen d49d1ba055 perf: oauth2 登录不再限制只能本地用户 2021-09-14 17:40:51 +08:00
ibuler 6e3d950e23 perf: 优化迁移账号，性能提高50倍 2021-09-14 17:39:27 +08:00