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

5286 Commits (1b1c91bab01f1f874c5a76541aa55f44b4c8502b)

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