github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
9,221 Commits
68 Branches
249 Tags
110 MiB
Commit Graph

5977 Commits (1aadb760f42f8b02591998152ae2178c9d3a708e)

Author SHA1 Message Date
Bai 3fa1b46312 fix: 修复授权规则Util类 2023-03-28 11:39:19 +08:00
jiangweidong 5b87470b5c perf: 优化账号活动日志界面的提示及操作日志的字段内容 2023-03-27 18:23:55 +08:00
Eric 118d33fa02 perf: 支持 super 方式的切换用户 2023-03-27 18:06:30 +08:00
Aaron3S 017682b383 perf: 增加我的资产通过 node_id 过滤我的资产 2023-03-27 14:53:39 +08:00
feng 1ac2fec13f feat: 收集账号 可选同步表 2023-03-27 14:13:44 +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
fit2bot 55e1ef116b
perf: clear secret (#10053) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-23 16:04:09 +08:00
Bai 5d022c7056 fix: 修复资产导入支持填写节点路径 2023-03-23 16:01:19 +08:00
fit2bot f6c5c35a2c
feat: 账号收集批量同步账号 (#10051) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-23 15:24:19 +08:00
fit2bot 166d074adb
perf: 修改 port (#10049) 
Co-authored-by: ibuler <ibuler@qq.com>
 2023-03-23 14:13:08 +08:00
fit2bot 3b45ad0c61
feat: account remove secret (#10045) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-23 11:20:48 +08:00
老广 4b8fd64c5d
Merge pull request #10041 from jumpserver/pr@dev@feat_k8s_support_gateway 
feat: k8s 支持 gateway
 2023-03-22 19:43:54 +08:00
ibuler e3bd698baf feat: k8s 支持 gateway 2023-03-22 19:42:51 +08:00
fit2bot 0be3cb3c27
fix: account update (#10039) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-22 19:14:43 +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 1e0a6b5072 perf: 优化一下 2023-03-22 17:17:49 +08:00
ibuler c6071740b1 perf: 硬件设备支持账号切换 2023-03-22 16:43:00 +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
老广 8289e4c2c8
Merge pull request #10032 from jumpserver/pr@dev@platform_set_protocols 
perf: 修改 platform protocols
 2023-03-22 15:38:01 +08:00
ibuler aca0d62feb perf: 优化 protocols 2023-03-22 15:28:05 +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
fit2bot 43d805d0ca
perf: 配置CHANGE_AUTH_PLAN_SECURE_MODE_ENABLED 对改密的特权账号过滤 (#10033) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-22 14:48:05 +08:00
ibuler 180ded1773 perf: 修改 platform protocols 2023-03-22 14:15:25 +08:00
fit2bot 81b04c449a
fix: tanslate (#10031) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-22 13:47:12 +08:00
fit2bot ed4a4ceca1
perf: 批量创建账号 定义创建账号策略 忽略或抛出错误 (#10028) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-22 11:09:48 +08:00
ibuler cac59db1ec perf: 设置资产账号的默认值，方便导入 2023-03-21 12:43:54 +08:00
fit2bot 9413fd4cd1
perf: 支持 iframe 标签选择 (#9908) 
* perf: 支持 iframe 标签选择

* perf: 完善 iframe 的选择语法

---------

Co-authored-by: Eric <xplzv@126.com>
 2023-03-20 17:26:47 +08:00
jiangweidong bac296f82e
Merge pull request #10015 from O-Jiangweidong/pr@dev@perf_dbeaver_no_upgrade_no_download 
perf: DBeaver连接时不检查更新、不提示创建实例数据库、不弹出下载驱动框
 2023-03-20 16:01:37 +08:00
fit2bot 69cd7bce17
perf: 批量创建账号时，跳过unique检查 不去创建 (#9966) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-20 15:45:21 +08:00
ibuler 44b6fd8771 fix: 去掉 warning 2023-03-20 10:05:29 +08:00
jiangweidong b6ccc53a71 perf: DBeaver连接时不检查更新、不提示创建实例数据库、不弹出下载驱动框 2023-03-20 10:02:50 +08:00
ibuler 209f0d72b4 perf: 去掉 warning 2023-03-20 10:01:42 +08:00
ibuler eac4b41783 perf: 优化 warning 2023-03-20 09:59:34 +08:00
老广 7a35309e88
Merge pull request #10009 from WeiZhixiong/dev 
fix: SyntaxWarning, apps/common/drf/parsers/base.py:114, "is" should be "=="
 2023-03-20 09:51:40 +08:00
fit2bot 39e618c127
perf: 资产批量更新平台 (#10013) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-19 23:55:16 +08:00
WeiZhixiong 8e33c6f422
fix: SyntaxWarning, apps/common/drf/parsers/base.py:114, "is" should be "==" 2023-03-18 23:19:51 +08:00
ibuler f5523aaf7b perf: 优化导入导出 2023-03-17 10:45:45 +00:00
ibuler 12db64ea18 perf: 优化导入导出 2023-03-17 18:44:21 +08:00
fit2bot 1acfdf0398
perf: 批量推送账号 分批处理 (#10000) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-17 17:10:10 +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
Bai 93a7cee4de fix: 修复导出账号历史翻译信息 2023-03-16 11:18:41 +08:00
Bai 41edeb9027 fix: 修复日志记录到syslog时中文编码问题 2023-03-15 19:46:01 +08:00
ibuler 891d9d36b0 fix: windows 平台默认不开启 console 2023-03-15 19:01:18 +08:00
fit2bot ebdd67d0f4
perf: endpoint rules list (#9975) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-15 18:24:39 +08:00
老广 09eebd7486
Merge pull request #9970 from jumpserver/pr@dev@perf_platform_change 
perf: 优化资产平台的获取
 2023-03-15 17:37:12 +08:00
Bai 894955dd68 fix: 修复更新授权报错的问题 2023-03-15 16:33:38 +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
Bai ffe9dd1f95 fix: 优化账号模版可以根据 protocols 过滤 secret_type 字段 2023-03-15 14:48:14 +08:00
ibuler 2b7f90349c perf: 优化资产平台的获取 2023-03-15 14:14:48 +08:00
Bai 48b937d867 fix: 修复手动登录用户失败的问题 2023-03-15 11:36:51 +08:00
Aaron3S df249a0355 perf: 优化 playbook 删除策略,正在被 job 使用时无法被删除 2023-03-14 20:02:23 +08:00
fit2bot 2ce293bd81
fix: push ssh key account bug (#9948) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-14 17:15:04 +08:00
老广 bff97929b5
Merge pull request #9942 from jumpserver/pr@dev@perf_csv_loads_error 
perf: 优化 csv parse
 2023-03-14 16:35:37 +08:00
Bai 0053d469f9 fix: 修复用户导入模版中没有 password_strategy 字段问题 2023-03-14 16:31:57 +08:00
ibuler 4c24e95b47 perf: 优化 csv parse 2023-03-14 14:12:42 +08:00
fit2bot c4945b3563
perf: 优化ansible 选择账号 (#9940) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-14 11:40:25 +08:00
ibuler 082af029a7 perf: 优化资产迁移，避免冲突 2023-03-14 11:21:52 +08:00
Bai 44d7165674 perf: 优化一些翻译信息，label 中带单位 2023-03-14 11:19:41 +08:00
fit2bot d4102ceb7a
perf: push select account (#9932) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-13 19:35:12 +08:00
老广 4a3196e193
Merge pull request #9931 from jumpserver/pr@dev@fix_excel_import_export 
perf: 优化 csv import export
 2023-03-13 18:07:57 +08:00
ibuler 16a7ccc95e perf: 优化文案 2023-03-13 18:06:54 +08:00
ibuler 6bb42b8d59 perf: 优化 csv import export 2023-03-13 17:57:50 +08:00
fit2bot ed70432016
fix: 账号模版创建带密码的密钥之后无法添加到主机 (#9927) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-13 15:46:17 +08:00
halo 9f98e3f098 fix: 远程应用特权用户不生效问题 2023-03-12 21:27:30 +08:00
ibuler 2ffb9a5aa3 perf: 修改 Import export 2023-03-10 19:23:49 +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
Bai aeb2e47880 feat: 支持飞书国际版(lark) 2023-03-10 15:13:12 +08:00
Bai 9be01b4c67 feat: 支持飞书国际版(lark) 2023-03-10 15:13:12 +08:00
Bai 83296be11f fix: ignore 2023-03-09 18:12:56 +08:00
Bai 266f5e9350 fix: 修复存在无效 es 时获取终端配置失败的问题 2023-03-09 17:12:05 +08:00
fit2bot dfbe8c0bc4
fix: 创建资产 可连接性为更新 (#9905) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-09 13:59:44 +08:00
jiangweidong 3de2992238 fix: 有可能保存明文密码 2023-03-09 13:02:34 +08:00
Eric fde92a28bd fix: 修复存储故障造成的录像获取失败问题 2023-03-09 11:51:00 +08:00
吴小白 2662ead1c4 perf: 正确配置 Ansible 证书校验 2023-03-09 11:19:24 +08:00
Bai 3f5af27a4e perf: 优化设置 MFA 文案(禁用=>重置) 2023-03-08 19:13:17 +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
老广 8a0bd3379c
Merge pull request #9889 from jumpserver/pr@dev@perf_ignore_ssl 
perf: tinkerd 部署增加 ignore-verify-certs 配置
 2023-03-08 16:34:34 +08:00
Eric 177150c5cc perf: tinkerd 部署增加 ignore-verify-certs 配置 2023-03-08 16:16:10 +08:00
Bai bbddf6a342 fix: 修复组织管理员查看活动日志详情时没有对象的问题 2023-03-08 15:57:43 +08:00
Bai 6bbe602ebb fix: 修复组织管理员查看操作日志可以看到 system 组织下的操作问题, 只有系统管理员可以查看任务监控 2023-03-08 15:22:49 +08:00
老广 21352a2ab7
Merge pull request #9871 from jumpserver/pr@dev@fix_su_from_accounts 
fix: 修复su-from-accounts API 500问题，Unsubscribe msg error 转成debug
 2023-03-08 14:06:59 +08:00
老广 1cbfd48e11
Merge pull request #9874 from jumpserver/pr@dev@fix_operatelog_hide_sth 
fix: 操作日志显示用户加密后的密文，及日期格式调整
 2023-03-08 14:06:12 +08:00
老广 c8c33c02ef
Merge pull request #9880 from jumpserver/pr@dev@perf_applet_certs 
fix: 修复自签证书下发布机部署失败
 2023-03-08 14:04:47 +08:00
老广 261ec60ab7
Merge pull request #9870 from jumpserver/pr@dev@fix_reconnecttoken 
feat: connection-token 添加重联兑换 API
 2023-03-08 14:04:01 +08:00
jiangweidong 72ca55c293 perf: 邮箱测试时，不填写'主题前缀'会报错 2023-03-08 13:49:38 +08:00
吴小白 7d6295775f perf: 还原国际化文本格式 2023-03-08 13:42:37 +08:00
吴小白 17ec105f69 perf: 修正错误 2023-03-08 13:40:55 +08:00
吴小白 366e20b165 fix: 修复自签证书下发布机部署失败 2023-03-08 13:27:03 +08:00
jiangweidong be669f7f05 fix: 操作日志显示用户加密后的密文，及日期格式调整 2023-03-08 11:21:15 +08:00
feng 8833b19d79 fix: 修复su-from-accounts API 500问题，Unsubscribe msg error 转成debug 2023-03-08 10:58:37 +08:00
Bai 4c7bc105d7 feat: connection-token 添加重联兑换 API 2023-03-08 10:25:53 +08:00
老广 bb30fcd7fd
Merge pull request #9851 from jumpserver/pr@dev@fix_private_key 
fix: 修复 ed25519 私钥测试可连接性失败问题
 2023-03-07 11:29:10 +08:00
Eric eedc1ae8b5 fix: 修复类型问题 2023-03-02 19:05:27 +08:00
Eric b951ed9206 fix: 修复 account 私钥文件生成 2023-03-02 18:57:49 +08:00
Eric 03cc487fe6 fix: 修复 ed25519 私钥测试可连接性失败问题 2023-03-02 18:50:09 +08:00