Commit Graph

1991 Commits (4899f6bb69cffc43383a10bf4e77d0b0509a70b8)

Author SHA1 Message Date
fit2bot ab0a1421a0
perf: push_account_enabled (#9727)
Co-authored-by: feng <1304903146@qq.com>
2023-02-23 18:55:15 +08:00
jiangweidong e45eb96f12 fix: 对于网关无法连接的,给出原因并停止此任务的后续步骤,不影响其他任务 2023-02-23 18:15:31 +08:00
ibuler 1a9cd2dee2 perf: 优化资产批量更新 2023-02-23 17:44:38 +08:00
ibuler d1b807bd8b perf: 修改 account asset auto_info 返回 2023-02-23 16:14:24 +08:00
老广 ad0fc0d70a
Merge pull request #9699 from jumpserver/pr@dev@perf_field
perf: 优化部分 field
2023-02-22 20:39:51 +08:00
fit2bot b83667bbd5
perf: celery task and add org single (#9698)
Co-authored-by: feng <1304903146@qq.com>
2023-02-22 20:31:20 +08:00
ibuler ea31de0b2b perf: 优化部分 field 2023-02-22 20:30:43 +08:00
ibuler e5081fd6a9 merge: with dev 2023-02-22 15:17:44 +08:00
ibuler 33f6c5b257 perf: 修改 探测 2023-02-22 15:13:51 +08:00
老广 4b8e2d464f
Merge pull request #9682 from jumpserver/pr@dev@change_platform_migration
perf: 修复用户平台内置的问题
2023-02-22 13:17:14 +08:00
ibuler 6f765ebef5 perf: 修复用户平台内置的问题 2023-02-22 13:08:32 +08:00
jiangweidong fd146055f3 fix: 删除空行 2023-02-22 11:46:28 +08:00
jiangweidong cde59f7ae8 perf: 解决冲突 2023-02-22 11:44:46 +08:00
ibuler 0996b1fbf5 merge: with dev 2023-02-22 11:27:53 +08:00
ibuler b5321e497b perf: 修改账号去掉无用的 2023-02-22 11:25:33 +08:00
ibuler fae494d707 perf: 修改 acount 2023-02-22 11:20:57 +08:00
ibuler 4c233cfb69 perf: 优化 account,去掉版本好 2023-02-22 11:18:42 +08:00
fit2bot b9dcce5c51
fix: 资产更新没有账号及自动化任务更新name (#9679)
Co-authored-by: feng <1304903146@qq.com>
2023-02-22 11:04:29 +08:00
fit2bot d7946ccb6f
perf: 账号 资产 列表任务 (#9676)
Co-authored-by: feng <1304903146@qq.com>
2023-02-21 22:57:31 +08:00
jiangweidong 9c851cbd68 perf: 解决冲突 2023-02-21 20:32:44 +08:00
jiangweidong def5989cdc perf: 支持数据库网域执行Task 2023-02-21 20:27:44 +08:00
fit2bot 0bd674bb9c
perf: ansible enabled false (#9670)
Co-authored-by: feng <1304903146@qq.com>
2023-02-21 20:06:45 +08:00
老广 b5d814e9be
Merge pull request #9665 from jumpserver/pr@dev@fix_platform_internal
perf: 修改 platform 内置创建
2023-02-21 15:50:58 +08:00
ibuler 771ea17469 perf: 修改 platform 内置创建 2023-02-21 15:49:59 +08:00
fit2bot 4735565cb8
perf: inventory 为空 任务跳过 (#9664)
Co-authored-by: feng <1304903146@qq.com>
2023-02-21 15:33:15 +08:00
fit2bot 1caca32a26
perf: merge asset migrate (#9662)
Co-authored-by: feng <1304903146@qq.com>
2023-02-21 15:15:26 +08:00
ibuler 82432299b8 merge: with dev 2023-02-21 13:47:08 +08:00
ibuler df9e533b3c perf: 修改 rabc 2023-02-21 13:40:48 +08:00
ibuler 0001ffba1b perf: 优化 rbac 2023-02-21 13:39:28 +08:00
ibuler f4cc03434f perf: 修改 rbac asset nodes 2023-02-21 13:11:56 +08:00
ibuler e67a876513 perf: 优化账号任务 2023-02-21 13:00:04 +08:00
Bai 1888597451 fix: 修改slugfield校验问题 2023-02-20 20:15:47 +08:00
fit2bot 137d69a539
perf: ansible runner logs (#9655)
Co-authored-by: feng <1304903146@qq.com>
2023-02-20 20:14:06 +08:00
fit2bot 95eeeb4208
perf: 自动化脱敏 aix (#9652)
Co-authored-by: feng <1304903146@qq.com>
2023-02-20 19:12:57 +08:00
ibuler 37c54e976f perf: 优化 tasks 2023-02-20 18:00:29 +08:00
Bai d246b9bb35 fix: 修复资产硬件信息收集失败的问题 2023-02-20 17:25:16 +08:00
jiangweidong c2773351af Fix: 解决资产创建后系统执行Ping及Gather任务失败问题 2023-02-20 14:06:26 +08:00
ibuler bb0bb4e764 perf: domain serializer 2023-02-20 13:40:42 +08:00
ibuler 492dd34cb8 perf: 优化排序 2023-02-20 13:31:56 +08:00
ibuler a1440ee4e0 perf: 优化 asset 创建时 nodes 可能有问题 2023-02-19 15:43:56 +08:00
ibuler 83c844292c perf: 优化 task 参数是 uuid 可能导致的问题 2023-02-19 15:10:10 +08:00
fit2bot 9ed1b8fc86
perf: 修改 swagger 查询 (#9616)
* perf: 修改 swagger 查询

* perf: 修改 operate log

---------

Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
2023-02-17 21:11:06 +08:00
ibuler 98355ce468 perf: 优化一波 migrations 2023-02-17 17:19:18 +08:00
fit2bot 9a62a7aaab
pref: 修改 activity log (#9571)
* pref: 修改 activity log

* perf: 优化 acitivity

* pref: 修改 activity

* fix: 修复一些运行问题

* fix: app.py 中添加 tasks import

* fix: 添加 activity_callback

* fix: 添加 execute_account_backup_plan activity_callback

* fix: 添加 activity_callback -> gather_asset_accounts

* fix: 对 celery 任务添加 activity_callback 回调

* fix: 修改翻译

---------

Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: jiangweidong <weidong.jiang@fit2cloud.com>
Co-authored-by: Bai <baijiangjie@gmail.com>
2023-02-17 17:14:53 +08:00
Bai 1bfb434651 fix: 修复创建网关时, 没有保存到 Host 列表中的问题; 2023-02-17 13:58:08 +08:00
jiangweidong 3b3355f3f8 perf: 修改PostgreSQL数据库参数为必填 2023-02-16 17:33:03 +08:00
老广 1678eeb915
Merge pull request #9587 from jumpserver/pr@dev@perf_gateway
perf: 优化 gateway 返回情况
2023-02-16 17:21:36 +08:00
Bai 22dd81de43 fix: 创建删除节点、资产时,节点资产数量没有刷新的问题,监听的信号不太对,如果是 post_remove 那么获取资产的关联节点是获取不到的 2023-02-16 16:54:24 +08:00
ibuler a63709002d perf: 优化 gateway 返回情况 2023-02-16 16:51:42 +08:00
fit2bot e66168dfa4
perf: account secret 加密 (#9570)
Co-authored-by: feng <1304903146@qq.com>
2023-02-15 20:16:01 +08:00
Bai cf2089d826 fix: 修复迁移数据库应用账号缺少的问题 2023-02-15 20:09:14 +08:00
fit2bot 4ac214e91d
perf: account task timing not triggered (#9564)
Co-authored-by: feng <1304903146@qq.com>
2023-02-15 16:48:27 +08:00
Bai e25306608b fix: 修复克隆网关没有克隆账号的问题 2023-02-15 11:18:44 +08:00
fit2bot f20c803356
perf: ansible_enabled false (#9548)
Co-authored-by: feng <1304903146@qq.com>
2023-02-14 18:34:46 +08:00
Bai 2c13439b8a fix: 添加迁移文件 2023-02-14 16:38:28 +08:00
ibuler 786d96ee6e perf: 修改登录 2023-02-14 16:01:35 +08:00
ibuler 8b0a967306 perf: 优化 audit log 2023-02-14 15:53:08 +08:00
Bai 770e7733e7 fix: 修复添加资产到节点,移除资产从节点,移动资产到节点 API rbac 权限位 2023-02-14 15:35:56 +08:00
ibuler b3244d0215 perf: 优化 redis 平台协议 2023-02-14 13:44:14 +08:00
fit2bot 10d776f7e5
perf: account name required (#9533)
Co-authored-by: feng <1304903146@qq.com>
2023-02-14 11:37:18 +08:00
老广 99e5ac9aa6
Merge pull request #9530 from jumpserver/pr@dev@perf_delay_run
perf: 优化 delay run
2023-02-13 20:06:01 +08:00
ibuler 223b73c5c6 perf: 优化 delay run 2023-02-13 20:04:17 +08:00
fit2bot 269cf6628a
perf: gateway auto (#9529)
Co-authored-by: feng <1304903146@qq.com>
2023-02-13 19:52:49 +08:00
老广 48fe6b975b
Merge pull request #9526 from jumpserver/pr@dev@perf_merge_delay
perf: 改造 merge_delay_func
2023-02-13 19:45:36 +08:00
ibuler bd9b1f1a5b perf: 优化 audit log 2023-02-13 19:42:42 +08:00
Eric 9cd780eb06 perf: 改造 merge_delay_func 2023-02-13 19:14:00 +08:00
ibuler cd866532da perf: 优化测试节点可连接性 2023-02-13 15:04:45 +08:00
fit2bot 64f21a518a
perf: asset gather fact (#9511)
Co-authored-by: feng <1304903146@qq.com>
2023-02-10 18:50:11 +08:00
老广 aa483a3c6d
Merge pull request #9507 from jumpserver/pr@dev@perf_asset_task
perf: 优化 task
2023-02-10 17:43:39 +08:00
ibuler dd15286d27 perf: 优化 task 2023-02-10 17:36:15 +08:00
fit2bot ab132e02d0
perf: k8s tree (#9503)
Co-authored-by: feng <1304903146@qq.com>
2023-02-10 15:56:34 +08:00
ibuler 136bec94ca perf: merge with dev 2023-02-10 15:38:40 +08:00
ibuler 6a0fbc6ac2 perf: 修改 signals 2023-02-10 14:44:59 +08:00
fit2bot e36506c3b8
perf: ansible log (#9499)
Co-authored-by: feng <1304903146@qq.com>
2023-02-10 14:37:55 +08:00
fit2bot 0c11a602a8
perf: push account automation (#9497)
Co-authored-by: feng <1304903146@qq.com>
2023-02-10 14:07:20 +08:00
Bai 4c96d6935a fix: 修复没有 push_now 权限的用户可以在创建资产、创建账号中开启推送 2023-02-10 11:14:05 +08:00
ibuler 37a52c420f perf: 优化并发处理 2023-02-09 20:48:25 +08:00
Bai 4f6a17290a fix: 修复创建资产时账号禁用不生效的问题 2023-02-09 12:30:28 +08:00
fit2bot e3d1474b9b
perf: k8s tree error msg (#9472)
Co-authored-by: feng <1304903146@qq.com>
2023-02-08 20:14:33 +08:00
fit2bot ab76d8cce0
fix: 修复创建资产资源 dashboard 不变化的问题 (#9471)
Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
2023-02-08 19:32:09 +08:00
fit2bot ddff968be1
perf: postgresql ansible (#9469)
Co-authored-by: feng <1304903146@qq.com>
2023-02-08 18:13:05 +08:00
ibuler eabb41b74c perf: 修改 platform serializer 2023-02-08 13:53:21 +08:00
ibuler 17fce76ac4 perf: 修改 signal handler 2023-02-08 10:14:09 +08:00
老广 bb8ca41149
Merge pull request #9454 from jumpserver/pr@dev@perf_api_sql
perf: 优化 api sql 查询
2023-02-07 16:24:45 +08:00
ibuler e7202ac984 perf: 优化 api sql 查询 2023-02-07 16:21:26 +08:00
Bai b41d30dbac fix: 修复导入更新资产时包含labels报错的问题(取消id唯一键校验) 2023-02-07 16:00:36 +08:00
fit2bot 90d5f62327
perf: gathered-accounts api (#9451)
Co-authored-by: feng <1304903146@qq.com>
2023-02-07 13:27:44 +08:00
fit2bot 8afe28773d
perf: clone plateform charset (#9442)
Co-authored-by: feng <1304903146@qq.com>
2023-02-06 15:05:38 +08:00
fit2bot 654cbe7bd0
perf: 创建网关 没有关联网域 (#9441)
Co-authored-by: feng <1304903146@qq.com>
2023-02-06 14:54:30 +08:00
fit2bot 500124f485
perf: asset automation filter (#9440)
Co-authored-by: feng <1304903146@qq.com>
2023-02-06 13:37:03 +08:00
fit2bot 9a1109e13d
perf: 资产创建添加账号 没有携带密码 (#9436)
Co-authored-by: feng <1304903146@qq.com>
2023-02-06 11:00:36 +08:00
Bai 4af80bfcdf fix: 修改中文翻译文件 2023-02-06 10:30:40 +08:00
ibuler 91357b3715 perf: 优化 gateway 设置 2023-02-03 19:46:42 +08:00
fit2bot 20d2efc407
perf: 主机硬件信息 (#9429)
Co-authored-by: feng <1304903146@qq.com>
2023-02-03 18:23:38 +08:00
ibuler 470d2703f4 perf: 协议端口校验 2023-02-03 16:13:29 +08:00
fit2bot 93932f1904
perf: 优化批量更新 (#9418)
* perf: 优化批量更新

* perf: 优化代码,减少 80%,依然可用

---------

Co-authored-by: ibuler <ibuler@qq.com>
2023-02-02 20:10:48 +08:00
fit2bot 64e48712a5
perf: gateway migrate (#9412)
Co-authored-by: feng <1304903146@qq.com>
2023-02-02 16:16:38 +08:00
Bai 5fcd83b587 fix: 修复获取 swagger api 时,AssetSerializer category, type 字段手动设置 _choices 属性时报错的问题 2023-02-02 14:40:23 +08:00
feng 0aa681620f perf: asset tree search 2023-02-02 13:56:18 +08:00
jiangweidong 3080771559
fix: 解决没获取到证书的mongodb导致的无法执行自动化任务 (#9399) 2023-02-02 10:32:48 +08:00
老广 f68dde456d
Merge pull request #9397 from jumpserver/pr@dev@perf_code_i18n
perf: 修改 i18n
2023-02-02 10:23:17 +08:00
fit2bot 758d6ae81b
perf: gateway print (#9398)
Co-authored-by: feng <1304903146@qq.com>
2023-02-01 19:02:41 +08:00
ibuler 853f9c422d perf: 修改 i18n 2023-02-01 18:45:51 +08:00
fit2bot 7b95859015
perf: device ansible (#9396)
Co-authored-by: feng <1304903146@qq.com>
2023-02-01 18:20:56 +08:00
Bai fc34980f20 fix: 修复主机详情显示硬件信息 2023-02-01 17:05:28 +08:00
fit2bot 66c58a2084
perf: 账号 模版创建 (#9386)
Co-authored-by: feng <1304903146@qq.com>
2023-02-01 14:43:58 +08:00
ibuler 34b740583e perf: 修改 asset info 2023-01-31 19:37:16 +08:00
ibuler ae1b134f70 perf: 修改 spec for cert 2023-01-31 19:30:38 +08:00
ibuler e9454c42cc perf: 修改 spec 2023-01-31 19:22:20 +08:00
ibuler 6bbb1f7e86 perf: 修改 connectivity 2023-01-31 19:02:24 +08:00
ibuler 03c0d2edbd perf: 修改 connectivity 2023-01-31 18:51:04 +08:00
jiangweidong be670872e5 perf: 修改逻辑,将证书文件转换放到manager中 2023-01-31 18:32:14 +08:00
jiangweidong 211a0abe9e feat: 测试可连接性mongodb支持ssl 2023-01-31 18:32:14 +08:00
Bai ae79584faa perf: 修改账号列表 secret 字段名称 密钥/密码 2023-01-31 18:11:00 +08:00
ibuler 41154d3793 asset: specific to spec_info 2023-01-31 17:57:06 +08:00
ibuler 9ec7a8ac61 perf: 优化 asset info 2023-01-31 17:46:56 +08:00
ibuler 9161b1ab1c perf: 资产的 specific 不返回加密信息 2023-01-31 13:41:09 +08:00
老广 bebfe10d73
Merge pull request #9373 from jumpserver/pr@dev@change_migrations
perf: 修改 database 的 cert model field
2023-01-31 13:05:19 +08:00
老广 685b99e04d
Merge pull request #9366 from jumpserver/pr@dev@fix_no_db_name_mongodb_task_err
fix: mongodb无指定数据库时,一些自动化任务会失败
2023-01-31 13:04:34 +08:00
ibuler 9d59fb736b perf: 修改 database 的 cert model field 2023-01-31 13:03:45 +08:00
ibuler b34af62ec1 perf: 修改 migrations 2023-01-31 11:12:09 +08:00
ibuler d5cc2e77b2 perf: admin user 不能删除,xpack 引用着,不确定顺序 2023-01-31 11:12:09 +08:00
ibuler 0c1048ed89 perf: 修改 migrations 2023-01-31 10:42:55 +08:00
ibuler 382201188c perf: admin user 不能删除,xpack 引用着,不确定顺序 2023-01-31 10:22:25 +08:00
jiangweidong 87ca9cb11d fix: 使用type 2023-01-30 20:26:07 +08:00
fit2bot f18f2df4ab
perf: account template secret (#9368)
Co-authored-by: feng <1304903146@qq.com>
2023-01-30 18:59:12 +08:00
jiangweidong a664d0b752 Merge branch 'dev' of http://github.com/jumpserver/jumpserver into pr@dev@fix_no_db_name_mongodb_task_err 2023-01-30 17:33:15 +08:00
jiangweidong c34b7e69eb fix: mongodb无指定数据库时,一些自动化任务会失败 2023-01-30 17:33:10 +08:00
ibuler 351bcd3337 perf: 优化 k8s migrations 2023-01-30 17:04:11 +08:00
Bai f6da14b80d fix: 修复网域导入500问题(不支持修改gateways) 2023-01-30 14:42:44 +08:00
fit2bot 47cd79ea5a
perf: databases protocol required (#9354)
Co-authored-by: feng <1304903146@qq.com>
2023-01-29 17:40:15 +08:00
fit2bot da915249ab
perf: su_method allow_null (#9352)
Co-authored-by: feng <1304903146@qq.com>
2023-01-29 14:02:03 +08:00
fit2bot 26de26d7b0
perf: ansible enabled (#9351)
Co-authored-by: feng <1304903146@qq.com>
2023-01-29 13:31:11 +08:00
fit2bot 4409809106
perf: asset connectivity ordering (#9343)
Co-authored-by: feng <1304903146@qq.com>
2023-01-23 18:20:17 +08:00
fit2bot c2a8acb73b
perf: 修改网关自动化任务 (#9335)
Co-authored-by: feng <1304903146@qq.com>
2023-01-18 17:14:02 +08:00
fit2bot 571e9b1878
perf: gateway closed domain (#9334)
Co-authored-by: feng <1304903146@qq.com>
2023-01-18 15:27:09 +08:00
fit2bot f8ac83d5c7
fix: change secret trigger 必填 (#9333)
Co-authored-by: feng <1304903146@qq.com>
2023-01-18 11:54:06 +08:00
Bai 6dc4519c78 fix: 修复 资产节点树 获取报错的问题(全局组织) 2023-01-17 13:42:13 +08:00
fit2bot 56d533c802
v3.0.0-rc1 (#9322)
* perf:automation

* pref: 修改账号推送

* perf: 修改 assets

* perf: 修改 accounts

* feat: 优化代码

* fix: 修复 ObjectRelatedField 获取 value attr 时先判断是否有 attr 属性

* perf: 增加翻译

* feat: 增加部分翻译

* feat: 去除无用列

* perf: ticket remove app

* fix: 修复创建账号备份任务失败的问题

* perf: 添加 accounts app

* perf: ticket type serializer (#9252)

Co-authored-by: feng <1304903146@qq.com>

* perf: ticket

* perf: 修改 accounts api

* perf: 优化 AssetPermissionSerializer fields 顺序

* perf: 修改 accounts

* feat: 限制常用用户名api返回长度

* feat: 限制常用用户名api返回长度

* perf: 修改 LoginAssetACL 序列类,增加 users_username_group, accounts_username_group... 字段

* perf: 修改 CommandFilterACLSerializer 增加 command_groups_amount 字段

* perf: 修改rbac API啥的 (#9254)

* perf: migrate

* perf: 修改 AssetPermedSerializer domain 字段类型

* perf: 放开push account 权限位

* perf: 修改 accounts

* perf: 修改 LoginACLSerializer 字段类型

* pref: 修改数据库 migrations

* perf: filter asset systemuser

* perf: 修改 SessionSerializer 字段类型

* pref: 修改 applet host

* perf: 修改 SessionCommandSerializer 字段类型

* perf: 修改 accounts import

* perf: 修改 celery datetime

* perf: 修改 asset serializer

* pref: 修改 labeled field

* feat: 修改翻译

* perf: 修改 JobSerializer 字段类型

* feat: 支持使用 ws 发送终断任务

* perf: add AccessTokenAuthentication

* perf: 修改 BaseStorageSerializer 字段类型

* perf: 修改 AppletHostSerializer 字段类型

* perf: signal event

* perf: asset types automations (#9259)

Co-authored-by: feng <1304903146@qq.com>

* perf: 修改下载 rdp 文件时返回的 address 地址信息为空的问题

* perf: 修改 AssetSerializer.accounts.secret 为 write_only; 修改 DomainWithGatewaySerializer.gateways 返回 account 信息及 secret 字段;

* perf: automation 干库 (#9260)

Co-authored-by: feng <1304903146@qq.com>

* perf: account push api

* feat: 修改迁移文件

* feat: 删除无用代码

* feat: 优化部分资源无操作日志

* perf: 修改 account

* perf: perm tree

* perf: asset serializers retrieve

* perf: 格式化代码

* perf: AutomationExecution (#9268)

Co-authored-by: feng <1304903146@qq.com>

* perf: AssetDetailSerializer 和 Asset Model 添加 specific_info 字段;

* perf: 修改账号推送

* feat: handle ws heartbeat status

* perf: k8s tree (#9269)

Co-authored-by: feng <1304903146@qq.com>

* perf: 修改账号推送

* perf: 修改 asset detail serializer

* fix: 修复 windows 不能运行 powershell 命令的问题

* feat: 支持按照资源时间线查看操作活动

* feat: 翻译

* feat: 优化操作日志

* perf: asset clone

* fix: 错误的修改改回去

* perf: create asset account

* feat: 增加task 刷新续传功能

* fix: applet host deloypment filter host

* perf: 修改了 common 结构,和 push accounts

* perf: 整理 common 结构

* perf: 修改 const import

* perf: 修改 allow bulk destroy

* fix: applet host search fileds

* perf: applet bulk delete

* fix: applet list 404

* perf: 修改 common view

* feat: 增加一些翻译, 修复 playbook 上传的错误

* fix: 修改错别字

* perf: 修改 applets status

* perf: 修改网关 api

* perf: automateion (#9281)

Co-authored-by: feng <1304903146@qq.com>
Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com>

* perf: 失效 connect methods 当 applet 删除 或者 host 删除

* perf: 网关账号的密码类型改成 LabelField

* perf: chrome applet script

* perf: verify code ttl (#9282)

Co-authored-by: feng <1304903146@qq.com>

* perf: database ping

* perf: ws

* perf: 修改网关创建

* perf: account task org (#9285)

Co-authored-by: feng <1304903146@qq.com>

* perf: asset test api

* perf: port 添加 account

* pref: 修改 db mapper permission

* fix: db port mapper list api

* perf: account change secret (#9286)

Co-authored-by: feng <1304903146@qq.com>

* perf: 修改 setup_eager_loading

* perf: SecretStrategy

* feat: 修改 ConnectionToken Create API 支持校验 ACL 逻辑

* feat: 修改 ConnectionToken Create API 支持校验 ACL 逻辑

* feat: 修改 ConnectionToken Create API 支持校验 ACL 逻辑

* pref: web database 信号转发

* perf: account push automation

* perf: push filter account

* perf: 修改 publish 版本

* perf: 修改网关

* fix: 修改资产 Specific 信息中 JSONField 字段返回 json.loads 对象

* feat: 远程应用内置Navicat Premium 16

* feat: 更新下载链接

* feat: 整理代码格式

* perf: 修改 terminal point

* perf: update chrome applet script

* fix: 资产 specific 获取 JSONField 时, 判断值的类型不为 list, dict

* perf: domain (#9292)

Co-authored-by: feng <1304903146@qq.com>

* perf: 优化 endpoint 监听端口,仅 oracle 动态

* perf: 修改翻译

* perf: 修改文案

* perf: 修改缺失的翻译

* perf: 修改 endpoint help text

* feat: 还原格式

* feat: 去掉基类

* feat: 增加特权账号字段

* perf: decode content

* fix: check pid

* perf: 修改 smart endpoint

* perf: 修改 endpoint mysql default port

* feat: 优化

* perf: 修改 endpoint mysql default port

* perf: gateway test (#9295)

Co-authored-by: feng <1304903146@qq.com>

* perf: migrate

* perf: 修改 endpoint mysql default port

* fix: 修复获取任务执行结果死循环

* feat: 作业审计日志增加字段

* fix: add on_transaction_commit task post save

* perf: gateway (#9297)

Co-authored-by: feng <1304903146@qq.com>

* feat: 过滤 jumpserver 自动产生的用户

* fix: 修复ops节点选择的问题

* fix: 修改 统一 connection-token 和 command 的 review API 返回数据 from_ticket_info

* perf: change secret (#9298)

Co-authored-by: feng <1304903146@qq.com>

* perf: 修改 db port manager

* perf: 修改 db port manager

* perf: add celery log mark

* perf: remove debug log data

* fix: navicat use manual type

* fix: remove navicate download url

* perf: push_account_enabled (#9301)

Co-authored-by: feng <1304903146@qq.com>

* fix: 修改navicat启动程序MD5值

* perf: push account (#9303)

Co-authored-by: feng <1304903146@qq.com>

* feat: Redis/MongoDB 支持SSL

* fix: 修改授权规则过滤字段 node_name,node_id; 修复获取授权节点下的资产为空的问题;

* perf: push account button (#9305)

Co-authored-by: feng <1304903146@qq.com>

* perf: account push

* fix: 修复获取 /user//assets/tree/ 返回用户授权的所有资产

* perf: asset ping (#9307)

Co-authored-by: feng <1304903146@qq.com>

* perf: asset enabled_info

* perf: 优化activity记录都保存至operatelog中

* feat: 远程应用navicat支持试用版连接

* perf: 优化迁移文件

* perf: 修改资产列表 API category type 字段 choices 根据 category 进行返回

* fix

* perf: 修改账号列表 API 解决根据 node_id asset_id 搜索账号列表无效的问题

* fix: navicat dba账号登录

* perf: 优化navicat连接

* perf: 修改账号列表 Model Manager 继承自 OrgManager,解决组织过滤问题

* perf: 修改账号列表 Filter 支持根据 platform,category,type 字段搜索

* perf: change secret email (#9312)

Co-authored-by: feng <1304903146@qq.com>

* feat: 保证认证信息一定清理

* perf: add mariadb

* perf: 修改资产类型树数量统计资产或账号

* perf: applet chrome quit

* perf: 优化关闭欢迎页面

* fix

* perf: executed amount

* perf: 修改 built-in applet installation

* perf: 修改资产列表增加标签搜索

* perf: 修改资产列表增加标签搜索

* perf: account task automation (#9319)

Co-authored-by: feng <1304903146@qq.com>

* perf: account trigger

* perf: 修改系统设置文案:批量命令执行 -> 作业中心

* perf: 优化migrate (#9320)

Co-authored-by: feng <1304903146@qq.com>

* perf: 修改资产节点树 API,支持搜索资产、节点

* perf: audit dashboard (#9321)

Co-authored-by: feng <1304903146@qq.com>

* fix: 修改 has_perm 权限判断兼容 list 和 str 类型

* perf: 修改一些换行

* perf: 修改 ansible config

* fix: oracle依赖文件地址错误 (#9324)

* perf: ansible mudules

* perf: 修改 runner host cwd

Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
Co-authored-by: Bai <baijiangjie@gmail.com>
Co-authored-by: feng <1304903146@qq.com>
Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com>
Co-authored-by: Eric <xplzv@126.com>
Co-authored-by: jiangweidong <weidong.jiang@fit2cloud.com>
Co-authored-by: jiangweidong <80373698+Hi-JWD@users.noreply.github.com>
2023-01-16 19:02:09 +08:00
ibuler 1b1c91bab0 t po v3
:wqMerge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-12-27 18:26:24 +08:00
Bai 52b5c8beee fix: 删除 AssetSerializer 中 enabled_info 字段 (已放到 AssetDetailSerializer 中). 2022-12-27 17:57:22 +08:00
feng ccc766df8d perf: account source 2022-12-27 17:54:34 +08:00
fit2bot c81f36cc27
perf: remove gather model (#9246)
Co-authored-by: feng <1304903146@qq.com>
2022-12-27 17:45:41 +08:00
Bai 0328fd1bb0 merge: v3 2022-12-27 17:13:29 +08:00
ibuler da61b4e201 perf: 修改 asset api 2022-12-27 17:06:00 +08:00
ibuler 1b9aad594c perf: remove push account 2022-12-27 16:54:47 +08:00
ibuler 411d199e18 perf: 修改 asset serializer 2022-12-27 16:53:23 +08:00
Bai 825bea5ea5 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-27 16:21:38 +08:00
Bai ba9123b1c4 perf: 修改资产序列类字段翻译 2022-12-27 16:21:32 +08:00
ibuler 3da9efc3fd perf: 修改账号推送 2022-12-27 15:27:33 +08:00
ibuler 795e952dc1 perf: change tree api 2022-12-27 13:20:18 +08:00
ibuler 3145582f0b perf: 修改 accounts 2022-12-26 18:58:21 +08:00
fit2bot ed82249fd1
perf: asset perm (#9240)
Co-authored-by: feng <1304903146@qq.com>
2022-12-23 19:01:29 +08:00
fit2bot 7530afe368
perf: 翻译 (#9239)
Co-authored-by: feng <1304903146@qq.com>
2022-12-23 15:49:32 +08:00
fit2bot c5edb9981e
perf: rbac tree (#9237)
Co-authored-by: feng <1304903146@qq.com>
2022-12-22 20:09:20 +08:00
Bai ab6518e60e fix: 开启授权规则signal信号监听;解决授权规则变动用户授权树没有即使刷新的问题 2022-12-22 18:56:54 +08:00
fit2bot 1de51a2bfd
perf: asset xpack (#9234)
Co-authored-by: feng <1304903146@qq.com>
2022-12-22 13:50:22 +08:00
ibuler e0e57a71aa pref: 类型树支持资产 2022-12-22 11:34:18 +08:00
ibuler 7ca2fdca89 perf: 修改 platform 搜索 2022-12-21 20:04:49 +08:00
ibuler 0c2a5bc44a fix: 修复搜索资产平台 2022-12-21 19:59:56 +08:00
ibuler df1950d063 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-21 18:37:37 +08:00
ibuler b01ef1585c perf: account secret rbac permission 2022-12-21 18:37:05 +08:00
ibuler 17627390f8 perf: 修改 account 序列号字段 2022-12-21 18:36:15 +08:00
fit2bot c304a58c05
perf: 修改k8s 树 (#9228)
Co-authored-by: feng <1304903146@qq.com>
2022-12-21 17:17:54 +08:00
ibuler 63d35ea8a6 perf: 修改资产 model 2022-12-20 20:39:48 +08:00
ibuler 58909ee67d perf: 修改基础 model,继承同一个 2022-12-20 20:23:42 +08:00
Bai 362cfb733c perf: 修改 su-from-accounts API 2022-12-20 16:13:44 +08:00
fit2bot 69b16e4754
perf: asset type xpack (#9218)
Co-authored-by: feng <1304903146@qq.com>
2022-12-19 11:35:50 +08:00
ibuler 26fa1f6f08 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-16 15:54:29 +08:00
ibuler d040162d86 perf: 修改 session 字段,添加 Comment 2022-12-16 15:53:59 +08:00
feng 11a58dc7ad perf: k8s tree proxy 2022-12-16 10:52:08 +08:00
feng d7a793b4c4 perf: 修改k8s tree 2022-12-15 18:47:54 +08:00
fit2bot 69fe0b07fd
perf: k8s tree (#9214)
Co-authored-by: feng <1304903146@qq.com>
2022-12-15 16:08:19 +08:00
ibuler 615a1ddc96 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-15 16:03:21 +08:00
ibuler cb7b31e8b8 perf: perm account 返回 alias 2022-12-15 16:02:34 +08:00
feng 840ca02223 perf: del redundant macos 2022-12-15 15:21:51 +08:00
Eric d60f9a7c69 perf: web selector 默认值修改 2022-12-14 17:39:22 +08:00
feng 408c6c568a perf: account backup 2022-12-12 12:33:45 +08:00
fit2bot c861f390c7
perf: k8s account ignore (#9188)
Co-authored-by: feng <1304903146@qq.com>
2022-12-12 11:43:19 +08:00
Bai a767c208b3 perf: 优化 get_all_node_keys 方法 2022-12-09 13:38:30 +08:00
Bai 4f5cc56b00 perf: 优化 UserPermTreeUtil 逻辑(进行中) 2022-12-09 13:38:30 +08:00
Bai 8beb1b81cf fix: 修改 AssetSerializer 继承 BulkOrgResourceSerializerMixin 序列类 2022-12-09 11:12:56 +08:00
Bai beac2a1514 perf: 优化获取账号 su-from-accounts 时,不包含自己和以自己为 su-from 的账号 2022-12-08 13:37:35 +08:00
fit2bot e5afbd4118
perf: k8s tree api (#9169)
Co-authored-by: feng <1304903146@qq.com>
2022-12-07 23:55:56 +08:00
Bai 66bdc375df Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-07 19:30:48 +08:00
Bai 58131a2b68 fix: 修复 su-from-accounts API; 前端 Select2 组件初始化时 API 报错的问题;
修改原因:
前端使用 Select2 组件渲染更新账号的表单页面时,会默认先创建 spm 值,
后端调用 get_object 方法时,使用的queryset,就是spm所对应的queryset,
而 detail=True, 查询的值是当前 account_id,不在 queryset 中,
所以会导致调用父类的 get_object 方法报错,对象找不到
2022-12-07 19:26:28 +08:00
ibuler a27b43107c Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-07 18:59:28 +08:00
ibuler 0c7de50708 perf: 修改 display field 2022-12-07 18:58:57 +08:00
Bai d252ee41ed Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-07 18:38:12 +08:00
Bai 6cda28c63d perf: 优化授权规则 user-permission 用户授权相关的 API; 包括 assets, nodes, tree-asset, tree-node, tree-node-with-asset; 2022-12-07 18:38:03 +08:00
ibuler 6a1c5aba12 perf: 修改一些翻译 2022-12-07 17:24:30 +08:00
ibuler da36ce9dfd perf: merge connect token rdp option 2022-12-07 15:13:32 +08:00
ibuler dbee3ed30d feat: connect token 添加 Rdp options 2022-12-07 15:09:01 +08:00
Bai 6233e2b3de perf: Account su_from 返回使用 ObjectRelatedField allow_null allow_empty 2022-12-06 19:41:26 +08:00
Bai 29fd6ee8c9 perf: Account su_from 返回使用 ObjectRelatedField 2022-12-06 18:54:13 +08:00
Bai 71e76e5075 feat: 添加su-from-accountsAPI 2022-12-06 17:43:33 +08:00
jiangweidong 803d68f3fe feat: 增加clickhouse 2022-12-06 17:13:37 +08:00
Jiangjie.Bai 7842e3e5ab
Merge: v3 to dev (#9160)
* fix: 修改 ConnectionTokenSecretSerializer

* perf: connect token secret (#9155)

Co-authored-by: feng <1304903146@qq.com>
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>

* feat: 作业迁移至个人级别

* perf: asset enabled (#9157)

Co-authored-by: feng <1304903146@qq.com>

* perf: 修改ConnectionTokenSecret Gateway数据结构; 修改Domain Gateway Model方法

* perf: ConnectionTokenSecret  返回 domain 信息

* refactor: 移动 Gateway Model 到 asset 目录下

* refactor: 移动 Gateway Model 单独到 gateway 文件中

* perf: 修改 GatewaySerializer 目录

* perf: 修改 GatewaySerializer 目录

Co-authored-by: fit2bot <68588906+fit2bot@users.noreply.github.com>
Co-authored-by: feng <1304903146@qq.com>
Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
2022-12-06 11:03:14 +08:00
ibuler daf279304a perf: 修改完冲突了 2022-12-05 18:54:12 +08:00
ibuler 2168610ffe perf: 修改合并引起的 migrations 依赖问题 2022-12-05 16:07:14 +08:00
ibuler e91cbb9c97 merge: with v3 2022-12-05 15:03:21 +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
fit2bot 8a7ecda4f6
perf: asset add automation_enabled_info (#9154)
Co-authored-by: feng <1304903146@qq.com>
2022-12-05 11:21:01 +08:00
Eric 6480b916d6 perf: parse ssh private key 2022-12-03 15:25:04 +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
fit2bot 0e0a9f4654
perf: gateway account (#9150)
Co-authored-by: feng <1304903146@qq.com>
2022-12-02 17:36:55 +08:00
ibuler 2d771eedc1 perf: 优化用户授权 api 2022-12-02 13:15:03 +08:00
fit2bot 541358978d
fix: gateway (#9145)
Co-authored-by: feng <1304903146@qq.com>
2022-12-02 11:45:05 +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
老广 bcf509ab07
Merge branch 'v3' into pr@v3@feat_support_clear_private_key 2022-12-02 10:35:20 +08:00
feng fa0382fc5e perf: gateway manager 2022-12-01 18:22:41 +08:00
ibuler 8162a1b17e perf: 优化 gateway 2022-12-01 15:21:53 +08:00
fit2bot d1461b33c5
perf: gather account mysql (#9136)
Co-authored-by: feng <1304903146@qq.com>
2022-12-01 13:12:31 +08:00
ibuler 307cf97ccb perf: 授权的资产支持过滤 2022-11-30 15:39:27 +08:00
ibuler d46f321f1a perf: 修改连接方式 2022-11-30 15:24:32 +08:00
ibuler 0f1e19ba41 perf: 修改数据库添加 ssl 字段 2022-11-30 11:28:51 +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
fit2bot d849fd52bd
perf: domian add node (#9130)
Co-authored-by: feng <1304903146@qq.com>
2022-11-29 17:01:03 +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
fit2bot 4f718f9b1f
perf: account template secret api (#9127)
Co-authored-by: feng <1304903146@qq.com>
2022-11-28 15:54:16 +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 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
feng 3d6609ec8c perf: gateway 2022-11-23 18:36:42 +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 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
halo 1b99a7e06f fix: 账户备份邮件发送找不到文件bug 2022-11-17 17:39:53 +08:00
ibuler a42641ca9a fix: 修复 redis 连接导致的 pub sub 错误 2022-11-17 14:07:43 +08:00
Jiangjie.Bai 896b59b1bd fix: 修复获取用户收藏的资产API失败的问题 2022-11-16 15:07:35 +08:00
Aaron3S c63c000b10 perf: 优化异步认识显示名称 2022-11-15 16:29:40 +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
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