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
Aaron3S 462dc2543b fix: 解决执行命令作业指定当前路径的问题 2023-02-06 16:19:43 +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
Bai f52a2ea47f fix: 修改日文翻译文件 2023-02-06 14:29:09 +08:00
fit2bot 500124f485
perf: asset automation filter (#9440) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-06 13:37:03 +08:00
Aaron3S dbd3cb35ec fix: 修复无法更新命令的bug 2023-02-06 11:40:56 +08:00
Aaron3S a3baac6763 fix: 修复无法更新命令的bug 2023-02-06 11:27:40 +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 1e075c3687 perf: 修改支持 connect methods 2023-02-06 10:30:16 +08:00
Eric 47c5f18c6e fix: applet deploy pip install 2023-02-03 23:47:41 +08:00
Bai 4960c4b260 fix: 修复登录资产ACL会获取所有组织下数据的问题 2023-02-03 20:03:31 +08:00
ibuler 91357b3715 perf: 优化 gateway 设置 2023-02-03 19:46:42 +08:00
老广 4462e745a5
Merge pull request #9428 from jumpserver/pr@dev@perf_ops_job 
perf: 修改 ops job 约束
 2023-02-03 18:41:39 +08:00
fit2bot 20d2efc407
perf: 主机硬件信息 (#9429) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-03 18:23:38 +08:00
ibuler 4220c72cd3 perf: 修改 ops job 约束 2023-02-03 16:44:05 +08:00
老广 431725b315
Merge pull request #9424 from jumpserver/pr@dev@perf_chrome 
perf: use Chromium browser
 2023-02-03 16:14:15 +08:00
ibuler 470d2703f4 perf: 协议端口校验 2023-02-03 16:13:29 +08:00
ibuler 7c429163ce perf: 协议端口校验 2023-02-03 16:03:34 +08:00
Bai ef3a1e399d fix: 修复登录资产ACL会获取所有组织下数据的问题 2023-02-03 15:21:46 +08:00
Bai ce8ad5f9cc perf: 优化资产授权规则过滤支持 accounts 2023-02-03 15:02:58 +08:00
Eric afb2b53035 fix: chromedriver path 2023-02-03 14:48:41 +08:00
Eric 159652ccfe fix: chrome path 2023-02-03 14:41:57 +08:00
Eric c22662a757 perf: use Chromium browser 
feat: add code dialog
 2023-02-03 14:35:23 +08:00
Bai d2ae6642eb fix: 修复更新账号时secret不正确导致更新失败的问题 2023-02-03 14:31:07 +08:00
ibuler 55de785947 perf: 优化最后更新 2023-02-03 12:25:09 +08:00
ibuler 88638187a5 perf: 修改 role 克隆 2023-02-03 11:29:23 +08:00
jiangweidong cb4410391c
fix: 修复mongodb ssl账号测试失败，oracle推送用户失败问题 (#9421) 2023-02-03 11:27:04 +08:00
fit2bot 003feb1aed
perf: command log risk choice (#9419) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-02 22:58:18 +08:00
fit2bot 93932f1904
perf: 优化批量更新 (#9418) 
* perf: 优化批量更新

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

---------

Co-authored-by: ibuler <ibuler@qq.com>
 2023-02-02 20:10:48 +08:00
ibuler b4068be89c perf: 修改换行 2023-02-02 18:16:40 +08:00
ibuler 3520f8222c merge: with dev 2023-02-02 18:13:32 +08:00
ibuler 77486f0773 fix: 修复用户过滤角色的错误 2023-02-02 18:09:31 +08:00
Bai d0bd35d88c fix: 修复测试ldap attr map报错问题 2023-02-02 17:06:17 +08:00
Aaron3S 1083f5f6f2 feat: 添加 task 的 verbose_name 2023-02-02 16:49:34 +08:00
Bai 4c9d16b4c1 fix: 修改角色列表viewset排序问题 2023-02-02 16:49:04 +08:00
Bai c3d01591e7 fix: 修改角色列表viewset排序问题 2023-02-02 16:49:04 +08:00
Bai 2d514c0db0 fix: 修改角色列表排序问题 2023-02-02 16:49:04 +08:00
Bai a045eb9936 fix: 修改角色列表排序问题 2023-02-02 16:49:04 +08:00
fit2bot be151523f4
perf: user filter (#9413) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-02 16:40:00 +08:00
fit2bot 64e48712a5
perf: gateway migrate (#9412) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-02 16:16:38 +08:00
Aaron3S e3e727f972 perf: 默认展开编辑器所有目录 2023-02-02 16:07:19 +08:00
Eric 3341d55d1b perf: APPLET_DOWNLOAD_HOST 优化 2023-02-02 15:37:14 +08:00
Eric 1c55bde8c8 perf: 发布机部署新增 CORE_HOST 配置 2023-02-02 15:37:14 +08:00
Bai 88edc9191c fix: 修改 ACL 排序 priority, date_updated, name 2023-02-02 15:34:22 +08:00
fit2bot 6429b56a54
fix: 资产克隆账号bug (#9407) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-02 15:01:56 +08:00
fit2bot d78725f7c5
perf: choice validate (#9404) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-02 14:52:44 +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
Aaron3S d68ed57eb9 优化 playbook ide 2023-02-02 13:55:55 +08:00
jiangweidong 7a5195e91e
fix: 解决部署后，Oracle无法执行自动化任务问题 (#9400) 2023-02-02 10:33:07 +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
Aaron3S 9d898f0aec playbook ide 2023-02-01 18:22:52 +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
老广 b4afdf7f72
Merge pull request #9389 from jumpserver/pr@dev@perf_audits_migrations 
perf: 优化audits的migrations
 2023-02-01 16:57:51 +08:00
老广 9dd7675bc9
Merge pull request #9393 from jumpserver/pr@dev@perf_user_create 
perf: 重构 notifications site msg
 2023-02-01 16:50:38 +08:00
ibuler 1169677286 perf: 重构 notifications site msg 2023-02-01 16:43:43 +08:00
Bai 4e2c2b652f fix: 修复创建数据库时包含账号失败的问题 2023-02-01 15:50:21 +08:00
jiangweidong 4762939dae perf: 优化audits的migrations 2023-02-01 15:13:07 +08:00
jiangweidong e324c46f87
fix: PrivateToken创建报错 (#9387) 
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
 2023-02-01 15:06:10 +08:00
Bai acab0b765c fix: 修复创建 2023-02-01 15:04:06 +08:00
fit2bot 66c58a2084
perf: 账号 模版创建 (#9386) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-01 14:43:58 +08:00
老广 d1f46768a3
Merge pull request #9385 from jumpserver/pr@dev@perf_user_create 
perf: 优化用户创建
 2023-02-01 12:56:46 +08:00
ibuler 023ca29752 perf: 优化用户创建 2023-02-01 12:39:38 +08:00
ibuler 4956e1147e perf: 优化用户创建 角色设置 2023-02-01 11:26:57 +08:00
Eric 142edd9438 perf: update applet download and deployment 2023-02-01 10:27:12 +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 6cda829f67 perf: 优化创建证书文件逻辑 2023-01-31 18:32:14 +08:00
jiangweidong 633e12bf86 feat: 其他mongodb自动化操作支持ssl 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 ef51e74b8e perf： 继续替换 spec 2023-01-31 18:06:44 +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
fit2bot 2ea8e30ca5
fix: 账号备份无法执行 (#9379) 
Co-authored-by: feng <1304903146@qq.com>
 2023-01-31 16:17:45 +08:00
Bai a7b744db10 perf: 修改账号列表 secret 字段名称 密钥/密码 2023-01-31 16:07:10 +08:00
Bai 6b4dbe6554 fix: 修复账号列表导出500的问题 2023-01-31 15:45:31 +08:00
Bai 229e89af03 fix: 修复终端列表根据负载状态进行过滤 2023-01-31 15:04:20 +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
fit2bot 3702ba92ea
perf: celery task delete (#9372) 
Co-authored-by: feng <1304903146@qq.com>
 2023-01-31 11:00:21 +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 bf867f8c95
celery yask perm tree (#9370) 
Co-authored-by: feng <1304903146@qq.com>
 2023-01-30 19:11:42 +08:00
fit2bot ec98f1bae5
perf: celery task del perm (#9369) 
Co-authored-by: feng <1304903146@qq.com>
 2023-01-30 19:07:46 +08:00
fit2bot f18f2df4ab
perf: account template secret (#9368) 
Co-authored-by: feng <1304903146@qq.com>
 2023-01-30 18:59:12 +08:00
老广 28d117bf3d
Merge pull request #9360 from jumpserver/pr@master@feat_support_redis_ssl_connect_magnus 
feat: 支持Magnus连接Redis SSL
 2023-01-30 17:52:53 +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
老广 d8f737c999
Merge pull request #9365 from jumpserver/pr@dev@perf_asset_migration 
perf: 优化 k8s migrations
 2023-01-30 17:15:40 +08:00
ibuler 351bcd3337 perf: 优化 k8s migrations 2023-01-30 17:04:11 +08:00
fit2bot c7c56775d3
perf: push accounts log error (#9364) 
Co-authored-by: feng <1304903146@qq.com>
 2023-01-30 17:00:52 +08:00
老广 e5ca8c5b2c
Merge pull request #9362 from jumpserver/pr@dev@perf_applet_upload 
perf: 优化 applet 上传报错
 2023-01-30 15:21:03 +08:00
ibuler 812f5490dc perf: 优化 applet 上传报错 2023-01-30 15:19:05 +08:00
jiangweidong c098172ed4 Merge branch 'dev' of http://github.com/jumpserver/jumpserver into pr@master@feat_support_redis_ssl_connect_magnus 2023-01-30 15:09:19 +08:00
jiangweidong b0baee95d3 feat: 支持Magnus连接Redis SSL 2023-01-30 15:09:13 +08:00
老广 789695f90b
Merge pull request #9359 from jumpserver/pr@dev@perf_deploy_applethost 
perf: 优化发布机初始化部署
 2023-01-30 14:47:08 +08:00
Bai f6da14b80d fix: 修复网域导入500问题(不支持修改gateways) 2023-01-30 14:42:44 +08:00
Eric 135c15d127 perf: 优化发布机初始化部署 2023-01-30 14:42:42 +08:00
fit2bot 4cca518543
perf: user profile (#9357) 
Co-authored-by: feng <1304903146@qq.com>
 2023-01-30 13:43:27 +08:00
老广 3f4814a392
Merge pull request #9356 from jumpserver/pr@dev@perf_readme 
perf: 优化 applet api
 2023-01-30 13:23:09 +08:00
ibuler 94e1d94423 perf: 修改 readme 2023-01-30 13:22:03 +08:00
ibuler f316b241aa perf: 优化 applet api 2023-01-30 13:01:06 +08:00
fit2bot 6ec4dc7dd5
perf: auditor joblog perm (#9355) 
Co-authored-by: feng <1304903146@qq.com>
 2023-01-29 18:20: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 55d7f17470
perf: mariadb verify account enabled (#9348) 
Co-authored-by: feng <1304903146@qq.com>
 2023-01-29 11:09:42 +08:00
老广 4d92e1c0d7
Merge pull request #9341 from jumpserver/pr@dev@perf_remoteapp_view 
perf: 优化远程应用界面
 2023-01-29 10:53:10 +08:00
fit2bot 4409809106
perf: asset connectivity ordering (#9343) 
Co-authored-by: feng <1304903146@qq.com>
 2023-01-23 18:20:17 +08:00
jiangweidong b6eac5a6b7 perf: 优化远程应用界面 2023-01-20 17:52:51 +08:00
fit2bot 4bef48eb6a
fix: push account duplicate (#9336) 
Co-authored-by: feng <1304903146@qq.com>
 2023-01-18 17:33:10 +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
fit2bot f54edab172
perf: user perm (#9329) 
Co-authored-by: feng <1304903146@qq.com>
 2023-01-17 18:19:34 +08:00
jiangweidong ab5b85d9b5 perf: 优化操作日志，activity日志都存入操作日志中 2023-01-17 13:43:51 +08:00
Bai 6dc4519c78 fix: 修复 资产节点树 获取报错的问题（全局组织） 2023-01-17 13:42:13 +08:00
Bai f647f88536 fix: 修改迁移 connection-token system_user -> account 字段失败的问题 2023-01-17 12:15:07 +08:00
Bai 3c93ed6a75 fix: 修改迁移 connection-token system_user -> account 字段失败的问题 2023-01-17 12:15:07 +08:00
fit2bot 6a9f1978bb
perf: ticket markdown (#9325) 
Co-authored-by: feng <1304903146@qq.com>
 2023-01-16 20:40:38 +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
老广 ce0632f49b
Merge pull request #9250 from jumpserver/v3 
v3 to dev
 2022-12-28 13:26:25 +08:00
feng 7094df3527 remove rbac redundant perms 2022-12-28 11:25:12 +08:00
Bai dbad0851e3 perf: 修改翻译 内部的 -> 内置 2022-12-27 19:00:32 +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
Aaron3S 1cfe8d9cc8 feat: 支持超时时间设置 2022-12-27 16:59:32 +08:00
Aaron3S ddca4dce41 feat: 支持pyhton脚本 2022-12-27 16:59:32 +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 3336f2ba67 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-27 15:28:32 +08:00
ibuler 3da9efc3fd perf: 修改账号推送 2022-12-27 15:27:33 +08:00
fit2bot 1e0bfbf8a8
perf: permission (#9244) 
Co-authored-by: feng <1304903146@qq.com>
 2022-12-27 14:48:00 +08:00
ibuler 795e952dc1 perf: change tree api 2022-12-27 13:20:18 +08:00
Bai bb23c2a9fa perf: 修改翻译组织ID 2022-12-26 20:30:10 +08:00
Bai a7be8bf365 perf: 修改翻译组织ID 2022-12-26 20:29:56 +08:00
Bai ed35ac2930 perf: 修改 OPTION 获取字段 org_id label 为 Organization ID 2022-12-26 19:32:07 +08:00
Bai 7f6d13a5a6 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-26 19:16:18 +08:00
Bai d0f70f4316 perf: 修改用户序列类 can_public_key_auth 类型; 修改 OPTION 获取字段 id label 为 ID 2022-12-26 19:16:11 +08:00
Aaron3S 9ba792cf1c feat: ops 支持节点和资产 2022-12-26 19:03:59 +08:00
ibuler dd630f0e14 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-26 18:58:48 +08:00
ibuler 3145582f0b perf: 修改 accounts 2022-12-26 18:58:21 +08:00
Bai d2ba7a98ea perf: 修改授权序列类字段翻译信息 2022-12-26 16:15:44 +08:00
ibuler 3172e954a8 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-26 15:02:27 +08:00
ibuler 6d4914fbd5 perf: 修改翻译 2022-12-26 15:01:51 +08:00
fit2bot ed82249fd1
perf: asset perm (#9240) 
Co-authored-by: feng <1304903146@qq.com>
 2022-12-23 19:01:29 +08:00
Aaron3S e32d51253a feat: 批量命令api 2022-12-23 18:23:20 +08:00
ibuler 213ae65b9a Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-23 16:15:56 +08:00
feng 8de2ffe5f4 perf: rbac asset 2022-12-23 16:10:04 +08:00
ibuler 4bd913b585 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-23 16:00:11 +08:00
ibuler 6bf4de8134 perf: 修改登录页面 2022-12-23 15:59:34 +08:00
fit2bot 7530afe368
perf: 翻译 (#9239) 
Co-authored-by: feng <1304903146@qq.com>
 2022-12-23 15:49:32 +08:00
Bai 4f8e0fc28e fix: 修改授权树API，连续刷新3次转为强制刷新；修改异步授权树一级节点的资产显示问题； 2022-12-23 13:19:38 +08:00
ibuler 047ba34238 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-23 11:12:31 +08:00
ibuler ffa30fdb69 perf: 修改 Logo 2022-12-23 11:11:56 +08:00
fit2bot c5edb9981e
perf: rbac tree (#9237) 
Co-authored-by: feng <1304903146@qq.com>
 2022-12-22 20:09:20 +08:00
Bai 3443b06a28 fix: 修复异步加载luna资产授权树时根节点下资产没有返回的问题 2022-12-22 19:17:52 +08:00
Bai 4aed287efc Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-22 18:57:04 +08:00
Bai ab6518e60e fix: 开启授权规则signal信号监听;解决授权规则变动用户授权树没有即使刷新的问题 2022-12-22 18:56:54 +08:00
ibuler 370d3b350e Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-22 17:49:37 +08:00
ibuler f5f8a01131 perf: 修改 celery tasks 列表 2022-12-22 17:49:07 +08:00
Bai b851fd1069 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-22 17:44:28 +08:00
Bai c645ca9aea fix: 修改点击我的授权树节点报错的问题 2022-12-22 17:43:03 +08:00
“huailei000” 65387ebff4 perf: 调整登录页面布局 2022-12-22 15:42:45 +08:00
ibuler 6ff104c100 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-22 13:59:00 +08:00
ibuler 2e91aa8ce5 perf: 添加 celery 健康检测 2022-12-22 13:58:29 +08:00
fit2bot 1de51a2bfd
perf: asset xpack (#9234) 
Co-authored-by: feng <1304903146@qq.com>
 2022-12-22 13:50:22 +08:00
ibuler a377317d6e Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-22 12:53:26 +08:00
ibuler e0e57a71aa pref: 类型树支持资产 2022-12-22 11:34:18 +08:00
Bai 00c955e8c0 perf: 修改方法名 check_db_port_mapper 2022-12-21 21:08:28 +08:00
Bai 5d865ffd54 fix: 修改db_port_mapper策略; 启动时进行check校验; 2022-12-21 21:08:28 +08:00
feng f4b0ba43a2 perf: filter application 2022-12-21 20:19:13 +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
feng e347e05210 perf: terminal type remove ssh 2022-12-21 18:26:06 +08:00
Bai d4e215aeaa fix: 修复luna页面资产树加载不出来的问题 2022-12-21 18:00:50 +08:00
fit2bot 34cc3b233d
refactor: 重构用户授权资产查询工具(重构中..) (#9225) 
* refactor: 重构用户授权资产查询工具(重构中..)

* perf: 修改 get_perm_nodes_assets 名称

* refactor: 优化用户授权节点查询工具; 删除UnionQuerySet工具

Co-authored-by: Bai <baijiangjie@gmail.com>
 2022-12-21 17:36:44 +08:00
feng 510ca9a5b8 perf: k8s tree 2022-12-21 17:32:55 +08:00
fit2bot c304a58c05
perf: 修改k8s 树 (#9228) 
Co-authored-by: feng <1304903146@qq.com>
 2022-12-21 17:17:54 +08:00
Aaron3S 0e534f3251 feat: 优化api 2022-12-21 17:14:07 +08:00
Bai 5198ac1cc0 perf: 修改 UserAssetGrantedTreeNodeRelation id 为 AutoField 2022-12-21 15:16:54 +08:00
Aaron3S 560ff651c4 perf: 删除无用代码 2022-12-21 11:20:28 +08:00
Aaron3S 3ddeb97ea5 fix: 解决执行命令引号造成的问题 2022-12-21 11:20:28 +08:00
ibuler 327eb7a27d perf: 修改 migrations 2022-12-21 10:17:28 +08:00
ibuler 63d35ea8a6 perf: 修改资产 model 2022-12-20 20:39:48 +08:00
ibuler 10f4a0d67e Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-20 20:25:14 +08:00
ibuler 58909ee67d perf: 修改基础 model，继承同一个 2022-12-20 20:23:42 +08:00
Aaron3S 0c35205e31 feat: 增加作业版本历史 2022-12-20 19:46:48 +08:00
feng 21d6243b61 perf: api doc 2022-12-20 19:18:39 +08:00
fit2bot 6e467d9b67
perf: terminal connect method gui (#9224) 
Co-authored-by: feng <1304903146@qq.com>
 2022-12-20 18:50:04 +08:00
jiangweidong 55cee43f91 perf: 优化Sentinels配置参数 2022-12-20 18:37:28 +08:00
ibuler a7815dc9e5 perf: 修改 job log 2022-12-20 18:12:35 +08:00
ibuler a21cb32245 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-20 17:52:40 +08:00
ibuler 0748c32c5a perf: 修改 session type 序列🥱 2022-12-20 17:52:08 +08:00
Aaron3S e4b4f98362 feat: 作业审计添加字段 2022-12-20 17:28:27 +08:00
ibuler 88355f55bb Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-20 16:57:07 +08:00
ibuler 754f8131b4 perf: 内置 applets 自动安装 2022-12-20 16:48:18 +08:00
Aaron3S d8cccfd40f feat: 优化job execution 详情字段 2022-12-20 16:36:38 +08:00
Aaron3S 54f720e992 增加部分翻译 2022-12-20 16:36:38 +08:00
Bai 362cfb733c perf: 修改 su-from-accounts API 2022-12-20 16:13:44 +08:00
feng dddff03336 perf: asset tree 2022-12-20 14:53:25 +08:00
ibuler 5d31200368 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-20 13:49:56 +08:00
ibuler c040564dc2 fix: 修改显示 model 的错误 2022-12-20 13:47:12 +08:00
Bai 1b82f3fc6a Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-20 11:26:25 +08:00
Bai ba4d222eda fix: 解决 nodes-with-assets/tree/ API 异常的问题 2022-12-20 11:25:44 +08:00
ibuler 758453ae96 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-20 11:05:29 +08:00
ibuler 24da1e7d91 perf: 修改 connect token, 获取 applet info 2022-12-20 11:05:00 +08:00
feng cdb89ee2f2 perf: job executed fail api 2022-12-20 10:35:05 +08:00
fit2bot e82eb8f3d1
perf: 批量命令 (#9220) 
Co-authored-by: feng <1304903146@qq.com>
 2022-12-19 18:04:11 +08:00
fit2bot 92a198c00b
refactor: 重构重建用户授权树工具 (#9219) 
* perf: 优化 <UserGrantedTreeBuildUtils> 用户授权树构建工具

* feat: 完成计算授权节点资产数量

* refactor: 重构重建用户授权树工具

* merge: v3

Co-authored-by: Bai <baijiangjie@gmail.com>
 2022-12-19 16:04:58 +08:00
feng ff16260024 perf: remove OrganizationMember model 2022-12-19 15:44:02 +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 675a41013e perf: connect methods xpack 2022-12-16 18:37:27 +08:00
ibuler 26794064b5 perf: session 添加类型 2022-12-16 17:16:14 +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
Aaron3S 009669febe feat: 增加作业审计api 2022-12-16 15:52:02 +08:00
Aaron3S bc47afb329 feat: 修改 inventory 名字生成规则 2022-12-16 15:20:36 +08:00
Aaron3S e969a01689 feat: 修改作业权限 2022-12-16 15:20:36 +08:00
吴小白 9d80abadd8 perf: 优化启动速度 2022-12-16 11:48:55 +08:00
halo 4f1d4ab71e fix: 导入翻译引用 2022-12-16 11:48:02 +08:00
halo cb8dc6c583 perf: 优化oauth2的服务地址参数拼接 2022-12-16 11:48:02 +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
feng cbf91e4c29 perf: ticket help text 2022-12-15 11:59:14 +08:00
Eric acfce4961c fix: 修复用户组织树问题 2022-12-14 18:17:25 +08:00
Eric d60f9a7c69 perf: web selector 默认值修改 2022-12-14 17:39:22 +08:00
fit2bot 7b0d26bbff
perf: ticket applicant (#9205) 
Co-authored-by: feng <1304903146@qq.com>
 2022-12-14 15:24:36 +08:00
fit2bot f42c0f667d
perf: ticket applicant (#9202) 
Co-authored-by: feng <1304903146@qq.com>
 2022-12-13 17:36:00 +08:00
吴小白 b6d6c54d8f
Merge pull request #9201 from jumpserver/pr@v3@perf_support_openid_pkce 
perf: OpenID支持PKCE方式对接
 2022-12-13 16:16:11 +08:00
feng 1660362499 perf: validate ssh key 2022-12-13 15:50:47 +08:00
jiangweidong 6b33a54aef perf: OpenID支持PKCE方式对接 2022-12-13 15:31:53 +08:00
jiangweidong c121ac6b1d perf: OpenID支持PKCE方式对接 2022-12-13 15:30:08 +08:00
Eric 1af86ccdfe perf: change secret_type to LabeledChoiceField 2022-12-13 12:31:20 +08:00
feng 2f3b1d3b66 fix: ticket xss inject 2022-12-12 17:12:04 +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 eba43f6a13 fix: 修改 db-listen-port.db_info API 返回的数据结构 2022-12-12 11:01:51 +08:00
Bai 26d9cdc50d perf: 优化用户授权树工具类存放目录 user_perm_tree 文件中 2022-12-09 14:03:00 +08:00
Bai 5e5061a825 perf: 优化 UserPermTreeExprireUtil 2022-12-09 13:38:30 +08:00
Bai 89f89532e7 perf: 优化 convert_to_queryset 方法 2022-12-09 13:38:30 +08:00
Bai a767c208b3 perf: 优化 get_all_node_keys 方法 2022-12-09 13:38:30 +08:00
Bai 1679efe2c9 refactor: 重构优化用户授权树工具类和用户授权树过期条件处理逻辑 <UserPermTreeRefreshUtil> <UserPermTreeExpireUtil> 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
Aaron3S c14b97419d feat: 增加跳过的主机统计， 增加每台主机执行情况api 2022-12-07 20:13:26 +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 02a03e1a28 perf: merge i18n 2022-12-07 16:02:18 +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 1cab84bb62 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-06 19:54:15 +08:00
Bai bf5da83008 perf: 修改授权 API Name 2022-12-06 19:53:36 +08:00
Aaron3S 07b3774d3d feat: 增加运行的内置变量,优化self资源的代码 2022-12-06 19:48:31 +08:00
Aaron3S d92b198a12 perf: 优化ops代码 2022-12-06 19:48:28 +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 c9bf99468c feat: 添加 command-review API 2022-12-06 18:27:53 +08:00
Bai 71e76e5075 feat: 添加su-from-accountsAPI 2022-12-06 17:43:33 +08:00
“huailei000” b6afe77bc0 perf: 调整登录页样式 2022-12-06 17:43:08 +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 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