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

865 Commits (e7f92ec0d7a2cd650ed55579e3c91a26cb9994a1)

Author SHA1 Message Date
ibuler cfca519158 fix: 修复授权的账号，用户名相同的，只有一个的情况 2023-07-19 20:16:40 +08:00
fangfang.dong 785e4cc3e4 perf: 接口sql优化 /api/v1/perms/asset-permissions/<uuid:pk>/assets/all/ 2023-07-04 19:14:21 +08:00
ibuler a22f36a06a perf: 去掉 debug 2023-06-27 14:31:20 +08:00
ibuler 77bcb05d80 perf: web 和 自定义类型资产支持匿名账号 2023-06-27 11:23:56 +08:00
ibuler 270ed5e2f8 perf: 修改 logging 避免冲突 2023-06-21 17:49:16 +08:00
ibuler 0901b95ce0 perf: 优化授权中动作的说明 2023-05-29 18:23:26 +08:00
ibuler 9932e7eadd perf: 资产授权支持 delete 控制 2023-05-25 19:15:48 +08:00
ibuler eccbf46300 merge: with dev 2023-05-24 15:26:59 +08:00
fit2bot 6c19fd4192
fix: 修复 luna 类型树数量计算不准确bug (#10492) 
Co-authored-by: feng <1304903146@qq.com>
 2023-05-18 15:42:30 +08:00
fit2bot f06059837d
perf: 授权类型树 (#10390) 
Co-authored-by: feng <1304903146@qq.com>
 2023-05-11 10:15:40 +08:00
fit2bot 1933e82587
feat: 账号模版切换至 (#10396) 
Co-authored-by: feng <1304903146@qq.com>
 2023-05-09 15:29:02 +08:00
ibuler a112d3c99d perf: 修改 accounts 字段 2023-05-06 19:52:03 +08:00
ibuler 632627db11 perf: 去掉 debug model 2023-04-25 16:25:00 +08:00
fit2bot a19586f8b8
perf: perm user asset add labels (#10339) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-25 14:48:09 +08:00
fit2bot 8fe5ab42e8
perf: 用户工作台资产显示更多字段 (#10338) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-25 14:36:01 +08:00
ibuler c991a73632 v1 2023-04-23 16:15:27 +08:00
ibuler eb9ac213d5 perf: 去掉 debug msg 2023-04-21 11:32:49 +08:00
jiangweidong e12b832992
perf: 关闭SFTP后，luna界面不显示相应选项 (#10186) 
* perf: 关闭SFTP后，luna界面不显示相应选项

* perf: 修改默认值

* perf: 增加资产协议冗余字段，减少关联查询

* perf: 修改

* perf: 优化

* perf: 精简

* perf: 删掉空格

* perf: 修改继承类
 2023-04-13 17:26:24 +08:00
Bai 3fa1b46312 fix: 修复授权规则Util类 2023-03-28 11:39:19 +08:00
Aaron3S 017682b383 perf: 增加我的资产通过 node_id 过滤我的资产 2023-03-27 14:53:39 +08:00
fit2bot f6c5c35a2c
feat: 账号收集批量同步账号 (#10051) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-23 15:24:19 +08:00
fit2bot 1acfdf0398
perf: 批量推送账号 分批处理 (#10000) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-17 17:10:10 +08:00
Bai 894955dd68 fix: 修复更新授权报错的问题 2023-03-15 16:33:38 +08:00
ibuler 082af029a7 perf: 优化资产迁移，避免冲突 2023-03-14 11:21:52 +08:00
ibuler 6bb42b8d59 perf: 优化 csv import export 2023-03-13 17:57:50 +08:00
fit2bot c90a2df28e
perf: automation account username change id (#9867) 
* perf: automation account username change id

* perf: 授权账号模版 自推送

---------

Co-authored-by: feng <1304903146@qq.com>
 2023-03-08 18:52:00 +08:00
Bai 1b2de703f4 fix: 修复获取授权资产详情时返回 spec_info 字段, 解决连接 Magnus 问题 2023-02-24 11:41:15 +08:00
ibuler 0f338a3b58 perf: 修复社区版可能引起的问题 2023-02-24 00:31:38 +08:00
ibuler 1a9cd2dee2 perf: 优化资产批量更新 2023-02-23 17:44:38 +08:00
ibuler 37524106bf perf: 优化迁移 2023-02-22 21:52:37 +08:00
Bai 49c7a12bb3 fix: 修复资产授权规则过滤 2023-02-22 21:07:49 +08:00
fit2bot 042108a9c0
perf: k8s account @input (#9692) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-22 17:56:20 +08:00
Eric 3f9f3f3290 fix: rdp file download 2023-02-21 17:39:33 +08:00
ibuler 4818e759bc perf: 优化 一些继承 2023-02-20 13:36:50 +08:00
ibuler 492dd34cb8 perf: 优化排序 2023-02-20 13:31:56 +08:00
fit2bot 9a62a7aaab
pref: 修改 activity log (#9571) 
* pref: 修改 activity log

* perf: 优化 acitivity

* pref: 修改 activity

* fix: 修复一些运行问题

* fix: app.py 中添加 tasks import

* fix: 添加 activity_callback

* fix: 添加 execute_account_backup_plan activity_callback

* fix: 添加 activity_callback -> gather_asset_accounts

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

* fix: 修改翻译

---------

Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: jiangweidong <weidong.jiang@fit2cloud.com>
Co-authored-by: Bai <baijiangjie@gmail.com>
 2023-02-17 17:14:53 +08:00
Bai d85b024c47 fix: 修复打开 PERM_SINGLE_ASSET_TO_UNGROUP_NODE 配置时返回两个收藏夹节点的问题 2023-02-17 11:11:57 +08:00
Bai 7d94e17e03 fix: 修改迁移文件 2023-02-16 14:21:24 +08:00
Bai 0828a0e9ba fix: 修复资产详情授权用户授权规则列表的搜索项 2023-02-15 14:55:02 +08:00
Bai 71f3fe64b4 fix: 修复获取资产授权的账号 API，过滤未激活的账号 2023-02-14 14:37:21 +08:00
Bai 5153817ff4 fix: 修复同名用户登录时username设置问题 2023-02-10 16:01:50 +08:00
ibuler 17fce76ac4 perf: 修改 signal handler 2023-02-08 10:14:09 +08:00
Bai ce8ad5f9cc perf: 优化资产授权规则过滤支持 accounts 2023-02-03 15:02:58 +08:00
Aaron3S 1083f5f6f2 feat: 添加 task 的 verbose_name 2023-02-02 16:49:34 +08:00
Bai 5fcd83b587 fix: 修复获取 swagger api 时，AssetSerializer category, type 字段手动设置 _choices 属性时报错的问题 2023-02-02 14:40:23 +08:00
ibuler ef51e74b8e perf： 继续替换 spec 2023-01-31 18:06:44 +08:00
fit2bot f54edab172
perf: user perm (#9329) 
Co-authored-by: feng <1304903146@qq.com>
 2023-01-17 18:19:34 +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
fit2bot c81f36cc27
perf: remove gather model (#9246) 
Co-authored-by: feng <1304903146@qq.com>
 2022-12-27 17:45:41 +08:00
ibuler dd630f0e14 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-26 18:58:48 +08:00
Bai d2ba7a98ea perf: 修改授权序列类字段翻译信息 2022-12-26 16:15:44 +08:00
ibuler 4bd913b585 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-23 16:00:11 +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
Bai 3443b06a28 fix: 修复异步加载luna资产授权树时根节点下资产没有返回的问题 2022-12-22 19:17:52 +08:00
Bai ab6518e60e fix: 开启授权规则signal信号监听;解决授权规则变动用户授权树没有即使刷新的问题 2022-12-22 18:56:54 +08:00
Bai c645ca9aea fix: 修改点击我的授权树节点报错的问题 2022-12-22 17:43:03 +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
Bai 5198ac1cc0 perf: 修改 UserAssetGrantedTreeNodeRelation id 为 AutoField 2022-12-21 15:16:54 +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
feng 21d6243b61 perf: api doc 2022-12-20 19:18:39 +08:00
feng dddff03336 perf: asset tree 2022-12-20 14:53:25 +08:00
Bai ba4d222eda fix: 解决 nodes-with-assets/tree/ API 异常的问题 2022-12-20 11:25:44 +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
ibuler 26fa1f6f08 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-16 15:54:29 +08:00
ibuler d040162d86 perf: 修改 session 字段，添加 Comment 2022-12-16 15:53:59 +08:00
feng d7a793b4c4 perf: 修改k8s tree 2022-12-15 18:47:54 +08:00
ibuler cb7b31e8b8 perf: perm account 返回 alias 2022-12-15 16:02:34 +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 c861f390c7
perf: k8s account ignore (#9188) 
Co-authored-by: feng <1304903146@qq.com>
 2022-12-12 11:43:19 +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 1679efe2c9 refactor: 重构优化用户授权树工具类和用户授权树过期条件处理逻辑 <UserPermTreeRefreshUtil> <UserPermTreeExpireUtil> 2022-12-09 13:38:30 +08:00
Bai 4f5cc56b00 perf: 优化 UserPermTreeUtil 逻辑(进行中) 2022-12-09 13:38:30 +08:00
fit2bot e5afbd4118
perf: k8s tree api (#9169) 
Co-authored-by: feng <1304903146@qq.com>
 2022-12-07 23:55:56 +08:00
Bai 6cda28c63d perf: 优化授权规则 user-permission 用户授权相关的 API; 包括 assets, nodes, tree-asset, tree-node, tree-node-with-asset; 2022-12-07 18:38:03 +08:00
Bai bf5da83008 perf: 修改授权 API Name 2022-12-06 19:53:36 +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 2cf3a21d27 perf: 修改校验权限 2022-12-02 20:33:32 +08:00
ibuler 2d771eedc1 perf: 优化用户授权 api 2022-12-02 13:15:03 +08:00
Bai d5d770e4ac Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-01 12:03:08 +08:00
Bai 592d79c0f8 perf: 合并授权规则用户相关的 API URL，统一使用 /<str:user>/ 格式 2022-12-01 12:02:20 +08:00
Eric d198dfcba9 perf: granted asset add specific field 2022-12-01 00:36:02 +08:00
Eric 142348b055 perf: 增加资产过滤 2022-11-30 18:16:52 +08:00
ibuler 307cf97ccb perf: 授权的资产支持过滤 2022-11-30 15:39:27 +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
Bai 99f5c02d84 perf: 获取用户授权的账号返回 has_username 字段 2022-11-24 17:04:27 +08:00
Bai 4574161009 fix: 修复获取授权规则的账号列表为空的问题 2022-11-24 16:44:15 +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