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

5402 Commits (55de785947222810d74f5c68de1a6b31fc15a6d0)

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