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

5342 Commits (6b4dbe655484e134cdb5ddd849e25cec01c356ee)

Author SHA1 Message Date
老广 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