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

632 Commits (85fedf0704f2c000aeac5b4116f3e6bb5d494bc4)

Author SHA1 Message Date
Bai ad311c15ca fix: 增加 TypeError 捕获 2023-07-11 10:19:31 +08:00
Bai 7d17c1a450 fix: 修复 beat 定时任务重复执行的问题 2023-07-10 19:28:19 +08:00
feng 768eb033eb fix: 修复自动化任务原子性error 导致整个任务失败问题 2023-06-25 18:20:49 +08:00
ibuler 26edd2f040 perf: 修改去掉一些 debug 2023-06-21 17:49:16 +08:00
ibuler 270ed5e2f8 perf: 修改 logging 避免冲突 2023-06-21 17:49:16 +08:00
feng ef4132d2c5 feat: 添加自动化任务rdp ping 2023-06-15 18:33:05 +08:00
Aaron3S d10db0aa62 fix: 修复任务被黑名单拦截后没有更新状态的问题 2023-06-14 20:40:40 +08:00
Aaron3S 2c2334b618 perf: 优化报错内容 2023-06-14 20:16:42 +08:00
Aaron3S 9e31a5064b perf: 优化黑名单命令提示 2023-06-14 20:16:42 +08:00
Bai 954f86f8a9 fix: 修复执行任务中心报错的问题 2023-06-14 19:57:55 +08:00
fit2bot bfd77aa1b0
feat: automation windows pyrdp ping (#10602) 
* feat: automation windows pyrdp ping

* perf: add pyfreerdp deps

---------

Co-authored-by: feng <1304903146@qq.com>
Co-authored-by: Eric <xplzv@126.com>
 2023-06-07 17:28:35 +08:00
fangfangdong a0bb25e558 feat: 系统设置-安全设置 支持配置 作业中心命令黑名单 2023-05-31 17:43:05 +08:00
fit2bot 3626bf8df6
feat: 命令及录像存储可连接性定时检查 (#10594) 
Co-authored-by: feng <1304903146@qq.com>
 2023-05-30 18:45:51 +08:00
feng 20c1f4a293 perf: 改密过程原子性优化 2023-05-24 14:31:27 +08:00
ibuler c4b25fbdbd fix: 修复 applet 账号选择问题 2023-05-19 17:01:29 +08:00
Aaron3S 36aa0d301b perf: 优化 ops 用户提示 2023-05-17 18:37:54 +08:00
Aaron3S 3fa80351e0 fix: 修复作业中心提示用户名排序每次不一样的问题 2023-05-17 18:37:54 +08:00
fit2bot a7fed21819
perf: 翻译 (#10472) 
Co-authored-by: feng <1304903146@qq.com>
 2023-05-16 18:35:48 +08:00
fit2bot c7c3f711bf
perf: 优化发布机不显示task信息问题 (#10450) 
* perf: 优化发布机不显示task信息问题

* perf: 添加celery task execution api的task_name字段

---------

Co-authored-by: “huailei000” <2280131253@qq.com>
Co-authored-by: feng <1304903146@qq.com>
 2023-05-16 14:48:00 +08:00
jiangweidong afb49f4040 fix: oracle Ping 失败 2023-05-12 15:41:03 +08:00
“huailei000” ff4f01fb56 perf: 优化task执行数据显示 2023-05-11 17:19:21 +08:00
Aaron3S ebb0e796ce feat: 作业中心根据当前选择的资产提示用户名 2023-05-10 15:41:17 +08:00
“huailei000” 90cc2a2519 perf: 展示执行详情数据 2023-05-10 15:24:40 +08:00
ibuler 873c019b58 perf: 修改 job list 2023-05-09 17:23:21 +08:00
ibuler b5599fd3a6 perf: 优化 job permission 2023-05-09 17:18:52 +08:00
fit2bot 58d055f114
perf: 改密 推送 可以对自己操作 同时设置su_enabled 可提权 (#10349) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-26 18:50:30 +08:00
fit2bot ede53d3b6b
perf: ssh key strategy translate (#10295) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-21 14:08:59 +08:00
fit2bot 11ad6ab273
fix: 修复作业中心未开启的acl生效的问题 (#10265) 
* fix: 修复作业中心未开启的acl生效的问题

* perf: 优化代码风格

---------

Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
 2023-04-20 10:33:53 +08:00
jiangweidong 2ba32f6971 perf: 优化自定义改密时需要在命令中包含ssh登录用户的密码问题 2023-04-20 09:52:13 +08:00
Aaron3S ca898ed7b5 perf: 优化代码 2023-04-18 19:54:14 +08:00
Aaron3S 50421a1f89 fix: 修复作业中心选择收藏资产取不到资产的问题 2023-04-18 19:54:14 +08:00
jiangweidong 690e01cb78
feat: 支持部分资源的自定义自动化任务(Ping/VerifyAccount/ChangeSecret) (#9947) 
* feat: 支持部分资源的自定义自动化任务(Ping/VerifyAccount/ChangeSecret)

* perf: 去掉无用的属性

* perf: 优化自定义改密逻辑

* feat: 支持ssh_key认证

* perf: 去掉无用注释

* perf: 优化

* perf: 优化逻辑

* perf: 优化标题

* perf: 去掉一些无用的函数

* perf: 优化helptext
 2023-04-14 18:31:09 +08:00
fit2bot 1aadb760f4
perf: 优化命令长度限制到8m (#10193) 
Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
 2023-04-13 15:47:16 +08:00
Bai 4c7c8f482d fix: 修复执行批量命令时报错的问题 TypeError:set obiect is not subscriptable 2023-04-12 18:30:34 +08:00
wulabing cec176cc33 fix notifications.py 
fix ops.tasks.check_server_performance_period AttributeError: type object 'Status' has no attribute 'get_terminal_latest_stat'
 2023-04-10 10:35:16 +08:00
jiangweidong 187c1e3804 perf: 优化winrm协议网域连接支持ssh_key 2023-04-04 11:55:07 +08:00
jiangweidong cbe384161a perf: 优化一个函数名 2023-04-03 10:17:00 +08:00
jiangweidong 6aaa20ba17 Perf: 优化 2023-04-03 09:57:40 +08:00
jiangweidong cfe0206179 feat: winrm协议支持网域自动化 2023-03-30 14:58:20 +08:00
jiangweidong cab72c6991 feat: Windows类型资产增加winrm协议 2023-03-29 17:10:58 +08:00
fit2bot 166d074adb
perf: 修改 port (#10049) 
Co-authored-by: ibuler <ibuler@qq.com>
 2023-03-23 14:13:08 +08:00
ibuler 59d9572d07 perf: 优化 protocol 选择 2023-03-22 15:26:23 +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 c094bce71e perf: 优化 ansible 写法 2023-03-17 16:57:40 +08:00
ibuler cad6fffd74 perf: 优化 Ansible 账号选择 2023-03-16 19:09:29 +08:00
halo 0ade034391 fix: 修复celery api 报错 2023-03-15 15:37:15 +08:00
jiangweidong 07eebd93fb
perf: 测试资产可连接性选择账号策略优化 (#9954) 2023-03-15 15:16:27 +08:00
Aaron3S df249a0355 perf: 优化 playbook 删除策略,正在被 job 使用时无法被删除 2023-03-14 20:02:23 +08:00
fit2bot c4945b3563
perf: 优化ansible 选择账号 (#9940) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-14 11:40:25 +08:00
fit2bot d4102ceb7a
perf: push select account (#9932) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-13 19:35:12 +08:00
Aaron3S 6bc2f73f49 fix: 修复作业执行没有日志权限的问题 2023-03-01 18:37:27 +08:00
jiangweidong 824e4c9e81 fix: 解决Activity保存因为参数出错问题 2023-02-24 17:59:32 +08:00
fit2bot 37f7f1b510
fix: 修改查看 celery 日志的权限位 (#9728) 
Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
 2023-02-23 19:06:08 +08:00
fit2bot b2f38c2218
perf: 增加定时任务清理僵尸作业 (#9714) 
* perf: 增加定时任务清理僵尸作业

* perf: 优化代码结构

* fix: 修改翻译

* perf: 延长清理间隔时间

* perf: 添加优先级括号

---------

Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
 2023-02-23 17:01:24 +08:00
Aaron3S 25bd5c71d1 fix: 增加无法读取的文件提示 2023-02-22 21:27:14 +08:00
Aaron3S 9b2f422622 perf: 优化报错代码 2023-02-22 21:14:13 +08:00
Aaron3S d14010d4fa fix: 添加 api permission_classes 2023-02-22 20:04:00 +08:00
fit2bot ddcd09c6a6
fix: 修复最后执行时间不更新的问题 (#9694) 
Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
 2023-02-22 18:53:35 +08:00
Aaron3S 34386bd6fb fix: 修改生成 inventory 错误代码，增加运行作业权限校验 2023-02-22 18:06:46 +08:00
Aaron3S d9a11900a9 fix: 修复作业中心资产和用于没有过滤授权规则的问题 2023-02-22 15:36:25 +08:00
jiangweidong cde59f7ae8 perf: 解决冲突 2023-02-22 11:44:46 +08:00
fit2bot 7f1cbc8336
fix: except 无法解压的文件包 (#9677) 
Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
 2023-02-21 22:52:52 +08:00
jiangweidong 9c851cbd68 perf: 解决冲突 2023-02-21 20:32:44 +08:00
jiangweidong def5989cdc perf: 支持数据库网域执行Task 2023-02-21 20:27:44 +08:00
fit2bot e4d28f5f3e
fix: 修复 playbook 编辑器无法清空内容的bug (#9663) 
Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
 2023-02-21 15:22:08 +08:00
ibuler 82432299b8 merge: with dev 2023-02-21 13:47:08 +08:00
ibuler e67a876513 perf: 优化账号任务 2023-02-21 13:00:04 +08:00
fit2bot 95eeeb4208
perf: 自动化脱敏 aix (#9652) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-20 19:12:57 +08:00
老广 17a77586f7
Merge pull request #9641 from jumpserver/pr@dev@perf_ansible_gateway 
fix: 修复 ansible 网关问题
 2023-02-20 16:22:39 +08:00
ibuler 9644d8b1bc fix: 修复 ansible 网关问题 2023-02-20 16:20:03 +08:00
fit2bot 614aa069b0
fix: 添加 str 方法, 修复操作日志不友好的问题 (#9640) 
Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
 2023-02-20 16:05:35 +08:00
fit2bot d334b09fa6
fix: 修改playbook 创建的序列类 (#9639) 
Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
 2023-02-20 15:50:43 +08:00
ibuler ca6d71f442 perf: 优化 celery task context 2023-02-20 15:03:36 +08:00
ibuler 492dd34cb8 perf: 优化排序 2023-02-20 13:31:56 +08:00
Aaron3S a79a766a6a fix: 修改 job 审计日志 2023-02-17 20:14:11 +08:00
老广 2877ea0e3b
Merge pull request #9611 from jumpserver/pr@dev@perf_ping 
perf: 优化 Ping 和 telnet
 2023-02-17 19:42:50 +08:00
ibuler dd8bc5798b perf: 优化 Ping 和 telnet 2023-02-17 19:38:34 +08:00
ibuler 98355ce468 perf: 优化一波 migrations 2023-02-17 17:19:18 +08:00
fit2bot 9a62a7aaab
pref: 修改 activity log (#9571) 
* pref: 修改 activity log

* perf: 优化 acitivity

* pref: 修改 activity

* fix: 修复一些运行问题

* fix: app.py 中添加 tasks import

* fix: 添加 activity_callback

* fix: 添加 execute_account_backup_plan activity_callback

* fix: 添加 activity_callback -> gather_asset_accounts

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

* fix: 修改翻译

---------

Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: jiangweidong <weidong.jiang@fit2cloud.com>
Co-authored-by: Bai <baijiangjie@gmail.com>
 2023-02-17 17:14:53 +08:00
jiangweidong 12afc2aff5 feat: 增加media权限控制 2023-02-17 13:40:26 +08:00
ibuler 0c30e509dc perf: 修改日志清理 2023-02-16 18:32:04 +08:00
fit2bot ef33bc211d
fix: 修复任务再次执行报500问题 (#9584) 
Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
 2023-02-16 15:52:21 +08:00
fit2bot e84411588a
fix: 解决playbook 上传500的问题 (#9580) 
Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
 2023-02-16 15:36:54 +08:00
ibuler f046ea3560 perf: 修改 account signal version 2023-02-16 14:21:24 +08:00
fit2bot 4ac214e91d
perf: account task timing not triggered (#9564) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-15 16:48:27 +08:00
Aaron3S d8ef556adf fix: 修改 adhoc 的 verbose_name 2023-02-15 11:17:57 +08:00
Aaron3S 1b4c52bc9f fix: 增加作业中心开关 2023-02-14 19:49:47 +08:00
Aaron3S bd7e9ce4b9 perf: 优化代码结构 2023-02-14 16:44:42 +08:00
Aaron3S f7bb408ab2 feat: 增加命令过滤功能 2023-02-14 16:44:42 +08:00
Aaron3S 011535a02a fix: 过滤 localhost 注入问题 2023-02-13 19:22:52 +08:00
老广 0666b1e747
Merge pull request #9519 from jumpserver/pr@dev@perf_test_node_conn 
perf: 优化测试节点可连接性
 2023-02-13 18:24:23 +08:00
fit2bot eaad297c9c
fix: 修复 playbook 编辑器 main 文件无法修改的问题 (#9521) 
* fix: 修复 playbook 编辑器 main 文件无法修改的问题

* perf: 优化代码

---------

Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
 2023-02-13 15:39:29 +08:00
fit2bot 16922c4918
fix: 增加作业中心唯一校验 (#9518) 
* fix: 增加作业中心唯一校验

* fix: 增加迁移文件

---------

Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
 2023-02-13 15:05:31 +08:00
ibuler cd866532da perf: 优化测试节点可连接性 2023-02-13 15:04:45 +08:00
Aaron3S 4daadbfa0a feat: 修复 JOB 定时任务不执行的问题 2023-02-10 18:38:04 +08:00
fit2bot 0c11a602a8
perf: push account automation (#9497) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-10 14:07:20 +08:00
fit2bot 3c891ec313
fix: 修复因事务提交问题造成的任务无法执行和任务历史无法查看 (#9493) 
Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
 2023-02-09 20:11:12 +08:00
fit2bot 1b1ae1145c
fix: 重命名文件前校验是否存在冲突 (#9488) 
Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
 2023-02-09 20:05:26 +08:00
fit2bot b81416d973
perf: playbook 批量删除 (#9490) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-09 19:02:45 +08:00