github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
11,765 Commits
72 Branches
249 Tags
112 MiB
Commit Graph

569 Commits (1ee57cfda0e35384d82085ad9413da76ebc48364)

Author SHA1 Message Date
ibuler affa562384 perf: 优化禁用用户 2023-10-10 19:00:00 +08:00
fit2bot af733ecbad
fix: 修改平台id序列化属性 改为非只读 (#11581) 
Co-authored-by: feng <1304903146@qq.com>
 2023-09-17 16:07:05 +08:00
Bai 77944cc91b fix: 修复创建资产 is_valid 使用kw参数 2023-07-27 10:21:22 +08:00
ibuler 806baeb136 perf: 修复批量更新资产导致的错误 2023-07-25 14:45:24 +08:00
ibuler b4b9c805ff perf: 修改支持 Django4 2023-07-24 11:52:25 +08:00
fit2bot 19b91a6c1f
perf: 修复资产导入账号模版失败问题 导入文件不区分大小写 (#11031) 
Co-authored-by: feng <1304903146@qq.com>
 2023-07-20 14:57:51 +08:00
fit2bot de4ef7d1b5
perf: GPT资产修改节点导致资产协议变多 (#11021) 
Co-authored-by: feng <1304903146@qq.com>
 2023-07-19 19:00:15 +08:00
ibuler 046342ceee perf: 平台创建自动化设置默认值 2023-07-19 18:23:18 +08:00
fit2bot 9e8579d5b4
perf: proxy 添加校验 修改翻译 (#11017) 
Co-authored-by: feng <1304903146@qq.com>
 2023-07-19 17:05:42 +08:00
ibuler 8a89ee7ac0 perf: 优化平台创建时，协议 setting 必填 2023-07-17 13:53:27 +08:00
ibuler 2b51a7590e perf: 修改 api mode 和 i18n 2023-07-11 11:28:09 +08:00
老广 b10623c970
Merge pull request #10879 from jumpserver/pr@dev@feat_chatgpt_support 
feat: 支持 chatgpt 资产
 2023-07-11 09:59:04 +08:00
feng 89492410aa fix: 推送账号 不填写home 推送失败 2023-07-06 10:33:36 +08:00
ibuler 8dbe61100b perf: 优化协议，支持 port from addr 2023-07-04 10:29:27 +08:00
ibuler 19de79fadf feat: 支持 chatgpt 资产 2023-06-30 17:35:49 +08:00
fit2bot bbbd011cc2
perf: 修改 protocol setting (#10875) 
* feat: 新增账号配置

* perf: 修改 platform protocol define

* perf: 修改 account config

* perf: 修改协议设置

---------

Co-authored-by: ibuler <ibuler@qq.com>
 2023-06-30 15:54:06 +08:00
fit2bot 120f0dd3ad
perf: asset web autofill 添加LabeledChoiceField (#10706) 
Co-authored-by: feng <1304903146@qq.com>
 2023-06-14 14:42:53 +08:00
fit2bot 5bd4a882cc
fix: 平台导入无协议port (#10702) 
Co-authored-by: feng <1304903146@qq.com>
 2023-06-13 17:57:48 +08:00
ibuler 2a183e34ac perf: 修改去掉 debug 2023-05-31 16:48:50 +08:00
ibuler 7d111b6efb perf: 优化自定义平台和 applet 导入 2023-05-31 16:48:50 +08:00
fit2bot 44967b1af1
fix: 平台局部更新会自动关闭其他属性 (#10484) 
Co-authored-by: feng <1304903146@qq.com>
 2023-05-18 15:43:23 +08:00
Bai b98aa377b6 perf: 数据库资产 默认数据库 是必填项 2023-05-10 16:47:03 +08:00
Bai 24fd87f7bc perf: 平台协议API返回public字段 2023-05-10 15:36:18 +08:00
feng 9802aec881 perf: 自动化执行详情数据 2023-05-10 15:24:40 +08:00
fit2bot f842546042
perf: 平台导出过滤掉automation (#10367) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-28 17:13:43 +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
feng f85daa088f perf: 创建资产 nodes 可为空 默认 default 2023-04-21 14:58:11 +08:00
ibuler 06052b85a2 perf: 优化支持 自定义 applet 
perf: 优化平台
 2023-04-21 11:31:10 +08:00
ibuler dac708f952 perf: 优化 api doc 报错 2023-04-20 15:47:50 +08:00
fit2bot fc4a77df1a
fix: 账号导入500 (#10255) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-19 10:57:38 +08:00
ibuler 8b98bbddaa perf: custom fields 仅custom 类型资产支持 2023-04-18 17:07:01 +08:00
ibuler 5921b2ee8f perf: 修改默认节点 2023-04-18 16:29:41 +08:00
fit2bot cff4309b03
fix: export assets (#10224) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-17 15:42:46 +08:00
fit2bot 2b00e6e3a1
fix: 修复资产列表 mini 时报错 (#10220) 
Co-authored-by: ibuler <ibuler@qq.com>
 2023-04-17 15:10:34 +08:00
fit2bot b1374c6aba
fix: 更新平台 ansible_enabled 未设置 (#10210) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-14 17:10:33 +08:00
fit2bot 1eb8e40d3e
feat: 账号推送附加参数 (#10080) 
* feat: 账号推送附加参数

* perf: 通过节点 资产 过滤平台api

* perf: push automation params

* perf: 修改playbook

* perf: params serializer

* perf: 账号推送playbook 调整

* perf: Automation serializer add params field

* perf: params 非必填

* perf: 添加is_params 给前端判断

* perf: is_params bool

* perf: 修改push account ansible逻辑

* perf: 修改获取push_kwargs方法

* perf: platform migrate

* perf: 修改api

* perf: 单个推送

* perf: push account

* perf: 修改asset auto_config

---------

Co-authored-by: feng <1304903146@qq.com>
Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com>
 2023-04-13 19:02:04 +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
fit2bot 4654756966
fix: 修复账号克隆 500 (#10192) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-13 14:20:07 +08:00
ibuler 36813f64db perf: 修改 device platform 支持 su 2023-04-11 19:32:29 +08:00
fit2bot 1248458451
perf: 优化支持 choices (#10151) 
* perf: 支持自定义类型资产

* perf: 改名前

* perf: 优化支持 choices

* perf: 优化自定义资产

* perf: 优化资产的详情

* perf: 修改完成自定义平台和资产

---------

Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
 2023-04-10 10:57:44 +08:00
老广 9af2974bad
Merge pull request #10104 from O-Jiangweidong/pr@dev@feat_windows_winrm 
feat: Windows类型资产增加winrm协议
 2023-04-04 14:08:34 +08:00
fit2bot c5340b5adc
perf: 修改 account (#10088) 
* perf: 优化账号创建策略

* perf: 修改账号

* perf: 修改 account

* perf: 修改 account

* perf: 修改批量创建

* perf: 修改账号批量创建

* perf: 继续优化账号批量添加

* perf: 优化创建 accounts 的结果

* perf: 优化账号批量返回的格式

* perf: 优化账号

---------

Co-authored-by: ibuler <ibuler@qq.com>
 2023-04-03 18:18:31 +08:00
jiangweidong cab72c6991 feat: Windows类型资产增加winrm协议 2023-03-29 17:10:58 +08:00
Eric 118d33fa02 perf: 支持 super 方式的切换用户 2023-03-27 18:06:30 +08:00
Bai 66d368f882 fix: 修改nodes_display required = False 2023-03-24 17:11:03 +08:00
Bai 30ab6836ab fix: 修改 login_button 2023-03-24 17:09:07 +08:00
Bai 5d022c7056 fix: 修复资产导入支持填写节点路径 2023-03-23 16:01:19 +08:00
fit2bot f7ae23f7d9
perf: 导入资产账号模版api优化 (#10038) 
Co-authored-by: feng <1304903146@qq.com>
Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com>
 2023-03-22 18:35:23 +08:00
ibuler 47c207ce13 perf: 硬件设备支持账号切换 2023-03-22 16:49:29 +08:00
老广 463d54a4d8
Merge pull request #10023 from jumpserver/pr@dev@asset_accounts_secret_type_default 
perf: 设置资产账号的默认值，方便导入
 2023-03-22 15:38:26 +08:00
ibuler aca0d62feb perf: 优化 protocols 2023-03-22 15:28:05 +08:00
ibuler ba076f6612 perf: 优化提示 2023-03-22 14:56:20 +08:00
ibuler 180ded1773 perf: 修改 platform protocols 2023-03-22 14:15:25 +08:00
ibuler cac59db1ec perf: 设置资产账号的默认值，方便导入 2023-03-21 12:43:54 +08:00
ibuler 891d9d36b0 fix: windows 平台默认不开启 console 2023-03-15 19:01:18 +08:00
ibuler 2b7f90349c perf: 优化资产平台的获取 2023-03-15 14:14:48 +08:00
ibuler 6bb42b8d59 perf: 优化 csv import export 2023-03-13 17:57:50 +08:00
ibuler fa3bfceddc perf: 优化导入导出 
perf: remove debug

perf: 修改账号导入导出

perf: 去掉一些 debug
 2023-03-10 19:23:49 +08:00
fit2bot 3658ecce0c
perf: 修改 ssh key with pass 报错 (#9917) 
Co-authored-by: ibuler <ibuler@qq.com>
 2023-03-10 16:04:48 +08:00
fit2bot 797c7635a7
perf: asset hardwareinfo (#9813) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-28 18:45:38 +08:00
ibuler 22a1d60e3f perf: 优化 msg 2023-02-24 14:46:43 +08:00
Bai 05d40a5255 fix: 修复平台列表创建同名校验问题 2023-02-23 19:57:55 +08:00
Jiangjie.Bai 0a374db606
fix: 修复文件导出 {"": True"} 问题 (#9729) 2023-02-23 19:14:58 +08:00
ibuler 1a9cd2dee2 perf: 优化资产批量更新 2023-02-23 17:44:38 +08:00
ibuler d1b807bd8b perf: 修改 account asset auto_info 返回 2023-02-23 16:14:24 +08:00
fit2bot b9dcce5c51
fix: 资产更新没有账号及自动化任务更新name (#9679) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-22 11:04:29 +08:00
ibuler 82432299b8 merge: with dev 2023-02-21 13:47:08 +08:00
ibuler 0001ffba1b perf: 优化 rbac 2023-02-21 13:39:28 +08:00
Bai 1888597451 fix: 修改slugfield校验问题 2023-02-20 20:15:47 +08:00
Bai d246b9bb35 fix: 修复资产硬件信息收集失败的问题 2023-02-20 17:25:16 +08:00
ibuler 492dd34cb8 perf: 优化排序 2023-02-20 13:31:56 +08:00
ibuler a1440ee4e0 perf: 优化 asset 创建时 nodes 可能有问题 2023-02-19 15:43:56 +08:00
fit2bot 9ed1b8fc86
perf: 修改 swagger 查询 (#9616) 
* perf: 修改 swagger 查询

* perf: 修改 operate log

---------

Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
 2023-02-17 21:11:06 +08:00
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
jiangweidong 3b3355f3f8 perf: 修改PostgreSQL数据库参数为必填 2023-02-16 17:33:03 +08:00
fit2bot e66168dfa4
perf: account secret 加密 (#9570) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-15 20:16:01 +08:00
Bai e25306608b fix: 修复克隆网关没有克隆账号的问题 2023-02-15 11:18:44 +08:00
ibuler 786d96ee6e perf: 修改登录 2023-02-14 16:01:35 +08:00
ibuler 8b0a967306 perf: 优化 audit log 2023-02-14 15:53:08 +08:00
fit2bot 10d776f7e5
perf: account name required (#9533) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-14 11:37:18 +08:00
ibuler bd9b1f1a5b perf: 优化 audit log 2023-02-13 19:42:42 +08:00
ibuler 136bec94ca perf: merge with dev 2023-02-10 15:38:40 +08:00
Bai 4c96d6935a fix: 修复没有 push_now 权限的用户可以在创建资产、创建账号中开启推送 2023-02-10 11:14:05 +08:00
ibuler 37a52c420f perf: 优化并发处理 2023-02-09 20:48:25 +08:00
Bai 4f6a17290a fix: 修复创建资产时账号禁用不生效的问题 2023-02-09 12:30:28 +08:00
ibuler eabb41b74c perf: 修改 platform serializer 2023-02-08 13:53:21 +08:00
Bai b41d30dbac fix: 修复导入更新资产时包含labels报错的问题(取消id唯一键校验) 2023-02-07 16:00:36 +08:00
fit2bot 654cbe7bd0
perf: 创建网关 没有关联网域 (#9441) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-06 14:54:30 +08:00
fit2bot 9a1109e13d
perf: 资产创建添加账号 没有携带密码 (#9436) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-06 11:00:36 +08:00
Bai 4af80bfcdf fix: 修改中文翻译文件 2023-02-06 10:30:40 +08:00
ibuler 91357b3715 perf: 优化 gateway 设置 2023-02-03 19:46:42 +08:00
fit2bot 20d2efc407
perf: 主机硬件信息 (#9429) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-03 18:23:38 +08:00
ibuler 470d2703f4 perf: 协议端口校验 2023-02-03 16:13:29 +08:00
fit2bot 93932f1904
perf: 优化批量更新 (#9418) 
* perf: 优化批量更新

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

---------

Co-authored-by: ibuler <ibuler@qq.com>
 2023-02-02 20:10:48 +08:00
Bai 5fcd83b587 fix: 修复获取 swagger api 时，AssetSerializer category, type 字段手动设置 _choices 属性时报错的问题 2023-02-02 14:40:23 +08:00
ibuler 853f9c422d perf: 修改 i18n 2023-02-01 18:45:51 +08:00
fit2bot 66c58a2084
perf: 账号 模版创建 (#9386) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-01 14:43:58 +08:00
ibuler 9ec7a8ac61 perf: 优化 asset info 2023-01-31 17:46:56 +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
jiangweidong 87ca9cb11d fix: 使用type 2023-01-30 20:26:07 +08:00