fit2bot
dd50a1faff
feat: Update v3.0.1
2023-02-27 18:46:04 +08:00
fit2bot
86dab4fc6e
perf: 今日活跃资产 ( #9797 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-27 18:10:11 +08:00
Aaron3S
a85a80a945
fix: 默认增加普通用户作业中心权限
2023-02-27 17:28:04 +08:00
老广
349edc10aa
Merge pull request #9791 from jumpserver/pr@v3.0@add_accounts_suggestions
...
perf: 添加账号用户名的推荐
2023-02-27 15:19:26 +08:00
ibuler
44918e3cb5
perf: 添加账号用户名的推荐
...
perf: 修改账号推荐
2023-02-27 07:14:55 +00:00
ibuler
9a2f6c0d70
perf: 修改资产 address 长度,以支持 mb4
...
perf: 修改长度
2023-02-27 14:08:15 +08:00
ibuler
934969a8f1
perf: 去掉没有 Name 的迁移
2023-02-27 14:02:09 +08:00
老广
57162c1628
Merge pull request #9776 from jumpserver/pr@v3.0@perf_account_migrate2
...
perf: 优化迁移 accounts
2023-02-27 10:22:59 +08:00
ibuler
32fb36867f
perf: 优化迁移 accounts
...
perf: 优化账号迁移,同名的迁移到历史中
2023-02-26 01:49:25 +00:00
老广
158b589028
Merge pull request #9761 from jumpserver/pr@v3@fix_activity_save_error
...
fix: 解决Activity保存因为参数出错问题
2023-02-24 18:18:03 +08:00
jiangweidong
d64277353c
Merge branch 'v3.0' of http://github.com/jumpserver/jumpserver into pr@v3@fix_activity_save_error
2023-02-24 18:10:47 +08:00
jiangweidong
bff6f397ce
fix: 解决Activity保存因为参数出错问题
2023-02-24 18:10:42 +08:00
fit2bot
0ad461a804
perf: 修改host info 接口, 社区开放applet, 修改改密发邮件bug ( #9760 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-24 18:08:40 +08:00
Bai
a1dcef0ba0
fix: 修复 web gui 支持的数据库
2023-02-24 15:12:08 +08:00
Bai
dbb1ee3a75
fix: 修复认证MFA失败次数清空问题
2023-02-24 14:43:51 +08:00
fit2bot
d6bd207a17
fix: 修复计算今日活跃资产过滤逻辑 ( #9744 )
...
Co-authored-by: Bai <baijiangjie@gmail.com >
2023-02-24 12:17:10 +08:00
Bai
e69ba27ff4
fix: 修复获取授权资产详情时返回 spec_info 字段, 解决连接 Magnus 问题
2023-02-24 11:41:47 +08:00
ibuler
adbe7c07c6
perf: 修复社区版可能引起的问题
2023-02-24 00:31:10 +08:00
老广
d1eacf53d4
Merge pull request #9736 from jumpserver/dev
...
fix: 修复 loong64 grpc 构建失败
2023-02-23 21:50:11 +08:00
老广
472c14fd27
Merge pull request #9734 from jumpserver/pr@dev@fix_build_grpc
...
fix: 修复 loong64 grpc 构建失败
2023-02-23 21:46:26 +08:00
吴小白
9d4854b8c3
fix: 修复 loong64 grpc 构建失败
2023-02-23 21:34:21 +08:00
Jiangjie.Bai
19276e6bd4
Merge pull request #9733 from jumpserver/dev
...
v3.0.0
2023-02-23 20:15:55 +08:00
Bai
05d40a5255
fix: 修复平台列表创建同名校验问题
2023-02-23 19:57:55 +08:00
Bai
9b852f8b35
fix: 修复角色列表排序问题
2023-02-23 19:40:01 +08:00
fit2bot
b3851adfe7
perf: translate ( #9730 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-23 19:35:10 +08:00
Jiangjie.Bai
0a374db606
fix: 修复文件导出 {"": True"} 问题 ( #9729 )
2023-02-23 19:14:58 +08:00
老广
54239c9d44
Merge pull request #9725 from jumpserver/ssh_tunnel_no_auth_error
...
fix: 对于网关无法连接的,给出原因并停止此任务的后续步骤,不影响其他任务
2023-02-23 19:09:40 +08:00
fit2bot
37f7f1b510
fix: 修改查看 celery 日志的权限位 ( #9728 )
...
Co-authored-by: Aaron3S <chenyang@fit2cloud.com >
2023-02-23 19:06:08 +08:00
fit2bot
ab0a1421a0
perf: push_account_enabled ( #9727 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-23 18:55:15 +08:00
jiangweidong
10dad85e9f
Merge branch 'dev' of http://github.com/jumpserver/jumpserver into ssh_tunnel_no_auth_error
2023-02-23 18:17:38 +08:00
jiangweidong
e45eb96f12
fix: 对于网关无法连接的,给出原因并停止此任务的后续步骤,不影响其他任务
2023-02-23 18:15:31 +08:00
fit2bot
b797b46ab8
perf: translate ( #9724 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-23 18:14:44 +08:00
fit2bot
9f8900041d
per: gather account perm ( #9723 )
...
Co-authored-by: feng <1304903146@qq.com >
Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com >
2023-02-23 18:08:56 +08:00
老广
aa81db57b1
Merge pull request #9722 from jumpserver/pr@dev@perf_asset_update
...
perf: 优化资产批量更新
2023-02-23 17:54:09 +08:00
ibuler
1a9cd2dee2
perf: 优化资产批量更新
2023-02-23 17:44:38 +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
jiangweidong
e1a1e838bf
perf: 修改认证设置类的国际化,字符串方式会直接翻译成国际化内容
2023-02-23 16:59:35 +08:00
老广
4a36e54030
Merge pull request #9710 from jumpserver/pr@dev@fix_task_activity_error
...
fix: 创建用户和验证账号任务的Activity日志保存失败
2023-02-23 16:31:44 +08:00
老广
67d760719a
Merge pull request #9719 from jumpserver/pr@dev@fix_operatelog_i18n
...
fix: 操作日志的国际化应该根据查询对象的语言决定
2023-02-23 16:30:45 +08:00
jiangweidong
9c599fd1f4
fix: 更改label
2023-02-23 16:25:02 +08:00
jiangweidong
0a5766edd3
fix: 操作日志的国际化应该根据查询对象的语言决定
2023-02-23 16:20:43 +08:00
老广
bb62e19ea8
Merge pull request #9718 from jumpserver/pr@dev@perf_account_info
...
perf: 修改 account asset auto_info 返回
2023-02-23 16:16:39 +08:00
ibuler
d1b807bd8b
perf: 修改 account asset auto_info 返回
2023-02-23 16:14:24 +08:00
fit2bot
3ee2bfce9a
perf: 优化连接方式 ( #9716 )
...
Co-authored-by: ibuler <ibuler@qq.com >
2023-02-23 15:58:55 +08:00
吴小白
a20bd3acd4
perf: 更新 quick_start.sh
2023-02-23 15:54:08 +08:00
老广
68ea8ef1b7
Merge pull request #9713 from jumpserver/pr@dev@perf_agent_check
...
perf: 修改 agent 判断
2023-02-23 15:27:12 +08:00
ibuler
ee926cfa42
perf: 修改 agent 判断
2023-02-23 15:04:07 +08:00
Bai
d4435799ac
fix: 授权规则账号列表返回asset.auto_info字段
2023-02-23 11:45:56 +08:00
fit2bot
aaeef83d38
perf: history account secret ( #9711 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-23 11:27:03 +08:00
jiangweidong
c2b592f6fe
fix: 创建用户和验证账号任务的Activity日志保存失败
2023-02-23 10:46:59 +08:00
Jiangjie.Bai
8757cc97ed
Merge pull request #9703 from jumpserver/dev
...
v3.0.0-rc-latest
2023-02-22 22:22:47 +08:00
老广
4ec7a4a118
Merge pull request #9707 from jumpserver/pr@dev@fix_serializer
...
perf: 修复 role user serializer 问题
2023-02-22 22:21:13 +08:00
ibuler
c4982dd3b5
perf: 修复 role user serializer 问题
2023-02-22 22:20:11 +08:00
fit2bot
2279219404
perf: 工单备注 markdown ( #9706 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-22 22:12:50 +08:00
老广
58341a9e85
Merge pull request #9689 from jumpserver/pr@dev@fix_operatelog_root_org
...
fix: 操作日志、Activity日志显示当前组织和SYSTEM组织下的内容
2023-02-22 22:09:26 +08:00
老广
ce8be265e7
Merge pull request #9705 from jumpserver/pr@dev@perf_perm_migrate
...
perf: 优化迁移
2023-02-22 21:58:41 +08:00
ibuler
b8b25d2da8
perf: 修改 翻译
2023-02-22 21:57:48 +08:00
jiangweidong
07c23c5341
perf: 解决冲突
2023-02-22 21:56:40 +08:00
ibuler
37524106bf
perf: 优化迁移
2023-02-22 21:52:37 +08:00
jiangweidong
6b6f844795
fix: 修改org_id位置
2023-02-22 21:48:11 +08:00
Eric_Lee
6a5b2bd29e
Merge pull request #9704 from jumpserver/pr@dev@fix_add_file_unspported_msg
...
fix: 增加无法读取的文件提示
2023-02-22 21:31:57 +08:00
Aaron3S
25bd5c71d1
fix: 增加无法读取的文件提示
2023-02-22 21:27:14 +08:00
Eric_Lee
3aa7d1841b
Merge pull request #9702 from jumpserver/pr@dev@perf_ops_permed_assets_error_msg
...
perf: 优化报错代码
2023-02-22 21:18:40 +08:00
Aaron3S
9b2f422622
perf: 优化报错代码
2023-02-22 21:14:13 +08:00
Bai
49c7a12bb3
fix: 修复资产授权规则过滤
2023-02-22 21:07:49 +08:00
老广
ad0fc0d70a
Merge pull request #9699 from jumpserver/pr@dev@perf_field
...
perf: 优化部分 field
2023-02-22 20:39:51 +08:00
老广
0b1f6e2606
Merge pull request #9693 from jumpserver/pr@dev@perf_accounts_version
...
perf: 优化账号历史
2023-02-22 20:38:52 +08:00
fit2bot
b83667bbd5
perf: celery task and add org single ( #9698 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-22 20:31:20 +08:00
ibuler
ea31de0b2b
perf: 优化部分 field
2023-02-22 20:30:43 +08:00
老广
8db3543e98
Merge pull request #9697 from jumpserver/pr@dev@fix_oracle_ping
...
fix: 解决Oracle验证账号任务失败问题
2023-02-22 20:19:11 +08:00
jiangweidong
bcbab0ff49
fix: 解决冲突
2023-02-22 20:17:33 +08:00
jiangweidong
9207ee73ea
fix: 解决Oracle验证账号任务失败问题
2023-02-22 20:16:04 +08:00
Eric_Lee
17a96a5b48
Merge pull request #9696 from jumpserver/pr@dev@fix_add_perm_classes
...
fix: 添加 api permission_classes
2023-02-22 20:07:41 +08:00
Aaron3S
d14010d4fa
fix: 添加 api permission_classes
2023-02-22 20:04:00 +08:00
fit2bot
ec4cdc801f
perf: operate log amount ( #9695 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-22 19:42:40 +08:00
fit2bot
ddcd09c6a6
fix: 修复最后执行时间不更新的问题 ( #9694 )
...
Co-authored-by: Aaron3S <chenyang@fit2cloud.com >
2023-02-22 18:53:35 +08:00
Eric_Lee
a4e920e410
Merge pull request #9688 from jumpserver/pr@dev@fix_job_center_account_not_in_perm
...
fix: 修复作业中心资产和用于没有过滤授权规则的问题
2023-02-22 18:51:04 +08:00
Aaron3S
34386bd6fb
fix: 修改生成 inventory 错误代码,增加运行作业权限校验
2023-02-22 18:06:46 +08:00
ibuler
5d8d0a320b
perf: 优化账号历史
2023-02-22 17:58:00 +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_Lee
5f376077c2
Merge pull request #9691 from jumpserver/pr@dev@perf_label
...
perf: 部分字段 label 显示问题
2023-02-22 16:50:53 +08:00
Eric
8eaf3fa781
perf: 部分字段 label 显示问题
2023-02-22 16:48:49 +08:00
fit2bot
7ceb27301b
perf: automation task name validate ( #9690 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-22 16:23:18 +08:00
jiangweidong
0dba222796
Merge branch 'dev' of http://github.com/jumpserver/jumpserver into pr@dev@fix_operatelog_root_org
2023-02-22 15:57:17 +08:00
jiangweidong
b9c0b9084e
fix: 操作日志显示全部组织问题
2023-02-22 15:57:10 +08:00
Aaron3S
d9a11900a9
fix: 修复作业中心资产和用于没有过滤授权规则的问题
2023-02-22 15:36:25 +08:00
老广
ee3c548b6b
Merge pull request #9687 from jumpserver/pr@dev@perf_change_account_verify
...
perf: 修改 探测
2023-02-22 15:21:15 +08:00
ibuler
e5081fd6a9
merge: with dev
2023-02-22 15:17:44 +08:00
fit2bot
89c4635162
perf: change secrett 提示 ( #9686 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-22 15:15:00 +08:00
ibuler
33f6c5b257
perf: 修改 探测
2023-02-22 15:13:51 +08:00
Bai
156ad665c3
fix: rbac perms
2023-02-22 14:54:13 +08:00
Eric_Lee
1e1d88f203
Merge pull request #9683 from jumpserver/pr@dev@fix_deploy_applets
...
fix: 修复发布应用失败
2023-02-22 14:24:25 +08:00
Eric
312fe69015
fix: 修复发布应用失败
2023-02-22 14:10:13 +08:00
老广
4b8e2d464f
Merge pull request #9682 from jumpserver/pr@dev@change_platform_migration
...
perf: 修复用户平台内置的问题
2023-02-22 13:17:14 +08:00
ibuler
6f765ebef5
perf: 修复用户平台内置的问题
2023-02-22 13:08:32 +08:00
Eric_Lee
bbd274b92f
Merge pull request #9681 from jumpserver/pr@dev@fix_host_select
...
fix: 过滤离线的发布机
2023-02-22 12:29:31 +08:00
Eric
f407bfd7b2
fix: 过滤离线的发布机
2023-02-22 12:27:30 +08:00
老广
8a97245b1a
Merge pull request #9671 from jumpserver/pr@dev@fix_db_with_domain_task
...
feat: 支持数据库在连接网域的情况下执行Task
2023-02-22 11:46:36 +08:00
jiangweidong
fd146055f3
fix: 删除空行
2023-02-22 11:46:28 +08:00
jiangweidong
cde59f7ae8
perf: 解决冲突
2023-02-22 11:44:46 +08:00
老广
5d61d843f3
Merge pull request #9680 from jumpserver/pr@dev@perf_account_chagne_secret
...
perf: 修改 acount
2023-02-22 11:29:18 +08:00
ibuler
0996b1fbf5
merge: with dev
2023-02-22 11:27:53 +08:00
ibuler
b5321e497b
perf: 修改账号去掉无用的
2023-02-22 11:25:33 +08:00
ibuler
0140d4349a
perf: 修改 优化去掉版本号
2023-02-22 11:23:43 +08:00
老广
f103fa22c9
Merge pull request #9673 from jumpserver/pr@dev@fix_manual_update_account_can_ping_ok
...
fix: 解决部分数据库在修改密码后仍能ping通的问题
2023-02-22 11:21:58 +08:00
ibuler
fae494d707
perf: 修改 acount
2023-02-22 11:20:57 +08:00
ibuler
4c233cfb69
perf: 优化 account,去掉版本好
2023-02-22 11:18:42 +08:00
fit2bot
b9dcce5c51
fix: 资产更新没有账号及自动化任务更新name ( #9679 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-22 11:04:29 +08:00
fit2bot
d7946ccb6f
perf: 账号 资产 列表任务 ( #9676 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-21 22:57:31 +08:00
fit2bot
7f1cbc8336
fix: except 无法解压的文件包 ( #9677 )
...
Co-authored-by: Aaron3S <chenyang@fit2cloud.com >
2023-02-21 22:52:52 +08:00
fit2bot
1bb128526a
fix: 修复使用key 方式 ansible 不能连接的问题 ( #9675 )
...
Co-authored-by: Aaron3S <chenyang@fit2cloud.com >
2023-02-21 22:45:02 +08:00
Eric_Lee
d2deaf10d1
Merge pull request #9674 from jumpserver/pr@dev@fix_applethost
...
fix: 未激活的发布机,将无法使用
2023-02-21 22:28:10 +08:00
Eric
8f5d280e31
fix: 未激活的发布机,将无法使用
2023-02-21 22:25:50 +08:00
jiangweidong
02619e5ed8
fix: 解决部分数据库在修改密码后仍能ping通的问题
2023-02-21 22:08:34 +08:00
Eric_Lee
5add329a30
Merge pull request #9672 from jumpserver/pr@dev@fix_su_from
...
fix: 账号 su from 过滤未生效
2023-02-21 21:12:20 +08:00
Eric
4200fa7ff8
fix: 账号 su from 过滤未生效
2023-02-21 21:09:28 +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
Eric_Lee
a11eac7c3a
Merge pull request #9660 from jumpserver/pr@dev@perf_applethost
...
perf: 修改发布机选项默认值
2023-02-21 20:14:08 +08:00
Eric_Lee
0d8e0bd1cc
Merge pull request #9666 from jumpserver/pr@dev@fix_rdp_download
...
fix: rdp file download
2023-02-21 20:13:36 +08:00
Eric_Lee
85dbdd648f
Merge pull request #9669 from jumpserver/pr@dev@fix_ftp_log
...
fix: 修复 ftp 审计日志上传失败
2023-02-21 20:13:08 +08:00
fit2bot
0bd674bb9c
perf: ansible enabled false ( #9670 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-21 20:06:45 +08:00
Eric
31a3e3b177
fix: 修复 ftp 审计日志上传失败
2023-02-21 19:35:35 +08:00
fit2bot
b41880d4f2
perf: 自动化name 唯一键 校验 ( #9668 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-21 18:31:42 +08:00
fit2bot
266e7e0dd7
perf: change secret is_active ( #9667 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-21 17:54:59 +08:00
Eric
3f9f3f3290
fix: rdp file download
2023-02-21 17:39:33 +08:00
老广
b5d814e9be
Merge pull request #9665 from jumpserver/pr@dev@fix_platform_internal
...
perf: 修改 platform 内置创建
2023-02-21 15:50:58 +08:00
ibuler
771ea17469
perf: 修改 platform 内置创建
2023-02-21 15:49:59 +08:00
fit2bot
4735565cb8
perf: inventory 为空 任务跳过 ( #9664 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-21 15:33:15 +08:00
fit2bot
e4d28f5f3e
fix: 修复 playbook 编辑器无法清空内容的bug ( #9663 )
...
Co-authored-by: Aaron3S <chenyang@fit2cloud.com >
2023-02-21 15:22:08 +08:00
fit2bot
1caca32a26
perf: merge asset migrate ( #9662 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-21 15:15:26 +08:00
Eric
64e929a220
perf: 修改发布机选项默认值
2023-02-21 14:20:03 +08:00
老广
b91b9ef39e
Merge pull request #9649 from jumpserver/pr@dev@perf_account_tasks
...
perf: 优化 tasks
2023-02-21 14:14:37 +08:00
ibuler
3df411fd61
perf: 修改权限位
2023-02-21 13:47:47 +08:00
ibuler
82432299b8
merge: with dev
2023-02-21 13:47:08 +08:00
ibuler
df9e533b3c
perf: 修改 rabc
2023-02-21 13:40:48 +08:00
ibuler
0001ffba1b
perf: 优化 rbac
2023-02-21 13:39:28 +08:00
ibuler
f4cc03434f
perf: 修改 rbac asset nodes
2023-02-21 13:11:56 +08:00
ibuler
e67a876513
perf: 优化账号任务
2023-02-21 13:00:04 +08:00
Eric_Lee
f46b707f70
Merge pull request #9659 from jumpserver/pr@dev@fix_deployment
...
fix: 修复应用发布状态
2023-02-21 12:21:05 +08:00
Eric
f5d086702a
fix: 修复应用发布状态
2023-02-21 12:12:38 +08:00
jiangweidong
b5347be4e3
perf: Navicat为xpack功能 ( #9650 )
...
* perf: Navicat移动到xpack功能
* 优化
* fix: 去掉多余的import
* perf: 优化逻辑
* perf: 修改打印位置
2023-02-21 11:37:30 +08:00
fit2bot
c8e1660f7e
perf: windows not ssh automation ( #9658 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-21 11:36:17 +08:00
ibuler
b49b7125b2
perf: 修改收集用户中间
2023-02-21 08:34:31 +08:00
ibuler
c9534bb9c4
perf: 优化账号推送
2023-02-20 23:50:33 +08:00
老广
36712f51f8
Merge pull request #9657 from jumpserver/pr@dev@fix_dbeaver_no_cli_dos
...
Perf: 优化DBeaver连接数据库时,不显示cli-dos窗口
2023-02-20 22:24:20 +08:00
jiangweidong
296ce7a59f
perf: 优化执行命令
2023-02-20 22:21:46 +08:00
jiangweidong
28e28b620b
perf: 优化DBeaver连接数据库时,不显示cli-dos窗口
2023-02-20 22:10:59 +08:00
fit2bot
ca22b08cde
perf: account update ( #9656 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-20 20:22:26 +08:00
Bai
1888597451
fix: 修改slugfield校验问题
2023-02-20 20:15:47 +08:00
fit2bot
137d69a539
perf: ansible runner logs ( #9655 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-20 20:14:06 +08:00
fit2bot
b76ed67c9c
perf: 超时过期时间 解释 ( #9653 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-20 19:21:32 +08:00
fit2bot
95eeeb4208
perf: 自动化脱敏 aix ( #9652 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-20 19:12:57 +08:00
Bai
2adfbeaeb7
fix: 修复终端列表搜索问题
2023-02-20 18:42:56 +08:00
Aaron3S
958122847b
fix: 作业日志搜索过滤问题
2023-02-20 18:00:58 +08:00
Eric
e001003ed3
perf: 完善发布机的重复部署
2023-02-20 18:00:30 +08:00
ibuler
37c54e976f
perf: 优化 tasks
2023-02-20 18:00:29 +08:00
Bai
8ab01931fb
fix: 修复logger.error堆栈问题
2023-02-20 17:59:18 +08:00
Bai
d246b9bb35
fix: 修复资产硬件信息收集失败的问题
2023-02-20 17:25:16 +08:00
fit2bot
995321cee9
perf: 工单详情跨组织 ( #9644 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-20 16:48:52 +08:00
fit2bot
30e51e37be
fix: 修复华为 SMS 提示不友好 ( #9643 )
...
Co-authored-by: Aaron3S <chenyang@fit2cloud.com >
2023-02-20 16:46:28 +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
Bai
90813d7690
fix: 修改翻译
2023-02-20 15:24:43 +08:00
Bai
c456782d9e
fix: 修复 ticket session 监控用户没有权限的问题
2023-02-20 15:09:10 +08:00
ibuler
ca6d71f442
perf: 优化 celery task context
2023-02-20 15:03:36 +08:00
老广
7c3b98cf3b
Merge pull request #9634 from jumpserver/pr@dev@perf_audit_log2
...
pref: 优化 audit log
2023-02-20 14:24:16 +08:00
老广
a25d9ffdf5
Merge pull request #9632 from jumpserver/pr@dev@perf_navicat_support_mongodb_ssl
...
Feat: 支持navicat连接MongoDB SSL连接
2023-02-20 14:15:26 +08:00
老广
cffa3533e5
Merge pull request #9633 from jumpserver/pr@dev@fix_create_asset_ping_gather_task_err
...
Fix: 解决资产创建后系统执行Ping及Gather任务失败问题
2023-02-20 14:13:53 +08:00
ibuler
ce2c3d7ce2
pref: 优化 audit log
2023-02-20 14:13:22 +08:00
jiangweidong
c2773351af
Fix: 解决资产创建后系统执行Ping及Gather任务失败问题
2023-02-20 14:06:26 +08:00
jiangweidong
2e451574ee
Merge branch 'dev' of http://github.com/jumpserver/jumpserver into pr@dev@perf_navicat_support_mongodb_ssl
2023-02-20 14:03:19 +08:00
jiangweidong
6cedb90f1b
Feat: 支持navicat连接MongoDB SSL连接
2023-02-20 14:03:07 +08:00
老广
5058d8158d
Merge pull request #9631 from jumpserver/pr@dev@perf_ordering
...
perf: 优化排序
2023-02-20 13:41:30 +08:00
ibuler
bb0bb4e764
perf: domain serializer
2023-02-20 13:40:42 +08:00
ibuler
4818e759bc
perf: 优化 一些继承
2023-02-20 13:36:50 +08:00
ibuler
492dd34cb8
perf: 优化排序
2023-02-20 13:31:56 +08:00
Bai
ec582e37dc
fix: 修复录像返回数据 system_user -> account
2023-02-20 11:21:05 +08:00
Bai
0888fb2318
fix: 修复账号模版密码API查看权限问题
2023-02-20 10:57:52 +08:00
老广
2f1e60cf91
Merge pull request #9627 from jumpserver/pr@dev@fix_platform_activity_err
...
fix: 平台Activity列表500
2023-02-19 20:31:27 +08:00
jiangweidong
37f74d7d73
fix: 格式看起来好看
2023-02-19 20:27:25 +08:00
jiangweidong
7837a28200
Merge branch 'dev' of http://github.com/jumpserver/jumpserver into pr@dev@fix_platform_activity_err
2023-02-19 20:20:49 +08:00
jiangweidong
3e7eef2522
fix: 平台Activity列表500
2023-02-19 20:20:42 +08:00
老广
7ea9b4d429
Merge pull request #9625 from jumpserver/pr@dev@fix_clean_activity_with_operation
...
fix: 解决跨组织资源的Activty在其他组织下404的问题
2023-02-19 20:05:42 +08:00
老广
68e82a9d6e
Merge pull request #9626 from jumpserver/pr@dev@fix_joblog_migrate_dependency
...
fix: 解决JobLog表依赖顺序不对,导致从新迁移失败问题
2023-02-19 20:05:08 +08:00
jiangweidong
485454f9c6
fix: 解决JobLog表依赖顺序不对,导致从新迁移失败问题
2023-02-19 19:49:06 +08:00
jiangweidong
3334f79e84
fix: 解决跨组织资源的Activty在其他组织下404的问题
2023-02-19 19:17:12 +08:00
老广
d795139108
Merge pull request #9624 from jumpserver/pr@dev@change_ldap_task_to_setting
...
perf: 修改 ldap task 位置
2023-02-19 18:01:47 +08:00
ibuler
da017f2e78
perf: 修改 ldap task 位置
2023-02-19 17:57:48 +08:00
老广
ba366e64e7
Merge pull request #9623 from jumpserver/pr@dev@account_push
...
perf: account push
2023-02-19 16:03:13 +08:00
feng
a4cb1690d6
perf: account push
2023-02-19 16:01:34 +08:00
老广
845fe291b1
Merge pull request #9622 from jumpserver/pr@dev@perf_nodes
...
perf: 优化 asset 创建时 nodes 可能有问题
2023-02-19 15:45:26 +08:00
ibuler
a1440ee4e0
perf: 优化 asset 创建时 nodes 可能有问题
2023-02-19 15:43:56 +08:00
老广
076a4333a1
Merge pull request #9621 from jumpserver/pr@dev@perf_json_encoer_error
...
perf: 优化 task 参数是 uuid 可能导致的问题
2023-02-19 15:25:55 +08:00
ibuler
83c844292c
perf: 优化 task 参数是 uuid 可能导致的问题
2023-02-19 15:10:10 +08:00
fit2bot
bdb963750b
perf: oauth2 perm ( #9620 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-18 17:55:11 +08:00
fit2bot
fa8fdf71c1
perf: client upgrade ( #9619 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-18 17:28:42 +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
Bai
1035e27201
fix: 解决 swagger api 报错的问题
2023-02-17 21:10:16 +08:00
fit2bot
2b29ce69f4
perf: api dashboard ( #9615 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-17 20:18:22 +08:00
fit2bot
60bdd17ca2
perf: login logs ( #9614 )
...
Co-authored-by: feng <1304903146@qq.com >
Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com >
2023-02-17 20:15:52 +08:00
Aaron3S
a79a766a6a
fix: 修改 job 审计日志
2023-02-17 20:14:11 +08:00
Eric
40b49e258e
perf: 去掉 tunnel 和 command 会话的监控
2023-02-17 20:13:51 +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
10e50c7c2c
perf: 修改 Ping
2023-02-17 19:42:14 +08:00
ibuler
dd8bc5798b
perf: 优化 Ping 和 telnet
2023-02-17 19:38:34 +08:00
Bai
fb32c976b2
fix: 翻译所有 celerytask verbose
2023-02-17 19:25:19 +08:00
fit2bot
5f2f38d815
perf: mysql psql database ( #9609 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-17 19:00:44 +08:00
ibuler
3cc22f8524
perf: settings 删掉 windows default shell
2023-02-17 17:19:46 +08:00
ibuler
98355ce468
perf: 优化一波 migrations
2023-02-17 17:19:18 +08:00
jiangweidong
23238ca8e0
fix: 解决一些资源的Activity日志无法查看问题 ( #9608 )
...
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com >
2023-02-17 17:17:25 +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
老广
01c2e7128d
Merge pull request #9604 from jumpserver/pr@dev@fix_applets_no_icon
...
fix: 远程应用图标无法显示问题
2023-02-17 15:15:03 +08:00
jiangweidong
2cecf20944
fix: 远程应用图标无法显示问题
2023-02-17 15:04:30 +08:00
fit2bot
419381bd10
perf: account backup ( #9603 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-17 14:34:51 +08:00
老广
40bd197581
Merge pull request #9601 from jumpserver/pr@dev@feat_protect_resource
...
feat: 增加media权限控制
2023-02-17 14:17:08 +08:00
Bai
1bfb434651
fix: 修复创建网关时, 没有保存到 Host 列表中的问题;
2023-02-17 13:58:08 +08:00
jiangweidong
fa5097fe28
Merge branch 'dev' of http://github.com/jumpserver/jumpserver into pr@dev@feat_protect_resource
2023-02-17 13:42:51 +08:00
jiangweidong
7ff08b35fe
feat: 添加依赖
2023-02-17 13:42:44 +08:00
jiangweidong
12afc2aff5
feat: 增加media权限控制
2023-02-17 13:40:26 +08:00
fit2bot
7040f46565
perf: account view secret mfa ( #9600 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-17 12:30:11 +08:00
Bai
d85b024c47
fix: 修复打开 PERM_SINGLE_ASSET_TO_UNGROUP_NODE 配置时返回两个收藏夹节点的问题
2023-02-17 11:11:57 +08:00
老广
355af42812
Merge pull request #9598 from jumpserver/pr@dev@perf_take_out_dbeaver_clickhouse
...
perf: 去掉dbeaver的clickhouse协议
2023-02-17 10:58:54 +08:00
jiangweidong
151433004c
perf: 去掉dbeaver的clickhouse协议
2023-02-17 10:53:25 +08:00
fit2bot
e056b31b4c
perf: 优化 index api 批量命令部分 ( #9596 )
...
Co-authored-by: Aaron3S <chenyang@fit2cloud.com >
2023-02-16 20:16:04 +08:00
fit2bot
f7500b8aff
perf: account perm ( #9595 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-16 19:39:10 +08:00
fit2bot
fc2d7aafce
perf: push account ( #9594 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-16 18:49:42 +08:00
老广
1298cc0a91
Merge pull request #9593 from jumpserver/pr@dev@perf_log_clean
...
perf: 修改日志清理
2023-02-16 18:47:26 +08:00
ibuler
0c30e509dc
perf: 修改日志清理
2023-02-16 18:32:04 +08:00
jiangweidong
3b3355f3f8
perf: 修改PostgreSQL数据库参数为必填
2023-02-16 17:33:03 +08:00
老广
9af8c629ca
Merge pull request #9591 from jumpserver/pr@dev@fix_audit_log_search_field
...
fix: 修复作业日志页面搜索和时间过滤组件不生效的问题
2023-02-16 17:23:18 +08:00
ibuler
9e6b01283d
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2023-02-16 17:21:49 +08:00
老广
1678eeb915
Merge pull request #9587 from jumpserver/pr@dev@perf_gateway
...
perf: 优化 gateway 返回情况
2023-02-16 17:21:36 +08:00
老广
4242727f24
Merge pull request #9589 from jumpserver/pr@dev@perf_conn_method_koko_oracle
...
perf: koko 不支持 oracle 登录
2023-02-16 17:20:44 +08:00
ibuler
7d813de71d
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2023-02-16 17:20:09 +08:00
Aaron3S
aa7c3041f7
fix: 修复作业日志页面搜索和时间过滤组件不生效的问题
2023-02-16 17:10:46 +08:00
ibuler
eff2cd104f
perf: koko 不支持 oracle 登录
2023-02-16 16:55:20 +08:00
Bai
22dd81de43
fix: 创建删除节点、资产时,节点资产数量没有刷新的问题,监听的信号不太对,如果是 post_remove 那么获取资产的关联节点是获取不到的
2023-02-16 16:54:24 +08:00
jiangweidong
6bc72c519d
fix: sqlserver无法推送用户问题 ( #9588 )
2023-02-16 16:53:46 +08:00
ibuler
a63709002d
perf: 优化 gateway 返回情况
2023-02-16 16:51:42 +08:00
Bai
726f90ab16
fix: 修复创建 es 命令存储后台 meta.hosts 被修改的问题;deepcopy dict list value 在创建操作日志的时候
2023-02-16 15:56:44 +08:00
Bai
bfa2e285f5
fix: 修复迁移数据库应用账号缺少的问题
2023-02-16 15:56:44 +08:00
fit2bot
b8c872c68e
perf: account cannot be modified ( #9585 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-16 15:53:45 +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
Eric_Lee
eae4f76e1f
Merge pull request #9578 from jumpserver/pr@dev@applets_dbeaver
...
perf: 优化applets-dbeaver依赖驱动方式
2023-02-16 15:24:37 +08:00
老广
e1437ac6e6
Merge pull request #9581 from jumpserver/pr@dev@perf_change_account
...
perf: 修改 account signal version
2023-02-16 14:28:25 +08:00
fit2bot
ea7d3c0651
perf: dashboard user amount ( #9582 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-16 14:27:54 +08:00
ibuler
f046ea3560
perf: 修改 account signal version
2023-02-16 14:21:24 +08:00
Bai
7d94e17e03
fix: 修改迁移文件
2023-02-16 14:21:24 +08:00
jiangweidong
541e418946
perf: 优化applets-dbeaver依赖驱动方式
2023-02-16 13:40:34 +08:00
老广
9cd0a348fc
Merge pull request #9575 from jumpserver/pr@dev@perf_session_account_id
...
perf: 会话新增 account_id
2023-02-16 10:13:30 +08:00
老广
e7ec0915a8
Merge pull request #9573 from jumpserver/pr@dev@perf_navicat
...
fix: 解决applets在razor方式拉起代填错误问题
2023-02-15 20:45:29 +08:00
老广
b464261ed3
Merge pull request #9554 from jumpserver/pr@dev@perf_activities_log
...
perf: 优化Activity日志[操作日志、登录日志]显示
2023-02-15 20:44:40 +08:00
jiangweidong
28babc116b
Merge branch 'dev' of http://github.com/jumpserver/jumpserver into pr@dev@perf_navicat
2023-02-15 20:34:53 +08:00
huailei
679cd6a4e1
Merge pull request #9572 from jumpserver/pr@dev@perf_login_page_style
...
perf: 调整登录页样式
2023-02-15 20:31:30 +08:00
“huailei000”
61579bb290
perf: 调整登录页样式
2023-02-15 20:30:12 +08:00
jiangweidong
897c5ca24f
Merge branch 'dev' of http://github.com/jumpserver/jumpserver into pr@dev@perf_navicat
2023-02-15 20:27:18 +08:00
jiangweidong
0f75fab094
fix: 解决applets在razor方式拉起代填错误问题
2023-02-15 20:27:12 +08:00
fit2bot
e66168dfa4
perf: account secret 加密 ( #9570 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-15 20:16:01 +08:00
Bai
cf2089d826
fix: 修复迁移数据库应用账号缺少的问题
2023-02-15 20:09:14 +08:00
Eric
b882b7de1a
perf: 会话新增 account_id
2023-02-15 19:53:04 +08:00
老广
8be25e1944
Merge pull request #9568 from jumpserver/pr@dev@fix_koko_ssh
...
fix: 修复 koko ssh 方式的连接开关
2023-02-15 18:24:59 +08:00
Eric
f4888304bc
fix: 修复 koko ssh 方式的连接开关
2023-02-15 18:16:56 +08:00
fit2bot
7b95d19de6
perf: verify code ttl translate ( #9567 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-15 18:16:24 +08:00
fit2bot
9339cd271a
perf: native method 优化 ( #9566 )
...
* perf: native method 优化
* perf: update docker action test
---------
Co-authored-by: Eric <xplzv@126.com >
2023-02-15 17:55:29 +08:00
fit2bot
1ec20a8f98
fix: 修复系统设置中关闭magnus 和razor 不生效 ( #9563 )
...
* fix: 修复系统设置中关闭magnus 和razor 不生效
* perf: 优化代码
---------
Co-authored-by: Aaron3S <chenyang@fit2cloud.com >
2023-02-15 17:46:17 +08:00
老广
3d7428e828
Merge pull request #9565 from jumpserver/pr@dev@fix_ssh_native
...
fix: ssh native 不显示问题
2023-02-15 16:59:09 +08:00
Eric
75b27b7834
fix: ssh native 不显示问题
2023-02-15 16:53:30 +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
Bai
4109f2cb1c
fix: 修改翻译
2023-02-15 16:30:46 +08:00
Eric_Lee
f10480179c
Merge pull request #9561 from jumpserver/pr@dev@fix_dbeaver
...
fix: 完善 DBeaver 安装
2023-02-15 16:07:32 +08:00
Eric
8f16c2a14f
fix: 完善 DBeaver 安装
2023-02-15 16:05:52 +08:00
fit2bot
18496aba59
perf: sqlserver change_secret ( #9560 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-15 15:13:45 +08:00
Bai
0828a0e9ba
fix: 修复资产详情授权用户授权规则列表的搜索项
2023-02-15 14:55:02 +08:00
Bai
9a39aca0f1
fix: Session 过滤支持 Terminal Name 和 ID 字段
2023-02-15 14:32:46 +08:00
Aaron3S
757702b99d
fix: 整理任务中心权限位
2023-02-15 14:04:03 +08:00
老广
186878366f
Merge pull request #9556 from jumpserver/pr@dev@fix_change_adhoc_model_verbose_name
...
fix: 修改 adhoc 的 verbose_name
2023-02-15 12:44:29 +08:00
jiangweidong
d784123c04
feat: 远程应用Applets支持DBeaver ( #9537 )
...
* perf: 远程应用Applets支持DBeaver
* feat: 更改下载路径
* perf: navicat修改不在这个pr中修改
* perf: add patch.yml
---------
Co-authored-by: Eric <xplzv@126.com >
2023-02-15 12:12:17 +08:00
Bai
e25306608b
fix: 修复克隆网关没有克隆账号的问题
2023-02-15 11:18:44 +08:00
Aaron3S
d8ef556adf
fix: 修改 adhoc 的 verbose_name
2023-02-15 11:17:57 +08:00
jiangweidong
7235910a86
perf: 优化Activity日志[操作日志、登录日志]显示
2023-02-15 10:46:37 +08:00
jiangweidong
f3b529170d
Merge pull request #9553 from jumpserver/pr@dev@perf_audit_activity
...
perf: 优化产生的 activity 没有 org
2023-02-14 23:05:28 +08:00
ibuler
e466b6e38e
perf: 优化产生的 activity 没有 org
2023-02-14 22:56:36 +08:00
老广
27e74f6d77
Merge pull request #9552 from jumpserver/pr@dev@perf_audit_log_to_perfect
...
perf: 优化activity log
2023-02-14 20:11:43 +08:00
ibuler
9a200920ca
perf: 修改 asset info
2023-02-14 20:11:04 +08:00
ibuler
fd38f5d89d
perf: 优化activity log
2023-02-14 20:01:29 +08:00
jiangweidong
ced454ca49
perf: 优化远程应用navicat连接时,确定有密码输入框后才输入密码
2023-02-14 19:50:20 +08:00
Aaron3S
1b4c52bc9f
fix: 增加作业中心开关
2023-02-14 19:49:47 +08:00
Bai
09b672917a
fix: 修复角色更新信号方法
2023-02-14 19:48:39 +08:00
fit2bot
f20c803356
perf: ansible_enabled false ( #9548 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-14 18:34:46 +08:00
jiangweidong
7d93c9ebc5
fix: 用户接口不分页时,api异常
2023-02-14 18:15:25 +08:00
Bai
ac4a321225
fix: 修复角色列表用户数量字段为0的问题
2023-02-14 18:14:46 +08:00
Aaron3S
44d3f88225
fix: 屏蔽不需要的权限位
2023-02-14 18:14:19 +08:00
Bai
1f4fdc13aa
fix: 修复一些 connection-token rbac 权限控制
2023-02-14 17:52:44 +08:00
Bai
174106ff1e
fix: 排除一些关于 PermedAsset 相关的权限位
2023-02-14 17:15:32 +08:00
fit2bot
306193ca5f
perf: input_secret ( #9542 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-14 16:53:10 +08:00
Aaron3S
bd7e9ce4b9
perf: 优化代码结构
2023-02-14 16:44:42 +08:00
Aaron3S
f7bb408ab2
feat: 增加命令过滤功能
2023-02-14 16:44:42 +08:00
fit2bot
26e890a99f
perf: ldap org ( #9541 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-14 16:41:49 +08:00
Bai
2c13439b8a
fix: 添加迁移文件
2023-02-14 16:38:28 +08:00
老广
f147724447
Merge pull request #9513 from jumpserver/dependabot/pip/requirements/ipython-8.10.0
...
build(deps): bump ipython from 8.4.0 to 8.10.0 in /requirements
2023-02-14 16:05:38 +08:00
老广
f10f7c3e08
Merge pull request #9528 from jumpserver/pr@dev@perf_audit_log_and_platform
...
perf: 优化 audit log
2023-02-14 16:03:03 +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
Bai
5c98fbbefd
fix: 修复添加资产到节点,移除资产从节点,移动资产到节点 API rbac 权限位
2023-02-14 15:35:56 +08:00
Bai
770e7733e7
fix: 修复添加资产到节点,移除资产从节点,移动资产到节点 API rbac 权限位
2023-02-14 15:35:56 +08:00
Bai
71f3fe64b4
fix: 修复获取资产授权的账号 API,过滤未激活的账号
2023-02-14 14:37:21 +08:00
Bai
eef067c9ca
fix: 修复授权查看组织角色权限问题
2023-02-14 14:18:16 +08:00
ibuler
b3244d0215
perf: 优化 redis 平台协议
2023-02-14 13:44:14 +08:00
Bai
18286b674c
fix: 修复云同步执行报错的问题(protocols,Asset=>Host)
2023-02-14 11:39:23 +08:00
fit2bot
10d776f7e5
perf: account name required ( #9533 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-14 11:37:18 +08:00
Bai
80903d1218
fix: 修复账号密钥查看rbac权限位
2023-02-14 11:30:54 +08:00
老广
1631f0fe3c
Merge pull request #9531 from jumpserver/pr@fix@create_asset_err
...
fix: 创建Web资产报错
2023-02-14 10:02:38 +08:00
jiangweidong
85796acfe4
fix: 创建Web资产报错
2023-02-14 09:52:23 +08:00
老广
33a80cb8ef
Merge pull request #9527 from jumpserver/pr@dev@fix_localhost_script_inject_error
...
fix: 过滤 localhost 注入问题
2023-02-13 20:09:28 +08:00
老广
99e5ac9aa6
Merge pull request #9530 from jumpserver/pr@dev@perf_delay_run
...
perf: 优化 delay run
2023-02-13 20:06:01 +08:00
ibuler
223b73c5c6
perf: 优化 delay run
2023-02-13 20:04:17 +08:00
fit2bot
269cf6628a
perf: gateway auto ( #9529 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-13 19:52:49 +08:00
老广
48fe6b975b
Merge pull request #9526 from jumpserver/pr@dev@perf_merge_delay
...
perf: 改造 merge_delay_func
2023-02-13 19:45:36 +08:00
ibuler
bd9b1f1a5b
perf: 优化 audit log
2023-02-13 19:42:42 +08:00
Aaron3S
011535a02a
fix: 过滤 localhost 注入问题
2023-02-13 19:22:52 +08:00
Eric
9cd780eb06
perf: 改造 merge_delay_func
2023-02-13 19:14:00 +08:00
老广
854e0f5fe0
Merge pull request #9516 from jumpserver/pr@dev@perf_mail_test_msg
...
perf: 修复测试 smtp 的subject prefix 丢失问题
2023-02-13 18:25:27 +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
66b248db77
perf: 去除 applet 脚本的退出弹窗 ( #9525 )
...
Co-authored-by: Eric <xplzv@126.com >
2023-02-13 17:11:43 +08:00
Eric
fcad5c637a
perf: chrome https网站忽略证书
2023-02-13 15:45:31 +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
439d3ddf47
perf: 翻译 ( #9520 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-13 15:29:48 +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
fit2bot
7f21e6cb6e
perf: terminal command ordering ( #9517 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-13 14:44:17 +08:00
ibuler
29c5fd1191
perf: 修复测试 smtp 的subject prefix 丢失问题
2023-02-13 14:36:17 +08:00
Eric_Lee
e88cb71d3c
Merge pull request #9514 from jumpserver/pr@dev@fix_event_loop
...
fix: 修复默认 event loop 冲突问题
2023-02-11 23:25:12 +08:00
Eric
9c5e4955f2
fix: 修复默认 event loop 冲突问题
2023-02-11 23:00:41 +08:00
dependabot[bot]
51ac01cb19
build(deps): bump ipython from 8.4.0 to 8.10.0 in /requirements
...
Bumps [ipython](https://github.com/ipython/ipython ) from 8.4.0 to 8.10.0.
- [Release notes](https://github.com/ipython/ipython/releases )
- [Commits](https://github.com/ipython/ipython/compare/8.4.0...8.10.0 )
---
updated-dependencies:
- dependency-name: ipython
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-02-11 01:49:52 +00:00
老广
d7d7d1174e
Merge pull request #9509 from jumpserver/pr@dev@perf_loop_tasks
...
fix: 优化并发延迟执行
2023-02-10 19:45:25 +08:00
老广
a50b74a989
Merge pull request #9510 from jumpserver/pr@dev@fix_period_task_error
...
feat: 修复 JOB 定时任务不执行的问题
2023-02-10 19:45:04 +08:00
老广
0c2873ae86
Merge pull request #9512 from jumpserver/pr@dev@perf_asset_task
...
perf: 优化 applet account 释放
2023-02-10 19:44:27 +08:00
ibuler
df3b76f357
perf: 优化 applet account 释放
2023-02-10 19:40:35 +08:00
fit2bot
64f21a518a
perf: asset gather fact ( #9511 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-10 18:50:11 +08:00
Aaron3S
4daadbfa0a
feat: 修复 JOB 定时任务不执行的问题
2023-02-10 18:38:04 +08:00
jiangweidong
564a87304c
perf: 优化关闭弹窗方式及数据库连接名称优化 ( #9508 )
2023-02-10 18:20:47 +08:00
Eric
78f6f6cf7d
fix: 优化并发延迟执行
2023-02-10 18:01:31 +08:00
老广
aa483a3c6d
Merge pull request #9507 from jumpserver/pr@dev@perf_asset_task
...
perf: 优化 task
2023-02-10 17:43:39 +08:00
ibuler
dd15286d27
perf: 优化 task
2023-02-10 17:36:15 +08:00
Aaron3S
889542079c
fix: 修复仪表盘失败连接数不更新的问题
2023-02-10 16:03:37 +08:00
Bai
5153817ff4
fix: 修复同名用户登录时username设置问题
2023-02-10 16:01:50 +08:00
fit2bot
ab132e02d0
perf: k8s tree ( #9503 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-10 15:56:34 +08:00
老广
eebd6c30de
Merge pull request #9494 from jumpserver/pr@dev@perf_api_bulk_add
...
perf: 优化并发处理
2023-02-10 15:55:12 +08:00
ibuler
136bec94ca
perf: merge with dev
2023-02-10 15:38:40 +08:00
ibuler
f192567072
perf: remove debug
2023-02-10 15:21:48 +08:00
ibuler
98a2d39a04
perf: merge with remote
2023-02-10 15:08:33 +08:00
老广
b85b6a38e2
Merge pull request #9449 from jumpserver/pr@dev@perf_activity
...
perf: 增加Activity日志中此资源的任务执行及详情查看
2023-02-10 15:07:25 +08:00
jiangweidong
e647205c24
perf: 优化applet-navicat连接方式 ( #9498 )
...
* perf: 优化applet-navicat连接方式
* perf: 关闭许可证通知,不阻塞登录
2023-02-10 15:03:21 +08:00
ibuler
6a0fbc6ac2
perf: 修改 signals
2023-02-10 14:44:59 +08:00
fit2bot
e36506c3b8
perf: ansible log ( #9499 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-10 14:37:55 +08:00
Eric
8b7bccc4ad
perf: 使用 asyncio 延迟并发执行
2023-02-10 14:21:24 +08:00
fit2bot
0c11a602a8
perf: push account automation ( #9497 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-10 14:07:20 +08:00
Bai
fcf20335e8
fix: 修复更新角色权限、更新角色、用户绑定时,用户权限没有即使更新的问题
2023-02-10 12:00:01 +08:00
Bai
4c96d6935a
fix: 修复没有 push_now 权限的用户可以在创建资产、创建账号中开启推送
2023-02-10 11:14:05 +08:00
jiangweidong
c5b8ae6c9a
perf: 修改变量名
2023-02-10 11:13:44 +08:00
jiangweidong
7926f7d75e
fix: 修改OAuth2协议的注销地址为非必填项目
2023-02-10 11:13:44 +08:00
ibuler
37a52c420f
perf: 优化并发处理
2023-02-09 20:48:25 +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
Eric
e36a64ae2c
perf: update resource
2023-02-09 20:00:20 +08:00
Eric
d0e56a17d6
fix: 修复审计日志保存失败的问题
2023-02-09 20:00:20 +08:00
Bai
48067415ef
fix: 修复第三方用户登录复核时,可以跳过的问题
2023-02-09 19:47:11 +08:00
fit2bot
b81416d973
perf: playbook 批量删除 ( #9490 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-09 19:02:45 +08:00
Aaron3S
a87ff2d880
feat: 为所有api添加搜索
2023-02-09 17:49:49 +08:00
Aaron3S
5d13f1e357
fix: 修复 Job 命令不显示的问题
2023-02-09 17:46:30 +08:00
fit2bot
5401b1cdf2
perf: audit dashboard ( #9486 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-09 17:17:35 +08:00
fit2bot
015ac4fbb6
fix: 禁用omnidb 连接 sqlserver ( #9480 )
...
Co-authored-by: Aaron3S <chenyang@fit2cloud.com >
2023-02-09 17:03:58 +08:00
jiangweidong
b3e609dc9b
fix: 解决不同用户使用远程应用Navicat登录Oracle失败的问题
2023-02-09 16:36:49 +08:00
Aaron3S
403faf9663
fix: 修复上传方式创建 playbook 内容为空的问题
2023-02-09 16:32:17 +08:00
Aaron3S
921d8f6a28
fix: 保护必要文件不被删除
2023-02-09 16:32:17 +08:00
Aaron3S
238dc2e559
fix: 禁用omnidb 连接 sqlserver
2023-02-09 16:32:17 +08:00
fit2bot
c7c5805b18
fix: update platform script ( #9479 )
...
* fix: update platform script
* perf: check protocol setting
---------
Co-authored-by: Eric <xplzv@126.com >
2023-02-09 14:11:54 +08:00
Bai
4f6a17290a
fix: 修复创建资产时账号禁用不生效的问题
2023-02-09 12:30:28 +08:00
fit2bot
c088739a5d
perf: celery task search ( #9477 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-09 11:49:16 +08:00
Bai
df428feaeb
fix: 修改 command review 返回为 response 对象
2023-02-09 11:10:20 +08:00
jiangweidong
33d5cdedea
perf: 优化
2023-02-09 11:02:09 +08:00
fit2bot
d6d45f64fa
perf: inventiry account ( #9474 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-08 20:42:06 +08:00
fit2bot
7b9523d6be
perf: ansible accounts is_active ( #9473 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-08 20:39:24 +08:00
fit2bot
e3d1474b9b
perf: k8s tree error msg ( #9472 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-08 20:14:33 +08:00
fit2bot
ab76d8cce0
fix: 修复创建资产资源 dashboard 不变化的问题 ( #9471 )
...
Co-authored-by: Aaron3S <chenyang@fit2cloud.com >
2023-02-08 19:32:09 +08:00
fit2bot
f3405b0937
fix: 修复新增用户控制台本周新增数量不变化的问题 ( #9470 )
...
Co-authored-by: Aaron3S <chenyang@fit2cloud.com >
2023-02-08 18:27:49 +08:00
fit2bot
ddff968be1
perf: postgresql ansible ( #9469 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-08 18:13:05 +08:00
Bai
03ad4124eb
fix: 修复手动登录资产时,LoginACL QuerySet 会获取所有组织下规则的问题(@INPUT账号没有org_id)
2023-02-08 16:46:03 +08:00
fit2bot
5c1acae4c5
perf: push account ssh ( #9467 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-08 15:36:45 +08:00
Bai
37f119260e
fix: 修复 connection token 相关的返回字段
2023-02-08 15:32:02 +08:00
fit2bot
2c952c2877
fix: account create bug ( #9465 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-08 14:30:05 +08:00
Bai
2a964bfa6c
fix: (smart endpoint 切换到全局组织下匹配)
2023-02-08 14:29:17 +08:00
Bai
953adf6cfb
fix: (smart endpoint 获取500的问题) (修复监控会话打开失败的问题)
2023-02-08 14:29:17 +08:00
老广
e590518108
Merge pull request #9463 from jumpserver/pr@dev@perf_ticket
...
perf: 修改 platform serializer
2023-02-08 13:56:12 +08:00
ibuler
eabb41b74c
perf: 修改 platform serializer
2023-02-08 13:53:21 +08:00
fit2bot
d308efc63b
fix: 更新账号后 立即推送 ( #9462 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-08 13:36:32 +08:00
jiangweidong
e3c0425a7d
perf: 优化
2023-02-08 11:46:10 +08:00
jiangweidong
fa54df6d99
perf: 还原任务参数
2023-02-08 11:43:35 +08:00
jiangweidong
fb285adcce
优化
2023-02-08 11:32:05 +08:00
fit2bot
32afa214fd
perf: k8s token 不过期 ( #9460 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-08 11:28:44 +08:00
ibuler
8c65429157
fix: 修复 perms 循环引用
2023-02-08 10:52:33 +08:00
ibuler
17fce76ac4
perf: 修改 signal handler
2023-02-08 10:14:09 +08:00
fit2bot
63a4620b19
perf: account push no password ( #9457 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-07 20:18:54 +08:00
fit2bot
38921cc5f0
perf: gather account ( #9456 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-07 19:45:12 +08:00
dependabot[bot]
22953c0306
build(deps): bump django from 3.2.16 to 3.2.17 in /requirements
...
Bumps [django](https://github.com/django/django ) from 3.2.16 to 3.2.17.
- [Release notes](https://github.com/django/django/releases )
- [Commits](https://github.com/django/django/compare/3.2.16...3.2.17 )
---
updated-dependencies:
- dependency-name: django
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-02-07 17:53:43 +08:00
老广
57c84f1329
Merge pull request #9455 from jumpserver/pr@dev@perf_delay_run
...
fix: role detail
2023-02-07 17:52:54 +08:00
ibuler
fe725106ac
fix: role detail
2023-02-07 17:51:22 +08:00
ibuler
c87c432c1a
perf: 延迟执行一个函数
2023-02-07 17:13:50 +08:00
老广
75b10d9d8f
Merge pull request #9452 from jumpserver/pr@dev@perf_job_delete
...
perf: 优化 job 删除策略
2023-02-07 16:25:51 +08:00
老广
bb8ca41149
Merge pull request #9454 from jumpserver/pr@dev@perf_api_sql
...
perf: 优化 api sql 查询
2023-02-07 16:24:45 +08:00
ibuler
e7202ac984
perf: 优化 api sql 查询
2023-02-07 16:21:26 +08:00
Bai
b41d30dbac
fix: 修复导入更新资产时包含labels报错的问题(取消id唯一键校验)
2023-02-07 16:00:36 +08:00
Aaron3S
9ee2b1b1f5
perf: 优化 job 删除策略
2023-02-07 14:05:59 +08:00
fit2bot
90d5f62327
perf: gathered-accounts api ( #9451 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-07 13:27:44 +08:00
Aaron3S
245bf073e9
增加历史任务再次执行功能
2023-02-07 11:43:12 +08:00
jiangweidong
a1300e2886
perf: 增加登录日志详情
2023-02-07 09:49:17 +08:00
jiangweidong
cb362b2fe4
perf: 生成迁移文件
2023-02-07 08:58:14 +08:00
jiangweidong
49c78f65a6
perf: 处理冲突
2023-02-07 08:55:57 +08:00
jiangweidong
90fdaca955
perf: 优化Activity日志
2023-02-07 08:52:48 +08:00
fit2bot
1dd915cefd
perf: win shell ( #9448 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-06 19:45:08 +08:00
Bai
0deb093e7a
fix: 修改工单close权限
2023-02-06 19:30:19 +08:00
fit2bot
c7ce535630
perf: account seri type category ( #9445 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-06 18:30:17 +08:00
老广
47f23a1b9c
Merge pull request #9443 from jumpserver/pr@dev@fix_execute_shell_chdir_invalid
...
fix: 解决执行命令作业指定当前路径的问题
2023-02-06 17:59:53 +08:00
fit2bot
7dae491691
perf: account asset category ( #9444 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-06 17:02:27 +08:00
Aaron3S
462dc2543b
fix: 解决执行命令作业指定当前路径的问题
2023-02-06 16:19:43 +08:00
fit2bot
8afe28773d
perf: clone plateform charset ( #9442 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-06 15:05:38 +08:00
fit2bot
654cbe7bd0
perf: 创建网关 没有关联网域 ( #9441 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-06 14:54:30 +08:00
Bai
f52a2ea47f
fix: 修改日文翻译文件
2023-02-06 14:29:09 +08:00
fit2bot
500124f485
perf: asset automation filter ( #9440 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-06 13:37:03 +08:00
Aaron3S
dbd3cb35ec
fix: 修复无法更新命令的bug
2023-02-06 11:40:56 +08:00
Aaron3S
a3baac6763
fix: 修复无法更新命令的bug
2023-02-06 11:27:40 +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
1e075c3687
perf: 修改支持 connect methods
2023-02-06 10:30:16 +08:00
Eric
47c5f18c6e
fix: applet deploy pip install
2023-02-03 23:47:41 +08:00
Bai
4960c4b260
fix: 修复登录资产ACL会获取所有组织下数据的问题
2023-02-03 20:03:31 +08:00
ibuler
91357b3715
perf: 优化 gateway 设置
2023-02-03 19:46:42 +08:00
老广
4462e745a5
Merge pull request #9428 from jumpserver/pr@dev@perf_ops_job
...
perf: 修改 ops job 约束
2023-02-03 18:41:39 +08:00
fit2bot
20d2efc407
perf: 主机硬件信息 ( #9429 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-03 18:23:38 +08:00
ibuler
4220c72cd3
perf: 修改 ops job 约束
2023-02-03 16:44:05 +08:00
老广
431725b315
Merge pull request #9424 from jumpserver/pr@dev@perf_chrome
...
perf: use Chromium browser
2023-02-03 16:14:15 +08:00
ibuler
470d2703f4
perf: 协议端口校验
2023-02-03 16:13:29 +08:00
ibuler
7c429163ce
perf: 协议端口校验
2023-02-03 16:03:34 +08:00
Bai
ef3a1e399d
fix: 修复登录资产ACL会获取所有组织下数据的问题
2023-02-03 15:21:46 +08:00
Bai
ce8ad5f9cc
perf: 优化资产授权规则过滤支持 accounts
2023-02-03 15:02:58 +08:00
Eric
afb2b53035
fix: chromedriver path
2023-02-03 14:48:41 +08:00
Eric
159652ccfe
fix: chrome path
2023-02-03 14:41:57 +08:00
Eric
c22662a757
perf: use Chromium browser
...
feat: add code dialog
2023-02-03 14:35:23 +08:00
Bai
d2ae6642eb
fix: 修复更新账号时secret不正确导致更新失败的问题
2023-02-03 14:31:07 +08:00
ibuler
55de785947
perf: 优化最后更新
2023-02-03 12:25:09 +08:00
ibuler
88638187a5
perf: 修改 role 克隆
2023-02-03 11:29:23 +08:00
jiangweidong
cb4410391c
fix: 修复mongodb ssl账号测试失败,oracle推送用户失败问题 ( #9421 )
2023-02-03 11:27:04 +08:00
fit2bot
003feb1aed
perf: command log risk choice ( #9419 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-02 22:58:18 +08:00
fit2bot
93932f1904
perf: 优化批量更新 ( #9418 )
...
* perf: 优化批量更新
* perf: 优化代码,减少 80%,依然可用
---------
Co-authored-by: ibuler <ibuler@qq.com >
2023-02-02 20:10:48 +08:00
老广
422bf92104
Merge pull request #9416 from jumpserver/pr@dev@fix_user_filter_role_error
...
fix: 修复用户过滤角色的错误
2023-02-02 18:17:15 +08:00
ibuler
b4068be89c
perf: 修改换行
2023-02-02 18:16:40 +08:00
ibuler
3520f8222c
merge: with dev
2023-02-02 18:13:32 +08:00
ibuler
77486f0773
fix: 修复用户过滤角色的错误
2023-02-02 18:09:31 +08:00
Bai
d0bd35d88c
fix: 修复测试ldap attr map报错问题
2023-02-02 17:06:17 +08:00
Aaron3S
1083f5f6f2
feat: 添加 task 的 verbose_name
2023-02-02 16:49:34 +08:00
Bai
4c9d16b4c1
fix: 修改角色列表viewset排序问题
2023-02-02 16:49:04 +08:00
Bai
c3d01591e7
fix: 修改角色列表viewset排序问题
2023-02-02 16:49:04 +08:00
Bai
2d514c0db0
fix: 修改角色列表排序问题
2023-02-02 16:49:04 +08:00
Bai
a045eb9936
fix: 修改角色列表排序问题
2023-02-02 16:49:04 +08:00
fit2bot
be151523f4
perf: user filter ( #9413 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-02 16:40:00 +08:00
fit2bot
64e48712a5
perf: gateway migrate ( #9412 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-02 16:16:38 +08:00
Aaron3S
e3e727f972
perf: 默认展开编辑器所有目录
2023-02-02 16:07:19 +08:00
Eric
3341d55d1b
perf: APPLET_DOWNLOAD_HOST 优化
2023-02-02 15:37:14 +08:00
Eric
1c55bde8c8
perf: 发布机部署新增 CORE_HOST 配置
2023-02-02 15:37:14 +08:00
Bai
88edc9191c
fix: 修改 ACL 排序 priority, date_updated, name
2023-02-02 15:34:22 +08:00
fit2bot
6429b56a54
fix: 资产克隆账号bug ( #9407 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-02 15:01:56 +08:00
fit2bot
d78725f7c5
perf: choice validate ( #9404 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-02 14:52:44 +08:00
Bai
5fcd83b587
fix: 修复获取 swagger api 时,AssetSerializer category, type 字段手动设置 _choices 属性时报错的问题
2023-02-02 14:40:23 +08:00
feng
0aa681620f
perf: asset tree search
2023-02-02 13:56:18 +08:00
Aaron3S
d68ed57eb9
优化 playbook ide
2023-02-02 13:55:55 +08:00
jiangweidong
7a5195e91e
fix: 解决部署后,Oracle无法执行自动化任务问题 ( #9400 )
2023-02-02 10:33:07 +08:00
jiangweidong
3080771559
fix: 解决没获取到证书的mongodb导致的无法执行自动化任务 ( #9399 )
2023-02-02 10:32:48 +08:00
老广
f68dde456d
Merge pull request #9397 from jumpserver/pr@dev@perf_code_i18n
...
perf: 修改 i18n
2023-02-02 10:23:17 +08:00
fit2bot
758d6ae81b
perf: gateway print ( #9398 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-01 19:02:41 +08:00
ibuler
853f9c422d
perf: 修改 i18n
2023-02-01 18:45:51 +08:00
Aaron3S
9d898f0aec
playbook ide
2023-02-01 18:22:52 +08:00
fit2bot
7b95859015
perf: device ansible ( #9396 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-01 18:20:56 +08:00
Bai
fc34980f20
fix: 修复主机详情显示硬件信息
2023-02-01 17:05:28 +08:00
老广
b4afdf7f72
Merge pull request #9389 from jumpserver/pr@dev@perf_audits_migrations
...
perf: 优化audits的migrations
2023-02-01 16:57:51 +08:00
老广
9dd7675bc9
Merge pull request #9393 from jumpserver/pr@dev@perf_user_create
...
perf: 重构 notifications site msg
2023-02-01 16:50:38 +08:00
ibuler
1169677286
perf: 重构 notifications site msg
2023-02-01 16:43:43 +08:00
Bai
4e2c2b652f
fix: 修复创建数据库时包含账号失败的问题
2023-02-01 15:50:21 +08:00
jiangweidong
4762939dae
perf: 优化audits的migrations
2023-02-01 15:13:07 +08:00
jiangweidong
e324c46f87
fix: PrivateToken创建报错 ( #9387 )
...
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com >
2023-02-01 15:06:10 +08:00
Bai
acab0b765c
fix: 修复创建
2023-02-01 15:04:06 +08:00
fit2bot
66c58a2084
perf: 账号 模版创建 ( #9386 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-02-01 14:43:58 +08:00
老广
d1f46768a3
Merge pull request #9385 from jumpserver/pr@dev@perf_user_create
...
perf: 优化用户创建
2023-02-01 12:56:46 +08:00
ibuler
023ca29752
perf: 优化用户创建
2023-02-01 12:39:38 +08:00
老广
30492b368c
Merge pull request #9384 from jumpserver/pr@dev@perf_applet_deps
...
perf: update applet download and deployment
2023-02-01 12:38:39 +08:00
ibuler
4956e1147e
perf: 优化用户创建 角色设置
2023-02-01 11:26:57 +08:00
Eric
142edd9438
perf: update applet download and deployment
2023-02-01 10:27:12 +08:00
老广
fa6d819f10
Merge pull request #9380 from jumpserver/pr@dev@perf_asset_info
...
perf: 优化 asset info
2023-01-31 19:37:51 +08:00
ibuler
34b740583e
perf: 修改 asset info
2023-01-31 19:37:16 +08:00
ibuler
ae1b134f70
perf: 修改 spec for cert
2023-01-31 19:30:38 +08:00
ibuler
e9454c42cc
perf: 修改 spec
2023-01-31 19:22:20 +08:00
ibuler
6bbb1f7e86
perf: 修改 connectivity
2023-01-31 19:02:24 +08:00
ibuler
03c0d2edbd
perf: 修改 connectivity
2023-01-31 18:51:04 +08:00
Jiangjie.Bai
aac805f5e4
Merge pull request #9383 from jumpserver/dev
...
v3.0.0-rc4
2023-01-31 18:34:24 +08:00
jiangweidong
be670872e5
perf: 修改逻辑,将证书文件转换放到manager中
2023-01-31 18:32:14 +08:00
jiangweidong
6cda829f67
perf: 优化创建证书文件逻辑
2023-01-31 18:32:14 +08:00
jiangweidong
633e12bf86
feat: 其他mongodb自动化操作支持ssl
2023-01-31 18:32:14 +08:00
jiangweidong
211a0abe9e
feat: 测试可连接性mongodb支持ssl
2023-01-31 18:32:14 +08:00
Bai
ae79584faa
perf: 修改账号列表 secret 字段名称 密钥/密码
2023-01-31 18:11:00 +08:00
ibuler
ef51e74b8e
perf: 继续替换 spec
2023-01-31 18:06:44 +08:00
ibuler
41154d3793
asset: specific to spec_info
2023-01-31 17:57:06 +08:00
ibuler
9ec7a8ac61
perf: 优化 asset info
2023-01-31 17:46:56 +08:00
fit2bot
2ea8e30ca5
fix: 账号备份无法执行 ( #9379 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-01-31 16:17:45 +08:00
Bai
a7b744db10
perf: 修改账号列表 secret 字段名称 密钥/密码
2023-01-31 16:07:10 +08:00
Bai
6b4dbe6554
fix: 修复账号列表导出500的问题
2023-01-31 15:45:31 +08:00
Bai
229e89af03
fix: 修复终端列表根据负载状态进行过滤
2023-01-31 15:04:20 +08:00
老广
43353c257e
Merge pull request #9374 from jumpserver/pr@dev@perf_remove_cert_from_db_spec
...
perf: 资产的 specific 不返回加密信息
2023-01-31 13:42:42 +08:00
ibuler
9161b1ab1c
perf: 资产的 specific 不返回加密信息
2023-01-31 13:41:09 +08:00
老广
bebfe10d73
Merge pull request #9373 from jumpserver/pr@dev@change_migrations
...
perf: 修改 database 的 cert model field
2023-01-31 13:05:19 +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
ibuler
9d59fb736b
perf: 修改 database 的 cert model field
2023-01-31 13:03:45 +08:00
ibuler
b34af62ec1
perf: 修改 migrations
2023-01-31 11:12:09 +08:00
ibuler
d5cc2e77b2
perf: admin user 不能删除,xpack 引用着,不确定顺序
2023-01-31 11:12:09 +08:00
fit2bot
3702ba92ea
perf: celery task delete ( #9372 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-01-31 11:00:21 +08:00
ibuler
0c1048ed89
perf: 修改 migrations
2023-01-31 10:42:55 +08:00
ibuler
382201188c
perf: admin user 不能删除,xpack 引用着,不确定顺序
2023-01-31 10:22:25 +08:00
jiangweidong
87ca9cb11d
fix: 使用type
2023-01-30 20:26:07 +08:00
fit2bot
bf867f8c95
celery yask perm tree ( #9370 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-01-30 19:11:42 +08:00
fit2bot
ec98f1bae5
perf: celery task del perm ( #9369 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-01-30 19:07:46 +08:00
fit2bot
f18f2df4ab
perf: account template secret ( #9368 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-01-30 18:59:12 +08:00
老广
28d117bf3d
Merge pull request #9360 from jumpserver/pr@master@feat_support_redis_ssl_connect_magnus
...
feat: 支持Magnus连接Redis SSL
2023-01-30 17:52:53 +08:00
老广
426176cc44
Merge pull request #9367 from jumpserver/pr@dev@change_ui_readme
...
perf: 修改 ui 的说明
2023-01-30 17:42:53 +08:00
ibuler
86a0ed8883
perf: 修改 ui 的说明
2023-01-30 17:36:42 +08:00
jiangweidong
a664d0b752
Merge branch 'dev' of http://github.com/jumpserver/jumpserver into pr@dev@fix_no_db_name_mongodb_task_err
2023-01-30 17:33:15 +08:00
jiangweidong
c34b7e69eb
fix: mongodb无指定数据库时,一些自动化任务会失败
2023-01-30 17:33:10 +08:00
老广
d8f737c999
Merge pull request #9365 from jumpserver/pr@dev@perf_asset_migration
...
perf: 优化 k8s migrations
2023-01-30 17:15:40 +08:00
ibuler
351bcd3337
perf: 优化 k8s migrations
2023-01-30 17:04:11 +08:00
fit2bot
c7c56775d3
perf: push accounts log error ( #9364 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-01-30 17:00:52 +08:00
老广
e5ca8c5b2c
Merge pull request #9362 from jumpserver/pr@dev@perf_applet_upload
...
perf: 优化 applet 上传报错
2023-01-30 15:21:03 +08:00
ibuler
812f5490dc
perf: 优化 applet 上传报错
2023-01-30 15:19:05 +08:00
jiangweidong
c098172ed4
Merge branch 'dev' of http://github.com/jumpserver/jumpserver into pr@master@feat_support_redis_ssl_connect_magnus
2023-01-30 15:09:19 +08:00
jiangweidong
b0baee95d3
feat: 支持Magnus连接Redis SSL
2023-01-30 15:09:13 +08:00
老广
789695f90b
Merge pull request #9359 from jumpserver/pr@dev@perf_deploy_applethost
...
perf: 优化发布机初始化部署
2023-01-30 14:47:08 +08:00
Bai
f6da14b80d
fix: 修复网域导入500问题(不支持修改gateways)
2023-01-30 14:42:44 +08:00
Eric
135c15d127
perf: 优化发布机初始化部署
2023-01-30 14:42:42 +08:00
fit2bot
4cca518543
perf: user profile ( #9357 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-01-30 13:43:27 +08:00
老广
3f4814a392
Merge pull request #9356 from jumpserver/pr@dev@perf_readme
...
perf: 优化 applet api
2023-01-30 13:23:09 +08:00
ibuler
94e1d94423
perf: 修改 readme
2023-01-30 13:22:03 +08:00
ibuler
f316b241aa
perf: 优化 applet api
2023-01-30 13:01:06 +08:00
fit2bot
6ec4dc7dd5
perf: auditor joblog perm ( #9355 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-01-29 18:20:44 +08:00
fit2bot
47cd79ea5a
perf: databases protocol required ( #9354 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-01-29 17:40:15 +08:00
老广
7ba7d178e5
Merge pull request #9353 from jumpserver/pr@dev@perf_readme
...
perf: 优化 readme 一些排版
2023-01-29 14:11:51 +08:00
ibuler
c5ca20d957
perf: 修改 readme
2023-01-29 14:07:07 +08:00
fit2bot
da915249ab
perf: su_method allow_null ( #9352 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-01-29 14:02:03 +08:00
fit2bot
26de26d7b0
perf: ansible enabled ( #9351 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-01-29 13:31:11 +08:00
ibuler
cdd58c9238
perf: 优化 readme 一些排版
2023-01-29 13:16:06 +08:00
老广
fb66acbf0a
Merge pull request #9350 from maninhill/patch-5
...
chore(docs): README 进一步简化和优化
2023-01-29 13:03:49 +08:00
maninhill
c8c5fcce9c
chore(docs): README 进一步简化和优化
2023-01-29 12:59:20 +08:00
老广
97d16aab11
Merge pull request #9349 from jumpserver/pr@dev@pref_ansible_install
...
perf: change ansible version
2023-01-29 11:22:42 +08:00
ibuler
0f82aa8c3a
perf: change ansible version
2023-01-29 11:21:03 +08:00
fit2bot
55d7f17470
perf: mariadb verify account enabled ( #9348 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-01-29 11:09:42 +08:00
老广
f55a195f13
Merge pull request #9346 from jumpserver/pr@dev@pref_ansible_install
...
perf: 修改 ansible 安装方式
2023-01-29 10:53:43 +08:00
老广
4d92e1c0d7
Merge pull request #9341 from jumpserver/pr@dev@perf_remoteapp_view
...
perf: 优化远程应用界面
2023-01-29 10:53:10 +08:00
ibuler
72b1163471
perf: 修改 ansible 安装方式
2023-01-29 10:52:04 +08:00
fit2bot
4409809106
perf: asset connectivity ordering ( #9343 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-01-23 18:20:17 +08:00
吴小白
37e471e950
Merge pull request #9340 from jumpserver/pr@dev@perf_ansible_core
...
chore: update ansible_core
2023-01-20 23:03:02 +08:00
jiangweidong
e006a1949e
Merge branch 'dev' of http://github.com/jumpserver/jumpserver into pr@dev@perf_remoteapp_view
2023-01-20 17:52:59 +08:00
jiangweidong
b6eac5a6b7
perf: 优化远程应用界面
2023-01-20 17:52:51 +08:00
吴小白
0b9f6a9341
chore: update ansible_core
2023-01-20 14:02:30 +08:00
Eric
c27c55b429
fix: failed to install builtin applets
2023-01-19 13:48:41 +08:00
fit2bot
ce1cb4214c
chore: docker build ( #9338 )
...
* chore: docker build
* chore: loong64 build
Co-authored-by: Eric <xplzv@126.com >
2023-01-19 13:08:54 +08:00
fit2bot
4bef48eb6a
fix: push account duplicate ( #9336 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-01-18 17:33:10 +08:00
fit2bot
c2a8acb73b
perf: 修改网关自动化任务 ( #9335 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-01-18 17:14:02 +08:00
fit2bot
571e9b1878
perf: gateway closed domain ( #9334 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-01-18 15:27:09 +08:00
fit2bot
f8ac83d5c7
fix: change secret trigger 必填 ( #9333 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-01-18 11:54:06 +08:00
jiangweidong
3c043a2233
fix: channels-redis版本回退导致redis哨兵ws连接有问题
2023-01-18 10:48:25 +08:00
老广
da2439d229
Merge pull request #9330 from jumpserver/pr@dev@update_ansible_version
...
perf: 修改 ansible 依赖,使用自维护分支
2023-01-17 19:27:11 +08:00
ibuler
e289037837
perf: 修改 ansible 依赖,使用自维护分支
2023-01-17 19:25:03 +08:00
fit2bot
f54edab172
perf: user perm ( #9329 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-01-17 18:19:34 +08:00
jiangweidong
ab5b85d9b5
perf: 优化操作日志,activity日志都存入操作日志中
2023-01-17 13:43:51 +08:00
Bai
6dc4519c78
fix: 修复 资产节点树 获取报错的问题(全局组织)
2023-01-17 13:42:13 +08:00
Bai
f647f88536
fix: 修改迁移 connection-token system_user -> account 字段失败的问题
2023-01-17 12:15:07 +08:00
Bai
3c93ed6a75
fix: 修改迁移 connection-token system_user -> account 字段失败的问题
2023-01-17 12:15:07 +08:00
fit2bot
6a9f1978bb
perf: ticket markdown ( #9325 )
...
Co-authored-by: feng <1304903146@qq.com >
2023-01-16 20:40:38 +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
吴小白
3f264ae999
Merge pull request #9315 from jumpserver/revert-9173-dependabot/pip/requirements/certifi-2022.12.7
...
Revert "chore(deps): bump certifi from 2018.1.18 to 2022.12.7 in /requirements"
2023-01-16 10:24:16 +08:00
老广
46a91f041a
Revert "chore(deps): bump certifi from 2018.1.18 to 2022.12.7 in /requirements"
2023-01-16 07:51:12 +05:30
老广
ef04c92223
Merge pull request #9173 from jumpserver/dependabot/pip/requirements/certifi-2022.12.7
...
chore(deps): bump certifi from 2018.1.18 to 2022.12.7 in /requirements
2023-01-10 13:46:31 +08:00
老广
38f078205d
Update README.md
2023-01-03 13:12:18 +08:00
老广
ce0632f49b
Merge pull request #9250 from jumpserver/v3
...
v3 to dev
2022-12-28 13:26:25 +08:00
吴小白
b01c466d6d
Merge pull request #9249 from jumpserver/pr@v3@chore_cryptography
...
chore(deps): bump cryptography from 36.0.2 to 38.0.4 in /requirements
2022-12-28 13:18:11 +08:00
吴小白
6f36242a7d
chore(deps): bump cryptography from 36.0.2 to 38.0.4 in /requirements
2022-12-28 13:01:30 +08:00
feng
7094df3527
remove rbac redundant perms
2022-12-28 11:25:12 +08:00
Bai
dbad0851e3
perf: 修改翻译 内部的 -> 内置
2022-12-27 19:00:32 +08:00
ibuler
1b1c91bab0
t po v3
...
:wqMerge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-12-27 18:26:24 +08:00
Bai
52b5c8beee
fix: 删除 AssetSerializer 中 enabled_info 字段 (已放到 AssetDetailSerializer 中).
2022-12-27 17:57:22 +08:00
feng
ccc766df8d
perf: account source
2022-12-27 17:54:34 +08:00
fit2bot
c81f36cc27
perf: remove gather model ( #9246 )
...
Co-authored-by: feng <1304903146@qq.com >
2022-12-27 17:45:41 +08:00
Bai
0328fd1bb0
merge: v3
2022-12-27 17:13:29 +08:00
ibuler
da61b4e201
perf: 修改 asset api
2022-12-27 17:06:00 +08:00
Aaron3S
1cfe8d9cc8
feat: 支持超时时间设置
2022-12-27 16:59:32 +08:00
Aaron3S
ddca4dce41
feat: 支持pyhton脚本
2022-12-27 16:59:32 +08:00
ibuler
1b9aad594c
perf: remove push account
2022-12-27 16:54:47 +08:00
ibuler
411d199e18
perf: 修改 asset serializer
2022-12-27 16:53:23 +08:00
Bai
825bea5ea5
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-12-27 16:21:38 +08:00
Bai
ba9123b1c4
perf: 修改资产序列类字段翻译
2022-12-27 16:21:32 +08:00
ibuler
3336f2ba67
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-12-27 15:28:32 +08:00
ibuler
3da9efc3fd
perf: 修改账号推送
2022-12-27 15:27:33 +08:00
fit2bot
1e0bfbf8a8
perf: permission ( #9244 )
...
Co-authored-by: feng <1304903146@qq.com >
2022-12-27 14:48:00 +08:00
ibuler
795e952dc1
perf: change tree api
2022-12-27 13:20:18 +08:00
Bai
bb23c2a9fa
perf: 修改翻译组织ID
2022-12-26 20:30:10 +08:00
Bai
a7be8bf365
perf: 修改翻译组织ID
2022-12-26 20:29:56 +08:00
Bai
ed35ac2930
perf: 修改 OPTION 获取字段 org_id label 为 Organization ID
2022-12-26 19:32:07 +08:00
Bai
7f6d13a5a6
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-12-26 19:16:18 +08:00
Bai
d0f70f4316
perf: 修改用户序列类 can_public_key_auth 类型; 修改 OPTION 获取字段 id label 为 ID
2022-12-26 19:16:11 +08:00
Aaron3S
9ba792cf1c
feat: ops 支持节点和资产
2022-12-26 19:03:59 +08:00
ibuler
dd630f0e14
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-12-26 18:58:48 +08:00
ibuler
3145582f0b
perf: 修改 accounts
2022-12-26 18:58:21 +08:00
Bai
d2ba7a98ea
perf: 修改授权序列类字段翻译信息
2022-12-26 16:15:44 +08:00
Bai
c924f48d79
perf: gitignore add .fleet/
2022-12-26 15:33:43 +08:00
ibuler
3172e954a8
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-12-26 15:02:27 +08:00
ibuler
6d4914fbd5
perf: 修改翻译
2022-12-26 15:01:51 +08:00
fit2bot
ed82249fd1
perf: asset perm ( #9240 )
...
Co-authored-by: feng <1304903146@qq.com >
2022-12-23 19:01:29 +08:00
Aaron3S
e32d51253a
feat: 批量命令api
2022-12-23 18:23:20 +08:00
ibuler
213ae65b9a
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-12-23 16:15:56 +08:00
feng
8de2ffe5f4
perf: rbac asset
2022-12-23 16:10:04 +08:00
ibuler
4bd913b585
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-12-23 16:00:11 +08:00
ibuler
6bf4de8134
perf: 修改登录页面
2022-12-23 15:59:34 +08:00
fit2bot
7530afe368
perf: 翻译 ( #9239 )
...
Co-authored-by: feng <1304903146@qq.com >
2022-12-23 15:49:32 +08:00
吴小白
db22a68786
Merge pull request #9235 from jumpserver/pr@v3@perf_check_celery
...
perf: 更新 celery 健康检测
2022-12-23 15:00:17 +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
fit2bot
c5edb9981e
perf: rbac tree ( #9237 )
...
Co-authored-by: feng <1304903146@qq.com >
2022-12-22 20:09:20 +08:00
Bai
3443b06a28
fix: 修复异步加载luna资产授权树时根节点下资产没有返回的问题
2022-12-22 19:17:52 +08:00
Bai
4aed287efc
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-12-22 18:57:04 +08:00
Bai
ab6518e60e
fix: 开启授权规则signal信号监听;解决授权规则变动用户授权树没有即使刷新的问题
2022-12-22 18:56:54 +08:00
ibuler
370d3b350e
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-12-22 17:49:37 +08:00
ibuler
f5f8a01131
perf: 修改 celery tasks 列表
2022-12-22 17:49:07 +08:00
Bai
b851fd1069
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-12-22 17:44:28 +08:00
Bai
c645ca9aea
fix: 修改点击我的授权树节点报错的问题
2022-12-22 17:43:03 +08:00
huailei
c46af02e1d
Merge pull request #9236 from jumpserver/pr@v3@perf_login_html_layout
...
perf: 调整登录页面布局
2022-12-22 15:44:17 +08:00
“huailei000”
65387ebff4
perf: 调整登录页面布局
2022-12-22 15:42:45 +08:00
吴小白
fd323c20e1
perf: 更新 celery 健康检测
2022-12-22 14:27:13 +08:00
ibuler
6ff104c100
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-12-22 13:59:00 +08:00
ibuler
2e91aa8ce5
perf: 添加 celery 健康检测
2022-12-22 13:58:29 +08:00
fit2bot
1de51a2bfd
perf: asset xpack ( #9234 )
...
Co-authored-by: feng <1304903146@qq.com >
2022-12-22 13:50:22 +08:00
ibuler
a377317d6e
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-12-22 12:53:26 +08:00
吴小白
c39e2e9a8a
chore: 添加 procps
2022-12-22 12:47:46 +08:00
ibuler
e0e57a71aa
pref: 类型树支持资产
2022-12-22 11:34:18 +08:00
Bai
00c955e8c0
perf: 修改方法名 check_db_port_mapper
2022-12-21 21:08:28 +08:00
Bai
5d865ffd54
fix: 修改db_port_mapper策略; 启动时进行check校验;
2022-12-21 21:08:28 +08:00
feng
f4b0ba43a2
perf: filter application
2022-12-21 20:19:13 +08:00
ibuler
7ca2fdca89
perf: 修改 platform 搜索
2022-12-21 20:04:49 +08:00
ibuler
0c2a5bc44a
fix: 修复搜索资产平台
2022-12-21 19:59:56 +08:00
ibuler
df1950d063
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-12-21 18:37:37 +08:00
ibuler
b01ef1585c
perf: account secret rbac permission
2022-12-21 18:37:05 +08:00
ibuler
17627390f8
perf: 修改 account 序列号字段
2022-12-21 18:36:15 +08:00
feng
e347e05210
perf: terminal type remove ssh
2022-12-21 18:26:06 +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
Aaron3S
0e534f3251
feat: 优化api
2022-12-21 17:14:07 +08:00
Bai
5198ac1cc0
perf: 修改 UserAssetGrantedTreeNodeRelation id 为 AutoField
2022-12-21 15:16:54 +08:00
吴小白
3bef582500
chore: 添加 vim
2022-12-21 11:56:39 +08:00
吴小白
f65146cd45
chore: 添加 mysql-client
2022-12-21 11:23:33 +08:00
Aaron3S
560ff651c4
perf: 删除无用代码
2022-12-21 11:20:28 +08:00
Aaron3S
3ddeb97ea5
fix: 解决执行命令引号造成的问题
2022-12-21 11:20:28 +08:00
ibuler
327eb7a27d
perf: 修改 migrations
2022-12-21 10:17:28 +08:00
ibuler
63d35ea8a6
perf: 修改资产 model
2022-12-20 20:39:48 +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
Aaron3S
0c35205e31
feat: 增加作业版本历史
2022-12-20 19:46:48 +08:00
feng
21d6243b61
perf: api doc
2022-12-20 19:18:39 +08:00
fit2bot
6e467d9b67
perf: terminal connect method gui ( #9224 )
...
Co-authored-by: feng <1304903146@qq.com >
2022-12-20 18:50:04 +08:00
老广
bc45a8d207
Merge pull request #9223 from jumpserver/pr@v3@perf_sentinel_ssl_conf
...
perf: 优化Sentinels配置参数
2022-12-20 18:42:25 +08:00
jiangweidong
55cee43f91
perf: 优化Sentinels配置参数
2022-12-20 18:37:28 +08:00
ibuler
a7815dc9e5
perf: 修改 job log
2022-12-20 18:12:35 +08:00
ibuler
a21cb32245
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-12-20 17:52:40 +08:00
ibuler
0748c32c5a
perf: 修改 session type 序列 🥱
2022-12-20 17:52:08 +08:00
Aaron3S
e4b4f98362
feat: 作业审计添加字段
2022-12-20 17:28:27 +08:00
ibuler
88355f55bb
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-12-20 16:57:07 +08:00
ibuler
754f8131b4
perf: 内置 applets 自动安装
2022-12-20 16:48:18 +08:00
Aaron3S
d8cccfd40f
feat: 优化job execution 详情字段
2022-12-20 16:36:38 +08:00
Aaron3S
54f720e992
增加部分翻译
2022-12-20 16:36:38 +08:00
Bai
362cfb733c
perf: 修改 su-from-accounts API
2022-12-20 16:13:44 +08:00
feng
dddff03336
perf: asset tree
2022-12-20 14:53:25 +08:00
ibuler
5d31200368
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-12-20 13:49:56 +08:00
ibuler
c040564dc2
fix: 修改显示 model 的错误
2022-12-20 13:47:12 +08:00
Bai
1b82f3fc6a
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-12-20 11:26:25 +08:00
Bai
ba4d222eda
fix: 解决 nodes-with-assets/tree/ API 异常的问题
2022-12-20 11:25:44 +08:00
ibuler
758453ae96
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-12-20 11:05:29 +08:00
ibuler
24da1e7d91
perf: 修改 connect token, 获取 applet info
2022-12-20 11:05:00 +08:00
feng
cdb89ee2f2
perf: job executed fail api
2022-12-20 10:35:05 +08:00
fit2bot
e82eb8f3d1
perf: 批量命令 ( #9220 )
...
Co-authored-by: feng <1304903146@qq.com >
2022-12-19 18:04:11 +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
feng
ff16260024
perf: remove OrganizationMember model
2022-12-19 15:44:02 +08:00
fit2bot
69b16e4754
perf: asset type xpack ( #9218 )
...
Co-authored-by: feng <1304903146@qq.com >
2022-12-19 11:35:50 +08:00
ibuler
675a41013e
perf: connect methods xpack
2022-12-16 18:37:27 +08:00
ibuler
26794064b5
perf: session 添加类型
2022-12-16 17:16:14 +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
Aaron3S
009669febe
feat: 增加作业审计api
2022-12-16 15:52:02 +08:00
Aaron3S
bc47afb329
feat: 修改 inventory 名字生成规则
2022-12-16 15:20:36 +08:00
Aaron3S
e969a01689
feat: 修改作业权限
2022-12-16 15:20:36 +08:00
吴小白
9d80abadd8
perf: 优化启动速度
2022-12-16 11:48:55 +08:00
halo
4f1d4ab71e
fix: 导入翻译引用
2022-12-16 11:48:02 +08:00
halo
cb8dc6c583
perf: 优化oauth2的服务地址参数拼接
2022-12-16 11:48:02 +08:00
feng
11a58dc7ad
perf: k8s tree proxy
2022-12-16 10:52:08 +08:00
feng
d7a793b4c4
perf: 修改k8s tree
2022-12-15 18:47:54 +08:00
fit2bot
69fe0b07fd
perf: k8s tree ( #9214 )
...
Co-authored-by: feng <1304903146@qq.com >
2022-12-15 16:08:19 +08:00
ibuler
615a1ddc96
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-12-15 16:03:21 +08:00
ibuler
cb7b31e8b8
perf: perm account 返回 alias
2022-12-15 16:02:34 +08:00
feng
840ca02223
perf: del redundant macos
2022-12-15 15:21:51 +08:00
feng
cbf91e4c29
perf: ticket help text
2022-12-15 11:59:14 +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
7b0d26bbff
perf: ticket applicant ( #9205 )
...
Co-authored-by: feng <1304903146@qq.com >
2022-12-14 15:24:36 +08:00
fit2bot
f42c0f667d
perf: ticket applicant ( #9202 )
...
Co-authored-by: feng <1304903146@qq.com >
2022-12-13 17:36:00 +08:00
吴小白
b6d6c54d8f
Merge pull request #9201 from jumpserver/pr@v3@perf_support_openid_pkce
...
perf: OpenID支持PKCE方式对接
2022-12-13 16:16:11 +08:00
feng
1660362499
perf: validate ssh key
2022-12-13 15:50:47 +08:00
jiangweidong
6b33a54aef
perf: OpenID支持PKCE方式对接
2022-12-13 15:31:53 +08:00
jiangweidong
c121ac6b1d
perf: OpenID支持PKCE方式对接
2022-12-13 15:30:08 +08:00
Eric
1af86ccdfe
perf: change secret_type to LabeledChoiceField
2022-12-13 12:31:20 +08:00
feng
2f3b1d3b66
fix: ticket xss inject
2022-12-12 17:12:04 +08:00
feng
408c6c568a
perf: account backup
2022-12-12 12:33:45 +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
eba43f6a13
fix: 修改 db-listen-port.db_info API 返回的数据结构
2022-12-12 11:01:51 +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
a767c208b3
perf: 优化 get_all_node_keys 方法
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
Bai
8beb1b81cf
fix: 修改 AssetSerializer 继承 BulkOrgResourceSerializerMixin 序列类
2022-12-09 11:12:56 +08:00
吴小白
0940eab6c8
Merge pull request #9183 from jumpserver/pr@v3@fix_health_check
...
fix: 修正健康检查失败
2022-12-09 11:09:19 +08:00
吴小白
a7354d949d
fix: 修正健康检查失败
2022-12-09 11:06:58 +08:00
吴小白
ddb731c5cd
chore: 更新 python3.9
2022-12-09 10:40:55 +08:00
fit2bot
0ae9b76f04
perf: 优化构建 ( #9179 )
...
* perf: 优化构建
* fix: 修正构建错误
* perf: 优化构建依赖包
* fix: 修正构建判断
* perf: 现阶段还需要 debug 工具
Co-authored-by: 吴小白 <296015668@qq.com >
2022-12-09 10:21:36 +08:00
Bai
beac2a1514
perf: 优化获取账号 su-from-accounts 时,不包含自己和以自己为 su-from 的账号
2022-12-08 13:37:35 +08:00
dependabot[bot]
0aa3d650d4
chore(deps): bump certifi from 2018.1.18 to 2022.12.7 in /requirements
...
Bumps [certifi](https://github.com/certifi/python-certifi ) from 2018.1.18 to 2022.12.7.
- [Release notes](https://github.com/certifi/python-certifi/releases )
- [Commits](https://github.com/certifi/python-certifi/compare/2018.01.18...2022.12.07 )
---
updated-dependencies:
- dependency-name: certifi
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-12-08 00:55:41 +00:00
fit2bot
e5afbd4118
perf: k8s tree api ( #9169 )
...
Co-authored-by: feng <1304903146@qq.com >
2022-12-07 23:55:56 +08:00
Aaron3S
c14b97419d
feat: 增加跳过的主机统计, 增加每台主机执行情况api
2022-12-07 20:13:26 +08:00
Bai
66bdc375df
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-12-07 19:30:48 +08:00
Bai
58131a2b68
fix: 修复 su-from-accounts API; 前端 Select2 组件初始化时 API 报错的问题;
...
修改原因:
前端使用 Select2 组件渲染更新账号的表单页面时,会默认先创建 spm 值,
后端调用 get_object 方法时,使用的queryset,就是spm所对应的queryset,
而 detail=True, 查询的值是当前 account_id,不在 queryset 中,
所以会导致调用父类的 get_object 方法报错,对象找不到
2022-12-07 19:26:28 +08:00
ibuler
a27b43107c
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-12-07 18:59:28 +08:00
ibuler
0c7de50708
perf: 修改 display field
2022-12-07 18:58:57 +08:00
Bai
d252ee41ed
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-12-07 18:38:12 +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
ibuler
6a1c5aba12
perf: 修改一些翻译
2022-12-07 17:24:30 +08:00
ibuler
02a03e1a28
perf: merge i18n
2022-12-07 16:02:18 +08:00
ibuler
da36ce9dfd
perf: merge connect token rdp option
2022-12-07 15:13:32 +08:00
ibuler
dbee3ed30d
feat: connect token 添加 Rdp options
2022-12-07 15:09:01 +08:00
jiangweidong
e7e3b603a9
perf: 清理无用的依赖包
2022-12-07 10:53:54 +08:00
Bai
1cab84bb62
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-12-06 19:54:15 +08:00
Bai
bf5da83008
perf: 修改授权 API Name
2022-12-06 19:53:36 +08:00
Aaron3S
07b3774d3d
feat: 增加运行的内置变量,优化self资源的代码
2022-12-06 19:48:31 +08:00
Aaron3S
d92b198a12
perf: 优化ops代码
2022-12-06 19:48:28 +08:00
Bai
6233e2b3de
perf: Account su_from 返回使用 ObjectRelatedField allow_null allow_empty
2022-12-06 19:41:26 +08:00
Bai
29fd6ee8c9
perf: Account su_from 返回使用 ObjectRelatedField
2022-12-06 18:54:13 +08:00
Bai
c9bf99468c
feat: 添加 command-review API
2022-12-06 18:27:53 +08:00
Bai
71e76e5075
feat: 添加su-from-accountsAPI
2022-12-06 17:43:33 +08:00
“huailei000”
b6afe77bc0
perf: 调整登录页样式
2022-12-06 17:43:08 +08:00
老广
b89720017b
Merge pull request #9162 from jumpserver/pr@dev@feat_clickhouse
...
feat: 增加clickhouse
2022-12-06 17:25:24 +08:00
jiangweidong
803d68f3fe
feat: 增加clickhouse
2022-12-06 17:13:37 +08:00
Jiangjie.Bai
7842e3e5ab
Merge: v3 to dev ( #9160 )
...
* fix: 修改 ConnectionTokenSecretSerializer
* perf: connect token secret (#9155 )
Co-authored-by: feng <1304903146@qq.com >
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com >
* feat: 作业迁移至个人级别
* perf: asset enabled (#9157 )
Co-authored-by: feng <1304903146@qq.com >
* perf: 修改ConnectionTokenSecret Gateway数据结构; 修改Domain Gateway Model方法
* perf: ConnectionTokenSecret 返回 domain 信息
* refactor: 移动 Gateway Model 到 asset 目录下
* refactor: 移动 Gateway Model 单独到 gateway 文件中
* perf: 修改 GatewaySerializer 目录
* perf: 修改 GatewaySerializer 目录
Co-authored-by: fit2bot <68588906+fit2bot@users.noreply.github.com >
Co-authored-by: feng <1304903146@qq.com >
Co-authored-by: Aaron3S <chenyang@fit2cloud.com >
2022-12-06 11:03:14 +08:00
老广
9ef5f17d5e
Merge pull request #9158 from jumpserver/pr@dev@to_v3
...
perf: 修改完冲突了
2022-12-05 19:47:05 +08:00
ibuler
1e669a7edb
perf: 修改 requirements
2022-12-05 19:28:11 +08:00
ibuler
daf279304a
perf: 修改完冲突了
2022-12-05 18:54:12 +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
873afd239e
chore: relove conflict
2022-12-05 13:41:28 +08:00
ibuler
80e550b71a
fix: 修复 supertoken 创建
2022-12-05 13:37:37 +08:00
Bai
1a9f520c1f
Merge to local v3
2022-12-05 13:32:33 +08:00
Bai
cc7424dbfe
perf: 修改 CommandFilterACL, CommandGroup Model 的 Meta 内部类; 修改 Command Model 的 system_user -> account 字段; 修改 ConnectionToken 的 command_filter_acls 返回字段;
2022-12-05 13:27:51 +08:00
ibuler
ca228074e3
perf: 修改 migrations 依赖
2022-12-05 12:58:09 +08:00
ibuler
0047af4584
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-12-05 12:42:39 +08:00
ibuler
38b1701b33
perf: 修改 migrations, 修改 Connect token
2022-12-05 12:42:15 +08:00
feng
03e62b5bc1
perf: asset mini
2022-12-05 11:48:41 +08:00
Aaron3S
74b783f62f
perf: 合并迁移文件
2022-12-05 11:26:14 +08:00
fit2bot
8a7ecda4f6
perf: asset add automation_enabled_info ( #9154 )
...
Co-authored-by: feng <1304903146@qq.com >
2022-12-05 11:21:01 +08:00
ibuler
d25d580ba4
perf: 合并 connect token
2022-12-05 11:06:50 +08:00
ibuler
669ccb502f
perf: 修改 connect token
2022-12-05 10:48:19 +08:00
Bai
0cfcfacb6d
perf: 修改 CommandFilterACL, CommandGroup __str__
2022-12-04 22:46:47 +08:00
Bai
519e0eac01
perf: 修改 CommandGroupSerializer type 字段为 LabeledChoiceField
2022-12-04 20:51:22 +08:00
Bai
70fb00c4ee
perf: 修改命令过滤ACL序列类和部分翻译
2022-12-04 18:48:48 +08:00
Bai
4d9344eb23
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-12-04 18:11:32 +08:00
Bai
229d36abb4
perf: 修改命令过滤 ACL 序列类
2022-12-04 18:01:35 +08:00
Eric
048be1782d
fix: replay file data
2022-12-04 17:39:48 +08:00
Bai
5568c4c5df
perf: 修改 CommandFilterACL Account 只匹配 username 字段
2022-12-04 14:44:30 +08:00
Bai
a69b762f13
fix: 修改 ACL ActionChoices review, accept, reject 引用
2022-12-04 12:08:44 +08:00
Bai
2b5bd558f3
perf: 修改命令过滤相关的Model, CommandFilterACL, CommandGroup; 修改Model QuerySet 相关的方法;
2022-12-04 00:04:39 +08:00
Eric
6480b916d6
perf: parse ssh private key
2022-12-03 15:25:04 +08:00
ibuler
289ecbcc75
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-12-02 20:33:56 +08:00
ibuler
2cf3a21d27
perf: 修改校验权限
2022-12-02 20:33:32 +08:00
fit2bot
156a6c9dc5
perf: gateway test connective ( #9152 )
...
Co-authored-by: feng <1304903146@qq.com >
2022-12-02 20:28:49 +08:00
ibuler
052a4afef6
pref: 暂时修改 key fingerprint
2022-12-02 20:06:56 +08:00
ibuler
fbea1f3480
perf: 修改一些拼写
2022-12-02 19:56:13 +08:00
Bai
a70f85e346
fix: 修改 ConnectionToken Serializer
2022-12-02 18:09:07 +08:00
Bai
52e8082470
fix: 修改 LoginAssetACL 过滤 review
2022-12-02 17:52:51 +08:00
Bai
c832f762a5
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-12-02 17:48:51 +08:00
Bai
c8c5aca355
fix: 修改 ConnectionToken Serializer 命令过滤器
2022-12-02 17:48:44 +08:00
jiangweidong
aa0dabfd10
fix: 删除不用migrations
2022-12-02 17:40:00 +08:00
fit2bot
0e0a9f4654
perf: gateway account ( #9150 )
...
Co-authored-by: feng <1304903146@qq.com >
2022-12-02 17:36:55 +08:00
Aaron3S
2f5e133558
perf: 优化celery任务
2022-12-02 17:18:11 +08:00
Aaron3S
6d0545f04f
perf: 持续优化作业创建
2022-12-02 17:17:05 +08:00
老广
21f91358cf
Merge pull request #9147 from jumpserver/pr@v3@fix_withdraw_acl_unfinished
...
fix: 删除掉连接方式控制半成品代码
2022-12-02 14:57:38 +08:00
ibuler
6c8d64de4e
perf: 修改冲突
2022-12-02 13:16:33 +08:00
ibuler
2d771eedc1
perf: 优化用户授权 api
2022-12-02 13:15:03 +08:00
jiangweidong
faf1dedfe2
fix: 删除掉连接方式控制半成品代码
2022-12-02 13:00:48 +08:00
Bai
563b9f77a6
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-12-02 12:41:05 +08:00
Bai
158d49b230
fix: 修复用户授权的资产 API 支持 id 过滤
2022-12-02 12:40:29 +08:00
ibuler
61e6ab20a2
perf: 修改 Connect acl
2022-12-02 12:27:26 +08:00
ibuler
6390b9c203
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-12-02 11:53:45 +08:00
ibuler
a6aafaec05
perf: 修改 command filter
2022-12-02 11:53:07 +08:00
fit2bot
541358978d
fix: gateway ( #9145 )
...
Co-authored-by: feng <1304903146@qq.com >
2022-12-02 11:45:05 +08:00
ibuler
19c3f98e8f
pref: 修改 migrations 冲突
2022-12-02 11:14:29 +08:00
ibuler
fdbaa0afe1
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-12-02 11:12:25 +08:00
ibuler
a18f544cf8
perf: 修改 acl
2022-12-02 11:12:14 +08:00
老广
1165ea817f
Merge pull request #9035 from jumpserver/pr@v3@feat_db_automations
...
[v3] feat: 支持Oracle、MongoDB、SQLServer数据库自动化操作部分功能
2022-12-02 10:53:29 +08:00
jiangweidong
85aad7ba62
feat: 解决冲突
2022-12-02 10:52:31 +08:00
老广
017a674f63
Merge pull request #9143 from jumpserver/pr@v3@perf_gunicorn
...
perf: 去掉 gunicorn threads
2022-12-02 10:47:16 +08:00
吴小白
709b6e5b0d
perf: 去掉 gunicorn threads
2022-12-02 10:45:12 +08:00
老广
a68e2e29f4
Merge pull request #9110 from jumpserver/dependabot/pip/requirements/pillow-9.3.0
...
build(deps): bump pillow from 9.1.1 to 9.3.0 in /requirements
2022-12-02 10:45:11 +08:00
老广
11a786d858
Merge pull request #9076 from jumpserver/v3_async_ws
...
perf: asyncio ws task log
2022-12-02 10:44:24 +08:00
老广
07f2e66546
Merge pull request #9138 from jumpserver/pr@dev@fix_csrf_403_error
...
fix: 增加CSRF_TRUSTED_ORIGINS参数,解决CSRF报错
2022-12-02 10:40:55 +08:00
老广
a6b1052767
Merge pull request #9139 from jumpserver/pr@v3@perf_gunicorn
...
perf: 控制 gunicorn 启动进程
2022-12-02 10:40:09 +08:00
老广
ab4c8402c3
Merge pull request #9119 from jumpserver/pr@v3@feat_support_clear_private_key
...
feat: 支持账号更新界面清空存在的秘钥信息
2022-12-02 10:35:43 +08:00
老广
bcf509ab07
Merge branch 'v3' into pr@v3@feat_support_clear_private_key
2022-12-02 10:35:20 +08:00
Eric
10e3100d3c
fix: LoginAssetACL confirm action
2022-12-01 22:09:16 +08:00
Bai
2401c241f2
fix: 修改 random_string 方法,支持只生成随机数字
2022-12-01 20:12:51 +08:00
ibuler
1fb0b0849d
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-12-01 19:41:42 +08:00
ibuler
cb3877bbda
perf: 修改 acl 添加命令过滤 acl
2022-12-01 19:41:18 +08:00
feng
fa0382fc5e
perf: gateway manager
2022-12-01 18:22:41 +08:00
吴小白
ce3ec85147
fix: 去掉默认值
2022-12-01 16:22:26 +08:00
吴小白
2bc47c87d1
perf: 修正错误
2022-12-01 16:12:10 +08:00
ibuler
8162a1b17e
perf: 优化 gateway
2022-12-01 15:21:53 +08:00
吴小白
7a475fc029
perf: 控制 gunicorn 启动进程
2022-12-01 14:54:57 +08:00
halo
269c087bac
fix: 增加CSRF_TRUSTED_ORIGINS参数,解决CSRF报错
2022-12-01 13:47:25 +08:00
fit2bot
d1461b33c5
perf: gather account mysql ( #9136 )
...
Co-authored-by: feng <1304903146@qq.com >
2022-12-01 13:12:31 +08:00
Bai
d5d770e4ac
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-12-01 12:03:08 +08:00
Bai
b55b755e8e
fix: 修复 LoginAssetACL Check API 获取 account_username 失败的问题
2022-12-01 12:03:01 +08:00
Bai
592d79c0f8
perf: 合并授权规则用户相关的 API URL,统一使用 /<str:user>/ 格式
2022-12-01 12:02:20 +08:00
feng
26efc42e8b
perf: type to assets
2022-12-01 10:23:04 +08:00
Eric
d198dfcba9
perf: granted asset add specific field
2022-12-01 00:36:02 +08:00
Bai
a430b0f1a9
perf: 优化 Login Asset ACL Serializer reviewers 字段
2022-11-30 23:05:20 +08:00
Bai
3b1c8a2327
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-11-30 21:13:56 +08:00
Bai
2aa1d664a6
perf: 处理 acl filter 逻辑放到 queryset 中
2022-11-30 21:13:50 +08:00
feng
a0df39ad28
fix: 修改connection token 对接client的username
2022-11-30 20:38:22 +08:00
feng
314b63cec8
perf: connection token launch command
2022-11-30 20:21:23 +08:00
fit2bot
edae6942ac
perf: connection token client add protocol ( #9134 )
...
Co-authored-by: feng <1304903146@qq.com >
2022-11-30 20:02:13 +08:00
Eric
142348b055
perf: 增加资产过滤
2022-11-30 18:16:52 +08:00
fit2bot
4083df07cc
perf: audit navigation ( #9133 )
...
Co-authored-by: feng <1304903146@qq.com >
2022-11-30 18:13:15 +08:00
Bai
d524e9885d
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-11-30 17:11:43 +08:00
Bai
2dea891b15
perf: 处理 acl 后台 check 逻辑
2022-11-30 17:11:36 +08:00
吴小白
6bb706efcf
perf: 添加代码构建测试 actions
2022-11-30 17:06:52 +08:00
ibuler
0ffea3855b
perf: 修改 connect token api
2022-11-30 16:39:27 +08:00
ibuler
6f02b239db
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-11-30 16:33:52 +08:00
ibuler
ed77d05bd8
pref: conneect token 支持 su from
2022-11-30 16:33:22 +08:00
Aaron3S
dcbdb0af4d
feat: 支持执行目录切换,修改字段显示
2022-11-30 16:25:31 +08:00
Bai
25b9739ce3
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-11-30 16:24:21 +08:00
Bai
48d2949404
perf: 修改 acl assets name/address
2022-11-30 16:21:27 +08:00
ibuler
307cf97ccb
perf: 授权的资产支持过滤
2022-11-30 15:39:27 +08:00
ibuler
21b1dd076a
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-11-30 15:34:31 +08:00
ibuler
d46f321f1a
perf: 修改连接方式
2022-11-30 15:24:32 +08:00
Bai
99e126f515
perf: 修改 Acl accounts serializer
2022-11-30 15:08:55 +08:00
ibuler
0f1e19ba41
perf: 修改数据库添加 ssl 字段
2022-11-30 11:28:51 +08:00
ibuler
47c405dee5
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-11-29 21:50:59 +08:00
ibuler
4b61790a92
fix: 修复 connect token remote app 错误
2022-11-29 21:50:48 +08:00
ibuler
44ee80b05a
perf: 去掉 connect token endpoint protocol
2022-11-29 21:41:33 +08:00
Aaron3S
82a8118ca0
feat: 增加comment 字段
2022-11-29 19:52:48 +08:00
Aaron3S
d741f14342
feat: merge migrations
2022-11-29 19:47:45 +08:00
Aaron3S
e191a197c6
feat: 完成剩余流程, 修改部分模型
2022-11-29 19:44:42 +08:00
feng
cc5b37350c
perf: domain del nodes
2022-11-29 19:37:11 +08:00
feng
dd207016b2
perf: del domain node
2022-11-29 19:14:12 +08:00
feng
52541d1dad
perf: push dynamic user
2022-11-29 19:05:45 +08:00
ibuler
6593648554
perf: 修改 connect token
2022-11-29 18:36:42 +08:00
Eric
426900145e
perf: connect token asset add specific
2022-11-29 17:08:22 +08:00
fit2bot
d849fd52bd
perf: domian add node ( #9130 )
...
Co-authored-by: feng <1304903146@qq.com >
2022-11-29 17:01:03 +08:00
ibuler
3ac952f735
perf: 修改 connect token 拉起
2022-11-29 15:47:35 +08:00
ibuler
9412c5d42d
perf: 修改 connect token 数据结构
2022-11-29 14:45:29 +08:00
ibuler
0981cd1ed1
perf: 修改 Connect token 数据结构
2022-11-29 14:42:04 +08:00
feng
e4edf3be02
perf: migrate
2022-11-29 09:34:43 +08:00
ibuler
cb76cad6de
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-11-28 22:59:17 +08:00
ibuler
f6bdc7f81c
pref: 暂存 客户端连接方式
2022-11-28 22:58:43 +08:00
feng
3052aa759c
perf: ticket login asset acl
2022-11-28 21:54:20 +08:00
fit2bot
11636dafd8
perf: history account secret perm ( #9128 )
...
Co-authored-by: feng <1304903146@qq.com >
2022-11-28 18:43:58 +08:00
ibuler
742cac1e90
pref: 修改数据库连接方式
2022-11-28 17:57:33 +08:00
feng
d0b9dd457f
perf: navigation date metrics
2022-11-28 16:12:06 +08:00
fit2bot
4f718f9b1f
perf: account template secret api ( #9127 )
...
Co-authored-by: feng <1304903146@qq.com >
2022-11-28 15:54:16 +08:00
Eric
3c5b459ab7
fix: connect token serializer
2022-11-28 15:31:00 +08:00
ibuler
2c26f96e28
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-11-28 15:01:50 +08:00
ibuler
a1d72a1746
pref: 修改 connect token 一些 Url
2022-11-28 15:01:16 +08:00
feng
0212e32ab2
perf: navigation api
2022-11-28 14:53:27 +08:00
feng
0417c6142d
Merge remote-tracking branch 'origin/v3' into v3
2022-11-28 11:48:33 +08:00
fit2bot
072c44974e
perf: navigation page ( #9125 )
...
Co-authored-by: feng <1304903146@qq.com >
2022-11-28 11:47:40 +08:00
feng
7f2267cf13
perf: navigation page
2022-11-28 11:42:03 +08:00
吴小白
1bc4c1aef0
perf: 优化构建
2022-11-28 09:55:55 +08:00
吴小白
b2bb46a51e
perf: 去掉不使用的 8070 端口标识
2022-11-27 20:20:26 +08:00
ibuler
211f560400
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-11-27 18:31:34 +08:00
ibuler
23f3f903f5
perf: 修改 connect token
2022-11-27 18:31:28 +08:00
Bai
61c96baeae
fix: 修复获取UserLoginLog对象org失败的问题
2022-11-27 14:36:16 +08:00
feng
7d0c480a13
Merge remote-tracking branch 'origin/v3' into v3
2022-11-27 12:57:31 +08:00
feng
eec463774a
perf: user login logs
2022-11-27 12:53:38 +08:00
吴小白
392ae18d85
feat: 使用 uvicorn 取代 daphne
2022-11-27 05:56:53 +08:00
feng
0b802b1782
perf: navigation page
2022-11-26 19:20:04 +08:00
Bai
8a3bc51faa
解决 authentication 迁移文件冲突
2022-11-26 09:52:04 +08:00
Aaron3S
2c8f51940a
feat: 修改ops api
2022-11-26 03:13:57 +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
Eric
608e0c9f26
feat: support ed25519 key
2022-11-25 18:06:22 +08:00
fit2bot
276f644794
perf: gateway ( #9121 )
...
Co-authored-by: feng <1304903146@qq.com >
2022-11-24 21:21:25 +08:00
吴小白
2bf9be48be
Merge pull request #9120 from jumpserver/pr@dev@perf_db_ssl_setting
...
perf: 增加DB_USE_SSL配置和redis配置统一
2022-11-24 17:36:23 +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
jiangweidong
69d8dc4bb3
perf: 增加DB_USE_SSL配置和redis配置统一
2022-11-24 16:01:26 +08:00
jiangweidong
2d86c8c843
Merge branch 'v3' of http://github.com/jumpserver/jumpserver into pr@v3@feat_support_clear_private_key
2022-11-24 15:25:17 +08:00
jiangweidong
9e41ad0764
feat: 支持账号更新界面清空存在的秘钥信息
2022-11-24 15:25:09 +08:00
吴小白
3dde2a44e8
Merge pull request #9108 from jumpserver/pr@dev@perf_redis_sentinel_support_ssl
...
perf: 支持sentinel开启ssl(Sentinel和Redis公用一套证书,无额外增加配置项)
2022-11-24 14:44:25 +08:00
feng
da9516608f
Merge remote-tracking branch 'origin/v3' into v3
2022-11-24 10:55:43 +08:00
Aaron3S
d977013dc6
Merge remote-tracking branch 'origin/v3' into v3
2022-11-24 00:52:45 +08:00
Aaron3S
fa948f7327
feat: job 增加组织限制
2022-11-24 00:50:37 +08:00
fit2bot
d44d475cae
perf: gateway ( #9115 )
...
Co-authored-by: feng <1304903146@qq.com >
2022-11-23 18:39:05 +08:00
feng
3d6609ec8c
perf: gateway
2022-11-23 18:36:42 +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
dependabot[bot]
5f4c7e8cf0
build(deps): bump pillow from 9.1.1 to 9.3.0 in /requirements
...
Bumps [pillow](https://github.com/python-pillow/Pillow ) from 9.1.1 to 9.3.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases )
- [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst )
- [Commits](https://github.com/python-pillow/Pillow/compare/9.1.1...9.3.0 )
---
updated-dependencies:
- dependency-name: pillow
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-11-22 11:21:50 +00: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
吴小白
436cb7b6e1
feat: 添加 Dockerfile.loong64
2022-11-22 10:15:55 +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
6febc104de
Merge pull request #9096 from jumpserver/dev
...
v2.28.0
2022-11-17 17:43:44 +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
Jiangjie.Bai
733b95ee99
Merge pull request #9089 from jumpserver/dev
...
v2.28.0-rc5
2022-11-17 14:14:18 +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
b179264127
Merge pull request #9080 from jumpserver/dev
...
v2.28.0-rc4
2022-11-16 21:05:05 +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
吴小白
e8fb6d5380
perf: 配置 apt 镜像
2022-11-16 08:58:16 +08:00
吴小白
e220b8174d
perf: 配置下载路径
2022-11-15 22:18:15 +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
吴小白
ae0ede5f73
Merge branch 'v3' of https://github.com/jumpserver/jumpserver into v3
2022-11-15 17:26:44 +08:00
吴小白
7bfa21260c
perf: 优化 Dockerfile
2022-11-15 17:24:56 +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
Jiangjie.Bai
c18388e27a
Merge pull request #9060 from jumpserver/dev
...
v2.28.0-rc3
2022-11-14 18:02:44 +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
Jiangjie.Bai
52830db500
Merge pull request #9052 from jumpserver/dev
...
v2.28.0-rc2
2022-11-14 09:54:50 +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
Jiangjie.Bai
2324cdc14e
Merge pull request #9040 from jumpserver/dev
...
v2.28.0-rc1
2022-11-10 17:48:40 +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
dependabot[bot]
4ceaba60ed
build(deps): bump django from 3.2.15 to 3.2.16 in /requirements
...
Bumps [django](https://github.com/django/django ) from 3.2.15 to 3.2.16.
- [Release notes](https://github.com/django/django/releases )
- [Commits](https://github.com/django/django/compare/3.2.15...3.2.16 )
---
updated-dependencies:
- dependency-name: django
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-11-04 11:13:51 +08:00
jiangweidong
40b7331ec0
feat: 支持网域网关应用改密-添加依赖
2022-11-04 11:13:07 +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
Jiangjie.Bai
bab4562820
Merge pull request #8980 from jumpserver/dev
...
v2.27.0
2022-10-20 20:39:39 +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
613a7d63b5
Merge pull request #8973 from jumpserver/dev
...
v2.27.0-rc5
2022-10-19 20:30:13 +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
Jiangjie.Bai
129c0e1bf4
Merge pull request #8968 from jumpserver/dev
...
v2.27.0-rc4
2022-10-18 20:48:37 +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
Jiangjie.Bai
384873b4cb
Merge pull request #8964 from jumpserver/dev
...
v2.27.0-rc3
2022-10-18 11:19:59 +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
9e410bb389
Merge pull request #8962 from jumpserver/dev
...
v2.27.0-rc2
2022-10-14 11:00:50 +08:00
吴小白
db2ab1513e
fix: 修正龙芯架构缺失依赖包
2022-10-14 10:59:06 +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
9337463471
Merge pull request #8957 from jumpserver/dev
...
v2.27.0-rc1
2022-10-13 19:03:33 +08:00
Jiangjie.Bai
8fdd89e67c
fix: 修复初始化DB port mapper的逻辑
2022-10-13 19:01:09 +08:00
fit2bot
c7882a615f
perf: 升级依赖 ( #8955 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-10-13 18:24:57 +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
Jiangjie.Bai
e6d50cc8b4
Merge pull request #8951 from jumpserver/dev
...
v2.27.0-rc1
2022-10-13 15:05:53 +08:00
“huailei000”
3bd7410ab8
perf: update jquery
2022-10-13 14:44:36 +08:00
老广
c610ec797f
docs: Change README description
...
Well
2022-10-13 13:55:34 +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
evlic
d1acab3aa9
docs: fix README ambiguity
2022-10-08 15:47:11 +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
吴小白
15363a7f72
perf: 更新缓存规则
2022-09-29 20:21:15 +08:00
吴小白
d573ade525
fix: 修复使用缓存构建
2022-09-29 20:21:15 +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
吴小白
7ac00d5fdf
perf: 多步骤构建
2022-09-29 17:05:20 +08:00
吴小白
2f6c9f8260
perf: 清理不需要的缓存
2022-09-29 17:05:20 +08:00
吴小白
41732d7a7b
perf: 不需要清理缓存
2022-09-29 17:05:20 +08:00
吴小白
28d19fd91f
perf: 构建时使用缓存
2022-09-29 17:05:20 +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
吴小白
1c8ad40565
perf: 优化语言包生成方式
2022-09-28 14:49:07 +08:00
吴小白
78de2a2403
feat: 添加 Dockerfile.loong64
2022-09-28 14:49:07 +08:00
ibuler
cf69caaade
perf: 修改 ansible runner 版本
2022-09-28 14:17:49 +08:00
ibuler
08bc9c7af8
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-09-28 12:11:21 +08:00
ibuler
2a9613d90a
perf: 修改 asset serializer
2022-09-28 12:10:39 +08:00
Jiangjie.Bai
e3b138be3a
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-09-27 16:14:48 +08:00
Jiangjie.Bai
0eccd313ff
fix: 锁定依赖包版本 pyOpenSSL==22.0.0
2022-09-27 16:14:18 +08:00
Jiangjie.Bai
218f917f69
fix: 锁定依赖包版本 pyOpenSSL==22.0.0
2022-09-27 15:47:23 +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
Aaron3S
a7cd0bc0fe
fix: 修复密码后空格的问题
2022-09-26 14:39:15 +08:00
ibuler
00e1dd6996
fix: remote gateway filter address
2022-09-26 11:01:21 +08:00
ibuler
6ed3b51928
perf: 优化 serailizer 统一到 drf 目录中
2022-09-26 10:43:18 +08:00
ibuler
f223cf43cc
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-09-23 19:00:09 +08:00
ibuler
234acd6317
perf: 修改 accounts
2022-09-23 18:59:19 +08:00
Jiangjie.Bai
399c6285f8
feat: 获取 用户、资产授权的所有账号API, 返回@INPUT、@USER等内部账号
2022-09-23 15:59:37 +08:00
Jiangjie.Bai
65b942ffa4
feat: 修改 Permission filter 方法名
2022-09-23 14:45:09 +08:00
ibuler
286d0e4ac1
perf: 修改 migrations
2022-09-23 10:53:44 +08:00
ibuler
3a884388cd
perf: 修改名称
2022-09-23 10:38:28 +08:00
ibuler
8f31a25fda
perf: 优化迁移文件
2022-09-23 10:15:07 +08:00
Jiangjie.Bai
24708a6c5e
feat: 优化 端口范围显示为 30000-30999
2022-09-22 19:23:39 +08:00
Jiangjie.Bai
55a10a8d1d
feat: 优化 DBPortManger 处理 port 的数据类型
2022-09-22 19:23:39 +08:00
Jiangjie.Bai
32b6a1f1a4
feat: 修改翻译信息
2022-09-22 19:23:39 +08:00
Jiangjie.Bai
c1c70849e9
feat: 修改 DBPortMapper 异常处理问题; DBListenPort API 迁移至 terminal app 中
2022-09-22 19:23:39 +08:00
Jiangjie.Bai
7a6ed91f62
feat: 添加翻译信息
2022-09-22 19:23:39 +08:00
Jiangjie.Bai
497a52a509
feat: 修改 DBPortManager 处理逻辑
2022-09-22 19:23:39 +08:00
Jiangjie.Bai
57e12256e7
feat: 修改 Endpoint 获取 Manugs DB listen port 的逻辑
2022-09-22 19:23:39 +08:00
Jiangjie.Bai
b8ec60dea1
feat: 优化 DB Listen Port 映射规则逻辑
2022-09-22 19:23:39 +08:00
Jiangjie.Bai
c9afd94714
feat: 优化 DB Listen Port 映射规则逻辑
2022-09-22 19:23:39 +08:00
Jiangjie.Bai
a0c61ab8cb
feat: 增加 DB Listen Port 映射规则
2022-09-22 19:23:39 +08:00
ibuler
a35e0c5efa
perf: 创建内置 platforms
2022-09-22 16:39:41 +08:00
ibuler
68ed3ac1a8
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-09-22 15:25:12 +08:00
ibuler
cc859f302a
perf: 优化 asset migrations
2022-09-22 15:24:32 +08:00
feng626
33948d614b
perf: ip -> address
2022-09-22 15:14:55 +08:00
ibuler
21a60bf55e
perf: change cateogory data strucature
2022-09-21 20:13:28 +08:00
ibuler
ea1cb158b5
perf: add charset control
2022-09-21 19:03:06 +08:00
feng626
567b62516a
fix: reset ssh url problem
2022-09-21 18:35:06 +08:00
feng626
ffdb3f3b83
perf: ticket
2022-09-21 18:34:51 +08:00
吴小白
404fadd899
fix: 修复 redis 异常后 celery 旧任务不执行的问题
2022-09-21 18:33:35 +08:00
ibuler
ee1ec6aeee
fix: 修复 celery 丢失心跳不会重连的问题
2022-09-21 18:33:35 +08:00
老广
783bddf2c7
perf: remove lgtm action
...
chore: remove lgtm action
2022-09-21 14:34:50 +08:00
ibuler
5ae49295e9
chore: remove lgtm action
2022-09-21 14:32:24 +08:00
老广
8d6d188ac7
perf: update some commit msg
...
perf: download ipdb if not found (maybe without lfs)
2022-09-21 14:29:56 +08:00
ibuler
912ff3df24
perf: download ipdb if not found (maybe without lfs)
2022-09-21 14:28:01 +08:00
ibuler
995d8cadb9
fix: warning after reboot
2022-09-21 14:27:09 +08:00
ibuler
6e5cea49ae
perf: remove unused config
2022-09-21 14:26:05 +08:00
ibuler
a33a452434
chore: add english version secrity info
2022-09-21 14:25:07 +08:00
ibuler
fe2f54fcf6
chore: upgrade GPL to v3
2022-09-21 14:24:25 +08:00
ibuler
1e3154d9b6
pref: add openssh client to dockerfile
2022-09-21 14:23:24 +08:00
ibuler
a1c09591d3
chore: change contributing content
2022-09-21 14:22:31 +08:00
ibuler
d4e0a51a08
perf: set data dir to ignore
2022-09-21 14:21:42 +08:00
ibuler
bba4c15d6d
perf: add ipdb to git lfs
2022-09-21 14:20:48 +08:00
ibuler
3e33c74b64
perf: add .git for ignore
2022-09-21 14:20:03 +08:00
ibuler
556d29360e
pref: add debug tool bar
2022-09-21 14:18:59 +08:00
ibuler
9329a1563c
chore: keep dir git
2022-09-21 14:17:38 +08:00
老广
8bf11c9ade
perf: some commit tips
...
perf: some commit tips
2022-09-21 14:13:12 +08:00
ibuler
bbb802d894
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2022-09-21 14:09:57 +08:00
ibuler
8e7226d9dc
pref: change run_server script
2022-09-21 14:09:28 +08:00
ibuler
2bd889e505
chore: add english readme
2022-09-21 14:07:23 +08:00
ibuler
3dcfd0035a
chore: add code of conduct
2022-09-21 14:06:46 +08:00
ibuler
edfda5825c
chore: keep dir on git
2022-09-21 14:05:47 +08:00
ibuler
3a196f0814
chore: keep log dir on git
2022-09-21 14:05:04 +08:00
ibuler
a4a671afd4
docs: redirect to doc site
2022-09-21 14:04:16 +08:00
ibuler
c337bbff8f
perf: remove old warning msg
2022-09-21 14:02:47 +08:00
ibuler
e498a645d3
perf: 修改文案
2022-09-21 14:01:24 +08:00
ibuler
584ce0afe3
perf: 修改迁移文件
2022-09-21 13:42:12 +08:00
ibuler
1b0195cb82
perf: 修改 asset 结构
2022-09-21 11:17:14 +08:00
ibuler
cf5c50b343
perf: 优化平台协议
2022-09-20 21:19:05 +08:00
ibuler
79ce1215f5
merge: with remote branch
2022-09-20 17:47:40 +08:00
ibuler
d0999dd1ef
perf: 优化平台创建约束
2022-09-20 17:33:15 +08:00
feng626
615f36c6f6
perf: 收集账号
2022-09-20 16:18:23 +08:00
ibuler
8c72bab82d
perf: 优化 account 结构
2022-09-20 13:54:25 +08:00
ibuler
9e84989bbe
merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-09-19 20:12:23 +08:00
ibuler
5d48d1ab15
perf: stash it
2022-09-19 20:11:55 +08:00
feng626
7b4c2ce97e
perf: xpack problem
2022-09-19 19:04:57 +08:00
feng626
108ccf5a8b
perf: 账号管理api
2022-09-19 17:00:03 +08:00
老广
863140e185
Merge pull request #8733 from jumpserver/dependabot/pip/requirements/django-3.2.15
...
build(deps): bump django from 3.2.14 to 3.2.15 in /requirements
2022-09-19 10:14:54 +08:00
老广
ad0d264c2a
Merge pull request #8859 from jumpserver/dependabot/pip/requirements/flower-1.2.0
...
build(deps): bump flower from 1.0.0 to 1.2.0 in /requirements
2022-09-19 10:14:26 +08:00
老广
7f85e503d5
Merge pull request #8870 from QuentinM-Hilbtec/saml_fix
...
Fix issue #8287 with blank SAML's RelayState
2022-09-19 10:13:22 +08:00
ibuler
762d84b5c3
merge: with remote
2022-09-19 09:59:43 +08:00
ibuler
fa28bfc659
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-09-19 09:55:41 +08:00
ibuler
b50d28ff9c
perf: 暂存修改
2022-09-19 09:52:09 +08:00
ibuler
65331e13ac
pref: 优化平台
2022-09-19 00:07:59 +08:00
Quentin Machu
61ff3db0f1
fix: address issue #8287 with blank SAML's RelayState
2022-09-16 13:51:40 -04:00
feng626
389094f615
perf: 账号备份
2022-09-16 17:24:27 +08:00
ibuler
a86d5c1456
perf: 修改 models
2022-09-16 11:45:50 +08:00
ibuler
1d1b252e58
perf: 解决冲突
2022-09-15 21:23:00 +08:00
ibuler
9b2acfe4a4
perf: 优化平台
2022-09-15 21:20:56 +08:00
feng626
a4d0ef3706
perf: verify ansible linux
2022-09-15 21:14:14 +08:00
feng626
139540fafe
perf: 修改change password linux ansible yaml
2022-09-15 19:53:26 +08:00
ibuler
e0e14a2fe1
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-09-15 16:44:29 +08:00
ibuler
9edd786bb4
perf: 修改 platform 表结构
2022-09-15 16:22:01 +08:00
Jiangjie.Bai
fa08517bea
Merge pull request #8868 from jumpserver/dev
...
v2.26.0-rc4
2022-09-15 16:16:51 +08:00
Jiangjie.Bai
f86d045c01
fix: 更新翻译
2022-09-15 16:12:12 +08:00
吴小白
1a7fd58abf
perf: 修复容器重启页面报错
2022-09-15 15:05:01 +08:00
Jiangjie.Bai
572f03d844
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-09-15 10:47:05 +08:00
Jiangjie.Bai
d23446016d
refactor: 添加授权相关的获取资产账号API、Model method
2022-09-15 10:46:57 +08:00
ibuler
37bbf75f66
perf: 修改数据库迁移文件
2022-09-14 20:55:14 +08:00
Jiangjie.Bai
d808256e6a
Merge pull request #8864 from jumpserver/dev
...
v2.26.0-rc3
2022-09-14 20:44:13 +08:00
jiangweidong
305a1b10ed
feat: 补充翻译
2022-09-14 20:43:21 +08:00
fit2bot
8c277e8875
fix: 修复mfa失效日期 失效问题 ( #8862 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-09-14 16:17:51 +08:00
dependabot[bot]
ca965aca9e
build(deps): bump flower from 1.0.0 to 1.2.0 in /requirements
...
Bumps [flower](https://github.com/mher/flower ) from 1.0.0 to 1.2.0.
- [Release notes](https://github.com/mher/flower/releases )
- [Commits](https://github.com/mher/flower/compare/v1.0.0...v1.2.0 )
---
updated-dependencies:
- dependency-name: flower
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-09-13 23:07:48 +00:00
ibuler
ae189ebdfe
perf: 修改 account serializer
2022-09-13 21:18:04 +08:00
ibuler
4fcbdfa3f4
perf: 优化 account 添加 name
2022-09-13 21:07:20 +08:00
Jiangjie.Bai
061b60ef59
Merge pull request #8858 from jumpserver/dev
...
v2.26.0-rc2
2022-09-13 17:40:13 +08:00
fit2bot
c008115888
fix: 修复配置mfa失效日期 失效问题 ( #8856 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-09-13 17:39:09 +08:00
feng626
8d1fb84aaf
perf: 工单新增相关过滤
2022-09-13 17:39:09 +08:00
jiangweidong
43d61b5348
feat: 支持对开启SSL/TLS的MongoDb数据库改密
2022-09-13 17:39:09 +08:00
ibuler
c26a786287
perf: 优化加密,没有rsa则不加密
2022-09-13 17:39:09 +08:00
fit2bot
cb2bd0cf2c
fix: 修复账号备份失败问题 ( #8852 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-09-13 17:39:09 +08:00
jiangweidong
3048e6311b
fix: 修复华为短信配置错误,前端提示不对的问题
2022-09-13 17:39:09 +08:00
fit2bot
5e16b6387a
fix: 修复配置mfa失效日期 失效问题 ( #8856 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-09-13 17:20:09 +08:00
ibuler
c1ad072736
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-09-13 16:39:49 +08:00
Jiangjie.Bai
a2c006f01b
perf: 整理用户授权资产的API
2022-09-13 15:41:39 +08:00
feng626
93e1adf376
perf: 工单新增相关过滤
2022-09-13 15:28:46 +08:00
jiangweidong
556bd3682e
feat: 支持对开启SSL/TLS的MongoDb数据库改密
2022-09-13 15:27:54 +08:00
ibuler
6bbbe312a2
perf: 优化加密,没有rsa则不加密
2022-09-13 15:27:20 +08:00
Jiangjie.Bai
4a21f86cd1
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-09-13 14:23:35 +08:00
ibuler
9a734e7069
perf: 修改结构
2022-09-13 14:06:25 +08:00
ibuler
3e794ec41a
perf: 修改 serializer
2022-09-13 10:41:49 +08:00
ibuler
6bf7f7cb48
perf: 修改 migrations
2022-09-09 19:17:25 +08:00
ibuler
910eaf1228
perf: 修改 web 表结构
2022-09-09 19:07:45 +08:00
fit2bot
1ac64db0ba
fix: 修复账号备份失败问题 ( #8852 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-09-09 16:01:08 +08:00
ibuler
f6fdc258b1
perf: 修改 playbook 目录结构
2022-09-09 15:47:40 +08:00
ibuler
894f153638
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-09-09 11:00:18 +08:00
ibuler
aed7b32d6c
perf: 修改 assets api
2022-09-09 11:00:09 +08:00
Jiangjie.Bai
6f71989553
perf: 下一步整理授权模块所有 API 的继承关系
2022-09-08 20:46:56 +08:00
Jiangjie.Bai
da772b572a
fix: 授权 API 顺序整理
2022-09-08 20:31:57 +08:00
ibuler
25bded69ab
perf: 修改平台和资产
2022-09-08 20:31:04 +08:00
jiangweidong
fa54a98d6c
fix: 修复华为短信配置错误,前端提示不对的问题
2022-09-08 18:55:01 +08:00
Jiangjie.Bai
31de9375e7
Merge pull request #8846 from jumpserver/dev
...
v2.26.0-rc1
2022-09-08 15:43:18 +08:00
halo
697270e3e6
perf: 优化清理任务偶发错误
2022-09-08 15:40:23 +08:00
Jiangjie.Bai
ca6b8ee960
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-09-08 10:43:29 +08:00
ibuler
706488d293
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-09-08 10:04:32 +08:00
ibuler
50cf40eaeb
perf: 完美解决 accounts 创建
2022-09-07 20:24:48 +08:00
ibuler
e9bb5223eb
perf: 修改 platforms
2022-09-07 20:01:04 +08:00
feng626
b910180a12
自动化策略 表
2022-09-07 19:49:42 +08:00
Jiangjie.Bai
746c6e4242
fix: 修改资产、授权创建时的小问题
2022-09-07 18:33:34 +08:00
halo
56c324b04e
perf: utf-8编码忽略报错
2022-09-07 17:50:34 +08:00
Jiangjie.Bai
f633a50f8e
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-09-07 17:36:24 +08:00
Jiangjie.Bai
a27aeca2fd
refactor: 修改授权相关Model,Serializer,API结构
2022-09-07 17:35:23 +08:00
ibuler
56abf0da23
pref: 修改平台协议配置
2022-09-07 17:12:53 +08:00
jiangweidong
984b94c874
perf: 修改数据库应用ssl相关字段名 ( #8840 )
...
* 修改变量名
* 修改变量名
2022-09-07 16:08:37 +08:00
jiangweidong
50df7f1304
perf: 支持连接开启ssl且自签证书的db时
2022-09-07 11:23:18 +08:00
ibuler
585ce6b46a
perf: 修改表结构
2022-09-06 19:57:03 +08:00
dependabot[bot]
7bd7be78a4
build(deps): bump django from 3.2.14 to 3.2.15 in /requirements
...
Bumps [django](https://github.com/django/django ) from 3.2.14 to 3.2.15.
- [Release notes](https://github.com/django/django/releases )
- [Commits](https://github.com/django/django/compare/3.2.14...3.2.15 )
---
updated-dependencies:
- dependency-name: django
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-09-06 07:50:20 +00:00
jiangweidong
8e5833aef0
修改一下顺序
2022-09-06 15:49:36 +08:00
jiangweidong
f20b465ddf
feat: 改密计划支持MongoDB改密
2022-09-06 15:49:36 +08:00
jiangweidong
409d254a2e
feat: 支持MFA可配置华为云平台短信对接
2022-09-06 15:48:33 +08:00
halo
e6d30fa77d
perf: telnet系统工具输出使用utf-8编码
2022-09-06 14:59:16 +08:00
jiangweidong
b25404cac1
feat: 支持OAuth2协议自定义注销功能
2022-09-06 14:58:48 +08:00
feng626
ef4cc5f646
perf: 优化账号备份
2022-09-06 14:40:59 +08:00
ibuler
984b8dfb28
perf: 修改 m2m 日志记录
2022-09-06 13:27:47 +08:00
ibuler
deba0c9057
feat: 支持 py3.9
2022-09-05 20:25:37 +08:00
ibuler
0011823789
perf: 去掉 pymysql, mysqlclie已支持 m1
2022-09-05 20:06:41 +08:00
广宏伟
4276ddc2cc
perf: 修改脚步
2022-09-05 18:50:33 +08:00
ibuler
d9663036f8
perf: revert csrf token project
2022-09-05 13:07:20 +08:00
ibuler
305e9bd0ea
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-09-05 12:49:49 +08:00
ibuler
2354650b82
perf: 暂时去掉 csrf token
2022-09-05 12:47:01 +08:00
feng626
757e688ab3
账号备份优化
2022-09-04 16:33:36 +08:00
ibuler
7ae395f7e8
perf: 修改 metadata
2022-09-01 21:00:04 +08:00
ibuler
81219e1e7c
pref: 添加各种 field
2022-09-01 17:42:48 +08:00
ibuler
d7d9fe2718
perf: 修改 model
2022-09-01 14:46:31 +08:00
ibuler
4947b0d8fd
Merge remote-tracking branch 'origin/v3' into v3
2022-09-01 10:41:23 +08:00
feng626
94f898b55d
login asset acl
2022-09-01 10:37:22 +08:00
ibuler
2ede152663
Merge remote-tracking branch 'origin/v3' into v3
...
# Conflicts:
# apps/assets/api/platform.py
2022-08-31 11:55:30 +08:00
feng626
60eb385c1e
账号过滤
2022-08-31 11:42:20 +08:00
ibuler
728dc43b6c
perf: 修改 fields 支持 display choices
2022-08-31 10:06:16 +08:00
ibuler
ffd08eef74
Merge remote-tracking branch 'origin/v3' into v3
2022-08-30 19:48:10 +08:00
feng626
d5c13df6be
补全资产api
2022-08-30 17:29:54 +08:00
ibuler
8020881e22
Merge remote-tracking branch 'origin/v3' into v3
2022-08-30 16:09:43 +08:00
Jiangjie.Bai
f81805f361
fix: 删除perms application多余文件
2022-08-30 15:43:29 +08:00
ibuler
9e7435f1c0
perf: 解决冲突
2022-08-30 14:15:41 +08:00
ibuler
5c73cb9b4e
perf: 修改 v3
2022-08-30 14:13:33 +08:00
feng626
62f8fac392
修复迁移文件
2022-08-30 14:09:45 +08:00
ibuler
b16e8ef1a5
Merge remote-tracking branch 'origin/v3' into v3
...
# Conflicts:
# apps/tickets/migrations/0018_applyapplicationticket_apply_actions.py
# apps/tickets/migrations/0018_auto_20220728_1125.py
2022-08-30 14:09:42 +08:00
feng626
28541c48f7
修复迁移文件
2022-08-30 14:00:20 +08:00
ibuler
8921dc9ac3
Merge remote-tracking branch 'origin/v3' into v3
2022-08-30 13:33:08 +08:00
feng626
3ee8cdbe88
修复迁移文件
2022-08-30 12:50:01 +08:00
ibuler
585f0c64cd
perf: 修改 v3
2022-08-30 11:56:56 +08:00
ibuler
951d4e4e0d
perf: 合并冲突
2022-08-30 10:07:03 +08:00
ibuler
c950508873
Merge remote-tracking branch 'origin/v3' into v3
2022-08-29 20:11:21 +08:00
feng626
794ec39446
修复备份bug
2022-08-29 19:59:00 +08:00
feng626
ca3d2271a8
merge v3
2022-08-29 19:53:04 +08:00
feng626
3e1c832964
账号备份
2022-08-29 19:49:45 +08:00
ibuler
f35cef7abb
perf: 修改校验方式
2022-08-29 16:19:37 +08:00
ibuler
a0b6849ccb
perf: 优化 platform
2022-08-29 15:50:25 +08:00
ibuler
5358f35c08
perf: 修改 host info
2022-08-29 10:49:53 +08:00
Jiangjie.Bai
f0dc519423
perf: 优化 windows ad帮助链接地址
2022-08-25 15:24:33 +08:00
老广
2cb6da3129
Merge pull request #8811 from jumpserver/pr@dev@perf_customauth
...
perf: 优化 custom 认证模块加载逻辑,判断MD5值,启动时只加载一次
2022-08-25 15:23:08 +08:00
Jiangjie.Bai
1819083a25
perf: 优化 custom 认证模块加载逻辑,判断MD5值,启动时只加载一次
2022-08-25 15:04:45 +08:00
ibuler
b7075b5378
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-08-24 19:34:32 +08:00
ibuler
bb6b9e6f6e
pref: 修改创建 platform
2022-08-24 19:32:49 +08:00
老广
bdeec0d3cb
Merge pull request #8803 from jumpserver/pr@dev@feat_customauthbackend
...
feat: 支持自定义认证 backend;统一其他认证方式的信号触发逻辑;
2022-08-24 18:44:05 +08:00
Jiangjie.Bai
8fc5c4cf9e
feat: 支持自定义认证 backend;统一其他认证方式的信号触发逻辑;通过配置文件控制
2022-08-24 18:41:47 +08:00
Jiangjie.Bai
89051b2c67
feat: 支持自定义认证 backend;统一其他认证方式的信号触发逻辑;
2022-08-24 18:04:22 +08:00
Jiangjie.Bai
9123839b48
feat: 支持自定义认证 backend;统一其他认证方式的信号触发逻辑;
2022-08-24 17:38:17 +08:00
feng626
d441f04a6c
Merge remote-tracking branch 'origin/v3' into v3
2022-08-24 16:39:25 +08:00
feng626
76390d013e
账号模版
2022-08-24 16:36:42 +08:00
ibuler
063c42b94d
perf: 修改 terminal session
2022-08-24 16:14:32 +08:00
老广
258c8a30d1
Merge pull request #8800 from jumpserver/pr@dev@feat_support_piico_gm
...
feat: 支持 piico 设备国密加密
2022-08-24 14:58:24 +08:00
jiangweidong
af75b5269c
ca_cert不做大小限制
2022-08-24 14:51:38 +08:00
jiangweidong
0a66693a41
feat: MongoDB支持连接SSL类型
2022-08-24 14:51:38 +08:00
ibuler
dca1388a67
perf: 修改依赖
2022-08-24 14:23:42 +08:00
Jiangjie.Bai
7151201d58
feat: 支持自定义认证 backend;统一其他认证方式的信号触发逻辑;
2022-08-24 11:41:48 +08:00
ibuler
cd8adc6d3d
perf: 修改 migrations
2022-08-24 10:57:44 +08:00
Aaron3S
51820f23bf
perf: 优化代码表达
2022-08-23 20:19:53 +08:00
ibuler
83bd8b600e
perf: 添加 __init__.py
2022-08-23 19:26:47 +08:00
ibuler
b1c563b309
fix: 修改 perms tasks 引用的 application
2022-08-23 19:15:48 +08:00
Aaron3S
8772cd8c71
feat: 支持 piico 设备国密加密
2022-08-23 17:40:01 +08:00
ibuler
1e57a0eb1f
perf: merge v3
2022-08-23 10:26:43 +08:00
ibuler
ab46194039
perf: 修改 导入
2022-08-23 10:23:48 +08:00
feng626
97c6e2c0b2
修复migrate bug
2022-08-22 18:48:07 +08:00
ibuler
09607a1885
perf: 修改 perms
2022-08-22 18:32:33 +08:00
ibuler
f0c9c2b1ad
perf: 添加生成 platform
2022-08-22 15:23:28 +08:00
ibuler
60cb1f8136
fix: 修复默认 gcm key padding
2022-08-22 14:26:11 +08:00
吴小白
5f1b7ff8f9
fix: 修正任务报错
2022-08-22 14:12:11 +08:00
ibuler
dd0b8e988c
perf: stash it
2022-08-22 13:25:57 +08:00
feng626
a7d193464e
添加 choices 获取 label方法
2022-08-22 11:47:45 +08:00
feng626
fe4df4b179
fix: 修复swagger
2022-08-19 19:01:26 +08:00
feng626
37b150bc04
fix: 表单提交csrftoken问题
2022-08-19 17:22:59 +08:00
吴小白
1432fe1609
fix: 添加 openssh-client 依赖包
2022-08-19 17:13:56 +08:00
Jiangjie.Bai
8ae98887ee
Revert "fix: 修复服务端渲染请求缺少csrf token 问题" ( #8780 )
...
This reverts commit 24a1738e73 .
2022-08-19 14:19:47 +08:00
feng626
24a1738e73
fix: 修复服务端渲染请求缺少csrf token 问题
2022-08-19 10:52:59 +08:00
ibuler
05f913ab18
perf: 修改 platform
2022-08-18 17:58:59 +08:00
Jiangjie.Bai
188c04c9a6
Merge pull request #8776 from jumpserver/dev
...
v2.25.0
2022-08-18 16:12:16 +08:00
ibuler
a9bf4eddea
perf: 修改 migrations
2022-08-18 13:02:10 +08:00
吴小白
bb4da12366
perf: 更新 pypi 镜像
2022-08-18 12:10:41 +08:00
fit2bot
382112ee33
perf: 批量命令搜索优化 ( #8772 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-08-18 11:48:58 +08:00
ibuler
2c3239e238
perf: 修改数据库 migrations
2022-08-18 11:15:17 +08:00
fit2bot
3e69e6840b
fix: oauth2不属于密码认证 ( #8771 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-08-18 10:30:20 +08:00
Jiangjie.Bai
a82ed3e924
Merge pull request #8768 from jumpserver/dev
...
v2.25.0-rc5
2022-08-17 18:57:22 +08:00
fit2bot
b347acd5ec
perf: 替换 mirrors ( #8765 )
...
* perf: 替换 mirrors
* perf: 使用中科大 mirrors
Co-authored-by: 吴小白 <296015668@qq.com >
2022-08-17 18:50:47 +08:00
Jiangjie.Bai
ccd6b01020
fix: 修复开启仅允许已存在用户登录并且是第三方用户认证时报错instance没有id的问题
2022-08-17 18:47:36 +08:00
Jiangjie.Bai
831b67eae4
Merge pull request #8763 from jumpserver/dev
...
v2.25.0-rc4
2022-08-17 16:52:28 +08:00
Jiangjie.Bai
3ab634d88e
fix: 翻译
2022-08-17 16:43:47 +08:00
ibuler
8282a6869a
perf: remove system users
2022-08-17 15:44:59 +08:00
Jiangjie.Bai
867ad94a30
fix: 修改认证重定向地址 scheme 取值逻辑
2022-08-17 15:23:35 +08:00
fit2bot
7d0a19635a
fix: 修复登录符合拒绝时 登录日志类型异常问题 ( #8758 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-08-17 14:45:02 +08:00
ibuler
3f47e63080
perf: remove system user
2022-08-17 11:54:18 +08:00
Jiangjie.Bai
4642804077
Merge pull request #8756 from jumpserver/dev
...
v2.25.0-rc3
2022-08-16 19:07:42 +08:00
fit2bot
d405bae205
fix: 修复认证失败后错误信息总是 IP block 的问题 ( #8755 )
...
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com >
2022-08-16 17:46:17 +08:00
fit2bot
68841d1f15
fix: 配置仅已存在用户登录后 cas用户首次登录报403 ( #8752 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-08-16 17:24:58 +08:00
fit2bot
4cad5affec
fix: 修复工单火狐浏览器上页面展示 ( #8753 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-08-16 17:15:21 +08:00
ibuler
2948d5af7f
perf: 删除一部分 system user
2022-08-16 16:34:16 +08:00
ibuler
b8f8c2a264
perf: remove application permission
2022-08-16 16:05:08 +08:00
ibuler
34c8cfc20a
perf: 迁移 app permission
2022-08-16 15:51:19 +08:00
fit2bot
2f8a07e665
perf: 批量命令新增过滤选项 ( #8749 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-08-16 13:56:19 +08:00
ibuler
85acd4b2ac
perf: 修改 command filter
2022-08-16 11:09:30 +08:00
ibuler
31eadd3dc9
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
...
t po v3# 以 '#' 开始的行将被忽略,而空的提交说明将终止提交。
2022-08-15 18:45:56 +08:00
ibuler
0bf8878228
perf: 添加 token
2022-08-15 18:31:57 +08:00
fit2bot
78133b0c60
fix: 修复后台手机号校验 ( #8747 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-08-15 17:39:54 +08:00
Jiangjie.Bai
88d9078c43
fix: 修改 OAuth2.0 认证的字段的必填项
2022-08-15 16:56:34 +08:00
fit2bot
5559f112db
fix: 用户登录复合500 ( #8743 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-08-15 16:21:27 +08:00
Jiangjie.Bai
9a4b32cb3c
perf: 优化 metadata 类型添加 float
2022-08-15 16:08:56 +08:00
feng626
ddf4b61c9f
fix: 修复全局组织批量删除资产500
2022-08-15 16:08:23 +08:00
feng626
0eaaa7b4f6
fix: 用户异地登陆bug
2022-08-15 10:45:22 +08:00
Jiangjie.Bai
09160fed5d
Merge pull request #8740 from jumpserver/dev
...
v2.25.0-rc2
2022-08-12 18:05:13 +08:00
fit2bot
18af5e8c4a
fix: 【登录日志】登录复核用户被拒绝,登录日志无登录日志记录】 ( #8739 )
...
* fix: 【登录】第三方用户登录复核,拒绝状态,未真正拦截
* fix: 【登录日志】登录复核用户被拒绝,登录日志无登录日志记录】
* fix: 【登录日志】用户设置登录复核,登录。此时不处理工单,管理员全局组织下查看登录日志,日志无限新增,且无记录用户名】
Co-authored-by: huangzhiwen <zhiwen.huang@fit2cloud.com >
2022-08-12 18:01:04 +08:00
fit2bot
1ed388459b
fix: 工单流 全局组织不能更新 ( #8735 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-08-12 14:29:13 +08:00
feng626
a748f5d57d
account template model
2022-08-11 17:39:44 +08:00
feng626
2e944c6898
perf: 修改下载版本号
2022-08-11 16:25:32 +08:00
ibuler
d402ba5d92
perf: 修改资产名称
2022-08-11 15:45:03 +08:00
Jiangjie.Bai
8409523fee
Merge pull request #8728 from jumpserver/dev
...
v2.25.0-rc1
2022-08-11 14:12:23 +08:00
ibuler
4021baf758
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2022-08-11 14:10:01 +08:00
吴小白
16634907b4
perf: ldap 支持客户端证书认证
2022-08-11 14:09:57 +08:00
feng626
cfa5de13ab
feat: 节点树搜索
2022-08-11 14:08:45 +08:00
ibuler
497204d777
perf: account remove protocol
2022-08-11 14:05:45 +08:00
feng626
28c8ec1fab
feat: 添加app 获取对应actions接口
2022-08-10 19:34:29 +08:00
huangzhiwen
a14ebc5f0f
fix: 解决第三方登录无限重定向问题
2022-08-10 19:32:39 +08:00
ibuler
9d4a828c53
perf: 修改平台
2022-08-10 19:27:08 +08:00
Jiangjie.Bai
6af20d298d
perf: 修改翻译
2022-08-10 19:07:22 +08:00
Jiangjie.Bai
795d6e01dc
fix: 修改测试IP地址工具的默认超市时间为 0.5s
2022-08-10 19:07:22 +08:00
Eric
acf8b5798b
perf: 优化rdp文件名的显示
2022-08-10 18:41:38 +08:00
Jiangjie.Bai
839099c97c
perf: 资产授权Model整理
2022-08-10 17:58:30 +08:00
jiangweidong
abcd12f645
perf: 补充cmpp2翻译及部分报错提示 ( #8717 )
...
* 修改CMPPv2.0翻译内容
* perf: 捕捉连接网关出错问题
* perf: 测试短信验证失败提示错误信息
* perf: 修改翻译
2022-08-10 17:32:28 +08:00
fit2bot
30fe5214c7
fix: 增加上了第三方用户登录失败的原因 ( #8714 )
...
* feat: OAuth2.0登录方式加上用户登录规则校验
* fix: 修复第三方用户登录规则(复核)问题
* fix: 增加上了第三方用户登录失败的原因
* fix: 修改变量名称
Co-authored-by: huangzhiwen <zhiwen.huang@fit2cloud.com >
2022-08-10 11:03:51 +08:00
ibuler
1ca0bdf843
perf: 修改 category
2022-08-09 16:53:43 +08:00
jiangweidong
708a87c903
feat: 支持CMPPv2.0协议短信网关 ( #8591 )
...
* feat: 支持CMPPv2.0协议短信网关
* 修改翻译
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com >
2022-08-09 16:09:20 +08:00
ibuler
3011b18eaa
perf: 干掉 applications
2022-08-09 15:42:06 +08:00
huangzhiwen
6a30e0739d
feat: OAuth2.0登录方式加上用户登录规则校验
2022-08-09 11:38:59 +08:00
fit2bot
3951b8b080
fix(auth): 第三方用户(saml2)登录规则设置无效 ( #8648 )
...
* fix: 修复 OpenID、CAS、SAML2登录规则设置无效
* refactor: auth_third_party_required写到一个地方和优化代码结构
* refactor: 优化代码结构
* refactor: 修改变量名称
Co-authored-by: huangzhiwen <zhiwen.huang@fit2cloud.com >
2022-08-09 11:24:28 +08:00
Jiangjie.Bai
05e2f8aaf6
fix: 修改 EncryptMixin get_prep_value 和 默认关闭 XPACK
2022-08-09 10:42:35 +08:00
feng626
a7c82f94cc
perf: 修复接口文档 修复迁移文件
2022-08-08 19:18:45 +08:00
Jiangjie.Bai
c295f1451a
fix: 修复登录失败日志的原因信息
2022-08-08 15:49:03 +08:00
Jiangjie.Bai
c4a94876cc
fix: 增加配置项 SECURE_PROXY_SSL_HEADER request build url 时获取对应的 scheme
2022-08-08 15:00:26 +08:00
ibuler
87df92ea92
perf: 修改脚本
2022-08-08 14:34:57 +08:00
feng626
dcab934d9f
fix: 修复用户自动登录bug
2022-08-08 11:42:45 +08:00
ibuler
11d9a0e9cc
perf: 支持嵌套创建
2022-08-08 11:39:55 +08:00
ibuler
c0cb58c001
perf: 添加 tree api
2022-08-08 10:41:37 +08:00
ibuler
698ea3f2ea
perf: 添加 category node view
2022-08-05 19:11:17 +08:00
ibuler
8dfb8eeb75
perf: 修改权限
2022-08-05 18:31:57 +08:00
ibuler
88d4bf932c
perf: change asset
2022-08-05 16:17:45 +08:00
ibuler
196e38897f
perf: 修改 protcols
2022-08-05 15:46:36 +08:00
fit2bot
4ecb0b760f
perf: 支持配置文件加密 ( #8699 )
...
* crypto
* perf: 暂存一下
* perf: 支持配置文件加密
* perf: 修改位置
* perf: 优化拆分出去
* stash
* perf: js 强制 key 最大 16
* pref: 修改语法
* fix: 修复启用 gm 后,又关闭导致的用户无法登录
Co-authored-by: ibuler <ibuler@qq.com >
2022-08-05 14:53:23 +08:00
fit2bot
b27b02eb9d
feat: Cloud 支持局域网 IP 扫描 ( #8589 )
...
* feat: Cloud 支持局域网 IP 扫描
* feat: Cloud 支持局域网 IP 扫描
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com >
2022-08-05 14:45:25 +08:00
Jiangjie.Bai
70cf847cd9
perf: update readme
2022-08-04 18:33:14 +08:00
jiangweidong
2099baaaff
feat: 认证方式支持OAuth2.0协议 ( #8686 )
...
* feat: 认证方式支持OAuth2.0协议
* perf: 优化 OAuth2 认证逻辑和Logo (对接 Github)
* perf: 优化 OAuth2 认证逻辑和Logo,支持上传图标
* perf: 优化 OAuth2 认证逻辑和Logo,支持上传图标
* perf: 优化 OAuth2 认证逻辑和Logo,支持上传图标
* perf: 优化 OAuth2 认证逻辑和Logo,支持上传图标
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com >
2022-08-04 14:40:33 +08:00
ibuler
6c57db0897
stash it
2022-08-04 10:44:11 +08:00
ibuler
d43acd8612
perf: v3
2022-08-03 16:21:34 +08:00
ibuler
65423ea893
perf: 优化migrations
2022-08-03 15:58:06 +08:00
ibuler
b22aed0cc3
feat: 用户密码 hash 采用 gmsm3
2022-08-03 15:05:22 +08:00
“huailei000”
3e7f83d44e
fix:修复忘记密码页布局错位问题
2022-08-02 16:42:55 +08:00
Jiangjie.Bai
40f8b99242
fix: 修复更新资产账号不成功的问题(末尾:)
2022-08-02 16:42:25 +08:00
Jiangjie.Bai
9ff345747b
fix: 修复系统平台不能导入的问题
2022-08-02 14:55:32 +08:00
Jiangjie.Bai
9319c4748c
perf: 修改用户登录 ACL 翻译信息
2022-08-02 14:54:09 +08:00
老广
e8b4ee5c40
Update README.md
2022-07-29 14:24:08 +08:00
fit2bot
429e838973
perf: 优化用户登录ACL根据规则优先级进行匹配 ( #8672 )
...
* perf: 优化用户登录ACL根据规则优先级进行匹配
* perf: 修改冲突
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com >
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com >
2022-07-29 11:37:16 +08:00
fit2bot
ee1aff243c
feat: 新增ping、telnet系统工具 ( #8666 )
...
* feat: 新增ping、telnet系统工具
* perf: 消息返回
Co-authored-by: halo <wuyihuangw@gmail.com >
2022-07-29 10:02:23 +08:00
ibuler
109db8886b
perf: 还原回 model
2022-07-28 19:27:42 +08:00
ibuler
0dc3d43ee5
perf: 修改系统用户
2022-07-28 19:12:27 +08:00
ibuler
fb0fb71ea3
perf: 修改系统用户
2022-07-28 18:50:58 +08:00
fit2bot
ea7133dea0
fix: translate ( #8664 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-07-28 13:47:32 +08:00
ibuler
43d3791ddc
stash
2022-07-27 16:51:39 +08:00
jiangweidong
e7229963bf
perf: 更换oracle依赖包
2022-07-27 13:42:14 +08:00
feng626
0f7b41d177
fix: super ticket close bug
2022-07-26 18:34:35 +08:00
fit2bot
c4146744e5
perf: 优化授权过期提醒 ( #8654 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-07-25 14:02:07 +08:00
fit2bot
dc32224294
feat: 应用工单支持选择动作 ( #8651 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-07-22 16:24:57 +08:00
fit2bot
d07a230ba6
feat: 添加默认工单授权时间 ( #8649 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-07-22 15:23:16 +08:00
Jiangjie.Bai
f52a0ce960
Merge pull request #8645 from jumpserver/dev
...
v2.24.0
2022-07-21 15:40:57 +08:00
ibuler
9d17f27fb3
fix: 修复密码可能解密失败报错
2022-07-21 15:37:32 +08:00
feng626
36d0b8d085
fix: 组件角色绑定错误
2022-07-21 15:37:06 +08:00
fit2bot
046356728a
perf: sso token 最小60秒 ( #8642 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-07-21 13:51:15 +08:00
Jiangjie.Bai
d34c4fb7ec
Merge pull request #8640 from jumpserver/dev
...
v2.24.0-rc5
2022-07-20 19:07:18 +08:00
Jiangjie.Bai
ca49029d8f
fix: 锁定依赖 keystoneauth1==3.4.0
2022-07-20 17:22:22 +08:00
ibuler
12036f8c96
perf: 修改 django 版本
2022-07-20 17:01:06 +08:00
ibuler
d176ccde4b
perf: stash
2022-07-20 16:52:01 +08:00
Jiangjie.Bai
60e455bea2
fix: 修改theme_info默认值为{}
2022-07-20 16:13:20 +08:00
fit2bot
e7dd731139
fix: 授权过期url 404 -> /console/ ( #8634 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-07-20 15:44:00 +08:00
Jiangjie.Bai
88ae8ac67a
fix: 会话列表修改翻译为终端ID
2022-07-20 13:54:43 +08:00
feng626
626b6da9c4
fix cmd为空时bug
2022-07-20 13:43:04 +08:00
fit2bot
cb8690dd63
fix: 处理组件获取connection token获取不到的问题 ( #8629 )
...
* fix: 处理组件获取connection token获取不到的问题
* fix: ViewSet 显示获取资源用户
* fix: ViewSet 显示获取资源用户
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com >
2022-07-20 13:23:43 +08:00
ibuler
2b2aa8f072
perf: 优化 换行
2022-07-20 13:19:39 +08:00
ibuler
772e540527
perf: 修改 connect token 换行
2022-07-20 13:19:39 +08:00
ibuler
ca5f6f3c6f
perf: 修改 windows ansible shell
2022-07-20 13:17:45 +08:00
ibuler
c9becca633
stash
2022-07-20 12:56:41 +08:00
Jiangjie.Bai
29656b1630
fix: 修改获取 rdp-file / client-url / smart-endpoint 时endpoint host后台处理为当前请求的host
2022-07-19 19:05:15 +08:00
吴小白
bdf59da0f6
Merge pull request #8625 from jumpserver/pr@dev@fix_perms_asset-user-permission
...
fix: 管理员与用户资产列表排序不统一
2022-07-19 18:06:40 +08:00
Jiangjie.Bai
7b6eeb2e3d
fix: 清除 ftp 日志
2022-07-19 17:57:09 +08:00
huangzhiwen
fed0732c1e
fix: 管理员与用户资产列表排序不统一
2022-07-19 17:28:10 +08:00
Jiangjie.Bai
c12efffcc9
Merge pull request #8622 from jumpserver/dev
...
v2.24.0-rc4
2022-07-19 16:25:32 +08:00
feng626
358460e7f0
fix: 如配置SECURITY_VIEW_AUTH_NEED_MFA 跳过校验
2022-07-19 16:24:55 +08:00
Jiangjie.Bai
6319be0ea3
Merge pull request #8620 from jumpserver/dev
...
v2.24.0-rc4
2022-07-19 16:12:08 +08:00
fit2bot
cc2b858769
fix: 修复获取令牌信息的remote app资产信息 ( #8619 )
...
* fix: 修复连接令牌只获取自己的令牌信息;修复连接令牌系统用户角色权限问题(普通用户看不到);
* fix: 修复获取令牌信息的remote app资产信息
* fix: 修复获取用户个人信息时使用连接令牌
* fix: 修复获取profile时的连接令牌问题
* fix: 修复连接令牌问题
* fix: 修复连接令牌问题
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com >
2022-07-19 15:57:02 +08:00
fit2bot
585ddeb25b
fix: 授权过期天数修改 ( #8618 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-07-19 11:15:56 +08:00
fit2bot
0eab83f73b
fix: 修改翻译 ( #8616 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-07-19 10:49:15 +08:00
fit2bot
62d403bf21
fix: reverse console ( #8615 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-07-18 19:24:17 +08:00
ibuler
bb9d32dc18
perf: 修改所有组织名称
2022-07-18 14:31:50 +08:00
fit2bot
e09383ecf4
fix: django 3.1.14 ( #8613 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-07-18 13:24:31 +08:00
Jiangjie.Bai
4d7f8ffc71
Merge pull request #8610 from jumpserver/dev
...
v2.24.0-rc3
2022-07-18 12:02:23 +08:00
fit2bot
af5295d30e
fix: django 还原 ( #8609 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-07-18 11:53:47 +08:00
feng626
5055d140fd
fix: 修复host为空情况
2022-07-18 11:32:38 +08:00
Eric
2ca72a4bff
fix: 修复未选择用户,无法创建共享会话的问题
2022-07-18 11:32:06 +08:00
Eric
de61e780e3
fix: 修复错误提示的翻译问题
2022-07-18 11:31:02 +08:00
ibuler
b961d1f9ee
perf: 修改 accounts
2022-07-18 11:12:21 +08:00
ibuler
93a89509d6
perf: merge with dev
2022-07-17 14:28:55 +08:00
halo
e1b3851be3
perf: 优化资产节点搜索,查询全路径
2022-07-17 14:18:20 +08:00
ibuler
fd94713583
Merge branch 'dev' into pr@dev@refactor_system_user_account
2022-07-17 14:17:18 +08:00
ibuler
8b188f020d
perf: 修改备注
2022-07-17 14:17:16 +08:00
ibuler
008b18eced
perf: 修改为账号模版
2022-07-17 13:57:13 +08:00
ibuler
0d46834fbf
pref: 修改暂存
2022-07-15 18:57:52 +08:00
Jiangjie.Bai
c665b0dbae
Merge pull request #8603 from jumpserver/dev
...
v2.24.0-rc2
2022-07-15 18:07:09 +08:00
huangzhiwen
0eaca0c1cb
fix: 解决mac m1 pip install pymssql报错问题
2022-07-15 18:06:34 +08:00
fit2cloud
8824b6b54e
fix: 解决pip不能安装psycopg2-binary和pymssql问题
2022-07-15 18:06:34 +08:00
ibuler
29c9c6d680
perf: 优化 accounts
2022-07-15 18:03:32 +08:00
fit2bot
4fd82b9946
fix: 修改翻译 ( #8602 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-07-15 17:17:56 +08:00
feng626
1b1b70e7bd
fix: 处理应用账号脏数据
2022-07-15 17:03:26 +08:00
Jiangjie.Bai
41541a91b9
fix: 修复 public 和 smart API 权限包含 connection token
2022-07-15 15:01:20 +08:00
fit2bot
93537c07a1
fix: 修复工单授权组织问题 ( #8599 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-07-15 11:38:50 +08:00
Jiangjie.Bai
a770a19252
Merge pull request #8595 from jumpserver/dev
...
v2.24.0-rc1
2022-07-14 17:44:33 +08:00
Jiangjie.Bai
395636296d
fix: 修改连接token secret长度为16
2022-07-14 17:43:57 +08:00
fit2bot
9967d52416
perf: 暂时去掉历史账号权限 ( #8594 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-07-14 15:37:00 +08:00
Jiangjie.Bai
717f97cd88
Merge pull request #8592 from jumpserver/dev
...
v2.24.0-rc1
2022-07-14 14:40:03 +08:00
Jiangjie.Bai
dec8e3459a
feat: 添加 Oracle 数据库 version 迁移文件默认 12c 版本
...
feat: 添加 Oracle 数据库 version 迁移文件默认 12c 版本
2022-07-14 11:18:26 +08:00
ibuler
d3c67d2f04
perf: 暂存一下
2022-07-14 10:56:09 +08:00
fit2bot
4a3d7a8524
perf: history account model queryset ( #8588 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-07-13 17:13:02 +08:00
fit2bot
f758414844
fix: 审批时 来着不同组织的资产校验 ( #8586 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-07-13 16:54:44 +08:00
dependabot[bot]
af080fe38d
build(deps): bump django from 3.2.13 to 3.2.14 in /requirements
...
Bumps [django](https://github.com/django/django ) from 3.2.13 to 3.2.14.
- [Release notes](https://github.com/django/django/releases )
- [Commits](https://github.com/django/django/compare/3.2.13...3.2.14 )
---
updated-dependencies:
- dependency-name: django
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-07-13 16:51:22 +08:00
ibuler
dac0b44b99
perf: 优化重构
2022-07-13 16:36:49 +08:00
ibuler
f0fbc73f73
perf: 工作台支持 root
2022-07-13 16:31:35 +08:00
fit2bot
ce2f6fdc84
feat: Endpoint 支持 oracle 版本 ( #8585 )
...
* feat: Endpoint 支持 oracle 版本
* feat: Endpoint 支持 oracle 版本
* feat: Endpoint 支持 oracle 版本
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com >
2022-07-13 16:29:05 +08:00
fit2bot
2abca39597
fix: ticket bug ( #8584 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-07-13 15:48:55 +08:00
fit2bot
11e538d417
fix: 工单三方审批不支持修改资产 ( #8582 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-07-13 11:31:53 +08:00
fit2bot
5155b3c184
fix: 修复bluk_create root 组织下判断 ( #8581 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-07-13 11:00:12 +08:00
feng626
e724cdf53d
fix: OrgManager add bulk_create method
2022-07-13 10:47:12 +08:00
halo
191d37dd56
feat: 支持session存储方式可配置,可选cache或db
2022-07-13 10:21:20 +08:00
Jiangjie.Bai
602192696c
feat: 添加翻译信息
2022-07-12 18:31:18 +08:00
Jiangjie.Bai
b262643f0a
fix: 连接令牌添加 expire_time 和 is_valid 字段
2022-07-12 18:29:48 +08:00
fit2bot
cd119a2999
fix: 飞书登录登录日志不记录认证方式 ( #8574 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-07-12 17:36:40 +08:00
fit2bot
d789810984
fix: condirm ( #8572 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-07-12 16:02:41 +08:00
fit2bot
b5cfc6831b
feat: 工单支持审批时修改资产 ( #8549 )
...
Co-authored-by: feng626 <1304903146@qq.com >
Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com >
2022-07-12 15:28:42 +08:00
Jiangjie.Bai
b64727e04c
fix: 修改用户自更新失败的问题
2022-07-12 14:22:07 +08:00
fit2bot
c7c0374c78
perf: 修改主题 ( #8569 )
...
* perf: 优化登录 backend
* perf: 修改主题
Co-authored-by: ibuler <ibuler@qq.com >
2022-07-12 13:45:48 +08:00
ibuler
e89765a9ad
refactor: 重构系统用户
2022-07-12 10:54:23 +08:00
Jiangjie.Bai
f3cf071362
feat: 修改connection token secret不显示
2022-07-11 19:37:55 +08:00
fit2bot
27cbbfbc79
refactor: 重构 Connection Token 模块 (完成获取 Super connection token API 逻辑) ( #8559 )
...
* refactor: 重构 Connection Token 模块 (完成 Model 设计和创建 Token 的API逻辑)
* refactor: 重构 Connection Token 模块 (完成获取 Token 详细信息的 API 逻辑)
* refactor: 重构 Connection Token 模块 (完成获取 RDP 文件 API 逻辑)
* refactor: 重构 Connection Token 模块 (完成获取 Client url API 逻辑)
* refactor: 重构 Connection Token 模块 (完成获取 Super connection token API 逻辑)
* refactor: 重构 Connection Token 模块 (完成删除原 Connection token 逻辑)
* refactor: 重构 Connection Token 模块 (完成删除原 Connection)
* refactor: 重构 Connection Token 模块 (完善序列类字段)
* refactor: 重构 Connection Token 模块 (完善expire API)
* refactor: 重构 Connection Token 模块 (完善迁移文件)
* refactor: 重构 Connection Token 模块 (完善翻译文件)
* refactor: 重构 Connection Token 模块 (拆分Connection ViewSet)
* refactor: 重构 Connection Token 模块 (修改翻译)
* refactor: 重构 Connection Token 模块 (优化)
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com >
2022-07-11 18:09:06 +08:00
feng626
7047e445a3
feat: 下载页面添加离线播放器
2022-07-11 17:21:07 +08:00
fit2bot
06375110b9
fix: 修改mfa check 判断 ( #8561 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-07-11 10:48:01 +08:00
Jiangjie.Bai
0e6dbb3e5d
fix: 修复 ES 存储 config 被修改的问题
2022-07-08 11:00:22 +08:00
fit2bot
bf7c05f753
fix: 调整confirm ( #8554 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-07-07 17:07:57 +08:00
Jiangjie.Bai
1b4d389f2b
fix: 修复创建共享会话链接时 created_by 字段长度问题
2022-07-07 15:44:07 +08:00
fit2bot
0f11ca9c37
perf: 修改翻译 ( #8543 )
...
* perf: 修改翻译
* perf: 优化 flash msg page
* perf: 修改 i18n
* perf: 修改 i18n
Co-authored-by: ibuler <ibuler@qq.com >
2022-07-06 17:26:09 +08:00
ibuler
4537e30e4a
perf: 修改颜色
2022-07-05 20:28:42 +08:00
dependabot[bot]
2f71ee71b9
build(deps): bump django from 3.2.12 to 3.2.13 in /requirements
...
Bumps [django](https://github.com/django/django ) from 3.2.12 to 3.2.13.
- [Release notes](https://github.com/django/django/releases )
- [Commits](https://github.com/django/django/compare/3.2.12...3.2.13 )
---
updated-dependencies:
- dependency-name: django
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-07-05 20:28:20 +08:00
ibuler
98644eeb61
perf: 修改 logo
2022-07-05 20:07:24 +08:00
fit2bot
001e5d857f
pref: debug toolbar 太费时间 先禁用 ( #8528 )
...
* perf: 修改主题色
* pref: debug toolbar 太费时间 先禁用
* perf: 修改颜色
* perf: 优化 interface
* perf: 修改 avartar
* perf: css color
Co-authored-by: ibuler <ibuler@qq.com >
2022-07-05 14:43:56 +08:00
Jiangjie.Bai
bbcf992531
feat: 添加 OmniDB Enabled 控制
...
feat: 添加 OmniDB Enabled 控制
2022-07-05 11:12:37 +08:00
fit2bot
75aacd0da6
fix: 用户登录错误处理bug ( #8531 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-07-05 11:08:35 +08:00
fit2bot
0aad0b7279
feat: 账号历史信息 ( #8500 )
...
* feat: 账号历史信息
* del app
Co-authored-by: feng626 <1304903146@qq.com >
2022-07-04 18:54:47 +08:00
fit2bot
8ebcb4b73a
fix: translate ( #8529 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-07-04 15:14:59 +08:00
fit2bot
88f60b58dd
fix: 修复翻译 ( #8527 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-07-04 14:57:45 +08:00
fit2bot
a6cc8a8b05
perf: 优化confirm接口 ( #8451 )
...
* perf: 优化confirm接口
* perf: 修改 校验
* perf: 优化 confirm API 逻辑
* Delete django.po
Co-authored-by: feng626 <1304903146@qq.com >
Co-authored-by: ibuler <ibuler@qq.com >
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com >
Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com >
2022-07-04 11:29:39 +08:00
halo
ca19e45905
perf: 优化截取方法
2022-07-04 11:00:41 +08:00
halo
c5bf4075e7
perf: 优化截取方法
2022-07-04 11:00:41 +08:00
halo
04ceca1b83
perf: 修复命令表系统用户字段长度问题,截取成64字符
2022-07-04 11:00:41 +08:00
Jiangjie.Bai
90228e69e0
perf: 会话列表显示终端名称;修复启动 warning 问题
2022-07-01 19:21:13 +08:00
Jiangjie.Bai
62a2a74c27
perf: 会话列表显示终端名称;修复启动 warning 问题
2022-07-01 19:21:13 +08:00
fit2bot
927ae43af2
perf: 优化工单 ( #8524 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-07-01 19:07:55 +08:00
feng626
272f64d743
fix: get_target_ip bug
2022-07-01 14:16:54 +08:00
feng626
af2d927c1f
perf: del pandas
2022-06-30 20:20:09 +08:00
Jiangjie.Bai
011e9ffec4
fix: 修复导入导出文件时对于bool类型字段的判断问题
2022-06-30 18:28:07 +08:00
Jiangjie.Bai
8e65975cd7
fix: 修改会话共享可以指定用户的一些问题
2022-06-30 14:22:40 +08:00
fit2bot
9465138faf
fix: 修复工单迁移文件 ( #8513 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-06-30 11:44:54 +08:00
fit2bot
081089d636
fix: 修复工单命令复合迁移问题 ( #8512 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-06-30 11:23:53 +08:00
jiangweidong
5d80933e7b
feat: 会话分享可设置1、5分钟时限,且可分享给指定人 ( #8227 )
...
* perf: 完成会话分享可设置1、5分钟时限,且可分享给指定人
* perf: 完成会话分享可设置1、5分钟时限,且可分享给指定人
* perf: 完成会话分享可设置1、5分钟时限,且可分享给指定人
* feat: 完成会话分享可设置1、5分钟时限,且可分享给指定人
2022-06-30 11:21:26 +08:00
fit2bot
067a90ff9a
fix: 修复工单数据库命令复合bug ( #8511 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-06-30 11:17:12 +08:00
Jiangjie.Bai
05826abf9d
feat: Endpoint 支持标签匹配
...
feat: Endpoint 支持标签匹配
feat: Endpoint 支持标签匹配
feat: Endpoint 支持标签匹配
feat: Endpoint 添加帮助信息
feat: Endpoint 添加帮助信息
2022-06-29 18:50:27 +08:00
Jiangjie.Bai
e8363ddff8
perf: 优化 BASE_SITE_URL OIDC 可以为空,实现多个不同端点访问时回调为当前访问的地址
2022-06-29 18:46:05 +08:00
fit2bot
de41747bb2
perf: 添加 debug tool bar ( #8504 )
...
* perf: 添加 debug tool bar
* perf: 修改 config name
Co-authored-by: ibuler <ibuler@qq.com >
2022-06-29 14:48:54 +08:00
ibuler
77067f18d5
stash tdsql
...
pref: 测试完成
perf: 修改支持 tdsql 5.7
revert: 欢迎之前的内容
revert: some
perf: 修改 tdsql
pref: 修改 。
2022-06-28 18:05:20 +08:00
fit2bot
3cbce63c54
perf: 拆分登录 View ( #8502 )
...
* perf: 拆分登录 View
* perf: 修改 code
Co-authored-by: ibuler <ibuler@qq.com >
2022-06-28 17:39:13 +08:00
fit2bot
c3c99cc5e8
perf: 优化 redis ( #8484 )
...
* perf: 优化 redis
* perf: 优化 redis 时间
* perf: 优化时间
* perf: 修改 ssl
* perf: 修改 ssl
* perf: 修改 ssl name
* perf: 修改名称
Co-authored-by: ibuler <ibuler@qq.com >
2022-06-28 17:23:20 +08:00
fit2bot
b33e376c90
fix: 解决一些工单已知问题 ( #8501 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-06-28 17:19:33 +08:00
ibuler
b619ebf423
perf: 修改 jumpserver 版本号,避免缓存
2022-06-28 10:49:02 +08:00
ibuler
b784d8ba87
fix: 升级依赖库版本,解决生成 key 时的内存泄露
2022-06-27 19:11:43 +08:00
fit2bot
fd7f73a18e
fix: 修复工单权限问题 ( #8493 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-06-27 14:02:28 +08:00
fit2bot
8247f24d3f
fix: 修复工单bug ( #8488 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-06-27 10:15:29 +08:00
ibuler
3749a0c6a1
perf: 修复 middleware 导致的内存增长
2022-06-25 10:34:18 +08:00
Jiangjie.Bai
fd41fd78cf
fix: 修改 private_key 的序列类长度为 16384
2022-06-24 19:24:21 +08:00
ibuler
8c31e8e634
perf: 修改 sdk 版本
2022-06-23 19:18:15 +08:00
feng626
648fabbe03
fix: 修复工单迁移文件
2022-06-23 19:15:57 +08:00
feng626
9388f37c39
fix: ticket bug
2022-06-23 18:35:53 +08:00
feng626
b264db3e7e
fix: 修复工单迁移文件
2022-06-23 17:45:34 +08:00
ibuler
dbc5b7bdc3
perf: 升级 tencent sdk
2022-06-23 17:29:12 +08:00
ibuler
ac20bc05ba
perf: 优化 css
2022-06-23 15:55:33 +08:00
fit2bot
7e2f81a418
perf: 重构 ticket ( #8281 )
...
* perf: 重构 ticket
* perf: 优化 tickets
* perf: 暂存
* perf: 建立 ticket model
* perf: 暂存一下
* perf: 修改 tickets
* perf: 修改 import
* perf: 修改model
* perf: 暂存一波
* perf: 修改...
* del process_map field
* 工单重构
* 资产 应用对接前端
* perf: 修改 ticket
* fix: bug
* 修改迁移文件
* 添加其他api
* 去掉process_map
* perf: 优化去掉 signal
* perf: 修改这里
* 修改一点
* perf: 修改工单
* perf: 修改状态
* perf: 修改工单流转
* step 状态切换
* perf: 修改 ticket open
* perf: 修改流程
* perf: stash it
* 改又改
* stash it
* perf: stash
* stash
* migrate
* perf migrate
* 调整一下
* 修复bug
* 修改一点
* 修改一点
* 优化一波
* perf: ticket migrations
Co-authored-by: ibuler <ibuler@qq.com >
Co-authored-by: feng626 <1304903146@qq.com >
2022-06-23 13:52:28 +08:00
Jiangjie.Bai
2471787277
Merge pull request #8457 from jumpserver/pr@dev@perf_redis
...
perf: redis AND login page
2022-06-23 10:39:22 +08:00
ibuler
e6abdbdadc
perf: 修改 req version
2022-06-22 18:17:57 +08:00
Jiangjie.Bai
5ed65ca2ff
fix: 修复post方法调用AuthBook接口时500的问题
2022-06-22 17:11:35 +08:00
ibuler
ba6b1bf692
perf: 修改翻译
2022-06-22 14:30:52 +08:00
ibuler
1aa58e1486
perf: 修改 ignore
2022-06-21 19:25:56 +08:00
ibuler
fa51465485
perf: 修改去掉 导入 certs
2022-06-21 19:23:29 +08:00
ibuler
8f59bb2a48
perf: 优化登陆
2022-06-21 19:06:06 +08:00
ibuler
2366da1485
perf: redis AND login page
2022-06-21 18:43:48 +08:00
ibuler
f1a22575d3
perf: 优化登录页面
2022-06-21 16:18:13 +08:00
ibuler
7c1882bb53
perf: login
2022-06-21 10:08:14 +08:00
ibuler
97baeebb2a
perf: 修改 redis scan counter
2022-06-20 19:40:07 +08:00
ibuler
8b819f3779
perf: 优化登录
2022-06-20 19:22:48 +08:00
Jiangjie.Bai
d1420de4c2
fix: 修复es类型的命令存储更新忽略证书字段不成功的问题
2022-06-20 14:47:30 +08:00
ibuler
379c7198da
pref: 去掉 django-redis-cache 依赖
2022-06-20 14:11:59 +08:00
Eric
710cd0fb3b
fix:修复es日期索引忽略证书的问题
2022-06-20 14:06:56 +08:00
Jiangjie.Bai
3fde31f2e0
fix: 修复工单自定义搜索时500的问题
2022-06-17 15:26:23 +08:00
Jiangjie.Bai
d3355ab0ec
Merge pull request #8427 from jumpserver/dev
...
v2.23.0 rc6
2022-06-16 18:12:44 +08:00
Jiangjie.Bai
81598a5264
perf: 推送系统用户用户名提示信息
2022-06-16 18:04:03 +08:00
feng626
298f6ba41d
fix: 修改翻译
2022-06-16 18:03:16 +08:00
feng626
8e43e9ee2b
fix: 授权过期通知
2022-06-16 17:52:33 +08:00
Jiangjie.Bai
adc8a8f7d3
fix: 修改翻译
2022-06-16 17:10:21 +08:00
Jiangjie.Bai
1e3da50979
fix: 修复会话加入记录更新失败的问题
2022-06-16 16:50:51 +08:00
Jiangjie.Bai
7ac385d64c
Merge pull request #8420 from jumpserver/dev
...
v2.23.0 rc5
2022-06-16 15:46:40 +08:00
Jiangjie.Bai
2be74c4b84
fix: 修复命令列表模糊搜索报错500的问题
...
fix: 修复命令列表模糊搜索报错500的问题
2022-06-16 13:45:24 +08:00
ibuler
e2f199606e
stash it
2022-06-16 11:32:36 +08:00
feng626
75a72fb182
fix: user confirm bug
2022-06-16 11:31:27 +08:00
Jiangjie.Bai
4c2274b14e
fix: 修改翻译
2022-06-16 11:19:26 +08:00
feng626
a024f26768
fix: 授权过期消息提示
2022-06-16 11:19:26 +08:00
Jiangjie.Bai
2898c35970
Merge pull request #8411 from jumpserver/dev
...
v2.23.0 rc4
2022-06-15 19:38:17 +08:00
Jiangjie.Bai
62f5662bd0
fix: 修复openid用户登录时默认邮件后缀使用配置项
2022-06-15 19:33:26 +08:00
ibuler
0fe221019a
pref: 优化没有获取到节点的问题
2022-06-15 19:33:26 +08:00
ibuler
d745314aa1
perf: 优化签名认证
2022-06-15 19:33:26 +08:00
feng626
153fad9ac7
feat: add client linux arm64 version
2022-06-15 19:33:26 +08:00
Jiangjie.Bai
0792c7ec49
fix: 修改推送系统用户提示文案
2022-06-15 19:33:26 +08:00
fit2bot
e617697553
fix: 修复授权过期通知bug ( #8404 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-06-15 19:33:26 +08:00
fit2bot
9dc7da3595
perf: 优化 apt ( #8398 )
...
* pref: 修改 oracle lib path
* perf: 优化 apt
Co-authored-by: ibuler <ibuler@qq.com >
2022-06-15 19:33:26 +08:00
Jiangjie.Bai
f7f4d3a42e
fix: 过滤系统用户密码过滤ansible不支持的字符
2022-06-15 19:33:26 +08:00
feng626
70fcbfe883
perf: 授权过期通知
2022-06-15 19:33:26 +08:00
Jiangjie.Bai
9e16b79abe
fix: 修复openid用户登录时默认邮件后缀使用配置项
2022-06-15 19:32:36 +08:00
ibuler
8c839784fb
pref: 优化没有获取到节点的问题
2022-06-15 15:31:33 +08:00
ibuler
10adb4e6b7
perf: 优化签名认证
2022-06-15 15:30:51 +08:00
feng626
75c011f1c5
feat: add client linux arm64 version
2022-06-15 15:30:13 +08:00
Jiangjie.Bai
a882ca0d51
fix: 修改推送系统用户提示文案
2022-06-15 15:20:08 +08:00
fit2bot
e0a2d03f44
fix: 修复授权过期通知bug ( #8404 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-06-15 15:01:56 +08:00
fit2bot
2414f34a5a
perf: 优化 apt ( #8398 )
...
* pref: 修改 oracle lib path
* perf: 优化 apt
Co-authored-by: ibuler <ibuler@qq.com >
2022-06-14 19:59:00 +08:00
ibuler
cc167f1b49
xxx
2022-06-14 19:49:07 +08:00
Jiangjie.Bai
2aebfa51b2
fix: 过滤系统用户密码过滤ansible不支持的字符
2022-06-14 18:49:35 +08:00
feng626
f91bfedc50
perf: 授权过期通知
2022-06-14 18:33:49 +08:00
Jiangjie.Bai
68aad56bad
Merge pull request #8379 from jumpserver/dev
...
v2.23.0-rc3
2022-06-13 17:42:31 +08:00
ibuler
556ce0a146
perf: 继续优化一波
2022-06-13 16:46:14 +08:00
Jiangjie.Bai
95f8b12912
fix: 修复部分 password encrypted field extra kwargs 参数不生效问题
2022-06-13 16:44:01 +08:00
fit2bot
25ae790f7d
fix: 修改client 版本 ( #8375 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-06-13 15:45:10 +08:00
ibuler
0464b1a9e6
perf: 优化迁移 rbac 速度
...
perf: migrate
2022-06-13 15:18:15 +08:00
Jiangjie.Bai
3755f8f33a
fix: 修复推送动态用户 comment 中包含空格导致推送失败的问题
2022-06-13 14:54:29 +08:00
Jiangjie.Bai
85b2ec2e6a
Merge pull request #8362 from jumpserver/dev
...
v2.23.0-rc2
2022-06-10 19:12:17 +08:00
Jiangjie.Bai
9d1e94d3c2
fix: 修复手动登录系统用户连接RemoteApp应用获取不到认证信息的问题
2022-06-10 18:35:39 +08:00
Jiangjie.Bai
be75edcb41
Merge pull request #8353 from jumpserver/dev
...
v2.23.0-rc1
2022-06-09 17:40:10 +08:00
ibuler
a5c6ba6cd6
perf: 优化 perm app node
2022-06-09 10:48:48 +08:00
fit2bot
81ef614820
fix: relogin重置MFA_VERIFY_TIME ( #8348 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-06-08 19:32:50 +08:00
ibuler
c6949b4f68
perf: 去掉 remote app 的加密
2022-06-08 10:04:14 +08:00
fit2bot
a5acdb9f60
perf: 统一校验当前用户api ( #8324 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-06-07 19:26:07 +08:00
Jiangjie.Bai
2366f02d10
feat: 添加组件类型 razor 并替换 XRDP_ENABLED
2022-06-07 13:43:53 +08:00
Jiangjie.Bai
dade0cadda
feat: 克隆角色权限
2022-06-06 16:13:12 +08:00
ibuler
e096244e75
pref: app tree 添加 icon
2022-06-06 14:00:34 +08:00
Jiangjie.Bai
3bc307d666
perf: 设置Connection Token 默认最少5分钟 ( #8331 )
2022-06-01 18:00:22 +08:00
Jiangjie.Bai
810c500402
feat: 添加配置项 CONNECTION_TOKEN_EXPIRATION
2022-05-31 18:23:48 +08:00
fit2bot
6c0d0c3e92
feat: OIDC 用户添加属性映射值 ( #8327 )
...
* feat: OIDC 用户添加属性映射值
* feat: OIDC 用户添加属性映射值
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com >
2022-05-31 16:09:31 +08:00
Jiangjie.Bai
af1150bb86
feat: OIDC 用户添加属性映射值
2022-05-31 16:03:39 +08:00
ibuler
f7cbcc46f4
perf: 升级 ansible version
2022-05-31 16:01:21 +08:00
ibuler
327c6beab4
fix: 修复假数据构造
2022-05-30 16:39:47 +08:00
ibuler
196663f205
perf: 修改生成假数据
2022-05-30 16:03:13 +08:00
Jiangjie.Bai
15423291cc
fix: 修复ldap用户登录时用户组不设置
2022-05-30 16:02:50 +08:00
ibuler
021635b850
perf: 优化 readme
2022-05-30 15:09:04 +08:00
老广
992c1407b6
Update README.md ( #8316 )
...
* Update README.md
* Update README.md
* Update README.md
* Update README.md
2022-05-30 14:51:29 +08:00
Chayim I. Kirshen
1322106c91
bumping redis-py to 4.3.1 (latest)
2022-05-30 13:30:25 +08:00
Jiangjie.Bai
42202bd528
fix: 修改 public settings API公告字段类型为 dict
2022-05-27 17:24:09 +08:00
fit2bot
b24d2f628a
perf: update download ( #8304 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-05-27 14:14:47 +08:00
fit2bot
041302d5d2
fix: 修复获取 city 时可能的报错 ( #8294 )
...
Co-authored-by: ibuler <ibuler@qq.com >
2022-05-24 12:31:16 +08:00
feng626
a08dd5ee72
fix: 修复用户更新自己密码 url 不准确问题
2022-05-24 11:16:13 +08:00
ibuler
09ef72a4a8
fix: 修复 Migrations 错误
2022-05-24 11:01:26 +08:00
ibuler
26cf64ad2d
perf: 修改 i18
2022-05-20 11:41:33 +08:00
ibuler
0a04f0f351
perf: 下载 ip 数据库
2022-05-20 10:03:13 +08:00
fit2bot
1029556902
perf: remote app 字段也加密 ( #8274 )
...
* perf: remote app 字段也加密
* perf: 修改一些加密字段
Co-authored-by: ibuler <ibuler@qq.com >
2022-05-20 10:01:41 +08:00
Jiangjie.Bai
c41fc54380
Merge pull request #8271 from jumpserver/dev
...
v2.22.0-rc4
2022-05-18 20:21:35 +08:00
feng626
c2fbe5c75a
fix: 不支持es8 提示
2022-05-18 20:20:54 +08:00
feng626
99e1b2cf92
fix: 不支持es8 提示
2022-05-18 20:14:31 +08:00
Jiangjie.Bai
33090c4cdf
Merge pull request #8268 from jumpserver/dev
...
v2.22.0-rc4
2022-05-18 19:49:11 +08:00
fit2bot
c8d7c7c56f
fix: 修复oidc认证不区分大小写 ( #8267 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-05-18 18:32:53 +08:00
ibuler
aa7540045b
feat: 添加 session guard
2022-05-18 14:55:58 +08:00
ibuler
e5f4b8000e
stash
2022-05-18 14:55:58 +08:00
ibuler
44ffd09924
fix: 修复可能的 decode error
2022-05-18 10:17:15 +08:00
ibuler
fe3059c1fd
fix: 修复获取密码失败
2022-05-17 23:50:30 +08:00
Jiangjie.Bai
b76920a4bf
fix: 修改组织资源统计时 org 为None的问题
2022-05-17 22:11:42 +08:00
ibuler
b5ac5c5670
perf: domain gateway 也添加
2022-05-17 21:36:40 +08:00
ibuler
c3c0f87c01
perf: domain gateway 也添加
2022-05-17 21:32:31 +08:00
Jiangjie.Bai
d672122c79
Merge pull request #8260 from jumpserver/dev
...
v2.22.0-rc3
2022-05-17 21:14:05 +08:00
fit2bot
0c71190337
fix: 修改 EncryptedField 字段的 write_only 属性 ( #8259 )
...
* fix: 修改 EncryptedField 字段的 write_only 属性
fix: 修改 EncryptedField 字段的 write_only 属性
* fix: 修改 EncryptedField 字段的 write_only 属性
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com >
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com >
2022-05-17 21:12:59 +08:00
feng626
14710e9c9e
feat: 工单审批人中去除申请人
2022-05-17 20:56:53 +08:00
ibuler
7eec50804c
perf: 优化 encrypted field
2022-05-17 20:04:46 +08:00
Jiangjie.Bai
0fc5a33983
fix: 修复企业微信、钉钉、飞书登录跳转问题
2022-05-17 18:57:49 +08:00
fit2bot
07779c5a7a
perf: 工单启用 ( #8254 )
...
Co-authored-by: ibuler <ibuler@qq.com >
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com >
2022-05-17 18:57:04 +08:00
fit2bot
d675b1d4fc
fix: k8s token 解密 ( #8252 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-05-17 16:53:15 +08:00
Jiangjie.Bai
514fa9cf0a
Merge pull request #8250 from jumpserver/dev
...
v2.22.0-rc2
2022-05-17 15:10:59 +08:00
ibuler
2c73611cb4
fix: 修复公告不显示的问题
2022-05-17 11:30:37 +08:00
ibuler
83571718e9
perf: 修改版本
2022-05-16 20:02:10 +08:00
ibuler
521ec0245b
fix: ipdb 版本
2022-05-16 20:02:10 +08:00
jiangweidong
e80b6936a2
perf: 兼容AWS上redis[ssl]无证书无法部署的问题
2022-05-16 18:03:47 +08:00
Jiangjie.Bai
2c4f937e0b
fix: 解决LDAP同步用户仪表盘总数没有刷新的问题
2022-05-16 17:52:49 +08:00
Jiangjie.Bai
2a5497de14
fix: 修改工单审批文案
2022-05-16 17:52:27 +08:00
feng626
d87dc7cbd6
fix: import ipdb
2022-05-16 17:51:37 +08:00
fit2bot
3b253e276c
perf: 优化翻译 ( #8244 )
...
Co-authored-by: ibuler <ibuler@qq.com >
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com >
2022-05-16 17:50:28 +08:00
feng626
525538e775
fix: 修复密码密钥翻译问题
2022-05-16 17:48:28 +08:00
ibuler
2a8f8dd709
perf: 优化使用两个 ip 库
2022-05-16 15:24:38 +08:00
ibuler
1e6e59d815
perf: 添加 ipdb
2022-05-16 15:24:38 +08:00
ibuler
475678e29b
fix: 修复密码 write only
2022-05-16 12:19:52 +08:00
Jiangjie.Bai
7f52675bd3
Merge pull request #8229 from jumpserver/dev
...
v2.22.0 rc1
2022-05-12 17:02:01 +08:00
fit2bot
6409b7deee
feat: Endpoint添加Redis Port ( #8225 )
...
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com >
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com >
2022-05-12 14:47:35 +08:00
ibuler
4f37b2b920
perf: 优化 setting 读取,避免遗漏
2022-05-12 11:52:44 +08:00
fit2bot
c692eed3c6
perf: 修改client 版本 ( #8223 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-05-12 10:59:19 +08:00
ibuler
dab8828b03
perf: 优化 setting 获取
2022-05-11 17:57:33 +08:00
ibuler
d692188a34
perf: 修改 i18n
2022-05-11 16:03:26 +08:00
Jiangjie.Bai
bc8df72603
fix: 修改创建更新用户的密码字段
2022-05-11 16:02:56 +08:00
Jiangjie.Bai
bf466a1ba2
feat: LDAP同步用户支持组织
2022-05-11 11:09:30 +08:00
fit2bot
aff5b0035d
perf: 优化加密 ( #8206 )
...
* perf: 优化加密
* perf: 优化加密
* perf: 优化加密传输
Co-authored-by: ibuler <ibuler@qq.com >
2022-05-10 17:28:10 +08:00
jiangweidong
b44fa64994
perf: 企业微信、钉钉工单审批增加拒绝功能 ( #8208 )
...
* perf: 工单直接审批增加拒绝功能
* feat: 翻译
* perf: 修改动作名词
* perf: 修改翻译
2022-05-10 16:30:25 +08:00
ibuler
094446c548
chore: 去掉一个workflow
2022-05-10 10:37:01 +08:00
jiangweidong
64eda5f28b
perf: 命令存储ES可根据日期动态建立索引 ( #8180 )
...
* perf: 命令存储ES可根据日期动态建立索引
* perf: 优化合并字段
* feat: 修改逻辑
2022-05-09 16:37:31 +08:00
Jiangjie.Bai
ab737ae09b
fix: 修复获取类型为null的命令显示不支持的问题
...
fix: 修复获取类型为null的命令显示不支持的问题
2022-05-07 17:56:50 +08:00
jiangweidong
55e04e8e9f
feat: 内置AIX系统,根据系统选择算法加密密码
2022-05-07 16:25:03 +08:00
jiangweidong
5e70a8af15
feat: 支持平台关联算法,支持AIX改密
2022-05-07 16:25:03 +08:00
fit2bot
031077c298
perf: password 等使用 rsa 加密传输 ( #8188 )
...
* perf: 修改 model fields 路径
* stash it
* pref: 统一加密方式,密码字段采用 rsa 加密
* pref: 临时密码使用 rsa
* perf: 去掉 debug msg
* perf: 去掉 Debug
* perf: 去掉 debug
* perf: 抽出来
Co-authored-by: ibuler <ibuler@qq.com >
2022-05-07 16:20:12 +08:00
Jiangjie.Bai
3f856e68f0
feat: public settings 区分 public 和 open
2022-05-07 11:09:24 +08:00
fit2bot
56862a965d
fix: 修复system-role获取users失败的问题 ( #8196 )
...
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com >
2022-05-07 10:40:12 +08:00
ibuler
e53aa9696b
perf: 修改 serializer
2022-05-05 16:18:05 +08:00
jiangweidong
e151548701
perf: 账号管理中查看密码记录日志 ( #8157 )
2022-05-05 14:42:09 +08:00
jiangweidong
c56179e9e4
feat: 支持企业微信、钉钉直接审批工单 ( #8115 )
2022-05-05 13:07:48 +08:00
feng626
d23953932f
perf: connection token 分api权限
2022-05-05 11:45:26 +08:00
Jiangjie.Bai
2493647e5c
fix: 修复windows执行ansible显示sudo失败的问题
2022-05-05 11:40:12 +08:00
ibuler
8de57773aa
stash it
2022-05-04 09:57:45 +08:00
ibuler
7025d46070
perf: 控制平台创建
2022-05-02 21:37:42 +08:00
ibuler
7e6964e0fc
perf: 修改 platform
2022-04-30 23:19:43 +08:00
ibuler
246710128e
perf: stash
2022-04-29 18:28:12 +08:00
Jiangjie.Bai
00ed7bb025
perf: 优化 OIDC 支持选择认证方式
2022-04-29 14:28:07 +08:00
xiaziheng
b1aadf1ee9
Fix oidc ( #8165 )
2022-04-29 10:59:29 +08:00
ibuler
69f3c85195
perf: 添加 category api
2022-04-28 22:54:18 +08:00
feng626
86e6982383
fix: 组织管理员 添加 view platform perm
2022-04-28 19:10:58 +08:00
halo
dc42d1caa2
perf: 修改ssh_client连接选项翻译
2022-04-28 19:09:44 +08:00
ibuler
e3f2878b0f
perf: 修改迁移
2022-04-28 12:50:41 +08:00
ibuler
ba0a017aa4
perf: 修改迁移
2022-04-28 12:47:39 +08:00
ibuler
770d2508d7
perf: 其他 asset model
2022-04-26 21:30:11 +08:00
ibuler
0a2b2ad127
perf: 其他 asset model
2022-04-26 21:30:01 +08:00
ibuler
cb5d8fa13f
fix: 去掉自动生成的map文件
2022-04-26 16:46:47 +08:00
ibuler
44d192cbe7
perf: stash
2022-04-26 11:24:08 +08:00
jiangweidong
3a3f7eaf71
feat: 优化SAML2生成的metadata文件内容及属性映射
2022-04-26 10:00:53 +08:00
fit2bot
9804ca5dd0
fix: workbench_orgs 去重 ( #8150 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-04-25 11:38:15 +08:00
老广
034d0e285c
Update README.md
2022-04-24 17:47:02 +08:00
feng626
104d672634
perf: client download
2022-04-24 15:09:33 +08:00
ibuler
529e3d12e0
perf: 删除 build
2022-04-24 09:12:29 +08:00
ibuler
978c1f6363
perf: 修改 Dockerfile, 优化构建
2022-04-24 09:12:29 +08:00
ibuler
d25cde1bd5
fix: 修复社区版跳转问题
2022-04-21 22:48:59 +08:00
Jiangjie.Bai
a4be0ff2f3
Merge pull request #8131 from jumpserver/dev
...
v2.21.0
2022-04-21 18:11:21 +08:00
Jiangjie.Bai
a6d61721dd
fix: 修改csrftoken获取问题
2022-04-21 16:17:33 +08:00
fit2bot
c3de7b78c2
fix: 远程应用授权时 有些资产已经不存在了 导致授权失败 ( #8127 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-04-21 15:36:40 +08:00
Jiangjie.Bai
e83d676712
Merge pull request #8119 from jumpserver/dev
...
v2.21.0-rc6
2022-04-20 20:25:43 +08:00
Jiangjie.Bai
63ee2dd8fb
fix: 修复获取权限树权限控制
2022-04-20 20:14:44 +08:00
feng626
74f88d842d
fix: 修改replay download perm
2022-04-20 19:14:42 +08:00
fit2bot
e61bae5ee4
perf: 优化权限位 ( #8110 )
...
* perf: 优化权限位
* perf: 优化返回的组织
* perf: 保证结果是 ok
* perf: 去掉 distinct
* perf: tree count
Co-authored-by: ibuler <ibuler@qq.com >
2022-04-20 18:50:53 +08:00
fit2bot
b0b379e5a9
fix: del org check ldap ( #8114 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-04-20 16:38:42 +08:00
fit2bot
415521a003
fix: 删除组织时检测ldap同步组织 ( #8112 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-04-20 16:32:33 +08:00
Jiangjie.Bai
c29d133776
feat: 修改LDAP导入定时任务interval/crontab优先级
...
Signed-off-by: Jiangjie.Bai <bugatti_it@163.com >
2022-04-20 16:31:56 +08:00
fit2bot
d2dd487e2c
feat: 修改LDAP导入组织问题 ( #8111 )
...
Signed-off-by: Jiangjie.Bai <bugatti_it@163.com >
Co-authored-by: BaiJiangJie <bugatti_it@163.com >
2022-04-20 16:05:33 +08:00
ibuler
f1bd4ea91f
perf: 修改 系统级别用户角色的 perms
2022-04-20 11:50:11 +08:00
fit2bot
7647438792
perf: 账号备份log ( #8106 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-04-20 11:18:50 +08:00
Jiangjie.Bai
015ff4b119
Merge pull request #8105 from jumpserver/dev
...
v2.21.0-rc5
2022-04-20 10:46:27 +08:00
fit2bot
af9248ef7c
fix: 还原connection token 逻辑 ( #8101 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-04-20 10:24:08 +08:00
ibuler
54e772741b
perf: 修改 base
2022-04-20 10:15:20 +08:00
Jiangjie.Bai
c04ab1aab9
Merge pull request #8100 from jumpserver/dev
...
v2.21.0-rc5
2022-04-19 21:52:51 +08:00
feng626
611a00a5fa
fix: 修复super user perm bug
2022-04-19 21:52:01 +08:00
Jiangjie.Bai
57969a4e23
fix: 修改获取smart endpoint的逻辑
2022-04-19 19:50:18 +08:00
Jiangjie.Bai
5f370c1c04
perf: 优化内置系统用户角色权限
2022-04-19 19:19:47 +08:00
Jiangjie.Bai
f026b86a20
fix: 修复获取组织用户
2022-04-19 18:09:07 +08:00
ibuler
0addba7c14
perf: 修改 command 命令执行
2022-04-19 17:21:27 +08:00
ibuler
e4b0ab6a45
perf: 修改命令执行区分组织
2022-04-19 17:21:27 +08:00
Jiangjie.Bai
b4ac24ad6d
fix: 修改endpoint/rule权限树位置
2022-04-19 17:21:09 +08:00
halo
500477fad1
fix: ftp日志清理bug
2022-04-19 17:13:17 +08:00
Jiangjie.Bai
3b9cb2a99c
fix: 修改翻译临时密码
2022-04-19 16:26:33 +08:00
Jiangjie.Bai
f8fade4cf2
feat: 添加配置项 KoKo SSH Client 方式
2022-04-19 16:16:55 +08:00
ibuler
832228e184
stash
2022-04-19 15:30:56 +08:00
Jiangjie.Bai
be2708f83d
fix: 修复ajax请求携带csrftoken问题
2022-04-19 14:29:23 +08:00
ibuler
516cb05d69
perf: 修改翻译
2022-04-19 13:33:28 +08:00
老广
714b6b1233
Merge pull request #8085 from jumpserver/dev
...
v2.21.0-rc5
2022-04-19 13:15:16 +08:00
ibuler
3e3835dc28
perf: 修改用户权限
2022-04-19 10:42:36 +08:00
ibuler
f4ed4e1176
perf: 添加 temp token 排序
2022-04-18 19:55:16 +08:00
feng626
7b2d51f343
fix: 修复角色过滤失败
2022-04-18 19:54:44 +08:00
feng626
fe47e40588
fix: es6 create index fail
2022-04-18 19:44:54 +08:00
fit2bot
4362f8d5af
perf: 优化组织 ( #8080 )
...
* perf: 优化用户的orgs
* perf: 优化组织
Co-authored-by: ibuler <ibuler@qq.com >
2022-04-18 17:17:23 +08:00
Jiangjie.Bai
6f49d240af
Merge pull request #8079 from jumpserver/dev
...
v2.21.0-rc4
2022-04-18 15:31:02 +08:00
Jiangjie.Bai
3eab621b28
feat: 优化Endpoint迁移逻辑,增加XRDP规则和Endpoint
...
fix: 修改Endpoint迁移文件
2022-04-18 15:29:40 +08:00
Jiangjie.Bai
afcbe60531
Merge pull request #8076 from jumpserver/dev
...
v2.21.0-rc3
2022-04-18 11:43:40 +08:00
jiangweidong
548a374c6d
fix: 修复部署在没有密码的redis上时,站内信数量不更新问题
2022-04-18 11:39:20 +08:00
feng626
10c146b07d
fix: 修复远程应用无资产下载xrdp file 500 问题
2022-04-18 11:38:31 +08:00
fit2bot
a647e73c02
feat: 设置SessionCookieNamePrefix ( #8071 )
...
* feat: 设置SessionCookieNamePrefix
* feat: 设置SessionCookieNamePrefix
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com >
2022-04-15 21:33:15 +08:00
Jiangjie.Bai
7b02777f1e
fix: 修改endpoint smart API允许有效用户访问
2022-04-15 16:33:41 +08:00
Jiangjie.Bai
97e59384e0
fix: connection token API 返回有效时间
2022-04-15 16:33:20 +08:00
jiangweidong
70a07539af
perf: 优化部分云厂商的redis连接的问题
2022-04-15 10:00:49 +08:00
Jiangjie.Bai
f98c170b8c
Merge pull request #8061 from jumpserver/dev
...
v2.21.0-rc2
2022-04-14 19:51:29 +08:00
fit2bot
0b94d7414a
feat: download ( #8062 )
...
Co-authored-by: feng626 <1304903146@qq.com >
Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com >
2022-04-14 19:51:10 +08:00
feng626
7aa0c9bf19
feat: download
2022-04-14 15:00:59 +08:00
Jiangjie.Bai
6d8e8856ac
fix: 修改命令timestamp_display只读
2022-04-14 14:45:19 +08:00
Jiangjie.Bai
c240a471dc
fix: Public Setting 添加 Magnus
2022-04-14 14:16:02 +08:00
Jiangjie.Bai
ea478fc801
fix: Public Setting 添加 Magnus
2022-04-14 12:55:18 +08:00
fit2bot
5127214375
feat: 站内信一键已读 ( #8057 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-04-14 12:18:11 +08:00
Jiangjie.Bai
21c41a6334
Merge pull request #8054 from jumpserver/dev
...
v2.21.0-rc1
2022-04-13 20:25:47 +08:00
fit2bot
b610d71e11
feat: 添加 临时 password ( #8035 )
...
* perf: 添加 template password
* perf: 修改id
* perf: 修改 翻译
* perf: 修改 tmp token
* perf: 修改 token
Co-authored-by: ibuler <ibuler@qq.com >
2022-04-13 20:24:56 +08:00
Jiangjie.Bai
10b033010e
feat: 优化命令导出时间戳可读性
2022-04-13 19:50:17 +08:00
fit2bot
c630b11bd5
fix: port str ( #8055 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-04-13 19:48:31 +08:00
ibuler
b0f7c114fc
perf: 修改 csrf token domain
2022-04-13 16:08:07 +08:00
ibuler
5101aae5ae
perf: 修改..
2022-04-12 19:24:59 +08:00
fit2bot
72608146cc
chore: lgtm ( #8048 )
...
* chore: lgtm
* perf: add lgtm
Co-authored-by: ibuler <ibuler@qq.com >
2022-04-12 18:25:28 +08:00
ibuler
3213fe0984
chore: 添加action lgtm
2022-04-12 18:06:42 +08:00
ibuler
9f927f9703
stash
2022-04-12 17:53:56 +08:00
fit2bot
f481463c64
feat: 添加Endpoint ( #8041 )
...
* feat: add Endpoint EndpointRule EndpointProtocol model
* feat: add Endpoint EndpointRule EndpointProtocol API
* feat: modify protocols field
* feat: 修改序列类
* feat: 获取connect-url连接地址
* feat: 获取connect-url连接地址
* feat: 优化后台获取smart-endpoint逻辑
* feat: 优化后台获取smart-endpoint逻辑
* feat: 删除配置KOKO、XRDP、MAGNUS
* feat: 删除配置KOKO、XRDP、MAGNUS
* feat: 修改翻译
* feat: 修改smart endpoint
* feat: 修改翻译
* feat: smart API 添加token解析
* feat: 删除 smart serializer
* feat: 修改迁移逻辑
* feat: 解决冲突
* feat: 修改匹配 endpoint
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com >
2022-04-12 17:45:10 +08:00
ibuler
4cf90df17c
perf: 默认角色添加 created by
2022-04-12 16:20:46 +08:00
ibuler
ffd98c6e3f
fix: 修改 import
2022-04-12 16:20:46 +08:00
fit2bot
1f8ded49fa
feat: 工作台区分组织 ( #8040 )
...
* perf: 工作台受组织角色控制
* perf: workspace => workbench
* perf: 修改 workspace codename
Co-authored-by: ibuler <ibuler@qq.com >
2022-04-12 14:25:49 +08:00
fit2bot
7c7d7d52b2
perf: asset number 扩容 ( #8045 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-04-12 14:01:57 +08:00
feng626
f769d5a9bb
fix: 修复用户数据不同步问题
2022-04-08 15:47:14 +08:00
ibuler
d418c28e98
perf: 修改 base
2022-04-07 18:51:35 +08:00
ibuler
1b9efff6c7
perf: 添加 types
2022-04-06 18:14:51 +08:00
feng626
c8758f417d
feat: ldap一键导入及设置用户组织
2022-04-06 17:13:34 +08:00
Eric
ef36b2e662
perf: 完善 setting 的动态配置
2022-04-06 16:45:22 +08:00
ibuler
ce13b194a5
perf: 修改 asset info
2022-04-06 11:29:16 +08:00
ibuler
8688781e15
perf: 修改 asset 结构
2022-04-06 10:15:06 +08:00
ibuler
3de881fa19
perf: 打算重构 asset application
2022-04-02 18:35:46 +08:00
jiangweidong
fe8527fd07
feat: 修改翻译
2022-04-02 16:04:13 +08:00
feng626
2cb08b4785
fix: user is common user
2022-04-02 16:02:57 +08:00
fit2bot
a936092020
perf: es相关代码格式优化 ( #8020 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-04-02 13:26:18 +08:00
fit2bot
e602bc0341
fix: 修复网关翻译 ( #8016 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-04-01 16:52:50 +08:00
Jiangjie.Bai
3121b4e3ff
feat: 更新翻译
2022-03-31 13:05:55 +08:00
Jiangjie.Bai
eff562505e
feat: 更新翻译
2022-03-31 13:05:55 +08:00
Jiangjie.Bai
73cb5e10b4
fix: 添加用户不能自更新字段逻辑 & 修复用户is_active创建失败的问题
...
fix: 添加用户不能自更新字段逻辑 & 修复用户is_active创建失败的问题
fix: 添加用户不能自更新字段逻辑 & 修复用户is_active创建失败的问题
2022-03-30 19:52:45 +08:00
fit2bot
c58d245636
fix: 修复koko setting ( #8005 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-03-30 19:51:56 +08:00
fit2bot
e7af037513
perf: 修改命令command input 长度问题 ( #7996 )
...
* perf: 修改命令command input max_length 1024
* perf: 修改命令command input 长度问题
* perf: 修改命令command input 长度问题
* perf: 修改命令command input 长度问题
* perf: 修改命令command input 长度问题
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com >
2022-03-30 19:07:49 +08:00
Jiangjie.Bai
54d1996507
feat: 支持续期Connection Token
2022-03-30 11:20:56 +08:00
dependabot[bot]
71f8b40e21
build(deps): bump paramiko from 2.7.2 to 2.10.1 in /requirements
...
Bumps [paramiko](https://github.com/paramiko/paramiko ) from 2.7.2 to 2.10.1.
- [Release notes](https://github.com/paramiko/paramiko/releases )
- [Changelog](https://github.com/paramiko/paramiko/blob/main/NEWS )
- [Commits](https://github.com/paramiko/paramiko/compare/2.7.2...2.10.1 )
---
updated-dependencies:
- dependency-name: paramiko
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-03-30 11:06:49 +08:00
ibuler
59342a88c0
perf: 优化各种翻译
2022-03-29 19:33:38 +08:00
fit2bot
b8e6bc932b
perf: 添加 mariadb port ( #7989 )
...
* perf: 添加 mariadb port
* perf: 优化 mariadb 树上天津更多信息
* perf: remove mixin
Co-authored-by: ibuler <ibuler@qq.com >
2022-03-29 17:22:59 +08:00
Jiangjie.Bai
cddff9fd19
feat: 改密计划支持su切换用户执行
...
feat: 改密计划支持su切换用户执行
feat: 改密计划支持su切换用户执行
feat: 改密计划支持su切换用户执行
feat: 改密计划支持su切换用户执行
feat: 改密计划支持su切换用户执行
feat: 改密计划支持su切换用户执行
2022-03-29 15:32:33 +08:00
feng626
d856f1364a
feat: 拉起ssh api
2022-03-29 13:23:58 +08:00
fit2bot
52709d2efa
feat: 企业微信、钉钉 工作台免密登录(飞书已实现) ( #7855 )
...
* feat: 添加oauth接口
* feat: 企业微信支持OAuth认证,工作台免密登录
* feat: 钉钉支持OAuth认证,工作台免密登录
* fix: 修复参数错误
Co-authored-by: halo <wuyihuangw@gmail.com >
2022-03-29 13:19:13 +08:00
ibuler
a20de3df16
perf: app tree 添加attrs,luna 使用
2022-03-29 12:44:36 +08:00
ibuler
e303b4f571
perf: 修复 settings patch 问题
2022-03-28 13:40:36 +08:00
jiangweidong
03fdaa03e4
feat: 支持日语
2022-03-28 10:06:54 +08:00
fit2bot
b7b1d81ea0
fix: magenus bug ( #7977 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-03-25 16:46:36 +08:00
fit2bot
e0fdfa52b9
feat: 支持 magnus ( #7965 )
...
* feat: 支持 magnus
* perf: 添加 setting 到 api
* perf: 放出 mongodb
Co-authored-by: ibuler <ibuler@qq.com >
2022-03-25 14:45:08 +08:00
ibuler
8718dc6751
pref: 优雅一发
2022-03-25 14:44:33 +08:00
ibuler
9e284f96e5
perf: 修改依赖写法,避免 github 认错
2022-03-25 14:44:33 +08:00
Eric
fc06295d04
perf: 优化 windows rdp 窗口显示
2022-03-25 10:50:34 +08:00
fit2bot
9b73727bbc
fix: 修复系统组件绑定角色bug ( #7962 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-03-23 10:56:23 +08:00
Jiangjie.Bai
6bde31cdd0
fix: 修复获取远程应用认证信息问题
2022-03-22 18:54:25 +08:00
ibuler
2721793b8f
fix: 修复权限 view 没有 Model 的问题
2022-03-22 16:59:01 +08:00
feng626
2ec0cb8a2c
fix: 修复用户绑定角色重大bug
2022-03-22 16:55:53 +08:00
feng626
d01d44b48d
fix: api docs
2022-03-22 13:05:44 +08:00
老广
0ef7a9571c
Merge pull request #7800 from jumpserver/pr@dev@feat_core_redis_support_ssl
...
feat: JumpServer支持部署在使用了ssl的redis上
2022-03-22 10:34:32 +08:00
ibuler
54fd1fb0c8
perf: 移动到信号中
2022-03-21 19:27:23 +08:00
ibuler
87c6eec619
perf: 优化 role bingding,优化 is_superuser
2022-03-21 19:27:23 +08:00
jiangweidong
e35fbfc7e9
Update session.py
2022-03-21 19:02:30 +08:00
fit2bot
3345456dc2
fix: 修复wateway api ( #7947 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-03-21 17:53:16 +08:00
Jiangjie.Bai
9ae74120ed
fix: 修复用户API权限
2022-03-21 12:00:15 +08:00
Jiangjie.Bai
9e5c132485
fix: 修复用户API权限
2022-03-21 11:58:29 +08:00
fit2bot
5cc2fdae4f
fix: 修复api docs打不开的问题 ( #7938 )
...
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com >
2022-03-21 11:14:49 +08:00
jiangweidong
e993f31b6d
feat: 支持纳管百度云资产 ( #7921 )
...
Co-authored-by: ibuler <ibuler@qq.com >
2022-03-21 10:39:47 +08:00
Jiangjie.Bai
60edbb36a1
fix: 应用树隐藏mongodb节点
2022-03-18 18:02:15 +08:00
fit2bot
5da1ec55a7
perf: org del ticket perm ( #7932 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-03-18 17:44:20 +08:00
Jiangjie.Bai
b8c083af7e
fix: 工单权限位放到sys角色中
2022-03-18 17:36:22 +08:00
Jiangjie.Bai
996621f303
fix: 移除权限dashboard
2022-03-18 17:10:34 +08:00
fit2bot
ec9e5da653
fix: 修复apikey perm ( #7918 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-03-18 15:53:34 +08:00
Jiangjie.Bai
d4e4015d91
fix: 修复去除rolebiding change 权限
2022-03-18 15:38:33 +08:00
Jiangjie.Bai
005dd27701
Merge pull request #7917 from jumpserver/dev
...
v2.20.0
2022-03-17 19:22:22 +08:00
Jiangjie.Bai
ac6052546a
fix: 修改翻译
2022-03-17 19:20:39 +08:00
Jiangjie.Bai
0265adcc72
fix: 修改翻译
2022-03-17 19:20:39 +08:00
Jiangjie.Bai
9654083662
fix: 修改站内信权限位
2022-03-17 19:06:44 +08:00
fit2bot
08ff8fa285
fix: login confirm bug ( #7914 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-03-17 18:50:37 +08:00
Jiangjie.Bai
f82f7eba2b
fix: 修改一些权限
2022-03-17 17:51:02 +08:00
Jiangjie.Bai
a8cee26874
fix: 修复资产详情授权用户tab页的权限位
2022-03-17 17:25:20 +08:00
Jiangjie.Bai
8080d36d90
Merge pull request #7911 from jumpserver/dev
...
v2.20.0-rc6
2022-03-17 17:07:22 +08:00
ibuler
3ed7477057
perf: 修改 default role
2022-03-17 16:53:29 +08:00
ibuler
a3cddd5d34
fix: 修复批量命令的bug
2022-03-17 16:26:22 +08:00
Jiangjie.Bai
26b3c60e5c
fix: 删除一些perms相关的权限位
2022-03-17 16:26:00 +08:00
ibuler
b5dea38164
perf: 修改bug
2022-03-17 16:09:51 +08:00
ibuler
7addb881f6
fix: 修复系统用户Perms
2022-03-17 16:09:51 +08:00
fit2bot
9c395b674f
fix: command log search ( #7906 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-03-17 15:39:05 +08:00
Jiangjie.Bai
b297ebe973
fix: 修改应用category
2022-03-17 15:37:57 +08:00
fit2bot
5c7bfcff1c
perf: 修改 i18n ( #7904 )
...
* perf: some perm to xpack
* perf: 修改 i18n
* perf: 修改 i18n
* perf: 修改 i18n
Co-authored-by: ibuler <ibuler@qq.com >
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com >
2022-03-17 15:23:22 +08:00
fit2bot
76796f249d
fix: user match ( #7903 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-03-17 14:47:24 +08:00
Jiangjie.Bai
55a63477ed
fix: 去除系统用户资产相关权限
2022-03-17 14:38:19 +08:00
ibuler
5942037d81
perf: some perm to xpack
2022-03-17 14:24:52 +08:00
Jiangjie.Bai
5882b8a682
fix: 去除application secret change perm
2022-03-17 14:24:25 +08:00
fit2bot
34e75099a3
perf: 设置默认的角色,系统用户角色添加权限 ( #7898 )
...
* perf: 修改 role handler
* perf: 设置默认的角色,系统用户角色添加权限
* perf: authentication 还是放到系统中吧
Co-authored-by: ibuler <ibuler@qq.com >
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com >
2022-03-17 14:08:16 +08:00
feng626
8fe84345e4
fix: 工单默认权限
2022-03-17 14:06:34 +08:00
Jiangjie.Bai
a31c3ccc30
fix: 去除application account delete perm
2022-03-17 14:05:08 +08:00
Jiangjie.Bai
e13e34098a
fix: 站内信命令告警中的会话地址
2022-03-17 14:05:08 +08:00
feng626
e8653c74cd
fix: ticket URL type
2022-03-17 12:35:08 +08:00
feng626
1433c35ff9
fix: test gateway
2022-03-17 12:33:59 +08:00
Jiangjie.Bai
a237b5a63d
fix: 去掉terminal task add/delete 权限位
2022-03-17 11:40:54 +08:00
feng626
2587c8693e
fix: account_change_pwd
2022-03-17 11:36:48 +08:00
feng626
dfe5e2bce3
fix: 修改rbac permission
2022-03-17 11:36:48 +08:00
Jiangjie.Bai
91a34d1a88
Merge pull request #7888 from jumpserver/dev
...
v2.20.0-rc5
2022-03-16 20:49:53 +08:00
Jiangjie.Bai
1a05a942c2
fix: 更新资产详情授权用户权限
2022-03-16 20:49:29 +08:00
Jiangjie.Bai
30556023d1
fix: 修复会话录像播放权限
2022-03-16 20:42:38 +08:00
fit2bot
aa022a02c1
fix: 修复用户认证失败的详细信息显示 ( #7886 )
...
* fix: 修复用户认证失败的详细信息显示
* fix: 更新授权树翻译
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com >
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com >
2022-03-16 20:41:54 +08:00
fit2bot
433d829c29
fix: 添加profile myorgs ( #7887 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-03-16 20:36:12 +08:00
fit2bot
3b507dc795
perf: 优化英文下树的显示 ( #7883 )
...
* perf: 优化英文下树的显示
* perf: 修改翻译
* perf: 修改翻译
Co-authored-by: ibuler <ibuler@qq.com >
2022-03-16 20:27:38 +08:00
Jiangjie.Bai
8233c69038
fix: 修复adhoc权限
2022-03-16 19:26:40 +08:00
ibuler
0fbc548c02
fix: 修复访问 flower 错误
2022-03-16 19:05:06 +08:00
Jiangjie.Bai
aa9ae14e46
fix: 修复view action获取
2022-03-16 18:33:55 +08:00
Jiangjie.Bai
04b35ba520
fix: 修复批量命令权限位
2022-03-16 18:33:13 +08:00
ibuler
580d2cd80b
perf: 修改 org admin
2022-03-16 18:26:16 +08:00
ibuler
da9136f7af
perf: 修改 org role
2022-03-16 18:26:16 +08:00
ibuler
1ce2706f20
perf: 修改翻译
2022-03-16 18:26:16 +08:00
ibuler
bbdeba3659
perf: 修复 org admin all
2022-03-16 18:26:16 +08:00
feng626
3a26b9d102
fix: 修复工单相应bug
2022-03-16 17:40:51 +08:00
ibuler
ee757e261d
perf: 修改写法
2022-03-16 17:14:42 +08:00
ibuler
f41e6db007
perf: sso token 只能超级管理员
2022-03-16 17:14:42 +08:00
ibuler
7eed7b32cc
perf: 修复 org role binding 在root组织下看到的可能不对
2022-03-16 17:14:42 +08:00
Jiangjie.Bai
efb26132f6
fix: 修复sso用户登录失败的问题
2022-03-16 17:11:22 +08:00
Jiangjie.Bai
572c5b6925
fix: 修改工单管理权限位
2022-03-16 14:54:50 +08:00
ibuler
8a1cd7e2a9
perf: fix some bug
2022-03-16 14:18:01 +08:00
Jiangjie.Bai
c065f82d30
fix: 排除收集用户执行的更新、删除权限位
2022-03-16 14:17:35 +08:00
ibuler
995c9a6c19
perf: 修复一些bug, rolebingding 找到合适的
2022-03-16 14:08:54 +08:00
Jiangjie.Bai
5ec970fab4
fix: 全局组织受权限位控制
2022-03-16 14:07:00 +08:00
Jiangjie.Bai
166745baf6
Merge pull request #7866 from jumpserver/dev
...
v2.20.0 rc4
2022-03-15 20:54:40 +08:00
Jiangjie.Bai
d320443c9f
fix: 去除change_setting权限位
2022-03-15 20:25:18 +08:00
ibuler
4bfa88f01f
perf: 修改 app tree
2022-03-15 20:09:30 +08:00
Jiangjie.Bai
aedd8ba589
fix: 修复查看我的应用翻译
2022-03-15 19:51:59 +08:00
Jiangjie.Bai
172b492bc3
fix: 修复存储测试权限位
2022-03-15 19:41:25 +08:00
Jiangjie.Bai
c4280d259a
fix: 修复翻译/权限设置
2022-03-15 19:18:01 +08:00
Jiangjie.Bai
b25ec559bb
fix: 修复翻译/权限设置
2022-03-15 19:18:01 +08:00
ibuler
cd46c8c78e
perf: 发送验证码,不再提示
2022-03-15 18:47:12 +08:00
ibuler
8839e6293b
perf: 修改 mfa 地址
2022-03-15 18:47:12 +08:00
ibuler
4f887b1b11
perf: 优化 tree node icon
2022-03-15 18:46:11 +08:00
fit2bot
90840a4417
fix: 工单创建bug ( #7858 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-03-15 18:22:13 +08:00
fit2bot
a18b9bad0a
fix: 修复ticketsession ( #7857 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-03-15 17:32:54 +08:00
feng626
e1a238b778
fix: 删除资产授权缓存接口
2022-03-15 16:55:45 +08:00
吴小白
ee44ae2e12
perf: 优化构建速度
2022-03-15 16:55:10 +08:00
fit2bot
d77e84e6f8
fix: ticket comment bug ( #7854 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-03-15 16:50:51 +08:00
Jiangjie.Bai
2042c7a6e5
fix: 云同步权限显示创建执行
2022-03-15 14:18:37 +08:00
Jiangjie.Bai
40aca26155
fix: 暂时排除会话分享的权限位
2022-03-15 13:13:16 +08:00
Jiangjie.Bai
e18e76002c
fix: 暂时排除会话分享的权限位
2022-03-15 13:00:56 +08:00
Jiangjie.Bai
c77f02b295
Merge pull request #7844 from jumpserver/dev
...
v2.20.0-rc3
2022-03-15 11:37:30 +08:00
Jiangjie.Bai
3924ff0114
fix: 修改查看会话录像权限位
2022-03-15 11:37:09 +08:00
Jiangjie.Bai
6a0264ad3b
fix: 删除权限位connect_myasset/myapp
2022-03-15 11:11:37 +08:00
Jiangjie.Bai
2d7349d596
fix: 删除权限位connect_myasset/myapp
2022-03-15 11:11:37 +08:00
feng626
c41a81c8d0
fix: 修改授权权限
2022-03-15 11:06:48 +08:00
feng626
7ba19ab1a1
fix: exclude adhoc change delete
2022-03-14 20:36:02 +08:00
Jiangjie.Bai
72247d1df3
fix: 修复批量命令权限
2022-03-14 20:35:43 +08:00
feng626
faf82d7cfb
fix: del connect my asset
2022-03-14 20:34:35 +08:00
feng626
4e8defc647
fix: 修复上传bug
2022-03-14 19:15:12 +08:00
Jiangjie.Bai
2f18208874
fix: 修复资产改密计划权限控制
2022-03-14 19:01:26 +08:00
Jiangjie.Bai
b37e8cdc3f
fix: 修复更新资产账号权限控制
2022-03-14 17:51:03 +08:00
Jiangjie.Bai
5b960fc46b
fix: 修复测试资产账号权限
2022-03-14 17:51:03 +08:00
fit2bot
df51c82cfd
perf: 优化Migration,删掉原来的 content type ( #7835 )
...
Co-authored-by: ibuler <ibuler@qq.com >
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com >
2022-03-14 17:10:34 +08:00
feng626
e9deb6fc7a
fix: app relation api
2022-03-14 17:05:47 +08:00
Jiangjie.Bai
cca49fa9cd
fix: 修复授权树显示
2022-03-14 16:47:29 +08:00
Jiangjie.Bai
cfed849175
Merge pull request #7834 from jumpserver/dev
...
fix: 修复setting perm
2022-03-14 15:53:11 +08:00
feng626
a7cc457f54
fix: 修复setting perm
2022-03-14 15:50:53 +08:00
Jiangjie.Bai
5996cedcd6
Merge pull request #7832 from jumpserver/dev
...
fix: 修复权限问题
2022-03-14 15:16:51 +08:00
feng626
567c1b0124
fix: node test refresh perm
2022-03-14 14:37:59 +08:00
fit2bot
2da541c127
fix: 修改授权树(账号备份) ( #7830 )
...
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com >
2022-03-14 14:23:13 +08:00
jiangweidong
794139782f
feat: JumpServer支持部署在使用了ssl的redis上,可使用证书连接
2022-03-14 11:35:14 +08:00
Jiangjie.Bai
307b739a03
fix: 修改授权树(收集用户)
2022-03-14 11:34:14 +08:00
feng626
ca5708988a
fix: 修复saml2 auth
2022-03-14 11:17:15 +08:00
ibuler
90d84f4d69
perf: 修改消息订阅
2022-03-14 11:16:54 +08:00
feng626
758f418f63
perf: 删除多余权限
2022-03-14 10:48:04 +08:00
Jiangjie.Bai
a64ec8a1d2
Merge pull request #7825 from jumpserver/dev
...
v2.20.0-rc2
2022-03-14 10:38:35 +08:00
ibuler
60564d1b4f
perf: 修改 bug
2022-03-14 10:01:51 +08:00
fit2bot
017710c056
perf: 修改perms ( #7822 )
...
* perf: 修改 perm tree
* perf: 修改perms
Co-authored-by: ibuler <ibuler@qq.com >
2022-03-11 21:24:07 +08:00
Jiangjie.Bai
a876a82a76
fix: 从组织移除用户
2022-03-11 21:20:44 +08:00
Jiangjie.Bai
8423ae602f
fix: 移除TICKET_ENABLED配置;系统设置API限制权限
2022-03-11 21:02:26 +08:00
Jiangjie.Bai
8e2471c1eb
fix: 移除TICKET_ENABLED配置;系统设置API限制权限
2022-03-11 21:02:26 +08:00
Jiangjie.Bai
224a9fbdb3
fix: 修复创建授权时actions为空保存时报错的问题
2022-03-11 21:00:37 +08:00
ibuler
797b184c7f
perf: 修改 perm tree
2022-03-11 20:31:38 +08:00
fit2bot
b3632f6531
fix: dingtalk auth perm ( #7814 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-03-11 19:32:23 +08:00
fit2bot
e3bc54e764
fix: 修复用户组添加用户 ( #7809 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-03-11 19:31:55 +08:00
fit2bot
f0325c48df
fix: 工单权限 ( #7808 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-03-11 19:31:29 +08:00
fit2bot
416d4bd0c3
fix: 修复tree ( #7802 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-03-11 17:24:28 +08:00
fit2bot
10c877c120
fix: 修复工单ticket exclude perm ( #7799 )
...
* fix: 修复工单ticket exclude perm
* fix: 修复perm tree
Co-authored-by: feng626 <1304903146@qq.com >
2022-03-11 13:30:14 +08:00
jiangweidong
f04378eaf8
feat: JumpServer支持部署在使用了ssl的redis上
2022-03-11 12:56:22 +08:00
fit2bot
b644c47173
perf: 排除工单流权限 ( #7798 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-03-11 11:04:21 +08:00
老广
45331dc9e8
Merge pull request #7796 from jumpserver/dev
...
v2.20.0-rc1
2022-03-10 20:34:18 +08:00
ibuler
8a565b9eef
perf: 修改设置
2022-03-10 20:30:41 +08:00
ibuler
4eb7b50b52
perf: 修改设置
2022-03-10 20:30:41 +08:00
Jiangjie.Bai
fd64bd03b4
fix: 修改LDAP配置API权限
2022-03-10 19:03:51 +08:00
Jiangjie.Bai
9c75147179
fix: 修改LDAP配置API权限
2022-03-10 19:03:51 +08:00
fit2bot
147e4cce94
perf: 修改 migrations ( #7794 )
...
* perf: 优化 auditor 权限
* perf: 修改 migrations
Co-authored-by: ibuler <ibuler@qq.com >
2022-03-10 18:55:53 +08:00
fit2bot
d1e25e1fef
fix: 删除应用/授权应用相关权限 ( #7792 )
...
* fix: 删除应用/授权应用相关权限
* fix: 删rbac清除code的一些迁移文件;增加到utils目录下
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com >
2022-03-10 18:51:45 +08:00
fit2bot
af2ba07338
fix: exclude ( #7791 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-03-10 18:11:33 +08:00
fit2bot
29b9adb684
perf: 修复一把数据 ( #7789 )
...
* fix: 优化 perm exclude
* perf: 修复一把数据
perf: 修复一些数据
Co-authored-by: ibuler <ibuler@qq.com >
2022-03-10 17:40:31 +08:00
fit2bot
64e0860d24
fix: 修复app suggestion perm bug ( #7788 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-03-10 17:24:24 +08:00
ibuler
9934007397
fix: 优化 perm exclude
2022-03-10 16:56:32 +08:00
Jiangjie.Bai
4044a71aea
revert: 回滚权限树
2022-03-10 15:27:15 +08:00
fit2bot
9725f0c963
fix: 修复工单流500bug ( #7784 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-03-10 11:26:34 +08:00
Jiangjie.Bai
b017e68a56
Perf: 优化RBAC权限树 ( #7782 )
...
* fix: 优化权限树(1)
* fix: 优化权限树(2)
* fix: 优化权限树(3)
* fix: 优化权限树(4)
* fix: 优化权限树(5)
* fix: 优化权限树(添加迁移文件)
* fix: 优化权限树(6)
* fix: 优化权限树(7)
* fix: 优化权限树(8)
* fix: 优化权限树(9)
2022-03-10 11:25:33 +08:00
fit2bot
9ca0eaf7ce
fix: 修改校对资产数量permbug ( #7777 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-03-09 15:01:44 +08:00
fit2bot
94e60e180e
fix: 修复新建组织用户列表获取到是全局用户bug ( #7776 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-03-09 11:17:28 +08:00
fit2bot
8ed221ea5a
fix: org role perm ( #7775 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-03-08 20:22:10 +08:00
fit2bot
42ebb1f82f
fix: 删除组织角色时 判断全局绑定用户数量 ( #7774 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-03-08 20:00:19 +08:00
ibuler
9492518773
perf: 修改 redis conn
2022-03-08 18:49:50 +08:00
feng626
1cca9c10fb
perf: 修改perm判断逻辑
2022-03-08 18:41:50 +08:00
feng626
c4a6715eb8
fix: 命令存储 or 命令权限
2022-03-08 17:43:26 +08:00
ibuler
4c31b5ec0f
perf: 去掉一些 perm
2022-03-08 17:33:06 +08:00
fit2bot
9fd7fa9339
fix: add auditor perm ( #7768 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-03-08 15:53:02 +08:00
feng626
a930f3aab3
fix: 修复创建更新用户给定默认权限
2022-03-08 14:07:02 +08:00
ibuler
5081fb5fe7
perf: 优化perm tree, 并添加缓存
2022-03-08 13:46:25 +08:00
fit2bot
cb072123d6
fix: 修复org admin ticket flow perm ( #7765 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-03-08 12:42:46 +08:00
fit2bot
761265dec5
fix: 修复index api perm ( #7761 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-03-08 10:43:01 +08:00
fit2bot
89de111acc
fix: 修复特殊用户过滤 ( #7759 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-03-07 20:09:52 +08:00
ibuler
14327ee398
perf: 优化账号备份api path
2022-03-07 19:56:27 +08:00
fit2bot
1b007c8c5c
perf: 修改权限树 ( #7757 )
...
* perf: 修改 rbac tree
* perf: 修改权限树
* perf: 修改用户默认权限
Co-authored-by: ibuler <ibuler@qq.com >
2022-03-07 19:02:37 +08:00
fit2bot
3222687aaa
fix: 修复应用授权权限bug ( #7756 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-03-07 18:42:22 +08:00
feng626
79994f5ddc
fix: 资产授权权限bug
2022-03-07 18:25:06 +08:00
fit2bot
8271492ec1
fix: 修复查看资产密钥bug ( #7754 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-03-07 17:55:35 +08:00
fit2bot
27560793f8
fix: 修复系统用户任务权限bug ( #7753 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-03-07 16:01:02 +08:00
Jiangjie.Bai
615929dd43
fix: 修复可以删除已关联用户角色的问题
2022-03-07 15:05:58 +08:00
feng626
a1c1b128e9
fix: 修复relation_systemuser_perm问题
2022-03-07 14:53:38 +08:00
ibuler
fa2c70c6be
perf: 修改 perm node title
2022-03-07 14:39:07 +08:00
Jiangjie.Bai
46e119db1f
fix: 后台不限制roles的必填项
2022-03-07 13:56:13 +08:00
ibuler
0afff45bae
fix: validate app perm error
2022-03-07 11:42:39 +08:00
fit2bot
31d219524b
fix: 修复创建用户roles必填问题 ( #7745 )
...
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com >
2022-03-07 11:21:25 +08:00
fit2bot
a20884e2ad
perf: 修改 rbac tree ( #7743 )
...
* perf: 修改 rbac tree
* perf: 修改verbose name
* fix: 修复系统用户
* fix: 还原 xpack
Co-authored-by: ibuler <ibuler@qq.com >
2022-03-07 11:19:03 +08:00
feng626
eb6bddc599
fix: 拆分角色权限树router
2022-03-04 18:13:59 +08:00
Jiangjie.Bai
8a8ed90eef
fix: 保留之前的jms_oidc_rp包
2022-03-04 18:12:46 +08:00
Jiangjie.Bai
75825f5baa
fix: 删除jms_oidc_rp包中的表jms_oidc_rp_oidcuser
2022-03-04 18:12:46 +08:00
fit2bot
0141fce27d
fix: 审计员add工作台 ( #7738 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2022-03-04 10:46:45 +08:00
老广
3f9f9351f3
Fix rbac ( #7737 )
...
* perf: 修改 rbac role bingding
* fix: suggestion perm
* perf: 修改 requirements
* perf: 修改 rbac
* fix: auditor_perms
Co-authored-by: feng626 <1304903146@qq.com >
2022-03-04 10:16:21 +08:00
ibuler
390b8693df
perf: 修改 signal handler
2022-03-03 10:03:06 +08:00
fit2bot
dafc416783
Fix rbac ( #7728 )
...
* perf: 重命名 signal handlers
* fix: 修复 ticket processor 问题
* perf: 修改 ticket 处理人api
* fix: 修复创建系统账号bug
* fix: 升级celery_beat==2.2.1和flower==1.0.0;修改celery进程启动参数先后顺序
* perf: 修改 authentication token
* fix: 修复上传权限bug
* fix: 登录页面增加i18n切换;
* fix: 系统角色删除限制
* perf: 修改一下 permissions tree
* perf: 生成 i18n
* perf: 修改一点点
Co-authored-by: ibuler <ibuler@qq.com >
Co-authored-by: feng626 <1304903146@qq.com >
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com >
2022-03-02 20:48:43 +08:00
halo
04e46e4b1c
fix: 修复节点创建不能指定id问题,兼容api
2022-03-02 16:24:03 +08:00
fit2bot
ab1024fbf4
perf: 优化 super ticket 的状态 ( #7714 )
...
* fix: token 系统用户增加 protocol
* fix: 修复清除orphan session时同时清除对应的 session_task
* perf: 修改 connection token api
* fix: 修复无法获取系统角色绑定的问题
* perf: 增加 db terminal 及 magnus 组件
* perf: 修改 migrations
* fix: 修复AUTHENTICATION_BACKENDS相关的逻辑
* fix: 修改判断backend认证逻辑
* fix: 修复资产账号查看密码跳过mfa
* fix: 修复用户组授权权限错误
* feat: 支持COS对象存储
* feat: 升级依赖 jms_storage==0.0.42
* fix: 修复 koko api 问题
* feat: 修改存储翻译信息
* perf: 修改 ticket 权限
* fix: 修复获取资产授权系统用户 get_queryset
* perf: 抽取 ticket
* perf: 修改 cmd filter 的权限
* fix: 修改 ticket perm
* perf: 修改工单的api
Co-authored-by: Eric <xplzv@126.com >
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com >
Co-authored-by: ibuler <ibuler@qq.com >
Co-authored-by: 小冯 <xiaofeng@xiaofengdeMacBook-Pro.local >
Co-authored-by: feng626 <1304903146@qq.com >
2022-02-28 20:22:14 +08:00
Jiangjie.Bai
03afa4f974
Fix rbac ( #7713 )
...
* fix: token 系统用户增加 protocol
* fix: 修复清除orphan session时同时清除对应的 session_task
* perf: 修改 connection token api
* fix: 修复无法获取系统角色绑定的问题
* perf: 增加 db terminal 及 magnus 组件
* perf: 修改 migrations
* fix: 修复AUTHENTICATION_BACKENDS相关的逻辑
* fix: 修改判断backend认证逻辑
* fix: 修复资产账号查看密码跳过mfa
* fix: 修复用户组授权权限错误
* feat: 支持COS对象存储
* feat: 升级依赖 jms_storage==0.0.42
* fix: 修复 koko api 问题
* feat: 修改存储翻译信息
* perf: 修改 ticket 权限
* fix: 修复获取资产授权系统用户 get_queryset
* perf: 抽取 ticket
* perf: 修改 cmd filter 的权限
* fix: 修改 ticket perm
* fix: 修复oidc依赖问题
Co-authored-by: Eric <xplzv@126.com >
Co-authored-by: ibuler <ibuler@qq.com >
Co-authored-by: 小冯 <xiaofeng@xiaofengdeMacBook-Pro.local >
Co-authored-by: feng626 <1304903146@qq.com >
2022-02-28 19:28:58 +08:00
Jiangjie.Bai
edfca5eb24
Fix rbac ( #7699 )
...
* perf: 优化 suggesstion
* perf: 修改 migrations
* feat: 添加OIDC认证逻辑
* perf: 修改 backend
* perf: 优化认证backends
* perf: 优化认证backends
* perf: 优化CAS认证, 用户多域名进行访问时回调到各自域名
Co-authored-by: ibuler <ibuler@qq.com >
2022-02-25 19:23:59 +08:00
老广
02ca473492
Fix rbac ( #7690 )
...
* perf: 优化 suggesstion
* perf: 修改 migrations
2022-02-24 12:03:40 +08:00
老广
484b75bb53
Merge pull request #7687 from jumpserver/fix_rbac
...
fix: rbac
2022-02-24 10:06:47 +08:00
xinwen
9c3fd59ef4
fix: 删除用户最近登录的资产接口
2022-02-23 18:35:53 +08:00
feng626
bbf3250161
fix: 优化用户列表接口性能
2022-02-23 18:35:10 +08:00
feng626
8604b9019f
fix: 添加迁移文件
2022-02-23 18:32:30 +08:00
Jiangjie.Bai
966b4250b8
Merge branch 'fix_rbac' of github.com:jumpserver/jumpserver into fix_rbac
2022-02-23 18:28:47 +08:00
Jiangjie.Bai
291f2b0e13
fix: 修复用户列表出现服务账号的问题
2022-02-23 18:28:23 +08:00
Eric
a1d15ef206
fix: 修复管理员终断会话API
2022-02-23 17:10:02 +08:00
ibuler
e76eec530f
perf: 添加migrations
2022-02-23 17:06:07 +08:00
ibuler
add4d8d2cd
fix: 修改上传录像 api 权限
2022-02-23 15:47:12 +08:00
ibuler
c6ece550a9
perf: 修改翻译
2022-02-22 19:53:00 +08:00
xinwen
e3b620089a
feat: 个人页面接口
2022-02-22 18:29:49 +08:00
Jiangjie.Bai
64f721875b
fix: 修复用户页面点击资产树节点提示对象找不到的问题
2022-02-22 18:29:49 +08:00
ibuler
02d3747c70
perf: 添加监测密码的脚本
2022-02-22 18:29:49 +08:00
feng626
09494193ab
fix: 修复批量操作权限bug
2022-02-22 18:29:49 +08:00
feng626
702111f578
fix: 修复系统用户sudo tab权限
2022-02-22 18:29:49 +08:00
feng626
e08db7423f
fix: 修复资产账号测试可连接性权限问题
2022-02-22 18:29:49 +08:00
ibuler
0c95faac04
fix: 修复 cache set
2022-02-22 18:29:49 +08:00
fit2bot
534cbf1281
perf: 修改依赖版本 ( #7666 )
...
* perf: 修复一些错误权限位
* Pr@fix rbac@fix rbac permissions (#7648 )
* fix: 确保每次 migrate 执行更新 role permissions
* perf: 修改 choices
* feat: 兼容apple m1
* perf: 修改 migrations role permissions
* perf: pymysql 导入
* perf: admin 判断
* perf: 修改依赖版本
Co-authored-by: ibuler <ibuler@qq.com >
Co-authored-by: Aaron3S <chenyang@fit2cloud.com >
2022-02-22 18:29:49 +08:00
fit2bot
abe5fa9036
perf: 修改依赖库版本 ( #7661 )
...
* perf: 修复一些错误权限位
* Pr@fix rbac@fix rbac permissions (#7648 )
* fix: 确保每次 migrate 执行更新 role permissions
* perf: 修改 choices
* feat: 兼容apple m1
* perf: 修改 migrations role permissions
* perf: pymysql 导入
* perf: admin 判断
* perf: 修改依赖库版本
Co-authored-by: ibuler <ibuler@qq.com >
Co-authored-by: Aaron3S <chenyang@fit2cloud.com >
2022-02-22 18:29:49 +08:00
feng626
2a2f05e51c
fix: 删除组织关联删除工单 工单流
2022-02-22 18:29:49 +08:00
xinwen
f460916e84
fix: swagger
2022-02-22 18:29:49 +08:00
jiangweidong
ad2cb233d7
feat: 支持 MongoDB 数据库的纳管 ( #7631 )
2022-02-22 10:09:48 +08:00
halo
0dbf035146
perf: 优化代码
2022-02-21 16:52:21 +08:00
halo
ea124fd0db
fix: 修复keycloak配置转换为openid不生效问题,持久化到数据库
2022-02-21 16:52:21 +08:00
Jiangjie.Bai
83ff8dbf26
fix: rbac 合并 ( #7658 )
...
* perf: 修复一些错误权限位
* Pr@fix rbac@fix rbac permissions (#7648 )
* fix: 确保每次 migrate 执行更新 role permissions
* perf: 修改 choices
* feat: 兼容apple m1
* perf: 修改 migrations role permissions
* perf: pymysql 导入
* perf: admin 判断
* fix: 修复消息订阅权限
Co-authored-by: ibuler <ibuler@qq.com >
Co-authored-by: Aaron3S <chenyang@fit2cloud.com >
Co-authored-by: feng626 <1304903146@qq.com >
2022-02-21 16:24:03 +08:00
Jiangjie.Bai
783c163324
fix: 修复获取命令过滤规则时按照有组织的资源进行组织过滤
2022-02-19 11:44:03 +08:00
Jiangjie.Bai
3deced4ade
fix: 修复登录系统用户temp_auth保存时构建的key和获取时不一致的问题
2022-02-18 20:07:19 +08:00
fit2bot
63de4e1806
perf: 添加 is_org_admin ( #7644 )
...
* fix: 修复 org members 的问题
* perf: 修改 org member
* perf: 修改 is sa
* perf: 修改 active
* perf: 修复写法
* perf: is_sa to is_service_account
Co-authored-by: ibuler <ibuler@qq.com >
2022-02-18 16:25:54 +08:00
ibuler
48d0c7b6cc
fix: 修复 org members 的问题
2022-02-18 14:37:38 +08:00
ibuler
20cc8a124f
perf: 修改connection token domain
...
perf: 添加 org_id
2022-02-18 14:10:22 +08:00
ibuler
db050e405d
fix: 修改 migrations
2022-02-17 23:02:32 +08:00
fit2bot
e259d2a9e9
fix: fix rbac to dev ( #7636 )
...
* feat: 添加 RBAC 应用模块
* feat: 添加 RBAC Model、API
* feat: 添加 RBAC Model、API 2
* feat: 添加 RBAC Model、API 3
* feat: 添加 RBAC Model、API 4
* feat: RBAC
* feat: RBAC
* feat: RBAC
* feat: RBAC
* feat: RBAC
* feat: RBAC 整理权限位
* feat: RBAC 整理权限位2
* feat: RBAC 整理权限位2
* feat: RBAC 整理权限位
* feat: RBAC 添加默认角色
* feat: RBAC 添加迁移文件;迁移用户角色->用户角色绑定
* feat: RBAC 添加迁移文件;迁移用户角色->用户角色绑定
* feat: RBAC 修改用户模块API
* feat: RBAC 添加组织模块迁移文件 & 修改组织模块API
* feat: RBAC 添加组织模块迁移文件 & 修改组织模块API
* feat: RBAC 修改用户角色属性的使用
* feat: RBAC No.1
* xxx
* perf: 暂存
* perf: ...
* perf(rbac): 添加 perms 到 profile serializer 中
* stash
* perf: 使用init
* perf: 修改migrations
* perf: rbac
* stash
* stash
* pref: 修改rbac
* stash it
* stash: 先去修复其他bug
* perf: 修改 role 添加 users
* pref: 修改 RBAC Model
* feat: 添加权限的 tree api
* stash: 暂存一下
* stash: 暂存一下
* perf: 修改 model verbose name
* feat: 添加model各种 verbose name
* perf: 生成 migrations
* perf: 优化权限位
* perf: 添加迁移脚本
* feat: 添加组织角色迁移
* perf: 添加迁移脚本
* stash
* perf: 添加migrateion
* perf: 暂存一下
* perf: 修改rbac
* perf: stash it
* fix: 迁移冲突
* fix: 迁移冲突
* perf: 暂存一下
* perf: 修改 rbac 逻辑
* stash: 暂存一下
* perf: 修改内置角色
* perf: 解决 root 组织的问题
* perf: stash it
* perf: 优化 rbac
* perf: 优化 rolebinding 处理
* perf: 完成用户离开组织的问题
* perf: 暂存一下
* perf: 修改翻译
* perf: 去掉了 IsSuperUser
* perf: IsAppUser 去掉完成
* perf: 修改 connection token 的权限
* perf: 去掉导入的问题
* perf: perms define 格式,修改 app 用户 的全新啊
* perf: 修改 permission
* perf: 去掉一些 org admin
* perf: 去掉部分 org admin
* perf: 再去掉点 org admin role
* perf: 再去掉部分 org admin
* perf: user 角色搜索
* perf: 去掉很多 js
* perf: 添加权限位
* perf: 修改权限
* perf: 去掉一个 todo
* merge: with dev
* fix: 修复冲突
Co-authored-by: Bai <bugatti_it@163.com >
Co-authored-by: Michael Bai <baijiangjie@gmail.com >
Co-authored-by: ibuler <ibuler@qq.com >
2022-02-17 20:13:31 +08:00
Jiangjie.Bai
18c388f3a5
Merge pull request #7629 from jumpserver/dev
...
v2.19.0-rc3
2022-02-17 11:04:33 +08:00
feng626
b088362ae3
perf: 账号备份性能优化
2022-02-17 11:02:49 +08:00
xinwen
c7f8ebb613
fix: 站内信 ServerPerformanceCheck redis 订阅报错
2022-02-17 10:53:36 +08:00
feng626
de2f9ae687
Merge pull request #7626 from jumpserver/pr@dev@fix_i18n
...
fix: 翻译
2022-02-16 19:19:55 +08:00
xinwen
a806a2d3e6
fix: 翻译
2022-02-16 19:16:45 +08:00
Jiangjie.Bai
7be76feeb0
Merge pull request #7622 from jumpserver/dev
...
v2.19.0-rc3
2022-02-16 16:42:19 +08:00
ibuler
f548abcb87
perf: 用户临时密码支持加密传输
2022-02-16 16:31:57 +08:00
xinwen
35c6b581e2
feat: 远程应用支持磁盘挂载
2022-02-16 16:29:06 +08:00
feng626
40b119786b
Merge pull request #7621 from jumpserver/pr@dev@ticket_flow
...
fix: 工单流需要超级管理员配置
2022-02-16 14:47:56 +08:00
feng626
ff9347e344
fix: 工单流需要超级管理员配置
2022-02-16 14:37:26 +08:00
feng626
da0bbcee57
fix: 修复资产账号过滤重复问题
2022-02-16 11:35:53 +08:00
ibuler
824d10ce93
pref: connection token 添加 secret
2022-02-16 11:33:25 +08:00
feng626
1d6dcf9fb5
fix: 修复命令报警翻译
2022-02-15 18:33:52 +08:00
Jiangjie.Bai
3325867f8f
fix: 修改LDAP SYNC相关参数设置
2022-02-15 17:57:56 +08:00
xinwen
2f43aeee5d
fix: Authbook 修改秘钥不生效
2022-02-15 11:14:51 +08:00
Jiangjie.Bai
764d70ea4f
fix: 修改用户组名称翻译
2022-02-14 19:27:41 +08:00
Jiangjie.Bai
ff6dbe67a6
Merge pull request #7610 from jumpserver/dev
...
v2.19.0-rc2
2022-02-14 18:31:52 +08:00
feng626
7f36958683
perf: 工单流只需组织管理员权限
2022-02-14 18:15:11 +08:00
xinwen
fa5921cd86
fix: 去掉 can_replay 兼容代码
2022-02-14 18:14:37 +08:00
feng626
540679df11
fix: 修复operatelog add remove 翻译问题
2022-02-14 14:04:59 +08:00
fit2bot
597b022905
fix: 修复历史会话文件不能被清理的bug ( #7604 )
...
* fix: 修复历史会话文件不能被清理的bug
* perf: 删除调试日志
Co-authored-by: halo <wuyihuangw@gmail.com >
2022-02-14 10:58:30 +08:00
jiangweidong
ab34b9906e
perf: 切割一次就可以了
2022-02-10 18:34:09 +08:00
jiangweidong
755fa8efa8
perf: 兼容不同版本间JumpServer获取的SAML2协议用户属性
2022-02-10 18:34:09 +08:00
feng626
889713f00e
fix: 修复工单流程设置显示其它组织问题
2022-02-10 14:07:32 +08:00
Jiangjie.Bai
c10436de47
Merge pull request #7589 from jumpserver/dev
...
v2.19.0-rc1
2022-02-10 11:24:28 +08:00
xinwen
333bb64b8b
fix: Authbook 取认证信息bug
2022-02-10 11:20:40 +08:00
Michael Bai
67a49dc5e9
feat: syslog 记录的数据来源于序列类
2022-02-08 19:22:08 +08:00
Michael Bai
8085db7acc
feat: 增加系统设置(安全)控制第三方认证用户是否进行MFA认证
2022-02-08 17:48:40 +08:00
Michael Bai
6adeafd1d2
fix: 修复创建命令过滤规则失败的问题
2022-02-08 14:21:43 +08:00
xinwen
1faba95a48
fix: 修复 xrdp 连接资产时会生成用户登录日志
2022-02-08 12:38:27 +08:00
吴小白
ab07091eb8
perf: 优化 quick_start.sh
2022-02-08 12:36:43 +08:00
xinwen
f994f5d776
fix: redis 订阅 bug
2022-02-08 12:35:16 +08:00
ibuler
55fae1667d
fix: 修复 redis 连接过多的问题
2022-02-08 12:35:16 +08:00
Michael Bai
b3397c6aeb
feat: 命令过滤规则增加忽略大小写选项
2022-02-08 12:31:15 +08:00
老广
8ab4f6f004
docs: 添加 pr 提示说明
2022-02-07 15:39:50 +08:00
老广
5a37540eda
docs: 修改贡献提示
2022-02-07 15:39:50 +08:00
老广
1c1d507e34
Create CONTRIBUTING.md
2022-02-07 15:39:50 +08:00
老广
9c40314edc
Create CODE_OF_CONDUCT.md
2022-02-07 15:39:22 +08:00
feng626
acdde5a236
fix: 密钥密码翻译
2022-01-27 18:19:44 +08:00
Jiangjie.Bai
37a3566b0e
Merge pull request #7540 from jumpserver/dev
...
v2.18
2022-01-20 13:47:13 +08:00
feng626
a81f6bf97b
fix: 应用账号attrs字段问题
2022-01-20 13:20:45 +08:00
Michael Bai
b07f532a71
fix: 修复导出应用账号会包含attrs字段的问题
2022-01-20 12:00:18 +08:00
feng626
46270fd91c
fix: authbook load asset queryset bug
2022-01-20 11:03:18 +08:00
Jiangjie.Bai
2b364c1476
Merge pull request #7534 from jumpserver/dev
...
v2.18.0-rc4
2022-01-19 19:36:59 +08:00
feng626
9e47bf6ec5
fix: 批量命令bug
2022-01-19 19:34:32 +08:00
ibuler
89c7e514eb
perf: 修复登录和推送系统用户是密码选择
2022-01-19 19:08:38 +08:00
feng626
83c5344307
fix: 获取命令规则过滤不准
2022-01-19 19:07:43 +08:00
feng626
2beec1a03b
Merge pull request #7530 from jumpserver/pr@dev@ssh_passphrase_bug
...
fix: 修改 修改ssh密钥时报500问题
2022-01-19 11:11:49 +08:00
feng626
d53925d1fb
Merge pull request #7529 from jumpserver/pr@dev@ticket_bug
...
fix: 修复工单审批后审批人与记录人不一致问题
2022-01-19 11:11:34 +08:00
feng626
69d4a0a250
fix: 修改 修改ssh密钥时报500问题
2022-01-19 10:39:17 +08:00
feng626
e33a67daf6
fix: 修复工单审批后审批人与记录人不一致问题
2022-01-19 10:33:41 +08:00
Jiangjie.Bai
2036037675
Merge pull request #7527 from jumpserver/dev
...
v2.18.0-rc3
2022-01-18 19:35:37 +08:00
fit2bot
0b16d70c0c
fix: 修改翻译 ( #7526 )
...
* fix: 修改翻译
* fix: 修改保存数据库翻译
* fix: 修复翻译为none问题
Co-authored-by: feng626 <1304903146@qq.com >
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com >
2022-01-18 19:31:01 +08:00
Michael Bai
8d6498c8f0
fix: 升级依赖 jms-storage==0.0.41
2022-01-18 17:01:02 +08:00
Michael Bai
59d0f53725
fix: 修改审计日志操作日志动作翻译问题
2022-01-18 15:21:35 +08:00
Michael Bai
518caa4f7a
fix: 修改应用账号APP名称的VerboseName
2022-01-18 15:03:23 +08:00
Michael Bai
b8aaa7d249
fix: 修改命令过滤器翻译
2022-01-18 14:27:22 +08:00
Michael Bai
c9f63a3f4a
fix: 修改审计日志中的i18n翻译问题
2022-01-18 13:21:31 +08:00
xinwen
ec68fc9562
fix: 绑定三方登录消息翻译
2022-01-18 10:39:35 +08:00
xinwen
561ce53413
fix: 空的 es 存储,指定 timestamp 排序报错
2022-01-18 10:14:51 +08:00
Jiangjie.Bai
6bd597eadd
Merge pull request #7511 from jumpserver/dev
...
v2.18.0-rc2
2022-01-17 19:21:39 +08:00
feng626
005032ea00
fix: 修复账号备份存在外键search 500 bug
2022-01-17 19:21:13 +08:00
Michael Bai
de74477fd6
fix: 修改翻译文件
2022-01-17 19:11:01 +08:00
fit2bot
c43ad981bd
perf: 优化写法 ( #7498 )
...
* fix: 修复登录页输入 mfa 时不支持 某 mfa 的错误提示
fix tapd 1145454465001008371
* perf: 优化 send code api,避免暴力常识
* perf: 优化写法
* Update mfa.py
Co-authored-by: ibuler <ibuler@qq.com >
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com >
2022-01-17 19:05:01 +08:00
xinwen
088676d998
fix: 计算工单序号的时候切换到root组织
2022-01-17 16:22:04 +08:00
jiangweidong
106bb9b63d
perf: SAML2属性映射去掉域名前缀
2022-01-17 16:06:37 +08:00
ibuler
451e61bb61
perf: 优化 celery 任务中的数据库连接问题
...
perf: add comment
2022-01-17 16:04:50 +08:00
halo
e1de210585
feat: 创建用户邮件内容支持html标签
2022-01-17 16:03:04 +08:00
xinwen
cce34f4939
fix: 用户登录失败时,登陆日志中的认证方式不准确
2022-01-17 16:02:28 +08:00
fit2bot
def9bedd30
perf: 账号备份优化 ( #7503 )
...
* perf: 账号备份优化
* feat: 优化账号备份获取有序备份字段列表
Co-authored-by: feng626 <1304903146@qq.com >
Co-authored-by: Michael Bai <baijiangjie@gmail.com >
2022-01-17 15:58:39 +08:00
feng626
d2b3edffca
Merge pull request #7505 from jumpserver/pr@dev@ticket_bug
...
fix: 修复工单审批后state不准问题
2022-01-17 15:51:49 +08:00
Michael Bai
aea2db84e8
fix: 添加deb依赖: libaio-dev freetds-dev
2022-01-17 13:57:08 +08:00
feng626
6a4ffcc9ad
fix: 修复工单审批后state不准问题
2022-01-16 17:49:17 +08:00
fit2bot
4343b6487d
fix: 修复登录页输入 mfa 时不支持 某 mfa 的错误提示 ( #7495 )
...
* fix: 修复登录页输入 mfa 时不支持 某 mfa 的错误提示
fix tapd 1145454465001008371
* perf: 优化 send code api,避免暴力常识
Co-authored-by: ibuler <ibuler@qq.com >
2022-01-13 19:01:12 +08:00
Michael Bai
ba695c4600
fix: 抽象permissions-serializer的actions字段值设置
2022-01-13 18:58:10 +08:00
Michael Bai
21a34ddc03
feat: 返回License信息
2022-01-13 18:55:44 +08:00
ibuler
145c7952c9
perf: 优化 ops 任务,支持 i18n
...
- 内置任务名称支持了 i18n,数据库存英文,返回是翻译一下
- 任务执行中,添加 language 上下文
2022-01-13 15:03:48 +08:00
xinwen
43c4c78378
fix: 工单序号添加排序
2022-01-13 14:37:02 +08:00
Michael Bai
620834c817
fix: 修改工单迁移文件warining问题
...
Any fields that are stored with VARCHAR column types may have their max_length restricted to 255 characters if you are using unique=True for the field.
See: https://docs.djangoproject.com/en/3.1/ref/databases/#mysql-character-fields
2022-01-13 14:36:30 +08:00
Jiangjie.Bai
fbd0b44d4f
Merge pull request #7490 from jumpserver/dev
...
v2.18.0-rc1
2022-01-12 20:58:04 +08:00
xinwen
4b44a54d97
fix: 腾讯验证码测试不通过
2022-01-12 20:57:22 +08:00
Eric
6716acb4ff
perf: 更新安全英文版本
2022-01-12 20:56:58 +08:00
Jiangjie.Bai
35722a8466
Merge pull request #7487 from jumpserver/dev
...
v2.18.0-rc1
2022-01-12 20:56:33 +08:00
feng626
e5659a1d07
fix: 修复翻译及迁移文件
2022-01-12 20:55:58 +08:00
xinwen
414137cd73
fix: 三方认证绑定发通知文案
2022-01-12 20:34:19 +08:00
xinwen
1e3a15a3d0
feat: 三方认证绑定发通知
2022-01-12 20:23:25 +08:00
ibuler
dde7559f47
feat: node api 支持使用 full_value 递归创建
2022-01-12 20:23:16 +08:00
feng626
b0932e5137
feat: 逃生通道
2022-01-12 20:22:36 +08:00
xinwen
5cdc4c3c28
feat: 工单添加序号
2022-01-12 10:38:07 +08:00
ibuler
25a2290804
perf: 优化迁移数据库错误提示
2022-01-10 17:32:01 +08:00
Michael Bai
4405abbedf
feat: 2022
2022-01-04 12:54:12 +08:00
halo
3f6c9d519e
fix: 修复通知用户过期时间bug
2021-12-31 17:26:23 +08:00
xinwen
bd84edea62
feat: 资产登录工单页面增加监控与中断
2021-12-31 17:23:39 +08:00
feng626
100bfe0304
feat: 新增获取k8s pod namespace container接口
2021-12-31 15:54:59 +08:00
feng626
11fd9a6567
feat: 配置私钥密码
2021-12-31 14:47:01 +08:00
Michael Bai
90299a508c
fix: 授权actions serializer 设置default值
2021-12-30 17:25:00 +08:00
Michael Bai
de9516dee5
feat: 应用授权增加Action动作控制
2021-12-30 14:47:58 +08:00
jiangweidong
db01a6d48d
fix: 因为admin_user表中有历史数据,导致组织无法删除
2021-12-30 10:48:07 +08:00
halo
c2d271f00b
feat: rdp协议新增username表达式,匹配更多特殊字符
2021-12-30 10:01:26 +08:00
halo
90de229631
feat: rdp协议username支持输入中文和$
2021-12-30 10:01:26 +08:00
xinwen
35a10fdd62
feat: 命令记录接口增加 remote_addr 字段
2021-12-28 18:26:21 +08:00
xinwen
89cad224c5
fix: SSO 限制用户删除
2021-12-28 18:24:32 +08:00
jiangweidong
9b2e1e08d8
feat: 将redis_acl协议合并到redis协议中
2021-12-28 18:15:00 +08:00
jiangweidong
aaaa87dd60
feat: 增加数据库redis的纳管功能
2021-12-28 18:15:00 +08:00
吴小白
24cad76232
perf: 更新基础镜像
2021-12-28 18:12:10 +08:00
吴小白
040f1fcbb8
perf: 添加 quick_start.sh
2021-12-27 12:32:58 +08:00
Eric
d76ef788d2
perf: 修改 Jmservisor 的下载地址名称
2021-12-24 11:35:47 +08:00
feng626
38c870a0b5
perf: 工单流对应受理人懒加载
2021-12-21 18:20:02 +08:00
Michael Bai
ac9e7e9b40
fix: 下载页面添加Jmservisor拉起脚本
2021-12-17 15:54:32 +08:00
Michael Bai
5aed04d58b
fix: 修改SAML2.0 Logo
2021-12-17 15:25:15 +08:00
jiangweidong
c05951b6c4
feat: 添加数据库SQLServer改密功能的python依赖库
2021-12-17 11:20:09 +08:00
ibuler
107215aadc
workflow: 添加同步 gitee 的 workflow
2021-12-17 11:19:47 +08:00
Jiangjie.Bai
d27947919b
Merge pull request #7404 from jumpserver/dev
...
v2.17.0 rc4
2021-12-15 22:03:19 +08:00
ibuler
b92530f0b9
perf: 优化通知,对支持 markdown 的发 markdown
2021-12-15 20:58:33 +08:00
ibuler
b113eeb1d6
perf: 修复基本设置中的 base_site 可能带 / 的问题
2021-12-15 20:55:06 +08:00
ibuler
eb3165f8e7
perf: 优化 saml
2021-12-15 20:54:34 +08:00
xinwen
93d77b2312
fix: 执行 ansible 任务日志记录错误
2021-12-15 18:02:14 +08:00
Michael Bai
ae1d419f70
fix: 修复用户组命令过滤规则获取不到的问题
2021-12-15 16:34:33 +08:00
feng626
36054cb64c
Merge pull request #7397 from jumpserver/pr@dev@translate
...
feat: translate
2021-12-15 16:21:52 +08:00
feng626
022e93d7a2
feat: translate
2021-12-15 16:15:21 +08:00
Michael Bai
ac14790960
fix: 修改命令过滤规则动作允许值1->9
2021-12-15 14:57:44 +08:00
feng626
facc231e3f
Merge pull request #7394 from jumpserver/pr@dev@ticket_filter_bug
...
perf: ticket filter
2021-12-15 14:40:28 +08:00
feng626
e4178849ba
perf: ticket filter
2021-12-15 14:23:07 +08:00
Jiangjie.Bai
151d897746
Merge pull request #7391 from jumpserver/dev
...
v2.17.0 rc3
2021-12-14 21:58:27 +08:00
xinwen
27588f48d8
fix: authbook 创建的时候没有自动推送
2021-12-14 20:07:16 +08:00
Michael Bai
303102d40b
fix: 删除一些启动时大量输出的debug日志
2021-12-14 20:06:49 +08:00
xinwen
ff9632d6da
fix: LDAP 测试连接报错
2021-12-14 20:04:41 +08:00
Michael Bai
4cbf6dd5e6
fix: 修复获取系统用户认证信息API
2021-12-14 19:12:22 +08:00
xinwen
4f889cfe36
fix: 带 ad_domain 的系统用户不应该支持推送
2021-12-14 18:05:34 +08:00
ibuler
0c2e5f3f2a
perf: 优化 saml2 i18n
2021-12-14 18:01:08 +08:00
ibuler
19ecc7fef6
fix: 修复 otp 返回时报错
2021-12-14 17:50:33 +08:00
ibuler
0020343ae0
perf: 优化运行的命名
2021-12-14 17:47:10 +08:00
ibuler
fa5c433c7c
perf: 优化启动脚本,避免启动超时
2021-12-14 17:47:10 +08:00
jiangweidong
5139f9c4b9
feat: saml2认证支持https协议
2021-12-14 17:12:43 +08:00
Jiangjie.Bai
d6aad41d05
Merge pull request #7373 from jumpserver/dev
...
v2.17.0 rc2
2021-12-13 19:47:33 +08:00
xinwen
b3acc0d451
fix: 去掉 get_docker_mem_usage_if_limit 日志
2021-12-13 18:09:55 +08:00
ibuler
330917df4c
fix: 修复 saml2 登陆的问题
2021-12-13 17:52:18 +08:00
ibuler
21d4ffa33b
perf: 优化 cas 回调地址翻译
2021-12-13 16:33:00 +08:00
xinwen
1bc14c53d4
fix: 企业微信发送报错
2021-12-13 16:32:09 +08:00
ibuler
5024d0d739
perf: 优化 saml2 log
2021-12-13 16:30:38 +08:00
jiangweidong
c5013dcbd6
feat: saml2协议单点登录支持在页面上配置saml2协议的高级配置 ( #7362 )
2021-12-13 10:54:14 +08:00
halo
84924bc3f6
fix: 修复会话详情页命令列表排序失效bug
2021-12-13 10:52:37 +08:00
Michael Bai
2de769ecad
chore: 修改依赖版本: jms-storage==0.0.40
2021-12-13 10:47:09 +08:00
feng626
ab68aed98f
Merge pull request #7363 from jumpserver/pr@dev@ticket_bug
...
perf: 工单根据选择组织自动选择流
2021-12-13 10:25:48 +08:00
feng626
9b9e32d2f4
perf: 工单根据选择组织自动选择流
2021-12-11 12:50:30 +08:00
ibuler
b6249e9a63
fix: 修复登录时跳转问题
2021-12-10 17:49:29 +08:00
Jiangjie.Bai
5f7fa7e02f
Merge pull request #7355 from jumpserver/dev
...
v2.17.0 rc1
2021-12-09 20:57:02 +08:00
Michael Bai
74fe9dddb7
fix: 修改i18n
2021-12-09 20:35:52 +08:00
ibuler
ade3f3ae6c
fix: 修复需要设置 mfa 的 bug
2021-12-09 20:24:02 +08:00
Michael Bai
1c3b574c46
fix: 修复系统用户命令过滤规则必填的问题
2021-12-09 20:23:26 +08:00
Michael Bai
92aeae4a2a
fix: 修改i18n
...
fix: 修改i18n
2021-12-09 20:23:07 +08:00
xinwen
ea6c28fa0d
fix: 修改 cgroup memory log
2021-12-09 20:22:34 +08:00
fit2bot
f44acc923b
perf: 修改 otp 的显示,避免误会 ( #7345 )
...
perf: 还是用 OTP 吧
Co-authored-by: ibuler <ibuler@qq.com >
2021-12-09 19:33:11 +08:00
ibuler
f27df2f523
fix: 修复 openstack 同步依赖
2021-12-09 19:28:22 +08:00
Michael Bai
bbf2aff96c
feat: 命令过滤器支持多维度绑定
...
feat: 修改命令过滤规则校验
feat: 修改系统用户命令过滤器迁移文件
2021-12-09 19:06:28 +08:00
ibuler
3ea4a9fbe6
chore: 修改 html 中 license 文案
2021-12-09 17:33:56 +08:00
fit2bot
3962af7c4f
feat: 支持saml2协议的单点登录,合并代码 ( #7347 )
...
* fix: 支持saml2协议的单点登录
* feat: 支持saml2协议的单点登录,合并代码
Co-authored-by: jiangweidong <weidong.jiang@fit2cloud.com >
2021-12-09 15:47:21 +08:00
ibuler
38c6d11af1
perf: 修改关闭 issue 的 comment
2021-12-09 15:31:27 +08:00
fit2bot
5f45acf68f
workflow: 修改 workflow ( #7341 )
...
* workflow: 修改 workflow
* fix: 修复判断的错误
* perf: 添加移除的内容
Co-authored-by: ibuler <ibuler@qq.com >
2021-12-09 12:07:55 +08:00
fit2bot
c7f2afc3c1
fix: redis lock bug ( #7338 )
...
Co-authored-by: feng626 <1304903146@qq.com >
2021-12-08 17:55:32 +08:00
xinwen
16fae00e0e
feat: xrdp 远程应用
2021-12-08 15:55:49 +08:00
Eric_Lee
0afeed0ff1
feat: 录像增加 cast 格式 ( #7259 )
...
* feat: 录像增加 cast 格式
* perf: 优化一下写法
* perf: 修改一点点
Co-authored-by: ibuler <ibuler@qq.com >
2021-12-08 15:35:22 +08:00
Michael Bai
d72aa34513
fix: 修改命令过滤规则生成正则表达式的逻辑,提高命令过滤准确性
2021-12-08 10:24:33 +08:00
feng626
d56de16563
fix: 依赖bug
2021-12-07 19:01:14 +08:00
ibuler
8536e6fca7
perf: 添加 issues workflow
2021-12-07 18:29:53 +08:00
feng626
adb9f01231
feat: 密码计划邮件提醒
2021-12-07 17:00:33 +08:00
ibuler
e0d4ad8570
workflow: 优化workflow
2021-12-07 10:40:13 +08:00
ibuler
3c8726f1b0
fix: 去掉多余的 collect static
...
perf: 使用bash 才能保证 subprocess 运行正常
2021-12-06 19:03:23 +08:00
ibuler
6b4bc1bdb5
chore: 升级 License 到 GPLv3
...
chore: 升级 License 到 GPLv3
2021-12-06 18:15:17 +08:00
ibuler
c92d36391f
chore: change license
2021-12-06 17:45:54 +08:00
xinwen
24bbe7c31f
fix: 计算docker limit 内存使用率时区分 cgroup v1 v2
2021-12-06 11:22:45 +08:00
fit2bot
77f2bd9262
perf: 优化workflow名称 ( #7323 )
...
* workflow: 添加定时检查issue的workflow
* perf: 优化workflow名称
Co-authored-by: ibuler <ibuler@qq.com >
2021-12-06 10:09:58 +08:00
ibuler
495a6fbc95
workflow: 添加定时检查issue的workflow
2021-12-03 19:25:56 +08:00
xinwen
36c6299a03
fix: redis 锁在redis集群环境报错
2021-12-03 19:23:44 +08:00
ibuler
8a31fbe35e
chore: 添加判断 pull request
2021-12-03 15:22:13 +08:00
ibuler
dbe628a8db
chore: 添加 issue 备注添加labels
2021-12-03 15:22:13 +08:00
ibuler
e45b893662
chore: 添加 workflow 检查issue
2021-12-02 17:50:31 +08:00
feng626
ac4b6e5b96
feat: 工单创建资产添加节点
2021-11-30 16:38:30 +08:00
ibuler
c85249be36
perf: 优化订阅处理,形成框架
2021-11-29 15:01:37 +08:00
ibuler
de006bc664
perf: 资产添加标签显示,更加易读
...
pref: 添加翻译
2021-11-29 14:57:50 +08:00
xinwen
a313e011ef
perf: 内存使用率兼顾 docker cgroup limit
2021-11-29 14:53:04 +08:00
Michael Bai
3076b7a5e1
fix: 修复migrations序号重复问题
2021-11-29 11:24:12 +08:00
老广
c47a588e7c
Merge pull request #7289 from jumpserver/pr@dev@merge_with_master
...
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2021-11-26 11:20:39 +08:00
ibuler
7f61c49db2
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2021-11-25 20:00:34 +08:00
ibuler
c8a76c9afb
fix: 修复 close connection 的问题
2021-11-25 18:29:01 +08:00
ibuler
3e85a9a079
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2021-11-25 18:05:18 +08:00
ibuler
62cbca7eb2
fix: 修复重置 mfa 的提示问题
2021-11-25 17:50:47 +08:00
ibuler
434793bc41
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2021-11-25 17:44:51 +08:00
xinwen
85a017b2c4
fix: 按资产ip搜索数据不全
2021-11-25 17:29:47 +08:00
ibuler
84bce19a92
perf: 去掉登录页面更好
2021-11-25 16:02:40 +08:00
ibuler
3874b8ed67
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
...
repr@dev_v2.16_v2.15@2ee26971c9b152@fix_xxxx
merges an updated upstream into a topic branch.
2021-11-25 15:58:33 +08:00
ibuler
7f0ad7e27f
fix: 修复 oidc cas 登录时跳转问题
...
perf: 优化一波,容易debug
perf: 还原回来的世界
2021-11-25 15:01:42 +08:00
ibuler
2ee26971c9
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2021-11-24 20:41:41 +08:00
ibuler
5ace5a752e
fix: 修复 cas/oidc 登录 MFA 产生的bug
...
perf: 优化更严谨
2021-11-24 19:05:15 +08:00
Michael Bai
e838d974c3
fix: 修复根据节点/资产查询授权时报错的问题
2021-11-24 19:04:42 +08:00
ibuler
9dd93ea3b8
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2021-11-24 16:15:57 +08:00
jiangweidong
88ea7ae149
feat: 云管同步中心支持OpenStack资产同步,所需python库依赖
2021-11-24 14:28:11 +08:00
ibuler
1132c6a4e4
fix: 修复 mfa radius 登录的bug
2021-11-24 12:51:12 +08:00
ibuler
0762f87ba5
Merge branch 'master' into dev
2021-11-24 11:25:51 +08:00
chenqiao
cb98b4f80a
feat:新增对sqlserver数据库托管
2021-11-24 11:21:04 +08:00
feng626
599d58e9f2
fix: 修复重置mfa 500 bug
2021-11-23 16:11:54 +08:00
ibuler
5c6f1730d5
perf: 系统用户密码不再trim空格
2021-11-23 10:41:58 +08:00
feng626
67d084fc43
perf: ip list 优化
2021-11-19 16:36:58 +08:00
feng626
24d0d52a0a
perf: 优化ip黑白名单
2021-11-19 11:48:45 +08:00
xinwen
d94c515cfc
fix: 验证码逻辑错误
2021-11-19 10:46:59 +08:00
Michael Bai
cae956f9a5
fix(i18n): 修改翻译文件
2021-11-18 19:07:14 +08:00
Jiangjie.Bai
2c70e117c6
Merge pull request #7229 from jumpserver/dev
...
v2.16
2021-11-18 18:51:57 +08:00
ibuler
70e8a03888
fix: 修复 mfa 登录时的 focus 错误
2021-11-18 18:49:22 +08:00
fit2bot
d2df8acd84
fix: 修复数据库连接没有关闭问题 ( #7227 )
...
* fix: 修复数据库连接没有关闭的bug
perf: websocket 断开也添加关闭数据库连接
* fix: 修复数据库连接没有关闭问题
Co-authored-by: ibuler <ibuler@qq.com >
2021-11-18 18:47:01 +08:00
Michael Bai
6e5dcc738e
fix: 修改ldap分页日志为debug模式
2021-11-18 18:07:51 +08:00
Jiangjie.Bai
d1ccb4af15
Merge pull request #7224 from jumpserver/dev
...
v2.16.0 rc4
2021-11-18 17:05:35 +08:00
fit2bot
086ecfc046
perf: 优化全局ip限制逻辑 ( #7220 )
...
* perf: 优化全局ip限制逻辑
* perf: 优化全局ip限制逻辑 2
* perf: 优化全局ip限制逻辑 3
Co-authored-by: feng626 <1304903146@qq.com >
Co-authored-by: Michael Bai <baijiangjie@gmail.com >
2021-11-18 16:55:23 +08:00
Jiangjie.Bai
8f3765a98d
Merge pull request #7217 from jumpserver/dev
...
v2.16.0 rc3
2021-11-18 13:02:51 +08:00
Michael Bai
2d6610b133
fix(settings): 修复LDAP系统设置中使用search_ou查询前执行strip操作
2021-11-18 13:01:20 +08:00
Jiangjie.Bai
5a82174c54
Merge pull request #7214 from jumpserver/dev
...
v2.16.0 rc2
2021-11-17 19:42:25 +08:00
Michael Bai
dac45f234a
fix: 终端列表指标数值保留一位小数
2021-11-17 19:36:52 +08:00
Michael Bai
096b2cf8b8
fix: 修改翻译
2021-11-17 19:36:10 +08:00
fit2bot
0ed0f69be0
fix: 登录日志字段翻译 ( #7211 )
...
Co-authored-by: xinwen <coderWen@126.com >
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com >
2021-11-17 19:28:58 +08:00
fit2bot
8af88cd2c6
fix: 修复otp verify msg引起的500 ( #7210 )
...
Co-authored-by: ibuler <ibuler@qq.com >
2021-11-17 16:43:04 +08:00
feng626
2a9f0f8dcf
perf: help信息迁移到public中
2021-11-17 15:44:50 +08:00
ibuler
cc2d47e6dc
perf: 修复首页登录mfa错误提示
2021-11-16 11:33:40 +08:00
xinwen
22c9dfc0f2
fix: 系统用户 actions
2021-11-16 11:33:00 +08:00
fit2bot
ed01f2f1fb
fix: 修复xrdp连接时报错 ( #7202 )
...
* fix: 修复xrdp连接时报错
perf: 添加注释
* perf: 去掉import
Co-authored-by: ibuler <ibuler@qq.com >
2021-11-16 11:32:25 +08:00
ibuler
c5ff0d972b
perf: 去掉mfa input 的required,以为用户可能没有设置
2021-11-15 17:01:12 +08:00
ibuler
7d9da9ff66
perf: 修改名称
2021-11-15 17:01:12 +08:00
fit2bot
d6395b64fa
merge: with dev ( #7195 )
...
* fix: 修复登录mfa时,选择了禁用的
* fix: mfa focus
Co-authored-by: ibuler <ibuler@qq.com >
2021-11-15 16:51:05 +08:00
xinwen
9bfbdea508
fix: 终端删除后,录像存储不能删除问题
2021-11-15 16:35:02 +08:00
ibuler
cb1c906db4
fix: 修复登录时没有绑定mfa,没有跳转的问题
...
fix: 首页登录如果没有则后续登录
2021-11-15 16:20:58 +08:00
ibuler
12a0096963
fix: 修复重置mfa的bug
2021-11-15 16:19:30 +08:00
ibuler
a315e8888b
perf: 优化一下 win2016 不再内置
2021-11-15 16:18:31 +08:00
ibuler
454d3cba96
fix: 修复登录mfa时,选择了禁用的
2021-11-15 16:17:02 +08:00
feng626
4a786baf4e
perf: 工单提示信息优化
2021-11-12 18:00:32 +08:00
xinwen
187977c04a
fix: 修改 CPU info 字段
2021-11-12 17:09:42 +08:00
xinwen
4260fe1424
fix: 资产 cpu_info 翻译不对
2021-11-12 16:56:19 +08:00
Michael Bai
7286b1b09e
fix: 移动【会话设置保留时间】至定期清理设置页面
2021-11-12 16:54:17 +08:00
xinwen
9a7919f3ac
fix: 更新公钥消息不对
2021-11-12 16:44:23 +08:00
xinwen
43cbf4f6a9
fix: 创建存储时名称重复报错
2021-11-12 16:31:14 +08:00
Eric
e9dc1ad86a
fix: 修复 ssh 工具连接无法二级登录的问题
2021-11-12 16:14:14 +08:00
feng626
90477146ed
feat: 添加全局ip黑名单
2021-11-12 14:56:25 +08:00
ibuler
353b66bf8f
fix: 修复创建token的问题
2021-11-11 19:10:28 +08:00
Jiangjie.Bai
3051996e35
Merge pull request #7169 from jumpserver/dev
...
v2.16.0 rc1
2021-11-11 14:00:33 +08:00
ibuler
8761ed741c
pref: 资产的硬件信息可以更改
2021-11-11 13:31:18 +08:00
ibuler
0facd8a25e
perf: 去掉官网的链接
2021-11-11 13:03:35 +08:00
xinwen
b28ce9de7a
feat: xrdp session bpp 读取环境变量
2021-11-11 10:42:17 +08:00
jiangweidong
f2b72aae37
feat: 支持管理员配置导航栏上帮助中的url
2021-11-10 17:06:16 +08:00
ibuler
b001443f34
pref: 修改为内置
2021-11-10 16:59:08 +08:00
fit2bot
17303c0550
pref: 优化MFA ( #7153 )
...
* perf: 优化mfa 和登录
* perf: stash
* stash
* pref: 基本完成
* perf: remove init function
* perf: 优化命名
* perf: 优化backends
* perf: 基本完成优化
* perf: 修复首页登录时没有 toastr 的问题
Co-authored-by: ibuler <ibuler@qq.com >
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com >
2021-11-10 11:30:48 +08:00
xinwen
bac974b4f2
feat: 异地登录提醒可配置是否启用
2021-11-09 14:35:54 +08:00
Michael Bai
f9e970f4ed
fix: 修改文案 切换用户 -> 用户切换
2021-11-05 16:41:45 +08:00
Jiangjie.Bai
07c60ca75d
feat: 支持二级登录资产 ( #7143 )
...
* feat: 支持su切换系统用户
* feat: 支持su切换系统用户
* feat: 支持su切换系统用户
2021-11-05 16:11:29 +08:00
ibuler
bbe2678df3
perf: 优化用户创建邮件信息,支持部分标签
2021-11-04 13:45:15 +08:00
ibuler
d57f52ee24
feat: 添加 window RDP TLS 平台
2021-11-04 11:05:50 +08:00
feng626
55775f0deb
perf: 异地登陆去掉本地判断
2021-11-02 21:11:17 +08:00
xinwen
fde118021e
fix: Radius 配置
2021-11-02 20:13:14 +08:00
ibuler
d484885762
perf: 修复ansible stdout 中非utf8的问题
2021-11-02 20:12:48 +08:00
feng626
8071f45f92
fix: 修复xpack引入包问题
2021-10-29 16:23:49 +08:00
Jiangjie.Bai
15cdd44c6c
Merge pull request #7107 from jumpserver/dev
...
v2.15.0
2021-10-28 17:45:42 +08:00
feng626
d44f90ea3d
fix: acl xpack
2021-10-28 17:38:55 +08:00
Jiangjie.Bai
42e9fbf37a
Merge pull request #7103 from jumpserver/dev
...
v2.15.0
2021-10-28 15:31:44 +08:00
ibuler
d44656aa10
fix: 修复修改用户信息后,绑定丢失
...
perf: 还原提示文案
2021-10-28 15:29:55 +08:00
feng626
09d4228182
Merge pull request #7102 from jumpserver/pr@dev@ticket_tips
...
perf: 工单错误提示优化
2021-10-28 15:25:42 +08:00
feng626
3ae8da231a
perf: 工单错误提示优化
2021-10-28 15:16:52 +08:00
feng626
2e4b6d150a
fix: 登录复合浏览器不兼容
2021-10-28 15:02:54 +08:00
Michael Bai
8542d53aff
fix: 修复ldap用户导入时字段进行strip
2021-10-28 15:02:33 +08:00
Michael Bai
141dafc8bf
fix: 创建授权/添加资产到节点;不再自动更新资产的管理用户
2021-10-28 13:39:27 +08:00
Michael Bai
28a6024b49
fix: 修改工单列表默认按照创建日志倒叙排序,修改翻译
2021-10-28 13:38:10 +08:00
ibuler
6cf2bc4baf
pref: 优化工单验证
2021-10-28 13:37:24 +08:00
xinwen
631f802961
fix: 钉钉报错的时取得字段不对
2021-10-28 13:31:27 +08:00
feng626
0eedda748a
perf: acl username unified
2021-10-28 13:31:05 +08:00
Jiangjie.Bai
7183f0d274
Merge pull request #7089 from jumpserver/dev
...
v2.15.0-rc3
2021-10-27 19:24:42 +08:00
feng626
c93ab15351
fix: acl migrate bug
2021-10-27 11:31:16 +08:00
Michael Bai
3fffd667dc
fix: 修改系统用户、工单列表排序字段
2021-10-27 11:16:01 +08:00
fit2bot
11fd2afa3a
perf: 优化下载页面 ( #7082 )
...
Co-authored-by: ibuler <ibuler@qq.com >
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com >
2021-10-26 17:27:01 +08:00
Michael Bai
1eb59b11da
fix: 添加Model的verbose_name属性
2021-10-26 17:22:05 +08:00
feng626
a1e2d4ca57
Merge pull request #7081 from jumpserver/pr@dev@command_record_filter
...
fix: 命令记录-导出选择项命令:却导出了所有命令
2021-10-26 16:54:27 +08:00
feng626
8a413563be
fix: 命令记录-导出选择项命令:却导出了所有命令
2021-10-26 16:50:14 +08:00
ibuler
203a01240b
perf: 优化dockerfile
2021-10-26 15:48:17 +08:00
Michael Bai
37fef6153a
fix: 修改依赖包版本: jumpserver-django-oidc-rp==0.3.7.8
2021-10-26 15:16:24 +08:00
feng626
ba6c49e62b
Merge pull request #7077 from jumpserver/pr@dev@app_account_translate
...
fix: 【【账号管理】应用账号导出字段存在英文】
2021-10-26 13:42:31 +08:00
feng626
da79f8beab
fix: 【【账号管理】应用账号导出字段存在英文】
2021-10-26 13:34:59 +08:00
ibuler
3f72c02049
perf: 添加命令org
2021-10-26 11:49:56 +08:00
feng626
380226a7d2
fix: 用户登陆mfa code为空限制
2021-10-26 11:01:12 +08:00
fit2bot
f88e5de3c1
perf: 优化用户创建邮件 ( #7072 )
...
* perf: 优化通知中的连接点击
* perf: 优化用户创建邮件
* perf: 优化时间日期
Co-authored-by: ibuler <ibuler@qq.com >
2021-10-26 10:52:23 +08:00
Michael Bai
7c149fe91b
fix: 修复系统用户applications_amount字段只读
2021-10-25 16:25:12 +08:00
Jiangjie.Bai
f673fed706
Merge pull request #7068 from jumpserver/dev
...
v2.15.0-rc2
2021-10-25 15:07:25 +08:00
Michael Bai
84326cc999
fix: 系统用户列表添加 应用数量 字段
2021-10-25 15:01:29 +08:00
xinwen
7d56678a8e
fix: 修复登录次数出现 0
2021-10-25 14:30:48 +08:00
feng626
25d1b71448
fix: 修复分时登陆bug
2021-10-25 14:26:47 +08:00
feng626
d3920a0cc9
Merge pull request #7065 from jumpserver/pr@dev@ticket_bug
...
fix: 修复工单发邮件及授权资产备注信息修改
2021-10-25 11:32:01 +08:00
feng626
52889cb67a
fix: 修复工单发邮件及授权资产备注信息修改
2021-10-25 11:30:37 +08:00
feng626
0b67c7a953
fix: 修复登陆复合acl时 未添加规则bug
2021-10-25 10:49:00 +08:00
ibuler
1f50a2fe33
perf: 优化签名
2021-10-25 10:48:27 +08:00
ibuler
cd5094f10d
perf: 优化通知中的连接点击
2021-10-25 10:48:03 +08:00
fit2bot
c244cf5f43
pref: 修改使用的消息内容 ( #7061 )
...
* perf: 再次优化通知
* pref: 修改使用的消息内容
* perf: 修复url地址
Co-authored-by: ibuler <ibuler@qq.com >
2021-10-22 20:06:16 +08:00
feng626
a0db2f6ef8
Merge pull request #7059 from jumpserver/pr@dev@ticket_send_message_multiple_times
...
fix: 修复工单结束重复发送受理人消息bug
2021-10-22 16:40:51 +08:00
feng626
ea485c3070
fix: 修复工单结束重复发送受理人消息bug
2021-10-22 16:38:14 +08:00
feng626
705f352cb9
Merge pull request #7057 from jumpserver/pr@dev@acl_bug
...
fix: 修复acl 选择时间段为空bug
2021-10-22 16:12:40 +08:00
feng626
dc13134b7b
fix: 修复acl 选择时间段为空bug
2021-10-22 16:09:22 +08:00
Michael Bai
06de6c3575
fix: 修复资产系统用户auth-info获取流程及创建时手动登录方式的校验
2021-10-22 15:19:58 +08:00
ibuler
c341d01e5a
perf: 修改工单信息
2021-10-21 20:04:27 +08:00
feng626
d1a3d31d3f
feat: 客户端协议内容添加rdp文件名
2021-10-21 19:16:04 +08:00
ibuler
10f4ff4eec
fix: 修复工单通知内容bug
2021-10-21 18:36:29 +08:00
ibuler
25ea3ba01d
perf: 修改sdk位置
2021-10-21 17:39:28 +08:00
ibuler
072865f3e5
perf: 优化修改 sdk 位置
2021-10-21 17:39:28 +08:00
ibuler
d5c9ec1c3d
perf: 优化位置
2021-10-21 17:39:28 +08:00
ibuler
487c945d1d
perf: 修改代码位置,用户sugestion增加到6个
2021-10-21 17:39:28 +08:00
feng626
a78b2f4b62
fix: 修复工单发消息报错
2021-10-21 17:31:59 +08:00
ibuler
a1f1dce56b
perf: 修改格式错误
2021-10-21 16:22:08 +08:00
xinwen
a1221a39fd
fix: 会话管理翻译
2021-10-21 16:21:49 +08:00
xinwen
8c118b6f47
fix: 组织删除报错未翻译
2021-10-21 16:21:11 +08:00
feng626
68fd8012d8
Merge pull request #7042 from jumpserver/pr@dev@acl_perf
...
perf: acl filter
2021-10-21 15:11:50 +08:00
feng626
526928518d
perf: acl filter
2021-10-21 15:00:29 +08:00
feng626
c5f6c564a7
fix: 系统启动bug
2021-10-21 13:05:07 +08:00
Jiangjie.Bai
076adec218
Merge pull request #7033 from jumpserver/dev
...
v2.15.0 rc1
2021-10-20 20:24:29 +08:00
fit2bot
00d434ceea
perf: 优化消息通知 ( #7024 )
...
* perf: 优化系统用户列表
* stash
* perf: 优化消息通知
* perf: 修改钉钉
* perf: 修改优化消息通知
* perf: 修改requirements
* perf: 优化datetime
Co-authored-by: ibuler <ibuler@qq.com >
2021-10-20 19:45:37 +08:00
fit2bot
9acfd461b4
feat: user login acl ( #6963 )
...
* feat: user login acl
* 添加分时登陆
* acl 部分还原
* 简化acl判断逻辑
Co-authored-by: feng626 <1304903146@qq.com >
Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com >
2021-10-20 17:56:59 +08:00
feng626
9424929dde
fix: sms bug
2021-10-19 20:23:06 +08:00
Michael Bai
b95d3ac9be
fix: 修改终端status翻译
2021-10-19 16:16:48 +08:00
Michael Bai
af2a9bb1e6
fix: 修复用户登录失败未记录日志的问题
2021-10-19 15:28:39 +08:00
fit2bot
63638ed1ce
feat: 首页的 chanlege 和 MFA 统一 ( #6989 )
...
* feat: 首页的 chanlege 和 MFA 统一
* 登陆样式调整
* mfa bug
* q
* m
* mfa封装组件 前端可修改配置
* perf: 添加翻译
* login css bug
* perf: 修改一些风格
* perf: 修改命名
* perf: 修改 mfa code 不是必填
* mfa 前端统一组件
* stash
* perf: 统一验证码
Co-authored-by: feng626 <1304903146@qq.com >
Co-authored-by: ibuler <ibuler@qq.com >
2021-10-18 18:41:41 +08:00
fit2bot
fa68389028
perf: 去掉单独的flash msg ( #7013 )
...
* perf: 去掉单独的flash msg
perf: 修改使用库
* fix: guangbug
* pref: 修改 context
Co-authored-by: ibuler <ibuler@qq.com >
Co-authored-by: xinwen <coderWen@126.com >
2021-10-18 11:25:39 +08:00
halo
63b338085a
feat: 修改username校验,telnet协议支持输入中文
2021-10-15 15:36:29 +08:00
fit2bot
5d8818e69e
feat: 添加资产授权用户API、资产授权用户的授权规则API ( #7008 )
...
* feat: 添加资产授权用户API、资产授权用户的授权规则API
* feat: 添加资产授权用户组API、资产授权用户组的授权规则API
* feat: 抽象API类
Co-authored-by: Michael Bai <baijiangjie@gmail.com >
2021-10-15 14:02:32 +08:00
xinwen
77521119b9
fix: 修改 oauth 认证提示信息
2021-10-15 11:32:20 +08:00
ibuler
baee71e4b8
perf: 添加requirements
2021-10-15 11:31:06 +08:00
ibuler
6459c20516
perf: Django语言文件推送到lfs
...
perf: 修改mac依赖,添加安装 git lfs
perf: 修改添加 mac 开发环境依赖
2021-10-14 16:30:18 +08:00
ibuler
0207fe60c5
perf: 修改ip城市获取算法
...
perf: 优化使用lfs
2021-10-14 10:35:18 +08:00
Eric
b8c43f5944
fix: 修复获取系统用户密码问题
2021-10-13 14:34:57 +08:00
xinwen
63ca2ab182
fix: 修复 traceback 问题
2021-10-13 11:42:54 +08:00
ibuler
f9ea119928
perf: 不再需要 tls 类型,any 方式都可以
2021-10-12 17:45:38 +08:00
xinwen.xu
d4bdc74bd8
feat: 授权过期通知
2021-10-11 15:41:13 +08:00
ibuler
42e7ca6a18
perf: 资产编号允许api更改
2021-10-11 15:26:31 +08:00
xinwen
6e0341b7b1
feat: xrdp挂载受授权的上传下载控制
2021-10-11 15:24:34 +08:00
jiangweidong
2f25e2b24c
fix: 系统用户认证方式从托管密码更新到手动输入模式后,不填写用户名报错
2021-10-11 10:02:48 +08:00
halo
87dcd2dcb7
feat: 增加关闭第三方登录跳转配置参数
2021-09-29 16:04:59 +08:00
ibuler
e96aac058f
fix: 修复跳转msg页面,取消button太小的问题
2021-09-29 15:30:17 +08:00
Jiangjie.Bai
d76bad125b
Merge pull request #6973 from jumpserver/pr@dev@feat_announcement
...
feat: 支持公告
2021-09-29 14:58:15 +08:00
ibuler
913b1a1426
perf: 修改翻译
2021-09-29 14:55:14 +08:00
ibuler
0213154a19
merge: with dev
2021-09-29 14:53:42 +08:00
ibuler
8f63b488b2
perf: 修改翻译
2021-09-29 14:43:00 +08:00
ibuler
f8921004c2
perf: 修改依赖版本
2021-09-29 14:42:11 +08:00
feng626
5588eab57e
feat: 用户异地登陆
2021-09-29 14:33:52 +08:00
ibuler
e0a8f91741
perf: 修改翻译
2021-09-28 18:57:21 +08:00
ibuler
467ebfa650
perf: 添加公告id
2021-09-28 18:17:10 +08:00
ibuler
0533b77b1b
perf: 支持公告
2021-09-28 17:01:47 +08:00
ibuler
a558ee2ac0
perf: 修改dockerfile
2021-09-28 10:10:20 +08:00
ibuler
46a39701d4
fix: 修复docker无法构建
2021-09-27 19:27:33 +08:00
ibuler
8c3ab31e4e
fix: 修复由于修改filter引起的问题
2021-09-27 18:50:29 +08:00
Jiangjie.Bai
476e6cdc2f
Merge pull request #6932 from jumpserver/pr@dev@perf_remove_djangopo
...
perf: 去掉django.po
2021-09-27 14:12:26 +08:00
ibuler
0b593f4555
perf: 优化drf filter, 修改terminal filter
...
perf: 去掉debug
perf: 去掉debug
2021-09-27 14:09:22 +08:00
ibuler
456116938d
perf: 优化数据迁移,性能提升50倍
2021-09-27 14:05:21 +08:00
ibuler
76b24f62d4
perf: merge with dev
2021-09-27 14:03:19 +08:00
Michael Bai
e1eef0a3f3
fix: 修复authbook systemuser字段问题
2021-09-24 20:24:25 +08:00
Michael Bai
2c74727b65
fix: 修复邮件测试序列类及API
2021-09-24 14:13:55 +08:00
ibuler
08cd91c426
perf: 修改应用授权树,没有的时候不显示
2021-09-24 14:12:31 +08:00
wojiushixiaobai
90d269d2a2
fix: 添加包
2021-09-24 12:56:35 +08:00
Michael Bai
a9ddbcc0cd
fix: 修复系统用户和资产/节点关联时资产特权用户更新的问题
2021-09-24 12:48:35 +08:00
Michael Bai
aec31128cf
perf: 修改翻译
2021-09-23 11:14:53 +08:00
ibuler
b415ee051d
perf: 去掉django.po
2021-09-23 10:26:39 +08:00
ibuler
082a5ae84c
perf: 修改不再添加编译后的翻译文件
2021-09-22 18:53:04 +08:00
老广
6b7554d69a
Merge pull request #6929 from jumpserver/pr@dev@ticket_comment
...
perf: 工单优化
2021-09-22 15:51:10 +08:00
feng626
5923562440
perf: 工单优化
2021-09-22 15:17:57 +08:00
老广
d144e7e572
Merge pull request #6922 from jumpserver/pr@dev@fix_tokensmsoptions
...
fix: 修复KoKo登录时,未开启SMS服务出现了SMS选项的问题
2021-09-22 11:24:03 +08:00
ibuler
cafbd08986
perf: 修改啊
2021-09-22 11:18:38 +08:00
ibuler
b436fc9b44
perf: 优化登录
2021-09-22 11:18:38 +08:00
ibuler
26fc56b4be
perf: 优化登录html
2021-09-22 11:18:38 +08:00
Michael Bai
3b1d199669
fix: 修复KoKo登录时,未开启SMS服务出现了SMS选项的问题
2021-09-22 03:17:14 +00:00
ibuler
e7edbc9d84
perf: 修改啊
2021-09-18 15:46:41 +08:00
ibuler
41f81bc0bf
merge: with dev
2021-09-18 15:29:29 +08:00
ibuler
75d2c81d33
perf: 优化登录
2021-09-18 15:24:04 +08:00
ibuler
da2dea5003
perf: 登录错误提示颜色
2021-09-18 15:07:05 +08:00
老广
fc60156c23
Merge pull request #6913 from jumpserver/pr@dev@perf_dockerfile
...
perf: 优化依赖包
2021-09-17 18:03:31 +08:00
wojiushixiaobai
76fb547551
perf: 优化依赖包
2021-09-17 16:14:15 +08:00
ibuler
e686f51703
perf: 优化登录html
2021-09-17 16:00:23 +08:00
feng626
7578bda588
Merge pull request #6911 from jumpserver/pr@dev@ticket_perf
...
perf: 工单优化
2021-09-17 15:50:48 +08:00
feng626
f2d743ec2b
perf: 工单优化
2021-09-17 15:46:33 +08:00
ibuler
7099aef360
perf: 登录错误提示颜色
2021-09-17 14:35:05 +08:00
wojiushixiaobai
246f5d8a11
fix: 添加依赖
2021-09-16 23:24:02 +08:00
wojiushixiaobai
6c98bd3b48
fix: 添加 pg 依赖包
2021-09-16 23:24:02 +08:00
老广
6def113cbd
Merge pull request #6902 from jumpserver/dev
...
v2.14.0
2021-09-16 21:17:25 +08:00
ibuler
2dc0af2553
perf: 优化 dockerfile
2021-09-16 21:08:04 +08:00
Jiangjie.Bai
a291592e59
Merge pull request #6900 from jumpserver/dev
...
修改依赖包版本 jumpserver-django-oidc-rp==0.3.7.7
2021-09-16 20:15:32 +08:00
Michael Bai
6fb4c1e181
修改依赖包版本 jumpserver-django-oidc-rp==0.3.7.7
2021-09-16 19:49:42 +08:00
老广
eee093742c
Merge pull request #6898 from jumpserver/dev
...
merge: dev to master
2021-09-16 19:35:39 +08:00
feng626
743c9bc3f1
fix: 过滤其它类型app
2021-09-16 19:30:32 +08:00
ibuler
f963c5ef9d
perf: 修改翻译
2021-09-16 19:29:05 +08:00
ibuler
2c46072db2
fix: 修复serializer问题
2021-09-16 19:08:21 +08:00
xinwen
b375cd3e75
fix: otp 绑定问题
2021-09-16 19:04:19 +08:00
fit2bot
c26ca20ad8
fix: 更新OIDC配置时,将keycloak配置转换为openid ( #6893 )
...
* fix: 修改磁盘使用等key值
* fix: 更新OIDC配置时,将keycloak配置转换为openid
Co-authored-by: Michael Bai <baijiangjie@gmail.com >
2021-09-16 18:57:09 +08:00
Jiangjie.Bai
982a510213
Merge pull request #6892 from jumpserver/ibuler-patch-1
...
Update README.md
2021-09-16 17:46:06 +08:00
老广
5d6880f6e9
Update README.md
2021-09-16 17:45:10 +08:00
xinwen
a784a33203
fix: 去掉手动系统用户提示输入密码
2021-09-16 16:47:15 +08:00
xinwen
a452f3307f
fix: 组件监控的消息
2021-09-16 16:29:56 +08:00
Michael Bai
b7a6287925
fix: 修改磁盘使用等key值
2021-09-16 16:29:19 +08:00
feng626
3cba8648cb
fix: 工单日期bug
2021-09-16 16:12:42 +08:00
ibuler
ef7b2b7980
perf: 优化登录错误提示
2021-09-16 14:07:51 +08:00
xinwen
1ab247ac22
fix: 用户密码过期提醒
2021-09-16 13:43:09 +08:00
Michael Bai
ef8a027849
fix: 修改翻译,链接过期
2021-09-16 11:16:21 +08:00
Michael Bai
7890e43f5a
fix: 修改网关测试可连接性报错提示信息
2021-09-16 11:00:10 +08:00
fit2bot
2030cbd19d
fix: 修复authbook信号监听;添加翻译文件.mo ( #6882 )
...
Co-authored-by: Michael Bai <baijiangjie@gmail.com >
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com >
2021-09-16 10:36:24 +08:00
feng626
0f7c8c2570
fix: 工单复核bug
2021-09-16 10:35:19 +08:00
Jiangjie.Bai
9b60d86ddd
Merge pull request #6880 from jumpserver/dev
...
v2.14.0 rc3
2021-09-15 21:05:26 +08:00
ibuler
f129f99faa
perf: 优化修改获取Hostname
2021-09-15 21:04:56 +08:00
fit2bot
43f30b37da
fix: 用户手机号没有校验 ( #6875 )
...
Co-authored-by: xinwen <coderWen@126.com >
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com >
2021-09-15 21:00:54 +08:00
xinwen
45aefa6b75
fix: 修改一些翻译
2021-09-15 20:59:50 +08:00
xinwen
b30123054b
fix: xrdp 手动登录系统用户仍然不需要输入密码
2021-09-15 20:58:56 +08:00
wojiushixiaobai
b456e71ec4
perf: 更新 client 链接
2021-09-15 20:57:04 +08:00
xinwen
7560b70c4d
feat: 用户详情页面显示 手机号,钉钉,企业微信,飞书
2021-09-15 19:42:24 +08:00
Michael Bai
0c96df5283
fix: 系统用户序列类返回nodes
2021-09-15 19:41:45 +08:00
fit2bot
9dda19b8d7
fix: 修改LDAP同步提示信息 ( #6872 )
...
* fix: 修改资产和特权用户发生变化时,更新资产的admin_user
* fix: 修改资产和特权用户发生变化时,更新资产的admin_user
* fix: 修改资产和特权用户发生变化时,更新资产的admin_user
* fix: 修改LDAP同步提示信息
Co-authored-by: Michael Bai <baijiangjie@gmail.com >
2021-09-15 19:16:44 +08:00
fit2bot
fbe5f9a63a
fix: 修改资产和特权用户发生变化时,更新资产的admin_user ( #6871 )
...
* fix: 修改资产和特权用户发生变化时,更新资产的admin_user
* fix: 修改资产和特权用户发生变化时,更新资产的admin_user
* fix: 修改资产和特权用户发生变化时,更新资产的admin_user
Co-authored-by: Michael Bai <baijiangjie@gmail.com >
2021-09-15 19:11:19 +08:00
xinwen
1c4b4951dc
fix: 一些提示
2021-09-15 18:06:57 +08:00
ibuler
8e12399058
perf: 资产序列类优化,改为只读
2021-09-15 18:05:55 +08:00
ibuler
741b96ddee
perf: 优化设置中的数字大小
2021-09-15 17:22:23 +08:00
xinwen
8c3f89ee51
fix: 高危命令告警偶发 session 不存在
2021-09-15 17:21:36 +08:00
xinwen
dee45ce2e0
fix: 用户离开组织命令复核没有删除
2021-09-15 17:19:37 +08:00
ibuler
cfab30f7f7
perf: 修改 i18n
2021-09-15 17:18:17 +08:00
Michael Bai
02e9a96792
fix: 修改翻译
2021-09-15 17:09:48 +08:00
feng626
aa6dcdc65d
Merge pull request #6862 from jumpserver/pr@dev@ticket_time_validation
...
fix: 工单失效日期小于开始日期
2021-09-15 16:44:23 +08:00
feng626
5a6b64eebd
fix: 工单失效日期小于开始日期
2021-09-15 16:25:43 +08:00
feng626
2dd7867b32
Merge pull request #6860 from jumpserver/pr@dev@login_confirm
...
fix: 登陆复核返回后 删除工单
2021-09-15 15:42:18 +08:00
feng626
6507f0982c
fix: 登陆复核返回后 删除工单
2021-09-15 15:39:34 +08:00
ibuler
c115ef7b47
perf: 优化ttl
2021-09-15 15:27:04 +08:00
xinwen
bf68ddf09e
fix: 腾讯短信检测是否发送成功
2021-09-15 15:26:35 +08:00
xinwen
f3906ff998
fix: 用户导出 can_public_key_auth 没翻译
2021-09-15 15:25:52 +08:00
Michael Bai
e47ee43631
fix: 修改默认es doc_type 为 _doc
2021-09-15 15:25:09 +08:00
xinwen
d22bb2c92f
fix: 重置密码连接生成多个token
2021-09-15 11:58:26 +08:00
xinwen
870dac37b9
fix: 重置密码成功的消息里有 br 标签
2021-09-15 11:10:57 +08:00
feng626
d14c5c58ff
Merge pull request #6855 from jumpserver/pr@dev@ticket_notice_bug
...
fix: ticket_notice_bug
2021-09-14 22:33:42 +08:00
feng626
a6b40510d0
fix: ticket_notice_bug
2021-09-14 22:32:13 +08:00
feng626
f762fe73ff
fix: 工单拒绝清除mfa
2021-09-14 19:36:03 +08:00
xinwen
d49d1ba055
perf: oauth2 登录不再限制只能本地用户
2021-09-14 17:40:51 +08:00
ibuler
6e3d950e23
perf: 优化迁移账号,性能提高50倍
2021-09-14 17:39:27 +08:00
Michael Bai
7939ef34b0
fix: 修复服务告警主题替换<br>
2021-09-14 17:39:06 +08:00
Michael Bai
07cd930c0e
fix: 删除配置 PERIOD_TASK_ENABLED
2021-09-14 17:38:47 +08:00
Michael Bai
c14c89a758
fix: 修改CAS配置项和CAS登录失败问题
2021-09-14 16:43:57 +08:00
feng626
245367ec29
Merge pull request #6844 from jumpserver/pr@dev@ticket_bug
...
fix: 修复工单消息推送bug
2021-09-14 15:56:35 +08:00
feng626
c5f4ecc8cc
fix: 修复工单消息推送bug
2021-09-14 15:48:22 +08:00
ibuler
eb8bdf8623
perf: 添加安全说明
2021-09-14 14:47:40 +08:00
Michael Bai
a26c5a5e32
fix: 修复设置未分组节点显示单独授权资产的配置时,用户授权树没有变化的问题
2021-09-14 14:46:51 +08:00
Michael Bai
068db6d1ca
fix: 修复设置未分组节点显示单独授权资产的配置时,用户授权树没有变化的问题
2021-09-14 14:46:51 +08:00
Michael Bai
e6e2a35745
fix: 修复设置未分组节点显示单独授权资产的配置时,用户授权树没有变化的问题
2021-09-14 14:46:51 +08:00
feng626
fafc2791ab
Merge pull request #6841 from jumpserver/pr@dev@ticket_bug
...
fix: 工单不同组织取相应资产的名字
2021-09-14 14:10:09 +08:00
feng626
39507ef152
fix: 工单不同组织取相应资产的名字
2021-09-14 14:03:28 +08:00
Jiangjie.Bai
683fb9f596
Merge pull request #6838 from jumpserver/dev
...
v2.14.0 rc2
2021-09-14 00:05:35 +08:00
Bai
ced9e53d62
fix: 修复 debug 日志信息
2021-09-14 00:04:17 +08:00
Jiangjie.Bai
93846234f8
Merge pull request #6834 from jumpserver/dev
...
v2.14.0 rc2
2021-09-13 21:27:15 +08:00
ibuler
8ac7d4b682
perf: 优化登录backends
2021-09-13 21:26:45 +08:00
Michael Bai
c4890f66e1
fix: i18n
2021-09-13 20:45:34 +08:00
Michael Bai
4618989813
fix: i18n
2021-09-13 20:39:18 +08:00
xinwen
29645768a0
fix: 登录复核没有日志
2021-09-13 20:39:18 +08:00
Michael Bai
8f1c934f73
fix: 授权规则支持通过 from_ticket 工单过滤
2021-09-13 20:24:27 +08:00
fit2bot
7a45f4d129
perf: 优化短信 ( #6826 )
...
* perf: 优化短信
* refactor: 适配新的短信模板配置
Co-authored-by: ibuler <ibuler@qq.com >
Co-authored-by: xinwen <coderWen@126.com >
2021-09-13 20:15:59 +08:00
feng626
55a5dd1e34
fix: ticket bug
2021-09-13 20:12:34 +08:00
xinwen
6695d0a8a2
fix: 用户不能禁用或启用自己
2021-09-13 19:52:30 +08:00
Michael Bai
84d6b3de26
fix: 修改测试网关端口错误时提示信息
2021-09-13 19:06:25 +08:00
feng626
17a5e919d5
fix: ticket bug
2021-09-13 19:05:41 +08:00
feng626
3ba07867c8
Merge pull request #6824 from jumpserver/pr@dev@fix_system_msg
...
feat: 工单多种审批
2021-09-13 18:59:03 +08:00
feng626
75b76170f9
feat: 工单多种审批
2021-09-13 18:54:02 +08:00
xinwen
d34c7edb00
refactor: 重构消息
2021-09-13 18:52:02 +08:00
feng626
f64740c2db
fix: 修改翻译及建议接口
2021-09-13 18:04:01 +08:00
Michael Bai
3a09845c29
fix: 修复终端启动时更新remote_addr字段
2021-09-13 18:03:06 +08:00
xinwen
09d51fd5be
fix: OTP_IN_RADIUS 与 mfa 冲突
2021-09-13 17:43:19 +08:00
Michael Bai
fc8181b5ed
fix: 修复删除关联了资产的特权用户失败的问题
2021-09-13 17:33:27 +08:00
feng626
5a993c255d
Merge pull request #6818 from jumpserver/pr@dev@fix_ticket_bug
...
fix: 修复工单与koko相关接口bug
2021-09-13 16:26:45 +08:00
feng626
ad592fa504
fix: 修复工单与koko相关接口bug
2021-09-13 16:23:58 +08:00
feng626
1dcc8ff0a3
Merge pull request #6816 from jumpserver/pr@dev@perm_user_node_tree_bug
...
fix: 修复用户详情获取子节点bug
2021-09-13 15:30:49 +08:00
feng626
11a9a49bf8
fix: 修复用户详情获取子节点bug
2021-09-13 15:23:12 +08:00
Michael Bai
b9ffc23066
fix: 修复应用账号不能通过用户名过滤的问题
2021-09-13 15:09:13 +08:00
feng626
ea4dccbab8
fix: 修复工单bug
2021-09-13 14:12:33 +08:00
Michael Bai
683461a49b
修改 FORGOT_PASSWORD_URL 允许为空
2021-09-13 14:02:46 +08:00
Michael Bai
1a1ad0f1a2
perf: 取消API Token的配置
2021-09-13 14:02:46 +08:00
xinwen
773f7048be
fix: 通知暂不支持短信
2021-09-13 13:30:54 +08:00
xinwen
f8f783745c
fix: 修改密码没有发通知
2021-09-13 13:30:54 +08:00
xinwen
4fe715d953
fix: 首次登录不能提交
2021-09-13 13:29:07 +08:00
Michael Bai
36dfc4bcb8
fix: i18n
2021-09-10 19:02:38 +08:00
xinwen
8925314dc7
refactor: 修改多对多关系日志样式
2021-09-10 19:02:38 +08:00
ibuler
817c02c667
fix: 修复is_app bug
2021-09-10 18:02:07 +08:00
xinwen
58a10778cd
fix: 修复短信问题
2021-09-10 18:01:36 +08:00
Michael Bai
fa81652de5
perf: 修改授权中(资产/应用)系统用户字段不必填
2021-09-10 17:55:08 +08:00
fit2bot
7e6fa27719
perf: 优化通知 ( #6798 )
...
* perf: 优化通知
* perf: 优化危险命令提示
* fix: i18n
* fix: i18n
Co-authored-by: ibuler <ibuler@qq.com >
Co-authored-by: Michael Bai <baijiangjie@gmail.com >
2021-09-10 17:54:34 +08:00
xinwen
3e737c8cb8
fix: 修复短信问题
2021-09-10 16:43:52 +08:00
feng626
345c0fcf4f
fix: 修复工单流bug 添加登陆审核配置
2021-09-10 16:22:30 +08:00
Michael Bai
bf6b685e8c
fix: api/health/健康检测添加localhost
2021-09-10 15:11:25 +08:00
xinwen
654ec4970e
更改设置接口
2021-09-10 13:52:51 +08:00
feng626
4a436856b4
feat: sms setting
2021-09-10 13:52:51 +08:00
Jiangjie.Bai
e993e7257c
Merge pull request #6795 from jumpserver/dev
...
v2.14.0 rc1
2021-09-09 21:18:32 +08:00
Michael Bai
f12a59da2f
fix: 修改翻译
2021-09-09 21:14:44 +08:00
Michael Bai
42c3c85863
fix: 修改翻译
2021-09-09 21:14:44 +08:00
xinwen
7e638ff8de
fix: 翻译
2021-09-09 20:49:56 +08:00
Michael Bai
932a65b840
perf: 修复批量更新组织失败的问题
2021-09-09 20:49:30 +08:00
fit2bot
81000953e2
fix: 修改消息订阅 ( #6789 )
...
Co-authored-by: xinwen <coderWen@126.com >
2021-09-09 20:12:52 +08:00
fit2bot
dc742d1281
perf: 提交禁用xrdp的开关 ( #6788 )
...
* perf: 提交禁用xrdp的开关
* perf: 修复换行
Co-authored-by: ibuler <ibuler@qq.com >
2021-09-09 19:18:37 +08:00
xinwen
b1fceca8a6
feat: 添加短信服务和用户消息通知
2021-09-09 16:47:24 +08:00
ibuler
d49d1e1414
perf: 修改添加downlaod
2021-09-09 16:31:32 +08:00
xinwen
dac3f7fc71
refactor: 修改 xrdp 挂载磁盘参数名称
2021-09-09 16:31:03 +08:00
Jiangjie.Bai
47989c41a3
perf: Update README
2021-09-09 16:17:46 +08:00
Michael Bai
ca34216141
perf: 优化Core/Celery注册终端名称
2021-09-09 16:17:23 +08:00
fit2cloud-jiangweidong
905014d441
feat: 改密计划支持数据库改密 ( #6709 )
...
* feat: 改密计划支持数据库改密
* fix: 将数据库账户信息不保存在资产信息里,保存到自己的存储中
* perf: 早餐村
* perf: 修改account
* perf: 修改app和系统用户
* perf: 优化系统用户和应用关系
* fix: 修复oracle不可连接问题
Co-authored-by: ibuler <ibuler@qq.com >
Co-authored-by: feng626 <1304903146@qq.com >
Co-authored-by: Michael Bai <baijiangjie@gmail.com >
2021-09-09 16:04:54 +08:00
feng626
3e51f4d616
fix: 修复授权500
2021-09-09 14:43:03 +08:00
fit2bot
07179a4d22
feat: 页面配置serializer版 ( #6750 )
...
* feat: 页面配置serializer版
* perf: 优化配置
* perf: 优化设置
* perf: 优化设置
* perf: 优化配置页面
* perf: 基本完成设置优化
Co-authored-by: feng626 <1304903146@qq.com >
Co-authored-by: ibuler <ibuler@qq.com >
2021-09-09 14:00:50 +08:00
Michael Bai
7a2e93c087
perf: 优化终端注册时名称长度处理逻辑
2021-09-09 13:27:27 +08:00
xinwen
3fb368c741
fix: 修复 xrdp domain 不生效
2021-09-08 17:54:03 +08:00
fit2bot
fca3a8fbca
perf: 绑定MFA认证密码时对密码进行加密传输 ( #6776 )
...
* perf: 绑定MFA认证密码时对密码进行加密传输
* perf: 绑定MFA认证密码时对密码进行加密传输
Co-authored-by: Michael Bai <baijiangjie@gmail.com >
2021-09-08 16:40:09 +08:00
xinwen
c1375ed7cb
feat: xrdp 支持挂载本地磁盘(仅适用于 win)
2021-09-07 19:10:27 +08:00
Michael Bai
8b483b8c36
fix: 终端获取配置API返回SECURITY_SESSION_SHARE
2021-09-07 19:07:50 +08:00
Jiangjie.Bai
c465fccc33
feat: 支持 Session 会话共享 ( #6768 )
...
* feat: 添加 SECURITY_SESSION_SHARE 配置
* feat: 添加 SessionShare / ShareJoinRecord Model
* feat: 添加 SessionShare / ShareJoinRecord Model
* feat: 添加 SessionSharing / SessionJoinRecord Model
* feat: 添加 SessionSharing API
* feat: 添加 SessionJoinRecord API
* feat: 修改迁移文件
* feat: 修改迁移文件
* feat: 修改迁移文件
* feat: 修改API权限
2021-09-07 18:16:27 +08:00
ibuler
3d934dc7c0
perf: 优化迁移
2021-09-06 19:57:37 +08:00
feng626
b69ed8cbe9
Merge pull request #6767 from jumpserver/pr@dev@keep_only_flow_app_asset
...
perf: 只保留app asset flow
2021-09-06 18:45:50 +08:00
feng626
c27230762b
perf: 只保留app asset flow
2021-09-06 18:44:58 +08:00
Bai
7ea8205672
feat: 云管中心添加GCP
2021-09-06 18:21:15 +08:00
wojiushixiaobai
b9b55e3d67
perf: 添加常用工具
2021-09-06 18:20:30 +08:00
feng626
900fc4420c
perf: 只保留app asset flow
2021-09-06 18:19:47 +08:00
feng626
0a3e5aed56
perf: 授权分类采用from_ticket字段
2021-09-06 11:03:16 +08:00
feng626
9fb6fd44d1
Merge pull request #6745 from jumpserver/pr@dev@add_authorization_rule
...
feat: 授权规则分类管理
2021-09-01 16:48:56 +08:00
feng626
4214b220e1
feat: 授权规则分类管理
2021-08-31 14:13:05 +08:00
feng626
ae80797ce4
fix: 修复工单迁移bug
2021-08-27 18:05:14 +08:00
feng626
d1be4a136e
Merge pull request #6735 from jumpserver/pr@dev@asset_app_suggestion
...
feat: add app asset suggestion
2021-08-27 16:52:56 +08:00
feng626
e8e211f47c
feat: add app asset suggestion
2021-08-27 16:47:36 +08:00
feng626
44044a7d99
Merge pull request #6730 from jumpserver/pr@dev@ticket_fix
...
perf: 优化变量名
2021-08-27 10:14:46 +08:00
feng626
5854ad1975
perf: 优化变量名
2021-08-26 18:29:02 +08:00
健健
0b1a1591f8
从 __all__ 中删除 RDPFileSerializer ( #6727 )
...
* 从 __all__ 中删除 RDPFileSerializer
RDPFileSerializer 已经被删除
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com >
Co-authored-by: 老广 <ibuler@qq.com >
Co-authored-by: xinwen <coderWen@126.com >
Co-authored-by: Eric_Lee <xplzv@126.com >
2021-08-26 15:12:19 +08:00
ibuler
6241238b45
feat: sso支持验证mfa
2021-08-26 15:07:55 +08:00
fit2bot
0f87f05b3f
feat: 工单多级审批 + 模版创建 ( #6640 )
...
* feat: 工单多级审批 + 模版创建
* feat: 工单权限处理
* fix: 工单关闭后 再审批bug
* perf: 修改一点
Co-authored-by: feng626 <1304903146@qq.com >
Co-authored-by: ibuler <ibuler@qq.com >
2021-08-25 19:02:50 +08:00
Jiangjie.Bai
19c63a0b19
Merge pull request #6708 from jumpserver/dev
...
feat:README
2021-08-20 16:52:02 +08:00
fit2bot
1fdc558ef7
feat: 修改readme ( #6707 )
...
* feat: 修改readme
* feat: 修改readme
* feat: 修改readme
* feat: 修改readme
Co-authored-by: Bai <bugatti_it@163.com >
2021-08-20 16:47:49 +08:00
ibuler
9f6e26c4db
fix: 修复ws引起的redis连接增加
2021-08-20 15:23:23 +08:00
ibuler
628012a7ee
perf: 修改健康监测
2021-08-20 14:33:51 +08:00
ibuler
c1579f5fe4
perf: 修改readme
2021-08-20 14:13:40 +08:00
Bai
cbe0483b46
fix: 资产mini接口返回platform、protocols
2021-08-20 14:12:59 +08:00
xinwen
10c2935df4
fix: 用户创建 500
2021-08-20 10:07:17 +08:00
Jiangjie.Bai
10e06a4533
Merge pull request #6692 from jumpserver/dev
...
v2.13.0
2021-08-19 18:52:25 +08:00
ibuler
98e38ebfd8
perf: 修复系统用户翻译
2021-08-19 17:26:38 +08:00
Bai
9660e20176
fix: 修复远程应用资产必填项
2021-08-19 16:28:51 +08:00
xinwen
21a7ec9fec
fix: 升级时清空缓存
2021-08-19 15:45:59 +08:00
xinwen
7d123ff8c5
fix: 登录时验证码卡住
2021-08-19 15:19:01 +08:00
ibuler
2af6ac504d
perf: 优化版本号
2021-08-19 11:15:10 +08:00
Jiangjie.Bai
6c8d1c4e77
Merge pull request #6680 from jumpserver/dev
...
v2.13.0 rc4
2021-08-18 19:50:17 +08:00
Bai
52d3e1b34b
fix: 修改协议错误信息翻译
2021-08-18 19:33:50 +08:00
Bai
bf6fcc9020
fix: 修改翻译信息;添加水印配置项到页面
2021-08-18 19:14:49 +08:00
Bai
a0b756ebaa
feat: 添加同步任务执行历史保留天数配置项
2021-08-18 18:30:10 +08:00
xinwen
5e8a55f949
fix: AuthBook 变动审计
2021-08-18 16:47:28 +08:00
xinwen
f9218584f4
fix: 组织统计里系统用户与特权用户数量不对
2021-08-18 16:46:01 +08:00
Bai
228446979f
fix: 修改过期节点资产映射缓存清除
2021-08-18 15:37:40 +08:00
Bai
aa37d86959
fix: 将flower放到web服务中;修复账号列表过滤节点的逻辑,获取所有子节点。
2021-08-18 15:36:13 +08:00
feng626
0e9079fa2e
Merge pull request #6673 from jumpserver/pr@dev@user_role_search
...
fix: 用户角色搜索
2021-08-18 15:26:56 +08:00
feng626
58c058c1a5
fix: 修复user筛选用户bug
2021-08-18 15:25:35 +08:00
ibuler
f390556a87
perf: 优化spm请求的问题
2021-08-18 14:39:55 +08:00
Bai
b7378da46e
fix: 修复创建/更新远程应用资产可以为空的问题
2021-08-18 11:28:28 +08:00
Bai
0c8c926aac
fix: 修复校验用户登录规则的API权限
2021-08-18 10:31:42 +08:00
xinwen
81d8592ee1
fix: 系统用户的账号列表里修改密码后不能登录
2021-08-18 10:22:02 +08:00
Jiangjie.Bai
af827f3626
Merge pull request #6664 from jumpserver/dev
...
v2.13.0 rc3
2021-08-17 20:37:03 +08:00
ibuler
91b269fc36
fix: 修复应用账号
2021-08-17 20:31:19 +08:00
ibuler
1605a57df6
perf: 修复应用账号选择部分导出问题
2021-08-17 17:33:55 +08:00
ibuler
5cd23b843a
fix: 修复授权树api数据结构
2021-08-17 17:31:45 +08:00
Bai
d46f1080f8
fix: 修复校验用户密码规则
2021-08-17 16:37:38 +08:00
feng626
9a541ebf05
fix: 资产批量推送和测试连接性 bug
2021-08-17 14:05:03 +08:00
ibuler
dba416f5eb
fix: 修复remote app没有返回asset的bug
2021-08-17 11:29:02 +08:00
xinwen
7d7da9bf98
fix: 添加新的 es 时创建索引
2021-08-17 11:27:57 +08:00
老广
4425efd3c2
Merge pull request #6649 from jumpserver/dev
...
Dev
2021-08-17 10:17:49 +08:00
feng626
c6bb9e97fb
fix: 工单已关闭 再审批bug
2021-08-16 19:24:42 +08:00
xinwen
9c7adb7a14
fix: 用户列表导出部分字段没翻译
2021-08-16 17:41:56 +08:00
xinwen
7b4faccf05
fix: 飞书没有翻译
2021-08-16 16:46:20 +08:00
xinwen
0cd3419e09
fix: 修复应用授权列表报错
2021-08-16 16:45:45 +08:00
Eric_Lee
e49dedf6b1
Merge pull request #6645 from jumpserver/dev
...
Dev
2021-08-16 11:25:24 +08:00
ibuler
bee4e05b5f
fix: 修复应用账号中没有应用却有账号的问题
2021-08-16 11:23:15 +08:00
ibuler
a5419b49ee
perf: 添加监测 celery
2021-08-16 09:51:48 +08:00
ibuler
84e60283b8
fix(account): 修复应用账号前端不对的问题
2021-08-16 09:51:22 +08:00
Jiangjie.Bai
96206384c0
Merge pull request #6634 from jumpserver/dev
...
v2.13.0 rc1
2021-08-12 19:51:48 +08:00
Bai
78c61d5afa
feat: 升级依赖 jms-storage==0.0.39
2021-08-12 18:38:10 +08:00
Bai
ee712d9a9d
feat: 升级依赖 s3transfer==0.5.0
2021-08-12 18:38:10 +08:00
ibuler
a1e8c2849a
perf: 修改entrypoint
2021-08-12 17:55:03 +08:00
fit2bot
54751a715c
feat: 添加 飞书 ( #6602 )
...
* feat: 添加 飞书
Co-authored-by: xinwen <coderWen@126.com >
Co-authored-by: wenyann <64353056+wenyann@users.noreply.github.com >
2021-08-12 16:44:06 +08:00
fit2bot
a2907a6e6d
fix: 将 es 的 doc_type 默认值改为 _doc ( #6627 )
...
* fix: 无效的 es 报 500
* fix: 修复索引不存在时报错
* fix: 将 es 的 doc_type 默认值改为 _doc
Co-authored-by: xinwen <coderWen@126.com >
2021-08-12 15:37:22 +08:00
Bai
33236aaa47
fix: 修复启动脚本beat进程偶尔不会结束的问题
2021-08-12 15:35:22 +08:00
Bai
cd6c7ce7fa
perf: jms脚本添加collectstatic命令
2021-08-11 14:28:39 +08:00
Bai
363baece4f
fix: 修复删除远程应用关联资产后,更新页面显示资产ID的问题
2021-08-11 14:23:47 +08:00
feng626
1db0e28346
feat: 用户管理增加角色搜素
2021-08-11 10:36:43 +08:00
xinwen
7366bbb197
fix: 修复 es 命令存储过滤不准确
2021-08-10 17:25:41 +08:00
Bai
7959f84bba
fix: 修改启动脚本
2021-08-10 14:45:58 +08:00
ibuler
0c96bf61ef
chore: 添加注释
2021-08-09 10:22:16 +08:00
fit2bot
39ce60c93a
feat: 系统监控添加 Core/Celery Terminal; 修改检测终端状态逻辑; ( #6570 )
...
* feat: 系统监控添加 Core Terminal; 修改检测终端状态逻辑;
* feat: 添加management包
* feat: 添加management包
* feat: 添加 start 模块
* feat: 修改 start 模块
* feat: 修改启动命令目录结构
* feat: 修改启动命令目录结构
* feat: 修改启动命令目录结构
* feat: 修改启动命令目录结构
* feat: 修改启动命令目录结构
* feat: 修改启动命令目录结构
* feat: 修改启动命令目录结构
* feat: 修改启动脚本
* feat: 修改启动脚本
* feat: 修改启动脚本
* feat: 修改启动脚本
* feat: 修改启动脚本
* feat: 修改启动脚本
* feat: 修改启动脚本
* feat: 修改启动脚本
* feat: 修改启动脚本
* feat: 修改启动脚本
Co-authored-by: Bai <bugatti_it@163.com >
2021-08-06 19:16:18 +08:00
Bai
8ad78ffef8
fix: 修改SECURITY_PASSWORD_MIN_LENGTH
2021-08-05 10:38:22 +08:00
xinwen
66b499b8e3
fix: 修复多对多审计内容太长报错&全局组织没有审计
2021-08-04 17:13:25 +08:00
xinwen
22406f47f7
fix: Luna 页面搜索资产,结果按资产名称排序
2021-08-04 10:32:20 +08:00
feng626
72f782b589
Merge pull request #6576 from jumpserver/pr@dev@edit_xpack_internationalization
...
feat: 修改xpack 国际化
2021-08-03 14:31:20 +08:00
xinwen
cf3df951a9
fix: xrdp 连接可以指定是否全屏
2021-08-03 11:28:49 +08:00
xinwen
4085df913b
feat: 记录网关可连接性
2021-08-02 18:42:43 +08:00
ibuler
d93f3aca51
perf: 修改支持客户端拉起
...
perf: remove print
2021-08-02 18:15:11 +08:00
老广
b180a162cd
Merge pull request #6580 from jumpserver/pr@dev@update_pip_version
...
perf: 修改依赖包版本
2021-08-02 17:59:15 +08:00
ibuler
1bf3ff5e1b
perf: 修改依赖包版本
2021-08-02 17:55:22 +08:00
Bai
0def477b63
fix: 修复收集windows资产用户时未收集到全部用户的问题
2021-08-02 16:34:54 +08:00
feng626
337e1ba206
feat: 修改xpack 国际化
2021-08-02 14:19:54 +08:00
Bai
fe2d80046c
fix: 修改用户密码更新API取消Retrieve权限
2021-08-02 12:00:14 +08:00
Bai
f16a9ddb86
fix: 修改 settings.SECURITY_MFA_AUTH 开启判断条件
2021-08-02 10:52:41 +08:00
老广
5f6c207721
Merge pull request #6572 from jumpserver/pr@dev@perf_account_filter
...
perf: 修改账号搜索
2021-07-30 19:52:08 +08:00
ibuler
988d686418
perf: 修改账号搜索
2021-07-30 19:48:23 +08:00
老广
89e654af80
Merge pull request #6571 from jumpserver/pr@dev@perf_i18n
...
perf: 优化i18n
2021-07-30 19:21:31 +08:00
ibuler
2ab1bbaa2c
chore: merge with dev
2021-07-30 19:18:36 +08:00
ibuler
b43626b5a2
perf: 优化i18n
2021-07-30 19:13:47 +08:00
ibuler
5e4b3e924f
perf: 优化树
2021-07-30 17:29:50 +08:00
fit2bot
66b0173e20
feat: 服务性能告警指标包含:Core服务和各组件状态;指标包括:cpu/disk/memory/is_alive ( #6564 )
...
* feat: 服务性能告警指标包含:Core服务和各组件状态;指标包括:cpu/disk/memory/is_alive
* feat: 服务性能告警指标包含:Core服务和各组件状态;指标包括:cpu/disk/memory/is_alive 2
Co-authored-by: Bai <bugatti_it@163.com >
2021-07-30 15:42:06 +08:00
fit2bot
67f6b1080e
feat: 管理员和普通用户支持单独设置MFA和密码长度 ( #6562 )
...
* feat: 支持配置系统管理员强制MFA和独立密码长度限制
* feat: 支持配置系统管理员强制MFA和独立密码长度限制
* feat: 支持配置系统管理员强制MFA和独立密码长度限制, 翻译文件
* fix: 设置界面可设置管理员用户开启MFA,当在设置开启全局的时候,不改变用户的mfa字段状态
* fix: 修改管理员最小密码长度变量名称
* perf: 优化不同的配置
* perf: 修改check password rule
* perf: 添加配置文件
* perf: 修改profile
* perf: 优化代码
* fix: 修复bug
Co-authored-by: fit2cloud-jiangweidong <weidong.jiang@fit2cloud.com >
Co-authored-by: ibuler <ibuler@qq.com >
2021-07-30 15:19:00 +08:00
ibuler
b56b897260
perf: 优化计算数量
2021-07-30 11:08:12 +08:00
ibuler
f031f4d560
perf: 修复授权应用树的问题
2021-07-29 19:45:36 +08:00
Bai
d0e119fb50
feat: session.Task model add kwargs field (记录kill_session的用户名称)
2021-07-29 15:06:54 +08:00
Bai
7892e50aa2
feat: session.Task model add kwargs field (记录kill_session的用户名称)
2021-07-29 15:06:54 +08:00
ibuler
bff3582136
perf: 修改时间日志格式,兼容firefox
2021-07-28 17:56:23 +08:00
Bai
bdf95903ce
feat: 支持终断DB会话
2021-07-28 17:48:53 +08:00
feng626
c1e6bc5d60
Merge pull request #6555 from jumpserver/pr@dev@user_collection_node_fix
...
fix: 用户管理-用户-授权的资产-收藏夹下拉菜单报404bug修复
2021-07-28 14:39:53 +08:00
feng626
da588ce0ae
perf: 代码优化
2021-07-28 14:33:02 +08:00
feng626
d0680c3753
fix: 用户管理-用户-授权的资产-收藏夹下拉菜单报404bug修复
2021-07-28 14:21:53 +08:00
fit2bot
905d0d5131
perf: 统一应用树 ( #6535 )
...
* perf: 添加应用树api
* perf: perms tree
* perf: 统一应用树
* perf: 修改icon
* perf: stash it
* perf: 优化应用账号
* perf: 基本完成应用账号重构
* perf: 修改翻译
Co-authored-by: ibuler <ibuler@qq.com >
2021-07-27 16:06:00 +08:00
feng626
d347ed9862
perf: 优化代码
2021-07-27 15:54:44 +08:00
feng626
8611f765a3
feat: 增加rdp 云端唤醒 api
2021-07-27 15:54:44 +08:00
ibuler
962f1c0310
perf: 资产账号支持,几点过滤
2021-07-27 15:54:08 +08:00
feng626
473a66719b
终端 批量更新 数据必填
2021-07-27 15:52:59 +08:00
Bai
aeb43a04f6
feat: 添加翻译: trigger 触发模式、手动触发、自动触发
2021-07-27 10:45:28 +08:00
xinwen
49a35985a1
feat: 多对多关系添加审计
2021-07-26 18:10:41 +08:00
Bai
21b789e08c
perf: 优化测试网域可连接性的错误提示信息
2021-07-26 15:53:08 +08:00
Bai
51387ad97e
fix: 解决访问api-docs失败的问题
2021-07-26 14:32:53 +08:00
Bai
290d584ac9
perf: 校验系统用户/账号密码不能包含 {{ 字符;升级依赖包ansible==2.9.24
2021-07-23 19:00:43 +08:00
Bai
160b238058
fix: 修复ssh-private-key错误导致系统用户列表加载出现500的问题
2021-07-23 18:57:53 +08:00
Bai
938255df6f
perf: 添加LDAPServerURL ldaps:// ldap:// 协议检测
2021-07-23 14:50:44 +08:00
Bai
4230da0fd9
perf: 添加LDAPServerURL ldaps:// ldap:// 协议检测
2021-07-23 11:24:05 +08:00
xinwen
fee3715d30
fix: 应用授权按type 过滤报错
2021-07-22 11:06:14 +08:00
Bai
689bd093be
云管中心同步任务支持设置同步IP网段和协议组(修改特权用户文案)
2021-07-21 16:50:04 +08:00
feng626
77461d7834
网域网管取消密码不为空校验
2021-07-21 16:33:09 +08:00
ibuler
ee5894c296
perf: 优化工单推荐资产的数量
2021-07-21 14:39:29 +08:00
Bai
07898004b0
feat: 丰富资产任务API创建;支持针对多个系统用户一个资产的推送和测试
2021-07-20 16:59:51 +08:00
Eric_Lee
630164cd51
Merge pull request #6494 from jumpserver/pr@dev@add_watermark
...
perf: 添加配置文件,控制luna水印
2021-07-19 18:28:24 +08:00
feng626
981319e553
关闭 网域网关 密码特殊字符校验
2021-07-19 18:27:11 +08:00
ibuler
fedd32ea7a
merge: 合并dev
2021-07-19 18:26:04 +08:00
ibuler
e57574f10a
perf: 添加配置文件,控制luna水印
...
perf: 添加配置文件样例
2021-07-19 18:20:51 +08:00
xinwen
3f0a0b33b5
feat: 应用按类型筛选可以指定多个类型
2021-07-19 10:11:07 +08:00
Bai
c21217d50c
perf: 添加配置项 LOGIN_REDIRECT_TO_BACKEND
2021-07-16 14:34:23 +08:00
Bai
e44c8ae940
perf: 优化登录跳转flash时间间隔可配置;0表示直接跳转
2021-07-16 14:34:23 +08:00
wojiushixiaobai
1da187c373
perf: 优化 MFA 绑定提示
2021-07-16 14:33:08 +08:00
xinwen
36ad42beb2
fix: xrdp 设置分辨率不生效
2021-07-16 14:32:18 +08:00
Jiangjie.Bai
c0560ad3cc
Merge pull request #6464 from jumpserver/dev
...
v2.12.0 rc5
2021-07-15 19:19:18 +08:00
ibuler
c318762f82
perf: 修改account密码加载
2021-07-15 19:12:58 +08:00
ibuler
5d373c0137
fix: 修复错误格式
2021-07-15 19:12:58 +08:00
Jiangjie.Bai
3aea998bd2
Merge pull request #6462 from jumpserver/dev
...
v2.12.0 rc5
2021-07-15 18:23:38 +08:00
ibuler
c1ca48a32a
perf: 修改i18n
2021-07-15 18:22:53 +08:00
Jiangjie.Bai
2f0fcddc29
Merge pull request #6458 from jumpserver/dev
...
v2.12.0 rc5
2021-07-15 18:00:27 +08:00
ibuler
329565251a
perf: 修改prefetch
2021-07-15 17:58:45 +08:00
ibuler
06a223376c
perf: 基本完成
2021-07-15 17:58:45 +08:00
Bai
47e8ad3aac
fix: 修复创建资产关联所在节点的系统用户时没有设置组织ID的问题
2021-07-15 17:12:56 +08:00
Jiangjie.Bai
c4fb3a8c04
Merge pull request #6455 from jumpserver/dev
...
v2.12.0 rc5
2021-07-15 17:04:22 +08:00
ibuler
9d4121c3b7
perf: 优化代码
2021-07-15 11:02:45 +08:00
xinwen
2eb1fe8547
fix: 系统用户与资产关系变化时 AuthBook 表的 org_id 可能是 root 组织
2021-07-15 11:02:45 +08:00
ibuler
e933774e6c
fix: 修复创建 authbook 可能没有组织id的问题
2021-07-15 11:01:14 +08:00
Jiangjie.Bai
0b994d1c46
Merge pull request #6450 from jumpserver/dev
...
v2.12.0 rc4
2021-07-14 21:38:38 +08:00
xinwen
381b150c2b
fix: 探测 authbook 在 root 组织下保存的情况
2021-07-14 21:37:48 +08:00
xinwen
53ebac9363
fix: 探测 authbook 在 root 组织下保存的情况
2021-07-14 21:36:53 +08:00
Jiangjie.Bai
a0638dd5c4
Merge pull request #6447 from jumpserver/dev
...
v2.12.0 rc4
2021-07-14 19:02:45 +08:00
Bai
5b741de896
fix: 修复系统用户资产导出包含组织名称
2021-07-14 18:56:40 +08:00
Bai
d7f587216d
fix: 修复测试系统用户可连接性问题
2021-07-14 17:07:55 +08:00
ibuler
019f00a34a
perf: 优化特权账号创建和导出
...
perf: 优化搜索
perf: Huany
perf: 还原
perf: 又改
xxx
2021-07-14 16:56:34 +08:00
Bai
9684b2d4ac
fix: 修复测试资产可连接性获取admin_user总是新加载的authbook对象
2021-07-14 15:31:39 +08:00
xinwen
2e190c9ea9
fix: 授权过期自动刷新授权树
2021-07-14 15:00:41 +08:00
xinwen
601a48071f
fix: 组织统计中系统用户数量不对
2021-07-14 13:56:44 +08:00
Bai
bf885f94e4
fix: 修复系统用户资产导出文案
2021-07-14 12:27:58 +08:00
Bai
7d4be819b8
fix: 修复系统用户资产导出文案
2021-07-14 12:25:07 +08:00
xinwen
26a7fa836c
fix: 网关测试连接 500
2021-07-14 12:24:43 +08:00
Jiangjie.Bai
187329b006
Merge pull request #6429 from jumpserver/dev
...
v2.12.0 rc3
2021-07-13 20:45:03 +08:00
xinwen
8375008cfa
fix: 用户无效时,企业微信&钉钉扫码 500
2021-07-13 20:43:37 +08:00
ibuler
16333fa1aa
fix: 修复管理用户批量删除失败的bug
2021-07-13 18:12:19 +08:00
Bai
72deb005a6
fix: 修复改密日志支持模糊搜索
2021-07-13 18:07:48 +08:00
Bai
18509a0ca4
fix: 修复导出系统用户资产列表时包含org_id字段
2021-07-13 17:46:21 +08:00
ibuler
e63d0dcd9e
perf: 添加ssh 指纹
2021-07-13 17:45:59 +08:00
Bai
62ba3984bd
fix: 修复用户列表角色字段不显示的问题
2021-07-13 16:22:49 +08:00
ibuler
db170aac9e
perf: 添加测试多个账号的任务
2021-07-13 13:16:27 +08:00
ibuler
5c7e73e2e0
fix: 修复系统用户详情,测试资产可连接性问题
...
fix; bug
perf: 还原migrations
2021-07-13 11:31:39 +08:00
ibuler
f772296dff
fix(assets): 修复patch system user的问题
...
perf: 去掉debug
2021-07-13 11:30:38 +08:00
xinwen
f6a26ac165
fix: 全局组织命令记录无数据
2021-07-13 10:58:48 +08:00
ibuler
4e3b3442d2
perf: 修改添加翻译
...
perf: 优化翻译
perf: 修改i18n
perf: 编译
2021-07-13 10:35:42 +08:00
Jiangjie.Bai
2752770ce2
Merge pull request #6416 from jumpserver/dev
...
v2.12.0 rc2
2021-07-12 18:26:56 +08:00
ibuler
1840609d53
fix: 修复动态系统用户无法提交的问题
...
fix: 修复动态系统用户
2021-07-12 18:21:04 +08:00
fit2bot
4f23090a5c
fix: 修复账号搜索 5xx ( #6413 )
...
Co-authored-by: ibuler <ibuler@qq.com >
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com >
2021-07-12 18:20:32 +08:00
ibuler
898b51c593
fix: 修复账号搜索问题
2021-07-12 18:17:21 +08:00
xinwen
2494418208
fix: 用户组删除时,授权树不会自动更新
2021-07-12 18:16:53 +08:00
Bai
0fec70fe69
feat: 添加移除AssetUser Model的migrations
2021-07-12 13:10:40 +08:00
Jiangjie.Bai
bcf90d71a2
Merge pull request #6405 from jumpserver/dev
...
v2.12.0 rc1
2021-07-08 16:55:46 +08:00
ibuler
f8f7ac0af5
fix(assets): 修复创建资产报错
2021-07-08 16:52:31 +08:00
Jiangjie.Bai
d6c2705bd6
Merge pull request #6402 from jumpserver/dev
...
v2.12 rc1
2021-07-08 15:19:21 +08:00
ibuler
10f8b9f130
perf: 优化ansible执行命令
2021-07-08 14:54:05 +08:00
Bai
1e601288fa
fix: 修改CAS配置默认值
2021-07-08 14:47:03 +08:00
Tommy.chen
b1032761c8
add cas CAS_USERNAME_ATTRIBUTE CAS_RENAME_ATTRIBUTES CAS_CREATE_USER read
2021-07-08 14:34:30 +08:00
Z000000
c532c361c0
批量命令支持更广泛的设备如思科等网络设备,docker等 ( #6356 )
...
* feat: Update README (#6182 )
* feat: Update README
* feat: Update README
* Update README.md
* feat: update README
* Update README.md
* docs: 修改英文版本
* Update README.md
* 批量命令支持更广泛的设备如思科等网络设备,docker等
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com >
Co-authored-by: 老广 <ibuler@qq.com >
2021-07-08 14:32:03 +08:00
fit2bot
ec8dca90d6
refactor: 整合系统用户和管理用户 ( #6236 )
...
* perf: 整合系统用户和管理用户
* stash
stash
perf: 优化系统用户和资产的表结构
* perf: 添加信号
* perf: 添加算法
* perf: 去掉 asset user backends
* perf: 整理系统用户api
* perfF: 暂存一下
* stash
* perf: 暂存一下
* perf: 暂存
* xxx
* perf: ...
* stash it
* xxx
* xxx
* xxx
* xxx
* xxx
* stash it
* 修改Protocols
* perf: 修改创建authbook信号
* perf: 添加auth info
* .stash
* perf: 基本完成
* perf: 修复完成
* perf: 修复更改的id
* perf: 修复迁移过去数量不对的问题
* perf: 修改systemuser
* fix: 修复批量编辑近期的问题
* fix: 修复authbook加载的问题
* xxx
Co-authored-by: ibuler <ibuler@qq.com >
2021-07-08 14:23:18 +08:00
xinwen
a9f814a515
fix: 过期用户登录提示不明确
2021-07-08 10:27:15 +08:00
xinwen
c4bbeaaccc
feat: rdp 添加授权过期自动断开
2021-07-07 11:09:17 +08:00
xinwen
0fd5ab02e9
fix: 修复 interval 周期任务不执行问题
2021-07-01 16:42:22 +08:00
老广
745979074a
Update README.md
2021-06-29 15:12:10 +08:00
Bai
8ae6863266
fix: 修复终端更新存储失败的问题
2021-06-29 13:33:16 +08:00
Bai
4fd7f0e949
fix: 修复自动生成系统用户密码中包含 {{ 双字符时测试可连接性失败的问题
2021-06-29 13:22:59 +08:00
xinwen
732f0b55dc
refactor: 更改系统消息初始化策略
2021-06-28 15:57:49 +08:00
Jiangjie.Bai
c0ec0f1343
feat: 支持设置默认存储(命令、录像) ( #6336 )
...
* fix: 修改LDAP用户导入的组织为当前组织
* fix: 修改翻译信息
* feat: 支持设置默认存储
* feat: 支持设置默认存储(2)
* feat: 支持设置默认存储(3)
2021-06-28 10:32:59 +08:00
xinwen
aa6e550ba2
fix: 系统消息通知升级错误
2021-06-25 23:47:13 +08:00
Jiangjie.Bai
2ffaf59238
Merge pull request #6328 from jumpserver/ibuler-patch-1
...
Update README.md
2021-06-25 14:47:36 +08:00
ibuler
6c13fdbc46
perf: 优化图片大小
...
perf: ...
2021-06-25 10:16:26 +08:00
fghbng@qq.com
35941ddf7f
feat: 优化缓存,将会话的缓存拿出来
2021-06-25 10:13:51 +08:00
fghbng@qq.com
3ae976c183
优化缓存,将会话的缓存拿出来
2021-06-25 10:13:51 +08:00
ibuler
999666f0eb
docs: 修改英文版本
2021-06-23 17:16:01 +08:00
老广
1812074231
Update README.md
2021-06-23 11:31:51 +08:00
Bai
53eb32e620
fix: 修改翻译信息
2021-06-22 19:17:44 +08:00
Bai
50bd0b796d
fix: 修改LDAP用户导入的组织为当前组织
2021-06-22 19:17:44 +08:00
wojiushixiaobai
a02d80a2ae
feat: arm64 支持
2021-06-22 14:44:47 +08:00
ibuler
71a7eea8ad
perf: 修复next为空可能会导致的bug
2021-06-22 11:13:44 +08:00
ibuler
2b927caa60
fix: 修复oidc登录的问题
...
..
2021-06-22 11:04:12 +08:00
ibuler
053d958f9a
fix: 修复app无法下载xrdp文件
2021-06-22 10:20:37 +08:00
ibuler
8d25d0a653
fix: 修复登录页面的 i18n 问题
2021-06-22 10:18:48 +08:00
Bai
62eb131f59
fix: 修改创建用户时如果没有在任何组织内默认添加到default组织
2021-06-21 18:59:07 +08:00
jiangweidong
40eb7c79bb
feat: 添加青云SDK
2021-06-21 15:57:21 +08:00
Bai
dabc9eb09b
fix: 修改获取系统用户认证信息时username的选择逻辑;(单独设置过的系统用户认证信息登录资产失败)
2021-06-18 18:15:58 +08:00
Jiangjie.Bai
502657bad4
Merge pull request #6294 from jumpserver/dev
...
v2.11.0 rc5
2021-06-17 12:23:20 +08:00
ibuler
b5120e72c8
perf(notification): 发送html msg
2021-06-17 12:20:51 +08:00
Bai
2ca659414e
fix: 修改应用账号序列类添加token字段
2021-06-17 12:13:06 +08:00
Jiangjie.Bai
64f772e747
Merge pull request #6291 from jumpserver/dev
...
v2.11.0. rc5
2021-06-17 11:49:04 +08:00
Bai
67a897f9c3
fix: 修改ldap导入
2021-06-17 11:48:00 +08:00
Jiangjie.Bai
d0a9ccbdfe
Merge pull request #6286 from jumpserver/dev
...
v2.11.0 rc5 (2)
2021-06-16 19:47:51 +08:00
xinwen
1a30675a86
fix: 去掉命令告警开关
2021-06-16 18:03:17 +08:00
ibuler
f6273450bb
perf: 优化批量危险命令告警
2021-06-16 18:02:17 +08:00
ibuler
8f35fcd6f9
perf: 优化通知迁移
2021-06-16 16:58:07 +08:00
xinwen
1999cfdfeb
perf: 优化钉钉命令告警
2021-06-16 16:57:28 +08:00
Bai
c4af78c9f0
fix: 修改AuthBook删除raise异常类
2021-06-16 14:42:03 +08:00
Bai
a3d02decd6
fix: 修改翻译
2021-06-16 14:28:28 +08:00
ibuler
e623f63fcf
perf: 修改i18n
...
perf: 优化命令告警,优化翻译
2021-06-16 14:24:57 +08:00
Jiangjie.Bai
4f1b2aceda
Merge pull request #6277 from jumpserver/dev
...
v2.11.0 rc5
2021-06-16 13:03:17 +08:00
健健
94fc1fb53b
fix: 导入数据解析 title 时,没有过滤 read only 字段 ( #6269 )
...
* feat: Update README (#6182 )
* feat: Update README
* feat: Update README
* Update README.md
* feat: update README
* fix: 导入数据解析 title 时,没有过滤 read only 字段
type,type_display 翻译都是一样的,导出时使用的是 type,导入时识别成 type_display
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com >
2021-06-16 13:00:55 +08:00
xinwen
937acbd0b5
fix: 资产授权不能打开或关闭
2021-06-16 12:54:03 +08:00
xinwen
067a70463e
fix: 高危命令邮件收不到
2021-06-16 12:41:14 +08:00
Bai
b115ed3b79
fix: 修改LDAP用户导入默认添加到Default组织
2021-06-16 11:13:21 +08:00
Jiangjie.Bai
057fbdf0b1
Merge pull request #6268 from jumpserver/dev
...
v2.11.0 rc3
2021-06-15 14:50:02 +08:00
xinwen
5263a146e2
fix: 修复站内信迁移脚本问题
2021-06-15 14:47:16 +08:00
Jiangjie.Bai
84070a558e
Merge pull request #6265 from jumpserver/dev
...
v2.11.0 rc2
2021-06-15 10:49:46 +08:00
Bai
e0604a3211
feat: 修改翻译
2021-06-15 10:42:06 +08:00
Bai
00e4c3cd07
feat: 添加应用用户API
2021-06-15 10:42:06 +08:00
ibuler
97a0e27307
perf: 优化消息中心未读数量
2021-06-11 18:02:53 +08:00
ibuler
8d3c1bd783
perf: 优化获取token secret, 重新校验权限
2021-06-10 19:51:11 +08:00
ibuler
db99ab80db
perf(auth): 授权token形式登录,支持记录登录日志
2021-06-10 18:07:24 +08:00
Jiangjie.Bai
1e8d9ba2ec
Merge pull request #6256 from jumpserver/dev
...
v2.11.0 rc1
2021-06-10 14:03:45 +08:00
xinwen
7dddf0c3c2
fix: 站内信未读信息计数不准
2021-06-10 10:24:54 +08:00
fit2bot
891a5157a7
perf: 优化token时间 ( #6252 )
...
* perf: 修复上次引起的小bug
* perf: 优化token时间
Co-authored-by: ibuler <ibuler@qq.com >
2021-06-09 20:10:34 +08:00
ibuler
34b2a5fe0b
perf: 修复上次引起的小bug
2021-06-09 15:47:26 +08:00
ibuler
de6908e5a6
perf: rdp file添加domain
...
fix: 禁用的用户不返回信息
perf: 优化token,禁用的资产无法链接
2021-06-09 14:18:15 +08:00
fit2bot
d6527e3b02
perf: 优化支持记录密码 ( #6247 )
...
* perf: 优化 xrdp setting
* perf: 优化支持记录密码
Co-authored-by: ibuler <ibuler@qq.com >
2021-06-08 20:50:15 +08:00
ibuler
33a29ae788
perf: 优化 xrdp setting
2021-06-08 15:25:32 +08:00
ibuler
a2eb431015
perf: 优化自动分辨率
2021-06-08 12:48:48 +08:00
Bai
8fbea2f702
fix: 修改资产账号name为非必填
2021-06-08 11:38:37 +08:00
fit2bot
af92271a52
feat: 调整站内信接口 ( #6228 )
...
* feat: 调整站内信接口
* 添加 websockt
* 添加信息类型字段
* 添加 has_read 过滤参数
* feat: 调整站内信接口
* 添加 websockt
* 添加信息类型字段
* 添加 has_read 过滤参数
* 去掉type websocket
* perf: 去掉type
Co-authored-by: xinwen <coderWen@126.com >
Co-authored-by: ibuler <ibuler@qq.com >
2021-06-08 11:11:27 +08:00
ibuler
391a5cb7d0
perf: 修复手动设置密码的问题
2021-06-07 10:46:58 +08:00
xinwen
daf7d98f0e
fix: 其他组织中创建的用户不要添加到默认组织了
2021-06-04 04:30:40 -05:00
Jiangjie.Bai
ed297fd1bd
Merge pull request #6226 from jumpserver/pr@dev@add_missing_migrations
...
chore: 添加删除的文件
2021-06-04 14:40:32 +08:00
Bai
f91bef4105
feat: 修改依赖包版本号: jms-storage-sdk==0.0.37
2021-06-04 14:37:02 +08:00
Bai
a8d84fc6e1
feat: 修改迁移文件
2021-06-04 11:39:17 +08:00
Bai
0c7838d0e3
feat: 修改迁移文件
2021-06-04 11:39:17 +08:00
Jiangjie.Bai
f26483c9cd
Merge pull request #6224 from jumpserver/feat_account_manager
...
feat: 添加账号管理相关API
2021-06-04 11:15:53 +08:00
Bai
5daca6592b
feat: 修改文案 后端 -> 来源
2021-06-04 11:14:53 +08:00
Bai
0bced39f08
fix: 修复redis服务异常时(如: 主从切换), 用户session立即过期的问题
2021-06-03 22:04:10 -05:00
ibuler
6d83dd0e3a
chore: 添加删除的文件
2021-06-03 14:54:41 +08:00
ibuler
46e99d10cb
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2021-06-03 14:28:39 +08:00
liubo
95eb11422a
feat: 支持添加 OBS 存储
2021-06-03 01:28:23 -05:00
ibuler
e8b3ee4565
perf: 优化系统用户,支持用户设置临时密码
...
perf: 优化rdp file下载
perf: 修改密码途观选项
perf: 优化api获取
2021-06-03 01:24:28 -05:00
Bai
1e99be1775
feat: 修改获取应用用户API
2021-06-03 13:59:44 +08:00
Bai
adae509bc0
fix: 修复组织批量删除的问题
2021-06-03 11:36:24 +08:00
ibuler
7868e91844
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2021-06-03 11:19:02 +08:00
xinwen
a9bdbcf7c6
fix: metadata api view 报错
2021-06-02 22:02:14 -05:00
xinwen
a809eac2b8
fix: 修复获取 Metadata 时,获取的总是 action 为 metadata
2021-06-02 04:41:01 -05:00
Bai
bdab93260f
feat: 资产用户API返回 BackendDisplay 和 Name 字段
2021-06-02 17:00:31 +08:00
fit2bot
4ef3b2630a
feat: 站内信 ( #6183 )
...
* 添加站内信
* s
* s
* 添加接口
* fix
* fix
* 重构了一些
* 完成
* 完善
* s
* s
* s
* s
* s
* s
* 测试ok
* 替换业务中发送消息的方式
* 修改
* s
* 去掉 update 兼容 create
* 添加 unread total 接口
* 调整json字段
Co-authored-by: xinwen <coderWen@126.com >
2021-05-31 17:20:38 +08:00
Bai
4eef25982d
feat: 更新 ApplicationUserList API
2021-05-27 18:42:43 +08:00
xinwen
b82e9f860b
fix: users 遗漏一个 migration
2021-05-26 15:26:56 +08:00
Bai
6b46f5b48e
feat: 添加ApplicationUserList API
2021-05-24 19:11:47 +08:00
Jiangjie.Bai
fe717f0244
feat: Update README ( #6182 )
...
* feat: Update README
* feat: Update README
* Update README.md
* feat: update README
2021-05-24 16:04:40 +08:00
ibuler
33fb063f78
perf: 暂时禁用xrdp实时监控
2021-05-24 15:37:21 +08:00
老广
7edc9c37f8
Update README.md
2021-05-24 11:02:18 +08:00
Michael Bai
f8b4259a8c
fix: 修复创建/更新用户时密码策略相关的问题
2021-05-23 21:56:37 -05:00
Michael Bai
572d0e3f27
fix: 修复parser没有处理int类型数据的问题
2021-05-23 21:54:14 -05:00
ibuler
b334f3c2d9
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2021-05-24 10:46:43 +08:00
Jiangjie.Bai
6b4b9f4b02
Merge pull request #6169 from jumpserver/dev
...
v2.10.1
2021-05-21 15:20:25 +08:00
ibuler
d765e61991
fix(assets): 修复网关信息没有密码的bug
2021-05-21 15:17:29 +08:00
Bai
9ccde03656
fix: 修改cloud翻译
2021-05-20 22:27:29 -05:00
xinwen
c66f366446
fix: 修复 default 组织用户数量统计错误
2021-05-21 10:36:27 +08:00
ibuler
34d46897f8
fix: 修复周期监测任务配置的bug
2021-05-21 10:35:39 +08:00
ibuler
2d9ce16601
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2021-05-20 15:53:16 +08:00
Jiangjie.Bai
0380be51dd
Merge pull request #6155 from jumpserver/dev
...
Merge dev to master
2021-05-20 15:02:28 +08:00
Bai
47df0cfaab
fix: 修改翻译
2021-05-20 15:00:10 +08:00
Bai
a2fb4a701e
fix: 修复命令过滤器规则Action Choices显示
2021-05-20 01:07:33 -05:00
fit2bot
6e4381ac04
perf: 修改readme ( #6152 )
...
* perf: 修改readme
* perf: 修改readme
Co-authored-by: ibuler <ibuler@qq.com >
2021-05-20 13:14:34 +08:00
fghbng@qq.com
8ae03e4374
修复资产导出字段名显示
2021-05-20 00:11:44 -05:00
fghbng@qq.com
73f2022ff6
修复全局组织仪表盘用户总数统计
2021-05-20 00:07:49 -05:00
ibuler
bc4258256a
perf: 修改readme
2021-05-20 13:06:37 +08:00
Jiangjie.Bai
58dfe58ae0
Merge pull request #6147 from jumpserver/dev
...
v2.10.0 rc4
2021-05-19 19:28:10 +08:00
fghbng@qq.com
53e3fa2590
修复全局组织仪表盘用户总数统计
2021-05-19 19:27:30 +08:00
xinwen
23dbdaf6c0
fix: 系统用户里测试资产可连接性不能指定资产
2021-05-19 18:07:29 +08:00
xinwen
3eba92548b
fix: 修改企业微信&钉钉一些小问题和翻译
2021-05-19 18:02:34 +08:00
fghbng@qq.com
ac5f2c560d
修复网关更新获取到了明文密码
2021-05-19 17:58:26 +08:00
Bai
f7f9331c48
fix: 修复Dashboard活跃用户数据不准确问题
2021-05-19 17:49:03 +08:00
xinwen
77b4847bd9
fix: 有在线会话的终端不能删除
2021-05-19 16:17:47 +08:00
Jiangjie.Bai
0de9b29fa9
Merge pull request #6136 from jumpserver/dev
...
v2.10.0 rc3
2021-05-18 19:16:25 +08:00
xinwen
f9ca46dd67
fix: 修复用户历史密码在创建时不起作用
2021-05-18 19:15:58 +08:00
xinwen
ba28f3263d
fix: 企业微信&钉钉解绑报错
2021-05-18 14:03:16 +08:00
xinwen
2e118665f5
fix: 过期用户退出登录
2021-05-17 21:08:01 -05:00
fit2bot
bf53df46dc
fix: 修复包含组织管理员时可以删除组织的问题 ( #6130 )
...
Co-authored-by: Bai <bugatti_it@163.com >
2021-05-17 19:11:55 +08:00
fit2bot
6449f36c7e
perf: 修改文案 ( #6129 )
...
* perf: 修改i18n
* perf: 修改文案
Co-authored-by: ibuler <ibuler@qq.com >
2021-05-17 19:11:28 +08:00
Bai
ba35f5906b
fix: 修复收集用户interval等字段的校验
2021-05-17 18:31:30 +08:00
fghbng@qq.com
c8d7d42f66
仪表盘全局组织统计
2021-05-17 17:35:13 +08:00
fghbng@qq.com
20dacea260
仪表盘全局组织报500错误
2021-05-17 17:35:13 +08:00
ibuler
d2dc2ab02c
perf: 修改i18n
2021-05-17 17:30:56 +08:00
xinwen
ba3b5a4027
fix: 创建 Es 时失败的提示翻译
2021-05-17 17:29:53 +08:00
xinwen
3743761024
fix: 修复绑定企业微信&钉钉的一些问题
2021-05-17 17:20:48 +08:00
Bai
70055b8af2
fix: 修复remoteapp获取asset_info失败的问题
2021-05-17 16:15:28 +08:00
ibuler
726fd94f65
fix: 修复 xslx 提交数字类型报错
2021-05-17 01:54:52 -05:00
Bai
8b951ce12c
perf: 添加迁移文件(lion)
2021-05-17 14:50:35 +08:00
Bai
189bc9d74a
perf: 添加lion终端类型; 修改加入会话校验逻辑(vnc/rdp)
2021-05-17 14:50:35 +08:00
Jiangjie.Bai
dd6c063478
Merge pull request #6119 from jumpserver/dev
...
v2.10.0 rc2 fix-dashboard
2021-05-17 10:11:06 +08:00
fghbng@qq.com
5e9006d0c2
修复仪表盘数据统计错误
2021-05-17 10:09:38 +08:00
Jiangjie.Bai
c42f69d1ba
Merge pull request #6117 from jumpserver/dev
...
v2.10.0 rc2
2021-05-14 19:20:40 +08:00
fghbng@qq.com
c7dfd0edce
修复授权导入系统用户为空报错
2021-05-14 19:20:24 +08:00
fghbng@qq.com
4382921c57
修复授权导入优化资产、用户、用户组、节点、系统用户id为空报错的情况
2021-05-14 19:20:24 +08:00
Bai
45feb468be
perf: 优化工单邮件信息
2021-05-14 16:19:25 +08:00
xinwen
c9b6b9a37a
fix: 修复企业微信,钉钉登录 BACKEND 没有注册
2021-05-14 15:55:28 +08:00
Michael Bai
8010bdecea
fix: 修复创建动态系统用户时设置了home目录,使得所有推送的用户共用同一个home目录,导致目录权限只限制在第一个推送的用户,其他用户进行可连接性测试时失败的问题
2021-05-14 15:43:50 +08:00
Bai
fc1c9c564a
fix: 修改翻译文件
2021-05-14 11:01:36 +08:00
Jiangjie.Bai
7c13b72739
Merge pull request #6107 from jumpserver/dev
...
v2.10.0 rc1
2021-05-13 19:51:43 +08:00
Bai
6a4bc1f8b3
perf: 修改翻译
2021-05-13 19:50:52 +08:00
Jiangjie.Bai
7d51d8c570
Merge pull request #6105 from jumpserver/dev
...
v2.10 rc1
2021-05-13 19:19:42 +08:00
Bai
0ecd9fa32a
fix: 修复自动生成公钥优先使用dss格式的问题(默认优先使用rsa)
2021-05-13 19:12:03 +08:00
xinwen
b37c8b09bf
refactor: 添加一些翻译&修正字段WECOM_SECRET
2021-05-13 16:29:41 +08:00
fghbng@qq.com
23f22e92b8
首页的统计数据,可以从 org resource cache 中获取
...
首页的统计数据,可以从 org resource cache 中获取
2021-05-13 16:05:53 +08:00
xinwen
c16319ec48
feat: 添加企业微信,钉钉扫码登录
2021-05-13 14:15:07 +08:00
jym503558564
340547c889
perf(README): 白皮书下载
2021-05-12 02:12:34 -05:00
xinwen
54f5e65d36
feat: 检查资产授权过期接口添加过期时间
2021-05-11 10:40:33 +08:00
ibuler
4d6d4cbc22
perf: 优化登录,cas, openid 自动登录
2021-05-07 05:58:56 -05:00
xinwen
7294f6e5e0
refactor: command es storage IGNORE_VERIFY_CERTS
2021-05-07 03:48:59 -05:00
ibuler
8ca2522c71
fix: 修改tokent中信息中没有返回 Protocols 的问题
...
fix: 优化protocols
fix: session bpp
token 时间加长
2021-04-30 01:29:52 -05:00
fghbng@qq.com
72f9d0d371
serializer优化&&资产授权导入优化
2021-04-30 14:05:46 +08:00
fghbng@qq.com
9a92e24e50
serializer优化&&授权导入优化
2021-04-30 14:05:46 +08:00
Bai
fea0170c5e
perf: 可以删除包含子孙节点但不包含子孙资产的节点
2021-04-29 00:42:58 -05:00
ibuler
5e5cd80bc2
perf: 优化登录前修改密码
2021-04-29 00:42:07 -05:00
fit2cloud-jiangweidong
e3511df4f8
feat: 管理员可以设置用户是否下次登录需修改密码 ( #6006 )
...
* feat: 管理员可以设置用户是否下次登录需修改密码
* feat: 管理员可以设置用户下次是否需要更改密码,本次修改:字段命名规范化
* feat: 管理员可以设置用户下次是否需要更改密码,本次修改:字段命名规范化
* fix: 用户下次登录是否需要改密,函数名及变量名规范化
* fix: 管理员设置用户下次是否改密功能的国际化翻译文件
* fixs: 管理员设置用户下次登录是否需改密功能,逻辑修改
* fix: 管理员可设置用户下次登录是否需要改密,字段名称更改
2021-04-28 19:25:30 +08:00
fit2cloud-jiangweidong
11e5a97f14
feat: 用户更改密码不可使用前n次历史密码,管理员可设置历史密码重复次数 ( #6010 )
...
* feat: 用户更改密码不可使用前n次历史密码,管理员可设置历史密码重复次数
* feat: 用户更改密码不可使用前n次历史密码,管理员可设置历史密码重复次数, 判断是否为历史密码逻辑修改
* feat: 用户更改密码不可使用前n次历史密码,管理员可设置历史密码重复次数, 提示内容更人性化
* fixs: 用户更改密码不可使用前n次历史密码,管理员可设置历史密码重复次数, 最新国际化翻译文件
2021-04-28 17:03:20 +08:00
fit2bot
4519ccfe1a
授权导入优化 ( #6057 )
...
* 授权导入优化,支持使用 用户名,资产名,ip,节点路径,系统用户名称导入
* Update permission.py
* 授权导入优化
* 授权导入优化
* 授权导入优化
* 授权导入优化
Co-authored-by: fghbng@qq.com <fghbng@qq.com >
2021-04-28 16:42:54 +08:00
xinwen
657a2ac7e7
fix: 命令记录导出选择项
2021-04-28 03:35:36 -05:00
Bai
f5d8e125cb
fix: 修复创建资产不传nodes时报错的问题 & 修复Option资产API时报JSON序列化失败的问题
2021-04-28 03:19:00 -05:00
xinwen
fd203c67c3
fix: 添加无效的 es 命令记录存储时,抛出错误提示
2021-04-27 05:39:50 -05:00
jing guo
9fe5496ce9
通过 api 添加资产,不写 protocols 时,默认值应该是列表
2021-04-27 05:36:46 -05:00
老广
c0875f6a87
Merge pull request #6037 from jumpserver/pr@dev@perf_public_key_setting
...
perf: 优化公钥设置,并删掉一部分不用的 html
2021-04-27 05:07:53 -05:00
ibuler
d1a005f750
perf: 优化MFA verify requierd
2021-04-27 05:05:22 -05:00
ibuler
c52431b5ce
chore(merge): 合并ddev
2021-04-27 18:01:15 +08:00
Bai
4a9e83ba15
feat: 添加命令复核逻辑; 添加命令复核工单; 5
2021-04-27 17:53:06 +08:00
Bai
7712c1659e
feat: 添加命令复核逻辑; 添加命令复核工单; 4
2021-04-27 16:36:42 +08:00
Bai
74c7b18dc4
feat: 添加命令复核逻辑; 添加命令复核工单; 3
2021-04-27 16:36:42 +08:00
Bai
5a3c67989b
feat: 添加命令复核逻辑; 添加命令复核工单; 2
2021-04-27 16:36:42 +08:00
Bai
50918a3dd2
feat: 添加命令复核逻辑; 添加命令复核工单;
2021-04-27 16:36:42 +08:00
Bai
e9b174f342
feat: 修改命令过滤规则Model: 添加Action-reconfirm; 添加field-reviewers
2021-04-27 16:36:42 +08:00
老广
63efbfe62e
Merge pull request #6049 from jumpserver/pr@dev@fix_expire_caches
...
fix: 添加启动失效缓存
2021-04-27 03:12:53 -05:00
xinwen
99cce185dd
fix: 添加启动失效缓存
2021-04-27 16:09:07 +08:00
ibuler
ab0fda93f6
perf: 优化公钥设置,并删掉一部分不用的 html
2021-04-26 10:21:22 +08:00
ibuler
d9552c0038
perf: 优化公钥设置,让用户可以选择是否开启
2021-04-25 18:13:41 +08:00
老广
f0f493081a
Merge pull request #6032 from jumpserver/pr@dev@fix_panelboard
...
【仪表盘】在线用户数不对,(连上windows资产之后,在线用户数就不对了)
2021-04-25 02:06:34 -05:00
fghbng@qq.com
c4727e1eba
【仪表盘】在线用户数不对,(连上windows资产之后,在线用户数就不对了)
2021-04-25 14:58:06 +08:00
Bai
ce8143c2ec
fix: 修改ACL提示支持的协议为: ssh、telnet
2021-04-23 16:35:50 +08:00
Bai
65ad63272c
fix: 修复操作应用/应用授权/acl等未记录日志的问题2
2021-04-20 16:47:31 +08:00
老广
4a4d5f3243
Merge pull request #5999 from jumpserver/pr@dev@fix_rdp_file_addr
...
fix: 修复下载rdp文件失败的问题
2021-04-20 03:28:34 -05:00
ibuler
4563743f00
fix: 修复下载rdp文件失败的问题
2021-04-20 16:17:18 +08:00
ibuler
7b679f3e82
fix(task): 修复推送过期的问题
...
fix(rdp): 修复下载rdp文件失败的问题
2021-04-20 15:20:49 +08:00
Bai
3d6aa15ece
fix: 修复操作应用/应用授权/acl等未记录日志的问题
2021-04-20 00:08:23 -05:00
ibuler
94a798eb01
fix(task): 修复推送过期的问题
2021-04-20 12:58:48 +08:00
ibuler
ec393c1440
fix(task): 修复推送过期的问题
2021-04-20 11:27:02 +08:00
ibuler
6571209864
fix: 修复创建的系统用户很快过期的问题
2021-04-19 17:01:48 +08:00
Jiangjie.Bai
d042de7b09
Merge pull request #5972 from jumpserver/dev
...
v2.9.0 发版
2021-04-15 21:02:28 +08:00
ibuler
5e6e97c822
perf: 优化推送系统用户,设置有效期
2021-04-15 19:25:58 +08:00
xinwen
f146873501
fix: key=0 修改到 key=1 时 parent_key 没有更新
2021-04-15 01:33:00 -05:00
Jiangjie.Bai
35dfdf831a
Merge pull request #5965 from jumpserver/dev
...
v2.9.0 rc3
2021-04-14 18:43:45 +08:00
xinwen
2b31cb2806
fix: 命令记录导出适配 ES
2021-04-14 05:02:50 -05:00
xinwen
e43ffa7994
fix: 远程应用显示名称
2021-04-14 04:56:59 -05:00
ibuler
b0a9a83231
fix(terminal): 修复终端列表看到的在线会话数量不对的bug
2021-04-14 16:41:57 +08:00
xinwen
7da14571ac
fix: 请求 token 接口,登录类型没内容
2021-04-14 03:14:10 -05:00
xinwen
73b67da4c0
fix: 修复 acl 一些翻译
2021-04-14 03:13:18 -05:00
Jiangjie.Bai
4bf2371cf0
Merge pull request #5952 from jumpserver/dev
...
v2.9.0 rc2
2021-04-13 19:19:43 +08:00
Jiangjie.Bai
075cbc497b
Merge pull request #5953 from jumpserver/pr@dev@dev_merge
...
chore(merge): 合并
2021-04-13 19:16:54 +08:00
ibuler
1a0d9a20f9
chore(merge): 合并
2021-04-13 18:54:08 +08:00
ibuler
fdb8416cac
fix: 修复组件在线会话数量不对的问题
2021-04-13 05:49:03 -05:00
ibuler
e2d5b69510
perf: 优化健康监测,并添加 health check 的 key
2021-04-13 05:48:35 -05:00
xinwen
9944474ba0
fix: settings 订阅不稳定
2021-04-13 05:40:04 -05:00
xinwen
ce6b9de07c
fix: ES 自动创建索引
2021-04-13 04:44:44 -05:00
xinwen
b97759687d
fix: 邀请用没有触发信号
2021-04-13 04:23:29 -05:00
xinwen
68b6236de2
fix: SSO 登录日志
2021-04-12 04:48:17 -05:00
xinwen
6616374c30
fix: subscribe_settings_change
2021-04-12 04:45:30 -05:00
xinwen
682f6b2fb9
fix: 资产节点关系变化时也要清空 root 组织的 node_assets_mapping
2021-04-12 04:44:13 -05:00
xinwen
a2e3979916
fix: org_mapping 保护订阅线程
2021-04-12 04:42:48 -05:00
xinwen
f11d3c1cf2
fix: 过期用户登录提示无效
2021-04-09 02:03:35 -05:00
xinwen
f0bad5f107
fix: 登录页面测试 cookie 失败
2021-04-09 01:46:21 -05:00
ibuler
ad3bc72dfb
fix(terminal): 修复session id 长度误写为 35 的bug
2021-04-08 19:23:36 +08:00
xinwen
de9c69843d
fix: 登录日志 user_agent 过长
2021-04-08 19:23:36 +08:00
xinwen
d2678e2a43
refactor: 移动 PermissionsMixin 位置
2021-04-08 19:23:36 +08:00
xinwen
632ea87f07
feat: MFA 登录次数限制
2021-04-08 19:23:36 +08:00
fit2bot
4e7e1d5e15
style: 优化全局组织设置相关代码 ( #5921 )
...
* feat:支持配置全局组织的显示名称
* style: 优化全局组织设置相关代码
Co-authored-by: liubo <liubo@fit2cloud.com >
2021-04-08 19:23:36 +08:00
liuboF2c
1ac8537a34
feat:支持配置全局组织的显示名称 ( #5919 )
...
Co-authored-by: liubo <liubo@fit2cloud.com >
2021-04-08 19:23:36 +08:00
fit2bot
dcaa798c2e
perf: csv upload ( #5894 )
...
perf: 修改翻译
Co-authored-by: ibuler <ibuler@qq.com >
2021-04-08 19:23:36 +08:00
xinwen
8da4027e32
fix: 授权资产列表 platform 应该显示名称
2021-04-08 19:23:36 +08:00
xinwen
32e2d19553
fix: 改密计划关掉周期执行再打开,任务不再执行
2021-04-08 19:23:36 +08:00
xinwen
48d1eecc08
fix: 修正 key 为 0 的节点
2021-04-08 19:23:36 +08:00
xinwen
0ab88ce754
fix: 访问 tokens 接口更新用户最后登录时间
2021-04-08 19:23:36 +08:00
xinwen
bee5500425
fix: 创建节点的时候加锁,可以并发调用
2021-04-08 19:23:36 +08:00
xinwen
7c03af7668
feat: 资产授权支持按名称模糊搜索
2021-04-08 19:23:36 +08:00
xinwen
7a61a671a2
fix: 管理用户输入带密码的秘钥报错
2021-04-08 19:23:36 +08:00
Bai
4a1fc0e2ac
fix: 修复NodeChildrenAddAPI不支持patch方法的问题
2021-04-08 19:23:36 +08:00
ibuler
1e5e87e62a
perf: 优化acl提示
2021-04-08 19:23:36 +08:00
ibuler
96c3b81383
perf: upgrade requirements version
2021-04-08 19:23:36 +08:00
xinwen
297fedeffa
fix: Default 组织下出现 app user
2021-04-08 19:23:36 +08:00
ibuler
9cd5675209
perf: 修改terminal statuts
...
perf: 优化status api
perf: 优化 status api
perf: 修改sesion参数
perf: 修改migrations
perf: 优化数据结构
perf: 修改保留日志
perf: 优化之前的一个写法
2021-04-08 19:23:36 +08:00
xinwen
a5179d1596
feat: 增加 es 忽略 https 证书验证
2021-04-08 19:23:36 +08:00
Bai
c2463fe573
perf: Session Login from 添加 RDP Terminal 类型
2021-04-08 19:23:36 +08:00
xinwen
2f8042141c
fix: 授权树节点排序
2021-04-08 19:23:36 +08:00
ibuler
06a4e0d395
perf: 修改表结构迁移,增加rdp terminal
2021-04-08 19:23:36 +08:00
xinwen
bb9d92fd7e
perf: delete_test_cookie
2021-04-08 19:23:36 +08:00
ibuler
749f9d3f81
fix(terminal): 修复session id 长度误写为 35 的bug
2021-04-08 17:39:29 +08:00
xinwen
03ad7777d0
fix: 登录日志 user_agent 过长
2021-04-08 04:39:12 -05:00
xinwen
7e4f20f443
refactor: 移动 PermissionsMixin 位置
2021-04-08 02:15:02 -05:00
xinwen
607b7fd29f
feat: MFA 登录次数限制
2021-04-08 01:46:36 -05:00
fit2bot
8895763ab4
style: 优化全局组织设置相关代码 ( #5921 )
...
* feat:支持配置全局组织的显示名称
* style: 优化全局组织设置相关代码
Co-authored-by: liubo <liubo@fit2cloud.com >
2021-04-08 14:18:53 +08:00
liuboF2c
8b1e202e68
feat:支持配置全局组织的显示名称 ( #5919 )
...
Co-authored-by: liubo <liubo@fit2cloud.com >
2021-04-08 13:55:58 +08:00
fit2bot
32fe8f674c
perf: csv upload ( #5894 )
...
perf: 修改翻译
Co-authored-by: ibuler <ibuler@qq.com >
2021-04-08 10:11:46 +08:00
xinwen
b4ef7bef55
fix: 授权资产列表 platform 应该显示名称
2021-04-08 10:10:32 +08:00
xinwen
31982c6547
fix: 改密计划关掉周期执行再打开,任务不再执行
2021-04-07 18:38:45 +08:00
xinwen
67d3b63c6d
fix: 修正 key 为 0 的节点
2021-04-07 11:11:23 +08:00
xinwen
f34fb5d9d5
fix: 访问 tokens 接口更新用户最后登录时间
2021-04-07 10:45:34 +08:00
xinwen
3ec78ff9be
fix: 创建节点的时候加锁,可以并发调用
2021-04-07 10:29:19 +08:00
xinwen
f361621ab5
feat: 资产授权支持按名称模糊搜索
2021-04-07 10:28:14 +08:00
xinwen
cd9587f68e
fix: 管理用户输入带密码的秘钥报错
2021-04-06 19:46:16 +08:00
Bai
2ff01a4bb3
fix: 修复NodeChildrenAddAPI不支持patch方法的问题
2021-04-01 10:55:21 +08:00
ibuler
06ed358fbc
perf: 优化acl提示
2021-03-30 10:36:41 +08:00
ibuler
3e11249e8c
perf: upgrade requirements version
2021-03-30 10:25:30 +08:00
xinwen
6b5435b768
fix: Default 组织下出现 app user
2021-03-30 10:24:25 +08:00
ibuler
7d5a13de38
perf: 修改terminal statuts
...
perf: 优化status api
perf: 优化 status api
perf: 修改sesion参数
perf: 修改migrations
perf: 优化数据结构
perf: 修改保留日志
perf: 优化之前的一个写法
2021-03-29 19:21:32 +08:00
xinwen
07bd44990b
feat: 增加 es 忽略 https 证书验证
2021-03-29 15:23:33 +08:00
noon
e4938ffc85
Update README_EN.md ( #5856 )
...
* Update README_EN.md
Translate parts of the README.md
* Update README_EN.md
* Update README_EN.md
change the word PAM to Bastion host
* Update README_EN.md
* Update README_EN.md
Clip the bug part to JumpServer 远程执行漏洞 2021-01-15
2021-03-27 20:14:45 +08:00
Bai
85d226eb07
perf: Session Login from 添加 RDP Terminal 类型
2021-03-26 10:38:48 +08:00
xinwen
c9a9ca7923
fix: 授权树节点排序
2021-03-24 10:23:45 +08:00
ibuler
306f7a08d1
perf: 修改表结构迁移,增加rdp terminal
2021-03-24 10:14:59 +08:00
老广
b86f9ac871
Update README.md
2021-03-23 15:47:19 +08:00
xinwen
2562386fe0
perf: delete_test_cookie
2021-03-23 15:27:06 +08:00
老广
61d4311e24
Merge pull request #5808 from jumpserver/dev
...
Dev
2021-03-19 20:01:03 +08:00
xinwen
370e1628be
fix: 禁用的资产限制访问
2021-03-19 20:00:25 +08:00
xinwen
adf5c4a7b9
fix: LDAP 自动创建的用户有多余的空格
2021-03-19 17:39:06 +08:00
Bai
9fc1ae7b6d
perf: 修改翻译
2021-03-19 14:45:05 +08:00
xinwen
313757dbe9
fix: 修复用户与用户组关系变化时 500
2021-03-19 14:33:39 +08:00
Jiangjie.Bai
b32e352b24
Merge pull request #5799 from jumpserver/dev
...
v2.8 发版
2021-03-18 21:04:37 +08:00
Bai
b950b48112
fix: 隐藏azure-sdk的日志
2021-03-18 21:03:35 +08:00
Jiangjie.Bai
519eb3bef2
Merge pull request #5797 from jumpserver/dev
...
v2.8 发版
2021-03-18 20:41:28 +08:00
Bai
4e55d0f1e4
添加依赖: (azure-identity==1.5.0)(azure-mgmt-subscription==1.0.0)
2021-03-18 20:30:59 +08:00
Jiangjie.Bai
2b3bb65114
Merge pull request #5794 from jumpserver/dev
...
v2.8 发版 (rc6)
2021-03-18 17:39:02 +08:00
xinwen
b597cfcd19
fix: 修复一些 Root 组织没数据的问题
2021-03-18 17:25:11 +08:00
xinwen
33952b2333
fix: 有无效的 ES 时,创建 Session 失败
2021-03-18 14:34:00 +08:00
xinwen
a47a9c0345
fix: Root 组织用户从用户组移除报错
2021-03-18 10:53:31 +08:00
xinwen
4e0c056867
fix: 日志审计-> 批量命令 全局组织无数据
2021-03-18 10:42:52 +08:00
ibuler
a9b5599db5
perf: 更换登录页图片
2021-03-18 10:30:23 +08:00
ibuler
8a2eb70ad2
revert: 还原api限制
2021-03-18 10:25:40 +08:00
老广
776234e8cc
Merge pull request #5785 from jumpserver/dev
...
v2.8 发版 (rc4)
2021-03-17 20:15:31 +08:00
ibuler
e2406955bc
perf: 优化license判断
...
perf: 优化license 过期
2021-03-17 18:47:38 +08:00
Bai
dba9550bc0
perf: 修改翻译
2021-03-17 18:25:39 +08:00
xinwen
6ad1362a3f
perf: 批量命令日志导出增加 hosts_display 字段
2021-03-17 18:16:19 +08:00
Bai
dfa2f7d6c9
fix: 修复用户登录复核工单org_id为ROOT
2021-03-17 17:23:39 +08:00
ibuler
c55e2db75e
perf: 优化license判断
2021-03-17 17:18:39 +08:00
xinwen
fd3a4d887e
fix: Root 组织查不到命令记录
2021-03-17 17:17:15 +08:00
ibuler
42afc1e0bf
fix(perms): 修复删除 资产或授权引起的bug
2021-03-17 17:15:38 +08:00
ibuler
50c89431df
perf: 修复ansible summary显示两遍的问题
2021-03-17 17:13:07 +08:00
xinwen
f1f5017be3
fix: 无效的 ES 会卡住
2021-03-17 17:09:52 +08:00
ibuler
9b85aafa52
perf: 全局组织仅支持删除和查看
2021-03-17 17:09:11 +08:00
xinwen
817268d7cd
perf: 资产与节点变化的时候,优化发送推送系统用户信号
2021-03-17 17:04:53 +08:00
ibuler
d3bbfdc458
perf: 不修改原来的默认配置
2021-03-17 17:02:44 +08:00
Bai
18a390d66a
perf: 修改迁移文件(default_org_name: DEFAULT => Default)
2021-03-17 15:22:21 +08:00
老广
73b57a662e
Merge pull request #5766 from jumpserver/dev
...
v2.8 发版 (rc4)
2021-03-16 20:49:04 +08:00
ibuler
ea325f6e52
perf(users): 优化用户认证来源
2021-03-16 20:48:00 +08:00
Bai
1216f15e45
fix: 修复新旧版本对于default_node节点变更冲突的问题(旧版本会将新版本迁移后的default_node节点的key修改为非1)
2021-03-16 20:45:50 +08:00
ibuler
cc3911d2f1
fix: 修复 user profile all orgs 的bug
2021-03-16 20:30:46 +08:00
xinwen
36c083f674
fix: 会话里查不到命令记录
2021-03-16 20:29:05 +08:00
xinwen
98c6a93658
fix: 任务应该分组织
2021-03-16 19:26:13 +08:00
Bai
adc607dafe
fix: 修复用户角色由组织用户->组织管理员时从组织清除用户
2021-03-16 19:21:01 +08:00
xinwen
1e85805ea3
fix: 用户授权资产过滤失效
2021-03-16 19:19:36 +08:00
老广
957d3660ce
Merge pull request #5754 from jumpserver/dev
...
v2.8 发版 (rc3)
2021-03-15 19:59:31 +08:00
xinwen
049f6dca67
fix: 删除组织时,确保没有跟节点之外的其他节点。以及组织删除后,将跟节点删除
2021-03-15 19:58:46 +08:00
ibuler
7f4377b0e8
fix(auditor): 修复审计员无法访问命令列表的bug
2021-03-15 19:29:47 +08:00
ibuler
7dfd0ee8fe
fix(orgs): 修复访问 current org api 错误
...
perf(users): 优化用户删除和移除行为
perf: 优化组织权限判断
2021-03-15 19:29:21 +08:00
xinwen
41f375a4f7
fix: 修正多个 DEFAULT 节点
2021-03-15 19:09:29 +08:00
Bai
a50dfe9c18
perf: 管理用户创建/更新username字段设置为required
2021-03-15 19:05:47 +08:00
Bai
bd8a1a7d0e
fix: 修复MFA绑定失败的问题(通过修改session中auth_backend的key实现;django.auth.get_user时校验backends路径失败返回AnonymousUser)
2021-03-15 19:05:10 +08:00
Bai
5546719712
fix: 修改get_instance逻辑;二次构建org_mapping;订阅失效速度慢于读取速度;
2021-03-15 11:40:54 +08:00
xinwen
068b39d922
perf: 优化 jms 脚本
2021-03-15 10:19:29 +08:00
Jiangjie.Bai
2e1763cce7
Merge pull request #5739 from jumpserver/dev
...
v2.8 发版 (2)
2021-03-12 20:56:23 +08:00
xinwen
ff9e470ce2
fix: 命令执行 500
2021-03-12 19:17:06 +08:00
xinwen
3080bf3647
fix: 修复获取整个授权树缺少节点 bug
2021-03-12 19:12:18 +08:00
Jiangjie.Bai
0b04821794
Merge pull request #5736 from jumpserver/dev
...
v2.8 发版 (2)
2021-03-12 18:11:25 +08:00
Bai
296bb88834
fix: 修改celery健康检测worker数量
2021-03-12 18:09:47 +08:00
Bai
c57cce8881
perf: 修改system_user.priority默认值为81
2021-03-12 18:07:52 +08:00
Jiangjie.Bai
174cc16980
Merge pull request #5728 from jumpserver/dev
...
v2.8 发版
2021-03-11 21:17:39 +08:00
fit2bot
5b2649f775
fix: 修改用户序列类read_only字段 ( #5729 )
...
* fix: 修改用户序列类read_only字段
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com >
Co-authored-by: Bai <bugatti_it@163.com >
2021-03-11 21:15:45 +08:00
xinwen
83829df70c
fix: 干掉 dockerfile 行内注释
2021-03-11 20:31:38 +08:00
Jiangjie.Bai
64641a18e6
feat: ACL ( #5696 )
...
* feature: acl (v0.1)
* feature: acl (v0.2)
* feature: acl (v0.3)
* feature: acl (v0.4)
* feature: acl (v0.5)
* feature: acl (v0.6)
* feature: acl (v0.7)
* feature: acl (v0.8)
* feature: acl (v0.9)
* feature: acl (v1.0)
* feature: acl (v1.1)
* feature: acl (v1.2)
* feature: acl (v1.3)
* feature: acl (v1.4)
* feature: acl (v1.5)
* feature: acl (v1.6)
* feature: acl (v1.7)
* feature: acl (v1.8)
* feature: acl (v1.9)
* feature: acl (v2.0)
* feature: acl (v2.1)
* feature: acl (v2.2)
* feature: acl (v2.3)
* feature: acl (v2.4)
* feature: acl (v2.5)
* feature: acl (v2.6)
* feature: acl (v2.7)
* feature: acl (v2.8)
* feature: acl (v2.9)
* feature: acl (v3.0)
* feature: acl (v3.1)
* feature: acl (v3.2)
* feature: acl (v3.3)
* feature: acl (v3.4)
* feature: acl (v3.5)
* feature: acl (v3.6)
* feature: acl (v3.7)
* feature: acl (v3.8)
* feature: acl (v3.9)
* feature: acl (v4.0)
* feature: acl (v4.1)
* feature: acl (v4.2)
* feature: acl (v4.3)
* feature: acl (v4.4)
2021-03-11 20:17:44 +08:00
ibuler
09303ecc56
perf: 优化各serializer字段翻译
2021-03-11 20:15:27 +08:00
xinwen
5f48e7aeb2
perf: Dockerfile 安装软件包时添加 rm -rf /var/lib/apt/lists/* 清理
2021-03-11 20:13:41 +08:00
ibuler
25dfce621b
perf: 优化,添加登录页面图片链接到 github
2021-03-11 18:45:50 +08:00
xinwen
102d3b590b
perf: luna 页面获取资产系统用户按 name 排序
2021-03-11 15:07:06 +08:00
fit2bot
a45f581b0e
fix: 将 user 添加到 default 组织时进度数量显示不准确 ( #5720 )
...
Co-authored-by: xinwen <coderWen@126.com >
2021-03-11 11:09:47 +08:00
ibuler
b3991d0388
fix: 修复Migrate的问题
...
fix: 修复 org migrations 依赖
2021-03-11 10:59:13 +08:00
xinwen
184e8b31e6
perf: 优化下 orgid_nodekey_assetsid_mapping
2021-03-10 18:15:49 +08:00
xinwen
615bcadf62
fix: 资产授权规则过滤添加 distinct
2021-03-10 17:51:31 +08:00
fit2bot
7b2f813e7f
feat: 支持修改忘记密码重置密码的连接 ( #5700 )
...
perf: 优化代码暗示
Co-authored-by: ibuler <ibuler@qq.com >
2021-03-10 11:21:12 +08:00
ibuler
81170b4b7b
perf: 优化登录页面,非常给力
...
perf: 优化报错
perf: 优化忘记密码
perf: 添加注释
2021-03-10 10:49:11 +08:00
xinwen
c4eacbabc6
refactor: 重构缓存框架
2021-03-10 10:33:45 +08:00
xinwen
ccb0509d85
feat: 批量导入解析为Json的接口添加 title 字段
2021-03-10 10:14:06 +08:00
xinwen
886393c539
feat: 添加批量导入时将其他格式(csv, excel)解析为Json的接口
2021-03-09 14:24:13 +08:00
xinwen
15b0ad9c12
refactor: 清理代码 orgs.mixins.api.OrgMembershipModelViewSetMixin
2021-03-09 12:44:28 +08:00
wojiushixiaobai
19e2a5b9f9
fix(terminal): 修正录像接口返回状态码
2021-03-08 10:14:01 +08:00
fit2bot
0aa2c2016f
perf(project): 优化命名的风格 ( #5693 )
...
perf: 修改错误的地
perf: 优化写错的几个
Co-authored-by: ibuler <ibuler@qq.com >
2021-03-08 10:08:51 +08:00
xinwen
935947c97a
fix: 用户详情页的资产授权列表慢
2021-03-08 07:56:58 +08:00
xinwen
3e7e01418d
perf: 优化命令记录慢的问题
2021-03-08 07:56:28 +08:00
xinwen
7f42e59714
fix: 修复生成假数据脚本错误
2021-03-05 15:59:38 +08:00
xinwen
840e5e8863
fix: 修复 default 组织迁移脚本问题
2021-03-05 15:56:08 +08:00
xinwen
24fb8b2a89
feat: 管理用户详情页添加认证方式与秘钥指纹
2021-03-05 15:26:14 +08:00
Bai
c1bf854824
perf: 添加依赖包(pyvmomi==7.0.1)(termcolor==1.1.0)
2021-03-04 17:12:51 +08:00
xinwen
ab23a357f7
feat: 推送动态系统用户,系统上用户的 comment 字段是 userdisplayname
2021-03-04 11:28:24 +08:00
xinwen
78bf6f5817
refactor: 获取授权树或者资产列表时避免读时锁
2021-03-04 11:26:54 +08:00
ibuler
91a26abf9e
perf: 优化default节点
2021-03-04 11:26:37 +08:00
ibuler
d7e7c62c7a
perf: 优化表结构迁移
2021-03-04 10:42:57 +08:00
xinwen
09bdff4a67
fix: 缓存框架 expire_fields 可能报错
2021-03-04 10:40:29 +08:00
Bai
56328e112a
perf: 移除资源创建时对于Auditor用户的限制
2021-03-03 15:57:13 +08:00
Bai
1d15f7125e
perf: 优化org获取逻辑 - 采用redis订阅机制实现orgs_mapping数据的维护;删除get_org_by_id等方法;
...
perf: 优化get_instance接口
2021-03-03 13:19:37 +08:00
ibuler
e6b17da57d
perf: 去掉pycrypto库
...
perf: 显示添加pycryptodome
2021-03-03 11:48:45 +08:00
xinwen
1870fc97d5
refactor: 适配新的 default 组织
2021-03-03 10:52:09 +08:00
fit2bot
f548b4bd2b
feat: serializer 添加默认值,前端可以调用 ( #5666 )
...
perf: 优化默认值
Co-authored-by: ibuler <ibuler@qq.com >
2021-03-02 19:18:25 +08:00
fit2bot
a56ac7b34e
perf(orgs): 默认组织改为实体组织,并支持全局组织 ( #5617 )
...
* perf(orgs): 默认组织改为实体组织
* perf: 添加获取当前组织信息的api
* perf: 资产列表在 root 组织下的表现
* fix: 修复 root 组织引起的问题
* perf: 优化OrgModelMixin save; org_root获取; org_roles获取; UserCanUseCurrentOrg权限类
Co-authored-by: ibuler <ibuler@qq.com >
Co-authored-by: Bai <bugatti_it@163.com >
2021-03-02 14:57:48 +08:00
fit2bot
51c9a89b1f
fix: 用户页面授权资产列表获取系统用户慢 ( #5663 )
...
Co-authored-by: xinwen <coderWen@126.com >
2021-03-02 14:48:47 +08:00
fit2bot
6f3ead3c42
perf: 优化系统用户生成密码的复杂度 ( #5648 )
...
* perf: 优化系统用户生成密码的复杂度
* perf: 修改 common.random_string
Co-authored-by: ibuler <ibuler@qq.com >
Co-authored-by: Bai <bugatti_it@163.com >
2021-03-01 18:40:07 +08:00
xinwen
1036d1c132
fix: 修复授权树一些问题
2021-03-01 18:09:41 +08:00
ibuler
5de5fa2e96
fix: 修复获取不到 org 的问题
2021-03-01 14:35:44 +08:00
ibuler
19043d0a66
perf: 添加 xrdp type
2021-03-01 14:34:08 +08:00
ibuler
bc3e50a529
fix: 修复代码更改引起的bug
2021-03-01 14:32:30 +08:00
fit2bot
a7ab7da61c
feat: 添加限制用户只能从source登录的功能 ( #5592 )
...
* stash it
* feat: 添加限制用户只能从source登录的功能
* fix: 修复小错误
Co-authored-by: ibuler <ibuler@qq.com >
2021-02-26 17:33:11 +08:00
fit2bot
b483f78d52
fix(assets): 系统用户支持 OPENSSH 格式的私钥 ( #5604 )
...
* fix(assets): 系统用户支持 OPENSSH 格式的私钥
* fix: 升级paramiko
Co-authored-by: ibuler <ibuler@qq.com >
2021-02-26 16:34:15 +08:00
ibuler
88d8a3326f
perf(ops): 优化定期检查磁盘,添加开关控制
2021-02-26 16:33:39 +08:00
ibuler
8f7dcd512a
perf(ops): ansible 增加 summary 汇总
2021-02-26 16:33:27 +08:00
xinwen
d795867916
perf: 优化批量更新会查询全部数据的问题
2021-02-26 16:32:46 +08:00
xinwen
4c4f544f0d
fix: 修复禁用 MFA 后还可以用 MFA 查看密码匣子
2021-02-26 16:28:45 +08:00
xinwen
8ec26dea43
feat: 重置 MFA 发个邮件 #754
2021-02-26 16:25:55 +08:00
xinwen
799d1e4043
feat: 资产授权规则添加是否有效的过滤条件
2021-02-25 14:48:47 +08:00
ibuler
b03642847e
perf: 去掉 data_tree
2021-02-24 16:22:26 +08:00
fit2bot
a4e635bff0
feat: 添加下载rdp文件的api ( #5637 )
...
* feat: 添加下载rdp文件的api
* perf: 优化一些权限
* perf: 优化一波token
Co-authored-by: ibuler <ibuler@qq.com >
2021-02-24 15:31:22 +08:00
xinwen
83cc339d4b
refactor: 调整组织统计数据缓存的更新策略为懒更新模式
2021-02-23 17:48:14 +08:00
ibuler
bb9790a50f
feat: 为rdp 添加一个api
2021-02-23 16:22:37 +08:00
xinwen
9be3cbb936
perf: 优化用户详情页授权列表加载速度&添加可重入锁
2021-02-20 10:25:35 +08:00
xinwen
e599bca951
fix: 命令存储 es 类型主机带用户名密码报错
2021-02-18 16:41:27 +08:00
fit2bot
501ad698b7
添加 UnionQuertSet ( #5578 )
...
* 添加 UnionQuertSet
* 跑通了
* 改变了 count 这类方法的代理模式
* 使用了老广的
Co-authored-by: xinwen <coderWen@126.com >
2021-02-07 10:15:39 +08:00
Bai
50e6c96358
fix: 修复 component status 获取key error 问题
2021-02-05 17:07:21 +08:00
Jiangjie.Bai
7cf6e54f01
refactor tree (重构&优化资产树/用户授权树加载速度) ( #5548 ) ( #5549 )
...
* Bai reactor tree ( 重构获取完整资产树中节点下资产总数的逻辑) (#5548 )
* tree: v0.1
* tree: v0.2
* tree: v0.3
* tree: v0.4
* tree: 添加并发锁未请求到时的debug日志
* 以空间换时间的方式优化资产树
* Reactor tree togther v2 (#5576 )
* Bai reactor tree ( 重构获取完整资产树中节点下资产总数的逻辑) (#5548 )
* tree: v0.1
* tree: v0.2
* tree: v0.3
* tree: v0.4
* tree: 添加并发锁未请求到时的debug日志
* 以空间换时间的方式优化资产树
* 修改授权适配新方案
* 添加树处理工具
* 完成新的用户授权树计算以及修改一些信号
* 重构了获取资产的一些 api
* 重构了一些节点的api
* 整理了一些代码
* 完成了api 的重构
* 重构检查节点数量功能
* 完成重构授权树工具类
* api 添加强制刷新参数
* 整理一些信号
* 处理一些信号的问题
* 完成了信号的处理
* 重构了资产树相关的锁机制
* RebuildUserTreeTask 还得添加回来
* 优化下不能在root组织的检查函数
* 优化资产树变化时锁的使用
* 修改一些算法的小工具
* 资产树锁不再校验是否在具体组织里
* 整理了一些信号的位置
* 修复资产与节点关系维护的bug
* 去掉一些调试代码
* 修复资产授权过期检查刷新授权树的 bug
* 添加了可重入锁
* 添加一些计时,优化一些sql
* 增加 union 查询的支持
* 尝试用 sql 解决节点资产数量问题
* 开始优化计算授权树节点资产数量不用冗余表
* 新代码能跑起来了,修复一下bug
* 去掉 UserGrantedMappingNode 换成 UserAssetGrantedTreeNodeRelation
* 修了些bug,做了些优化
* 优化QuerySetStage 执行逻辑
* 与小白的内存结合了
* 删掉老的表,迁移新的 assets_amount 字段
* 优化用户授权页面资产列表 count 慢
* 修复批量命令数量不对
* 修改获取非直接授权节点的 children 的逻辑
* 获取整棵树的节点
* 回退锁
* 整理迁移脚本
* 改变更新树策略
* perf: 修改一波缩进
* fix: 修改handler名称
* 修复授权树获取资产sql 泛滥
* 修复授权规则有效bug
* 修复一些bug
* 修复一些bug
* 又修了一些小bug
* 去掉了老的 get_nodes_all_assets
* 修改一些写法
* Reactor tree togther b2 (#5570 )
* fix: 修改handler名称
* perf: 优化生成树
* perf: 去掉注释
* 优化了一些
* 重新生成迁移脚本
* 去掉周期检查节点资产数量的任务
* Pr@reactor tree togther guang@perf mapping (#5573 )
* fix: 修改handler名称
* perf: mapping 拆分出来
* 修改名称
* perf: 修改锁名
* perf: 去掉检查节点任务
* perf: 修改一下名称
* perf: 优化一波
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com >
Co-authored-by: Bai <bugatti_it@163.com >
Co-authored-by: xinwen <coderWen@126.com >
Co-authored-by: xinwen <coderWen@126.com >
Co-authored-by: 老广 <ibuler@qq.com >
2021-02-05 13:29:29 +08:00
Bai
709e7af953
perf: 修改依赖版本jumpserver-django-oidc-rp=0.3.7.6
2021-02-03 14:38:38 +08:00
ibuler
93474766f6
perf(permission): 优化权限控制,显式的声明权限
2021-02-03 14:28:47 +08:00
fit2bot
542eb25e7b
fix(perms): 修复权限校验时的组织切换问题 ( #5546 )
...
* fix(perms): 修复权限校验时的组织切换问题
* fix(perms): 修复获取actions的切换组织问题
* perf: 继续添加 application 的验证组织
Co-authored-by: ibuler <ibuler@qq.com >
2021-02-03 12:01:18 +08:00
Bai
609d2710fa
perf: 会话列表添加search_fields字段
2021-02-03 11:55:19 +08:00
ibuler
d852d2f670
perf: 还原回原来的用户来源字段
2021-02-02 16:54:51 +08:00
Bai
087a3f2914
fix: 注释fake数据生成模块的导入(system)
2021-02-02 02:11:30 -06:00
fit2bot
36f113e307
chore: 添加贡献者图片 ( #5532 )
...
* chore: 添加贡献者图片
* chore: 优化通知样式
Co-authored-by: ibuler <ibuler@qq.com >
2021-01-27 13:03:20 +08:00
ibuler
23afe81ff5
perf(authentication): 优化connection token的使用
2021-01-26 18:07:11 +08:00
ibuler
dd5b2b9101
perf: 去掉 v2 的api
2021-01-26 18:04:47 +08:00
fit2bot
d363118911
perf(settings): 优化settings配置 ( #5515 )
...
* stash
* perf: 优化 动态seting
* perf(settings): 优化settings配置
* perf: 完成终端和安全setting
* perf: 修改翻译
* perf: 去掉其他位置的DYNAMIC
* perf: 还原回来原来的一些代码
* perf: 优化ldap
* perf: 移除dynmic config
* perf: 去掉debug消息
* perf: 优化 refresh 命名
Co-authored-by: ibuler <ibuler@qq.com >
2021-01-26 17:54:12 +08:00
fit2bot
351d4d8123
refactor(celery): 重构celery,使用 threads 模型,避免 占用太多内存 ( #5525 )
...
* refactor(celery): 重构celery,使用 threads 模型,避免 占用太多内存
* fix: 修复无法关闭fd的bug
Co-authored-by: ibuler <ibuler@qq.com >
2021-01-25 05:34:41 -06:00
Bai
efb9f48c6f
perf: 删除pycryptodome依赖包安装(因为pycryptodome和pycrypto安装包目录冲突);只安装 pycryptodomex依赖包; 修改 from crypto 为 from cryptodome
2021-01-25 11:59:20 +08:00
Bai
d04b90b8e8
feat: 修改copyright 2014-2021
2021-01-22 10:29:33 +08:00
Jiangjie.Bai
66f57fdb27
Merge pull request #5504 from jumpserver/dev
...
Dev
2021-01-21 15:56:09 +08:00
Bai
c949589564
perf: 修改翻译信息; 添加Domain迁移文件
2021-01-21 15:54:45 +08:00
ibuler
992708abe8
chore: 添加ping等工具
2021-01-21 15:43:17 +08:00
xinwen
f63f8d085d
fix: Web页面-> 命令执行 高危命令没有告警
2021-01-21 15:39:24 +08:00
Jiangjie.Bai
3e55447327
Merge pull request #5497 from jumpserver/dev
...
Dev
2021-01-20 19:31:33 +08:00
xinwen
3ac20d80d1
fix: 登录日志的登录方式不准确
2021-01-20 19:21:29 +08:00
fit2bot
3e38e4fc59
i18n: 优化翻译 ( #5492 )
...
* i18n: 优化翻译
* i18n: 优化翻译(2)
* i18n: 优化翻译(3)
Co-authored-by: Bai <bugatti_it@163.com >
2021-01-20 19:08:39 +08:00
xinwen
1090887b2b
fix: 管理用户-> 资产用户列表 更新密码报错
2021-01-20 00:58:20 -06:00
Bai
7c55d462cd
fix: 修复工单翻译和登录确认工单开启问题
2021-01-20 13:57:05 +08:00
fit2bot
ea16088c08
fix: 修改翻译内容 ( #5489 )
...
* fix: 修改翻译内容
* fix: 修改翻译内容(2)
Co-authored-by: Bai <bugatti_it@163.com >
2021-01-20 11:38:09 +08:00
Bai
4de9e608b1
fix: 修改命令存储配置DOC_TYPE字段类型为ReadableHiddenField
2021-01-20 11:24:08 +08:00
xinwen
dd9a55bd5f
fix: 用户名超过64字符,命令无法记录问题
2021-01-19 20:13:20 -06:00
Jiangjie.Bai
ee22006683
Merge pull request #5485 from jumpserver/dev
...
Dev
2021-01-19 20:10:24 +08:00
xinwen
09d91d8bf3
fix: 修复系统平台创建名称报错信息
2021-01-19 20:08:33 +08:00
Bai
46fbc19697
i18n: 修改翻译
2021-01-19 20:05:44 +08:00
Bai
44a42e4739
fix: 修改用户相关tickets为自己申请的或者待受理的
2021-01-19 19:43:17 +08:00
xinwen
4de2ae607d
perf: 优化 日志审计-> 批量命令-> 用户显示格式
2021-01-19 05:06:43 -06:00
Bai
9fee82cd14
fix: 添加录像存储endpoint校验逻辑
2021-01-19 19:05:16 +08:00
fit2bot
9126c7780d
perf: 工单优化(审批人可以填写工单对应的授权规则名称) ( #5468 )
...
* perf: 工单优化(审批人可以填写工单对应的授权规则名称)
* perf: 工单优化(优化推荐的资产、应用、系统用户等逻辑)
* perf: 工单优化(优化工单邮件内容)
* perf: MethodSerializer优化(优化当Serializer不需要时, 默认可以不传递对应字段)
Co-authored-by: Bai <bugatti_it@163.com >
2021-01-19 15:44:19 +08:00
fit2bot
0842553f8a
fix: 修复 celery 等日志文件的访问漏洞 ( #5469 )
...
Co-authored-by: xinwen <coderWen@126.com >
2021-01-19 14:36:41 +08:00
xinwen
5fae919499
fix: 跳板机危险命令告警发送邮件失败
2021-01-18 06:57:57 -06:00
noon
1243546627
Update README_EN.md
...
style: change some sentences in the critical bug warning
2021-01-18 04:13:11 -06:00
Bai
a0cb16e5c4
perf: 修改关闭工单API权限, 申请人有权限关闭工单
2021-01-18 18:06:30 +08:00
ibuler
7b8f932dcd
perf: 去掉几个不用的api
2021-01-18 17:18:05 +08:00
Bai
243eedc4f9
perf: 优化工单body html显示格式及翻译信息
2021-01-18 17:14:15 +08:00
xinwen
230ef2f662
fix: 修复用户离开组织信号被覆盖问题
2021-01-18 01:20:47 -06:00
xinwen
42019c9e8a
fix: 修复 AssetUserFilterBackend
2021-01-18 01:19:01 -06:00
Bai
f6622f5e01
fix: 修改翻译
2021-01-18 15:06:36 +08:00
Bai
31f098449f
perf: 修改 OPTION 获取 choices 字段选项; 修改display字段翻译 (显示名称)
2021-01-18 15:01:09 +08:00
ibuler
0d4e346210
chore: 修改readme
2021-01-18 00:26:51 -06:00
fit2bot
df193162f7
chore: 修改readme 英文版本 ( #5448 )
...
* chore: 修改readme 英文版本
Co-authored-by: ibuler <ibuler@qq.com >
2021-01-18 13:46:55 +08:00
ibuler
646f0a568b
chore: 修改readme
2021-01-17 21:21:33 -06:00
Jiangjie.Bai
be5b4a5f71
Merge pull request #5440 from jumpserver/dev
...
Dev
2021-01-17 19:29:37 +08:00
xinwen
e61511372c
fix: 修复缓存框架组织切换问题&组织的 resource_statistics 字段是只读
2021-01-17 19:28:00 +08:00
Jiangjie.Bai
d4f3280427
Merge pull request #5437 from jumpserver/dev
...
Dev
2021-01-17 17:58:30 +08:00
fit2bot
083f061665
perf: 更新翻译 ( #5438 )
...
* perf: 更新翻译
* perf: 更新翻译
Co-authored-by: Bai <bugatti_it@163.com >
2021-01-17 16:22:06 +08:00
fit2bot
be7a93d81a
feat: 在登录页面添加CAS/OpenID等第三方登录链接;不再自动跳转登录地址;统一开源/企业版登录页面; ( #5389 )
...
* feat: 在登录页面添加CAS/OpenID等第三方登录链接;不再自动跳转登录地址;统一开源/企业版登录页面;
* feat: 登录页面<忘记密码>链接,不限制第三方用户; 在忘记密码页面进行判断与限制
* feat: 登录页面<忘记密码>链接,不限制第三方用户; 在忘记密码页面进行判断与限制 (2)
* fix: 调整样式
Co-authored-by: Bai <bugatti_it@163.com >
Co-authored-by: Orange <orangemtony@gmail.com >
2021-01-17 15:28:22 +08:00
xinwen
156be0a64e
fix: 网域列表添加默认 name 排序
2021-01-17 13:06:00 +08:00
fit2bot
a7fa2331bd
feat: 添加缓存模块,添加组织资源统计 ( #5407 )
...
* feat: 添加缓存模块,添加组织资源统计
* refactor
* recover .gitkeep
* refactor
* 合并信号处理
* 修复组织添加用户没有发信号
* 修改了一个log级别
Co-authored-by: xinwen <coderWen@126.com >
2021-01-17 12:08:21 +08:00
老广
9e0d731a0c
Update README.md ( #5432 )
...
* Update README.md
* Update README.md
2021-01-16 16:23:30 +08:00
Orange
1b184db956
Merge pull request #5427 from jumpserver/ibuler-patch-1
...
Update README.md
2021-01-15 18:06:09 +08:00
老广
4b9ed47cda
Update README.md
2021-01-15 18:05:09 +08:00
ibuler
f04e2fa090
fix: bug
2021-01-14 10:27:49 +08:00
Bai
83d12d02fb
perf: 重构工单处理流程 (7)
2021-01-13 18:48:38 +08:00
ibuler
64257823c5
pref(common): 优化drf options的filterset 可能引起的问题
2021-01-13 18:06:15 +08:00
fit2bot
a7468a243d
perf: 重构工单处理流程 ( #5408 )
...
* perf: 重构工单处理流程
* perf: 重构工单处理流程 (1)
* perf: 重构工单处理流程 (2)
* perf: 重构工单处理流程 (3)
* perf: 重构工单处理流程 (4)
* perf: 重构工单处理流程 (5)
* perf: 重构工单处理流程 (6)
Co-authored-by: Bai <bugatti_it@163.com >
2021-01-13 17:49:03 +08:00
fit2bot
528e251f31
perf: 日志增加请求耗时 ( #5406 )
...
Co-authored-by: Eric <xplzv@126.com >
2021-01-12 18:15:59 +08:00
fit2bot
86a055638c
reactor: 重构命令&录像存储模块的Serializer及相关模块 ( #5392 )
...
* reactor: 重构命令&录像存储模块的Serializer及相关模块
Co-authored-by: Bai <bugatti_it@163.com >
2021-01-12 18:06:42 +08:00
fit2bot
b3f359d47b
perf(assets): 优化节点生成子节点key生成逻辑 ( #5405 )
...
* perf(assets): 优化节点生成子节点key生成逻辑
* perf(assets): 优化写法
* perf(assets): 优化获取子节点的mark
* perf(assets): 再优化一波
* perf(asset): 继续优化这里的写法
Co-authored-by: ibuler <ibuler@qq.com >
2021-01-12 12:59:05 +08:00
Bai
dbe969b064
perf: 解决MethodSerializer被swagger调用时parent.Serializer会互相影响所需字段显示的问题
2021-01-11 15:37:29 +08:00
Bai
b9258878fe
fix: 修复celery日志清除问题
2021-01-11 10:30:10 +08:00
Bai
19c2973501
perf: 可以获取多种协议类型的系统用户列表
2021-01-07 19:09:31 +08:00
ibuler
e7a3c5a822
perf(api): filter_fields被filterset_fields取代
...
https://django-filter.readthedocs.io/en/stable/guide/migration.html
2021-01-07 18:36:17 +08:00
老广
ff4748f9f4
Merge pull request #5385 from jumpserver/pr@dev@feat_asset_task
...
feat: 添加批量执行资产任务的接口
2021-01-06 16:54:21 +08:00
xinwen
60c19148dc
feat: 添加批量执行资产任务的接口
2021-01-06 16:51:25 +08:00
老广
7eedc0635e
Merge pull request #5362 from jumpserver/pr@dev@fix_adhoc_excution
...
fix: 修复多个 AdHocExecution 在一个 celery task 执行时日志错误
2021-01-06 15:57:09 +08:00
xinwen
f5fd40978e
fix: 修复多个 AdHocExecution 在一个 celery task 执行时日志错误
2021-01-06 15:53:38 +08:00
Bai
72dd23dcce
perf: ticket 申请添加 comment
2021-01-06 15:19:43 +08:00
老广
5b5c33116a
Merge pull request #5350 from hctech/dev
...
fix:资产自动推送UUIDD数组格式化字符串失败
2021-01-06 14:41:24 +08:00
fit2bot
7167515a53
feat: 实现MethodSerializer, 满足serializer中SerializerField动态更改的需求 ( #5382 )
...
* feat: 实现MethodSerializer, 满足serializer中SerializerField动态更改的需求
* feat: 实现MethodSerializer, 满足serializer中SerializerField动态更改的需求 (2)
Co-authored-by: Bai <bugatti_it@163.com >
2021-01-06 12:44:12 +08:00
fit2bot
17a01a12db
reactor: 增加DynamicMappingSerializer类,实现Serializer中的字段可以动态改变的功能 ( #5379 )
...
* reactor: 增加DynamicMappingSerializer类,实现Serializer中的字段可以动态改变的功能
* reactor: 增加DynamicMappingSerializer类,实现Serializer中的字段可以动态改变的功能 (2)
* reactor: 增加DynamicMappingSerializer类,实现Serializer中的字段可以动态改变的功能 (3)
Co-authored-by: Bai <bugatti_it@163.com >
2021-01-05 23:39:38 +08:00
Bai
3188692691
perf: 修改swagger问题
2021-01-04 16:25:16 +08:00
Bai
aab59403e1
perf: 修改工单创建授权规则的字段(created_by)
2021-01-04 14:36:54 +08:00
fit2bot
7e7e24f51f
reactor&remove: 重构applications模块 & 移除applications、perms中已不再使用的模块 ( #5374 )
...
* reactor: 重构applications模块 & 删除applications、perms中已不再使用的模块
* reactor: 1. 针对application.attrs字段的view-serializer映射逻辑,采用DynamicMapping的方案重写;
* reactor: 2. 删除applications和perms模块中已不再使用的database-app/k8s-app/remote-app模块;
* reactor: 添加迁移文件(删除perms/databaseperrmission/remoteapppermission/k8sapppermission)
* reactor: 修改细节
Co-authored-by: Bai <bugatti_it@163.com >
2021-01-04 05:27:03 +08:00
fit2bot
428e8bf2a0
perf: 修改 View dynamic mapping include dynamic mapping fields Serializer Class 方案的说明 ( #5373 )
...
* perf: 修改 View dynamic mapping `include dynamic mapping fields Serializer Class` 方案的说明
* perf: 修改 View dynamic mapping `include dynamic mapping fields Serializer Class` 方案的说明 (2)
Co-authored-by: Bai <bugatti_it@163.com >
2021-01-03 14:17:02 +08:00
Bai
24b1c87121
perf: 修改细节
2021-01-02 08:00:05 +08:00
fit2bot
cef93abb2f
feat: 抽象View Mapping Serializer架构设计; 重构工单View、Serializer模块 ( #5371 )
...
* perf: 优化工单模块(修改迁移文件->Model assignees_display 字段类型为list)
* ignore: try `view` `serializer jsonfields` Map design (1)
* ignore: try `view` `serializer jsonfields` Map design (2)
* ignore: try `view` `serializer jsonfields` Map design (3)
* ignore: try `view` `serializer jsonfields` Map design (4)
* ignore: try `view` `serializer jsonfields` Map design (5)
* ignore: try `view` `serializer.DynamicMappingField` Mapping design (6)
* feat: 抽象view_mapping_serializer逻辑架构; 重构工单View、Serializer模块
* feat: 抽象view_mapping_serializer逻辑架构; 重构工单View、Serializer模块(2)
* feat: 抽象view_mapping_serializer逻辑架构; 重构工单View、Serializer模块(3)
* feat: 抽象view_mapping_serializer逻辑架构; 重构工单View、Serializer模块(4)
Co-authored-by: Bai <bugatti_it@163.com >
2021-01-02 07:25:23 +08:00
Bai
5c483084b7
feat: 优化工单模块
2020-12-31 18:39:40 +08:00
fit2bot
167734ca5d
feat: 优化工单模块 ( #5365 )
...
* feat: 优化工单模块
* feat: 优化工单模块2
Co-authored-by: Bai <bugatti_it@163.com >
2020-12-31 05:47:27 +08:00
Bai
1a9a5c28f5
feat: 优化工单模块1
2020-12-31 05:09:46 +08:00
fit2bot
430e20a49c
feat: 优化工单模块 ( #5361 )
...
* feat: 优化工单模块1
* feat: 优化工单模块2
* feat: 优化工单模块3
Co-authored-by: Bai <bugatti_it@163.com >
2020-12-30 18:14:06 +08:00
Jiangjie.Bai
3b056ff953
reactor&feat: 重构工单模块 & 支持申请应用工单 ( #5352 )
...
* reactor: 修改工单Model,添加工单迁移文件
* reactor: 修改工单Model,添加工单迁移文件
* reactor: 重构工单模块
* reactor: 重构工单模块2
* reactor: 重构工单模块3
* reactor: 重构工单模块4
* reactor: 重构工单模块5
* reactor: 重构工单模块6
* reactor: 重构工单模块7
* reactor: 重构工单模块8
* reactor: 重构工单模块9
* reactor: 重构工单模块10
* reactor: 重构工单模块11
* reactor: 重构工单模块12
* reactor: 重构工单模块13
* reactor: 重构工单模块14
* reactor: 重构工单模块15
* reactor: 重构工单模块16
* reactor: 重构工单模块17
* reactor: 重构工单模块18
* reactor: 重构工单模块19
* reactor: 重构工单模块20
* reactor: 重构工单模块21
* reactor: 重构工单模块22
* reactor: 重构工单模块23
* reactor: 重构工单模块24
* reactor: 重构工单模块25
* reactor: 重构工单模块26
* reactor: 重构工单模块27
* reactor: 重构工单模块28
* reactor: 重构工单模块29
* reactor: 重构工单模块30
* reactor: 重构工单模块31
* reactor: 重构工单模块32
* reactor: 重构工单模块33
* reactor: 重构工单模块34
* reactor: 重构工单模块35
* reactor: 重构工单模块36
* reactor: 重构工单模块37
* reactor: 重构工单模块38
* reactor: 重构工单模块39
2020-12-30 00:19:59 +08:00
huangchao
795d1b59e0
fix:资产自动推送UUIDD数组格式化字符串失败
2020-12-27 23:00:45 +08:00
Bai
9d4f1a01fd
perf: 升级依赖 python-ldap==3.3.1
2020-12-22 17:18:42 +08:00
xinwen
332f65cf2f
fix: 将节点的资产添加到系统用户时固定组织
2020-12-22 15:14:01 +08:00
Bai
b79e6799c4
fix: 修复资产导入携带disk_info信息时失败的问题
2020-12-21 17:10:44 +08:00
Bai
4eef425e2a
fix: 修复提交系统设置失败的问题
2020-12-21 14:30:12 +08:00
Jiangjie.Bai
3f4877f26b
Merge pull request #5295 from jumpserver/dev
...
fix: 修复命令列表过滤字段文案`会话ID`
2020-12-17 18:26:54 +08:00
Bai
0e4d778335
fix: 修复命令列表过滤字段文案会话ID
2020-12-17 18:25:48 +08:00
Jiangjie.Bai
52d20080ff
Merge pull request #5293 from jumpserver/dev
...
fix: 修改系统监控问题
2020-12-17 17:36:06 +08:00
Bai
ed8d72c06b
fix: 修改系统监控问题
2020-12-17 17:34:37 +08:00
Jiangjie.Bai
5e9e3ec6f6
Merge pull request #5288 from jumpserver/dev
...
chore: Merge master from dev
2020-12-17 14:56:25 +08:00
xinwen
4f5f92deb8
fix: 批量删除管理用户报错信息太丑
2020-12-17 14:47:37 +08:00
xinwen
d2a15ee702
fix: 申请资产工单如果系统用户没填内容不推荐系统用户
2020-12-17 14:35:08 +08:00
Bai
a3a591da4b
fix: 修复命令导出excel格式报错
2020-12-17 14:31:34 +08:00
Bai
3f2925116e
fix: 修复metrics获取terminal过滤is_deleted字段
2020-12-17 11:30:29 +08:00
xinwen
c3e2e536e0
fix: 【用户管理】-创建用户组-可将系统审计员加入到用户组 #579
2020-12-17 10:33:45 +08:00
Jiangjie.Bai
8c133d5fdb
Merge pull request #5278 from jumpserver/dev
...
chore: Merge master from dev
2020-12-16 18:50:49 +08:00
xinwen
89d8efe0f1
fix: perms.signals_handler.on_application_permission_applications_changed 修改名字
2020-12-16 18:49:20 +08:00
Bai
54303ea33f
fix: 修复节点创建时更新孩子full_value日志输出问题
2020-12-16 18:37:54 +08:00
Bai
4dcd8dd8dd
fix: 修复节点创建时更新孩子full_value日志输出问题
2020-12-16 18:37:54 +08:00
老广
4f04a7d258
Merge pull request #5280 from jumpserver/pr@dev@fix_auto_push
...
fix: 推送系统用户时 AdHocExecution id 重复
2020-12-16 17:36:45 +08:00
xinwen
bf308e24b6
fix: 推送系统用户时 AdHocExecution id 重复
2020-12-16 17:31:37 +08:00
Bai
b3642f3ff4
fix: 修复LDAP用户登录(未找到)时循环调用问题
2020-12-16 12:01:57 +08:00
xinwen
3aed4955c8
fix: 远程应用授权的一些问题
2020-12-16 12:00:53 +08:00
fit2bot
9a5f9a9c92
fix: 应用授权不会自动推送的bug ( #5271 )
...
Co-authored-by: xinwen <coderWen@126.com >
2020-12-16 10:23:37 +08:00
Orange
6d5bec1ef2
Merge pull request #5269 from jumpserver/dev
...
chore: Merge master from dev
2020-12-15 20:35:51 +08:00
Bai
e93fd1fd44
fix: 删除终端列表state的默认值0
2020-12-15 20:34:47 +08:00
xinwen
7bf37611bd
fix: 系统审计员不应该能添加到组
2020-12-15 19:24:25 +08:00
xinwen
b8ec4bfaa5
fix: 日志审计-操作日志中搜索-按动作搜索:需修改文字 删除文件-->删除 #524
2020-12-15 18:38:23 +08:00
Bai
58b6293b76
fix: 组件监控添加offline数量
2020-12-15 18:37:16 +08:00
xinwen
8e12eebceb
fix: 获得 oidc acs 等认证方式失败
2020-12-15 18:36:37 +08:00
Bai
72d6ea43fa
fix: 修改命令列表过滤参数session
2020-12-15 18:34:05 +08:00
Bai
deedd49dc5
fix: 修复命令记录导出excel文件格式未定义的问题
2020-12-15 18:07:11 +08:00
fit2bot
a36e6fbf84
fix: 修改判断会话活跃逻辑;不必要判断协议 ( #5262 )
...
* fix: 修改判断会话活跃逻辑;不必要判断协议
* fix: 修改导入task问题
Co-authored-by: Bai <bugatti_it@163.com >
2020-12-15 18:06:35 +08:00
Bai
b57453cc3c
fix: 修复命令列表过滤使用session_id字段
2020-12-15 18:05:42 +08:00
Jiangjie.Bai
62f2909d59
Merge pull request #5256 from jumpserver/dev
...
chore: Merge master from dev
2020-12-15 14:20:23 +08:00
xinwen
0d469ff95b
fix(orgs): 用户离开组织后授权的资产没主动刷新
2020-12-15 14:00:51 +08:00
xinwen
ca883f1fb4
fix: 工单申请资产审批时系统用户没有推荐
2020-12-15 13:06:55 +08:00
fit2bot
6e0fbd78e7
fix: 修复prometheus_metricsAPI数据获取bug;修复组件注册type为空bug ( #5253 )
...
* fix: 修复prometheus_metricsAPI数据获取bug;修复组件注册type为空bug
* fix: 修改审计migrations/userloginlog/backend的verbose_name字段
Co-authored-by: Bai <bugatti_it@163.com >
2020-12-15 13:00:59 +08:00
ibuler
0813cff74f
perf: 优化 docs swagger,不再要求debug
2020-12-14 11:39:02 +08:00
ibuler
ff428b84f9
fix(assets): 修复asset更新子节点时的日志错误
2020-12-14 11:33:34 +08:00
ibuler
d0c9aa2c55
fix(assets): 修复更新孩子节点时的log error
2020-12-14 11:33:34 +08:00
老广
1d5e603c0d
Merge pull request #5231 from jumpserver/dev
...
chore(merge): 合并 dev 到 master
2020-12-11 19:29:45 +08:00
ibuler
ddbbc8df17
fix(docker): 修复Dockerfile中 echo引起的sh和bash换行兼容问题
2020-12-11 19:26:46 +08:00
Bai
90df404931
fix: 修复swagger问题
2020-12-11 19:02:33 +08:00
Bai
b9cbff1a5f
del: 删除测试prometheus相关代码
2020-12-11 19:02:33 +08:00
ibuler
b9717eece3
fix: 修改访问swagger会产生的错误
2020-12-11 18:30:20 +08:00
Bai
f9cf2a243b
fix: 修复settings中搜索LDAP用户重复问题
2020-12-11 18:26:10 +08:00
Bai
e056430fce
fix: 修复只配置DC域时,LDAP用户认证失败的问题
2020-12-11 18:26:10 +08:00
Jiangjie.Bai
2b2821c0a1
Merge pull request #5223 from jumpserver/dev
...
chore(merge): 合并 dev 到 master
2020-12-11 16:53:36 +08:00
Bai
213221beae
perf: 修改BasePermissionViewSet的custom_filter_fields
2020-12-11 16:19:18 +08:00
Bai
2db9c90a74
feat: 修改翻译:认证方式
2020-12-11 15:49:39 +08:00
Bai
8ced6f1168
fix: 用户ProfileAPI设置is_first_login不是可读写
2020-12-11 15:44:17 +08:00
Bai
6703ab9a77
perf: 添加BasePermissionsViewSet,支持搜索过滤
2020-12-11 15:44:17 +08:00
老广
2fc6e6cd54
Merge pull request #5213 from jumpserver/dev
...
chore(merge): 合并dev到master
2020-12-10 23:03:35 +08:00
Bai
2176fd8fac
feat: 更新翻译
2020-12-10 21:30:56 +08:00
fit2bot
856e7c16e5
feat: 添加组件监控;TerminalModel添加type字段; ( #5206 )
...
* feat: 添加组件监控;TerminalModel添加type字段;
* feat: Terminal序列类添加type字段
* feat: Terminal序列类添加type字段为只读
* feat: 修改组件status文案
* feat: 取消上传组件状态序列类count字段
* reactor: 修改termina/models目录结构
* feat: 修改ComponentTypeChoices
* feat: 取消考虑CoreComponent类型
* feat: 修改Terminal status判断逻辑
* feat: 终端列表添加status过滤; 组件状态序列类添加default值
* feat: 添加PrometheusMetricsAPI
* feat: 修改PrometheusMetricsAPI
Co-authored-by: Bai <bugatti_it@163.com >
2020-12-10 20:50:22 +08:00
fit2bot
d4feaf1e08
fix: 修复由于更新django captch版本引起的css丢失问题 ( #5204 )
...
* fix: 修复由于更新django captch版本引起的css丢失问题
* perf: 优化验证码的高度
Co-authored-by: ibuler <ibuler@qq.com >
2020-12-10 20:48:10 +08:00
fit2bot
5aee2ce3db
chore: 升级依赖库版本 ( #5205 )
...
* chore: 升级依赖库版本
* fix: 几个库回退几个版本
Co-authored-by: ibuler <ibuler@qq.com >
2020-12-10 20:46:45 +08:00
xinwen
4424c4bde2
perf(asset): 手动启动节点资产数量自检程序时区分组织
2020-12-10 18:17:01 +08:00
fit2bot
5863e3e008
perf(asset): 资产树,右击增加计算节点数量的菜单,可以让后台去计算 #527 ( #5207 )
...
Co-authored-by: xinwen <coderWen@126.com >
2020-12-10 17:12:39 +08:00
xinwen
79a371eb6c
perf(auth): 密码过期后,走重置密码流程 #530
2020-12-10 16:06:26 +08:00
fit2bot
7c7de96158
feat(login): 登录日志要体现用哪个backend登录的 #4472 ( #5199 )
...
Co-authored-by: xinwen <coderWen@126.com >
2020-12-09 18:43:13 +08:00
ibuler
80b03e73f6
feat(celery): 添加celery的health check接口
2020-12-09 18:06:34 +08:00
fit2bot
32dbab2e34
perf: 数据库应用database字段添加allow_null=True ( #5196 )
...
* perf: 数据库应用database字段修改为required
* perf: 数据库应用database字段添加allow_null=True
Co-authored-by: Bai <bugatti_it@163.com >
2020-12-09 13:44:07 +08:00
ibuler
b189e363cc
revert(system): 暂时去掉system组件
2020-12-09 11:24:44 +08:00
Bai
4c3a655239
perf: 用户序列类禁止修改source字段
2020-12-08 20:54:33 +08:00
Bai
5533114db5
feat: 用户授权应用树按组织节点进行区分
2020-12-08 20:37:07 +08:00
Jiangjie.Bai
4c469afa95
feat: 取消资产配置相关字段只读模式 ( #5182 )
...
* feat: 取消资产配置相关字段只读模式
* feat: 取消资产配置相关字段只读模式
2020-12-08 20:32:48 +08:00
fit2bot
2ccc5beeda
perf(Dockerfile): 不再使用zh_CN.UTF-8, en_US.UTF-8 应该也是可以的 ( #5190 )
...
* perf(Dockerfile): 不再使用zh_CN.UTF-8, en_US.UTF-8 应该也是可以的
* fix: 还原回原来的LANG设置
* perf: 合并层数
* feat: 修改Dockerfile
Co-authored-by: ibuler <ibuler@qq.com >
Co-authored-by: Bai <bugatti_it@163.com >
2020-12-08 20:22:48 +08:00
xinwen
4b67d6925e
feat(asset): api 添加推送系统用户到多个资产
2020-12-08 18:08:44 +08:00
fit2bot
dd979f582a
stash ( #5178 )
...
* Dev (#4791 )
* fix(xpack): 修复last login太长的问题 (#4786 )
Co-authored-by: ibuler <ibuler@qq.com >
* perf: 更新密码中也发送邮件 (#4789 )
Co-authored-by: ibuler <ibuler@qq.com >
* fix(terminal): 修复获取螺旋的异步api
* fix(terminal): 修复有的录像存储有问题的导致下载录像的bug
* fix(orgs): 修复组织添加用户bug
* perf(requirements): 修改jms-storage==0.0.34 (#4797 )
Co-authored-by: Bai <bugatti_it@163.com >
Co-authored-by: fit2bot <68588906+fit2bot@users.noreply.github.com >
Co-authored-by: ibuler <ibuler@qq.com >
Co-authored-by: Bai <bugatti_it@163.com >
* stash
* feat(system): 添加系统app
* stash
* fix: 修复一些bug
Co-authored-by: xinwen <coderWen@126.com >
Co-authored-by: ibuler <ibuler@qq.com >
Co-authored-by: Bai <bugatti_it@163.com >
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com >
2020-12-08 14:26:18 +08:00
Bai
042ea5e137
feat: 授权应用树API返回org_name字段
2020-12-08 11:01:09 +08:00
ibuler
2a6f68c7ba
revert: 还原原来的jms,自动运行migraionts
2020-12-07 19:16:27 +08:00
fit2bot
43b5e97b95
feat(excel): 添加Excel导入/导出 ( #5124 )
...
* refactor(drf_renderer): 添加 ExcelRenderer 支持导出excel文件格式; 优化CSVRenderer, 抽象 BaseRenderer
* perf(renderer): 支持导出资源详情
* refactor(drf_parser): 添加 ExcelParser 支持导入excel文件格式; 优化CSVParser, 抽象 BaseParser
* refactor(drf_parser): 添加 ExcelParser 支持导入excel文件格式; 优化CSVParser, 抽象 BaseParser 2
* perf(renderer): 捕获renderer处理异常
* perf: 添加excel依赖包
* perf(drf): 优化导入导出错误日志
* perf: 添加依赖包 pyexcel-io==0.6.4
* perf: 添加依赖包pyexcel-xlsx==0.6.0
* feat: 修改drf/renderer&parser变量命名
* feat: 修改drf/renderer的bug
* feat: 修改drf/renderer&parser变量命名
Co-authored-by: Bai <bugatti_it@163.com >
2020-12-07 15:23:05 +08:00
ibuler
619b521ea1
fix: 修改语言i18n
2020-12-05 13:22:22 +08:00
fit2bot
3447eeda68
fix(applications): 修改attrs不能为null ( #5172 )
...
Co-authored-by: Bai <bugatti_it@163.com >
2020-12-04 13:10:59 +08:00
fit2bot
75ef413ea5
fix(applications): 修改attrs不能为null ( #5171 )
...
Co-authored-by: Bai <bugatti_it@163.com >
2020-12-04 10:24:10 +08:00
fit2bot
662c9092dc
reactor(dockerfile): 使用debian构建docker ( #5169 )
...
Co-authored-by: ibuler <ibuler@qq.com >
2020-12-03 19:14:28 +08:00
ibuler
c8d54b28e2
perf: 优化变量命名
2020-12-03 14:23:16 +08:00
ibuler
96cd307d1f
perf: 优化entrypoint.sh
2020-12-03 14:23:16 +08:00
ibuler
6385cb3f86
perf: 优化启动,不再自动运行migrations
2020-12-03 14:23:16 +08:00
Bai
36e9d8101a
fix: 添加迁移文件: Node ordering
2020-12-03 11:16:27 +08:00
ibuler
3354ab8ce9
fix(req): fix wheel version
2020-12-03 10:47:21 +08:00
Bai
89ec6ba6ef
fix: Node ordering [parent_key, value]; 修复默认组织Default节点显示问题(存在key为0的Default节点)
2020-12-03 10:45:25 +08:00
Bai
af40e46a75
fix: 优化迁移Default节点
2020-12-03 10:29:00 +08:00
Bai
86fcd3c251
fix: 添加迁移文件(如果需要,将Default节点的key从0修改为1)
2020-12-03 10:29:00 +08:00
fit2bot
c2d5928273
build(pip): 锁定pip版本 ( #5152 )
...
* build(pip): 锁定pip版本
* fix: 锁定pip版本
* fix(req): 锁定加密库版本
* fix(build): 引用pip缓存
Co-authored-by: ibuler <ibuler@qq.com >
2020-12-02 11:09:39 +08:00
xinwen
e656ba70ec
fix(assets): 推送动态系统用户未指定 username 取全部 usernames
2020-12-01 20:08:54 +08:00
xinwen
bb807e6251
fix(perms): 新建授权时动态用户可能推送不成功
2020-12-01 20:08:54 +08:00
Bai
bbd6cae3d7
perf(org): 优化获取org_name字段
2020-11-30 15:21:56 +08:00
Bai
c3b09dd800
perf(perms): 优化用户授权树返回org_name字段;添加thread_local属性org_mapper减少查询次数
2020-11-30 15:21:56 +08:00
Bai
6d427b9834
fix: 禁止删除组织根节点
2020-11-30 14:19:20 +08:00
xinwen
610aaf5244
fix(assets): 动态系统用户和用户关系变化时没有推送到资产
2020-11-26 15:20:09 +08:00
xinwen
df2f1b3e6e
perf(User): 用户列表在大规模数据情况下慢
2020-11-26 12:32:18 +08:00
fit2bot
f26b7a470a
perf(celery-task): 优化检查节点资产数量的 Celery 任务 ( #5052 )
...
Co-authored-by: xinwen <coderWen@126.com >
2020-11-25 17:30:07 +08:00
xinwen
a4667f3312
fix(Node): Node 保存的时候,在信号里设置 parent_key
2020-11-25 16:35:12 +08:00
xinwen
91081d9423
refactor(perms): 在动态用户所绑定的授权规则中,如授权给用户组,当用户组增加成员后,动态系统用户下没有相应增加用户,因此也不会自动推送 ( #5084 ) ( #5086 )
2020-11-24 19:31:45 +08:00
fit2bot
3041697edc
fix(orgs): 兼容旧的组织用户关系接口 ( #5088 )
...
Co-authored-by: xinwen <coderWen@126.com >
2020-11-24 19:09:14 +08:00
xinwen
75d7530ea5
fix(perms): 在动态用户所绑定的授权规则中,如授权给用户组,当用户组增加成员后,动态系统用户下没有相应增加用户,因此也不会自动推送
2020-11-24 10:27:03 +08:00
ibuler
975cc41bce
perf(build): 优化使用pip mirror
2020-11-22 18:16:45 +08:00
ibuler
439999381d
perf(build): 优化构建时用的mirror
2020-11-22 17:51:24 +08:00
xinwen
39ab5978be
perf(perms): 获取用户所有授权时转换成 list
2020-11-22 17:24:00 +08:00
ibuler
7be7c8cee1
fix(perms): 修复我的资产页面问题
2020-11-22 16:55:21 +08:00
xinwen
68b22cbdec
fix(perms): 修复用户组授权树与资产问题
2020-11-22 15:03:03 +08:00
xinwen
a7c704bea3
perf(celery-task): 优化检查节点资产数量的 Celery 任务
2020-11-22 11:36:10 +08:00
xinwen
21993b0d89
perf(perms): 优化用户授权资产列表加载速度
2020-11-22 11:35:13 +08:00
xinwen
73ccf3be5f
fix(perms): 当用户授权为空时,清空旧的授权树
2020-11-22 11:26:39 +08:00
ibuler
bf3056abc4
fix(django3): 修复django3兼容问题
2020-11-20 15:25:37 +08:00
xinwen
f2fd9f5990
perf(assets): 限制搜索授权资产返回的条数
2020-11-20 15:24:33 +08:00
fit2bot
6d39a51c36
[fix]: 兼容django 3 ( #5038 )
...
* chore(django): 修改版本依赖
* [fix]: 兼容django 3
* fix(merge): 去掉不用的JSONField
* fix(requirements): 修改加密库的版本
Co-authored-by: ibuler <ibuler@qq.com >
2020-11-19 15:50:31 +08:00
xinwen
7fa94008c9
fix(old-api): 调整旧的组织与用户关联接口
2020-11-19 15:21:16 +08:00
Jiangjie.Bai
9685a25dc6
Merge pull request #5034 from jumpserver/dev
...
fix(perms): nodes-with-assets 接口添加刷新重构树
2020-11-18 11:53:12 +08:00
xinwen
1af4fcd381
fix(perms): nodes-with-assets 接口添加刷新重构树
2020-11-18 11:47:50 +08:00
Jiangjie.Bai
177055acdc
Merge pull request #5032 from jumpserver/dev
...
fix(assets): 修复获取org_root的问题
2020-11-18 11:29:53 +08:00
ibuler
6ec0b3ad54
fix(assets): 修复获取org_root的问题
2020-11-18 11:23:39 +08:00
Orange
49dd611292
Merge pull request #5029 from jumpserver/dev
...
Dev
2020-11-17 19:46:36 +08:00
xinwen
f557c1dace
fix(assets): model 添加 asset 默认排序
2020-11-17 19:40:49 +08:00
xinwen
6e87b94789
fix(command): 系统设置-安全设置-告警接收邮件字段如果为空,则更新不了
2020-11-17 19:19:08 +08:00
xinwen
b0dba35e5a
fix(public-api): 缺少SECURITY_PASSWORD_EXPIRATION_TIME字段
2020-11-17 19:11:39 +08:00
ibuler
d0b19f20c3
perf(tickets): 优化授权申请工单
2020-11-17 19:10:23 +08:00
xinwen
3e78d627f8
fix(perms): 作业中心-批量命令-选择系统用户之后,左侧资产列表未筛选,还是全部资产
2020-11-17 18:45:45 +08:00
Jiangjie.Bai
0763404235
Merge pull request #5021 from jumpserver/dev
...
Dev
2020-11-17 16:48:07 +08:00
ibuler
31cd441a34
fix(assets): 修复资产导入时填写节点引起的空节点名称的问题
2020-11-17 16:41:17 +08:00
ibuler
40c0aac5a9
fix(ops): 修复run as 可能引起的返回多个asset user
2020-11-17 16:39:13 +08:00
ibuler
83099dcd16
fix(ops): 修复task run as的问题
2020-11-17 16:39:13 +08:00
ibuler
0db72bd00f
fix(i18n): 修复js18n的问题
2020-11-17 16:29:09 +08:00
Bai
732b8cc0b8
fix(ops): 修复AdHocExecution字段task_display长度问题
2020-11-17 16:27:41 +08:00
Bai
a9f90b4e31
perf(terminal): 修改数据库字段长度(command_stroage/replay_storage name 128)
2020-11-17 15:59:42 +08:00
Bai
cf1fbabca1
fix(command): 修复批量命令执行可能获取到host为None的问题
2020-11-17 15:25:11 +08:00
ibuler
cbcefe8bd3
fix(ops): 修复因为更改controlmaster引起的连接不服用维内托
2020-11-16 15:22:25 +08:00
ibuler
133a2e4714
fix(assets): 修复动态系统用户推送的bug
2020-11-16 15:07:01 +08:00
fit2bot
b4b9149d5d
chore(docs): 修改readme ( #5005 )
...
* chore(docs): 修改readme
* chore(docs): 修改文档拼写
Co-authored-by: ibuler <ibuler@qq.com >
2020-11-16 14:52:07 +08:00
fit2bot
9af4d5f76f
fix(crypto): 有时解密失败 ( #5003 )
...
* fix(nodes): 节点默认按 value 排序
* fix(crypto): 有时解密失败
Co-authored-by: xinwen <coderWen@126.com >
2020-11-16 14:47:27 +08:00
Orange
96d26cc96f
Merge pull request #4991 from jumpserver/dev
...
fix(system_user): 修复更新系统用户时ad_domain字段为空提交失败的问题
2020-11-13 14:57:23 +08:00
Bai
18d8f59bb5
fix(system_user): 修复更新系统用户时ad_domain字段为空提交失败的问题
2020-11-13 14:56:15 +08:00
老广
841f707b6d
Merge pull request #4982 from jumpserver/dev
...
Dev
2020-11-12 14:12:35 +08:00
xinwen
448c5db3bb
fix(orgs): 添加旧的 member 相关 api
2020-11-12 11:20:42 +08:00
Bai
75b886675e
perf(i18n): 更新翻译
2020-11-12 11:14:23 +08:00
Bai
24e22115de
perf(i18n): 更新翻译
2020-11-12 11:14:23 +08:00
Bai
b18ead0ffa
perf(i18n): 更新翻译
2020-11-12 11:01:48 +08:00
xinwen
6e8922da1c
fix(trans): 完善翻译
2020-11-12 10:12:25 +08:00
Bai
dcb38ef534
perf(session): 修改变量名terminate
2020-11-11 19:10:53 +08:00
Bai
8a693d9fa7
feat(session): session列表返回can_termination字段值;设置所有db协议类型会话不可被终断和监控
2020-11-11 17:49:54 +08:00
xinwen
487932590b
fix(terminal): 扩展 Terminal name 长度
2020-11-11 15:01:30 +08:00
peijianbo
79b5aa68c8
feat(terminal):危险命令告警功能
2020-11-10 18:31:16 +08:00
Bai
50a4735b07
pref(cloud): 添加 Azure 依赖包
2020-11-10 11:13:00 +08:00
Bai
1183109354
perf(github): 更新github issue模版
2020-11-10 10:30:15 +08:00
xinwen
202e619c4b
feat(assets): 添加系统用户资产列表 api
2020-11-10 10:23:51 +08:00
xinwen
179cb7531c
feat(assets): 管理用户的资产列表增加 options 方法
2020-11-10 10:23:51 +08:00
ibuler
987f840431
fix(i18n): 修复重置密码那的i18n问题
2020-11-10 10:17:55 +08:00
fit2bot
f04544e8df
feat(MFA): 修改文案Google Authenticator为手机验证器 ( #4964 )
...
* feat(MFA): 修改文案Google Authenticator为手机验证器
* feat(MFA): 修改文案手机验证器 为 MFA验证器
* feat(MFA): 修改文案手机验证器 为 MFA验证器2
Co-authored-by: Bai <bugatti_it@163.com >
2020-11-09 19:08:24 +08:00
fit2bot
cd6dc6a722
fix(perms): 由于组织不对,导致生成或显示授权树错误 ( #4957 )
...
* perf(perms): 优化授权树生成速度
* fix(perms): 由于组织不对,导致生成或显示授权树错误
Co-authored-by: xinwen <coderWen@126.com >
2020-11-09 17:30:50 +08:00
Bai
150552d734
perf(requirements): 升级依赖版本jms-storage==0.0.35
2020-11-09 17:29:10 +08:00
Bai
388314ca5a
fix(applications): 修复应用列表会返回所有组织下数据的问题
2020-11-09 16:46:38 +08:00
Bai
26d00329e7
fix(assets): 修复计算node full value时,获取node value 有可能为 __proxy__ 的问题
2020-11-06 10:20:48 +08:00
xinwen
e93be8f828
feat(crypto): 支持国密算法
2020-11-05 19:04:50 +08:00
Bai
2690092faf
perf(ldap): LDAP用户搜索,本地忽略大小写,远端支持模糊
2020-11-05 14:57:08 +08:00
Bai
eabaae81ac
perf(application): 优化RemoteApp应用Chrome序列类的字符串主键关联字段
2020-11-05 14:13:45 +08:00
Bai
6df331cbed
perf(perms): 用户/用户组授权的所有应用API返回attrs属性
2020-11-05 11:25:32 +08:00
xinwen
0390e37fd5
feat(orgs): relation 增加搜索功能
2020-11-05 10:40:00 +08:00
xinwen
44d9aff573
fix(orgs): 改正单词拼写
2020-11-05 09:58:58 +08:00
xinwen
2b4f8bd11c
feat(ops): Task 支持批量操作
2020-11-05 09:54:51 +08:00
xinwen
231332585d
fix(perms): 重建授权树冲突时,响应里加 code
2020-11-03 17:53:49 +08:00
ibuler
531de188d6
perf(systemuser): 优化系统用户家目录权限更改
2020-11-03 17:51:02 +08:00
ibuler
0c1f717fb2
feat(assets): 推送系统用户增加comment
2020-11-03 17:51:02 +08:00
xinwen
9d9177ed05
refactor(terminal): 去掉 Session 中 Terminal 的外键关系
2020-11-03 15:00:44 +08:00
xinwen
ab77d5db4b
fix(orgs): org-member-relation url 拼写错误
2020-11-03 14:49:50 +08:00
ibuler
eadecb83ed
fix: 修改系统用户节点关系的抖索
2020-11-03 14:33:15 +08:00
ibuler
5d6088abd3
fix(assets): 修复nodes display pop 引起的bug
2020-11-03 11:22:36 +08:00
xinwen
38f7c123e5
fix(audits): sso 登录日志没有 type
2020-11-03 11:18:56 +08:00
xinwen
d7daf7071a
fix(ticket): 工单申请资产的时候审批人不能搜索
2020-11-03 10:53:31 +08:00
Bai
795245d7f4
perf(perms): 授权给用户应用列表API添加dispaly字段
2020-11-02 10:26:39 +08:00
Bai
7ea2a0d6a5
perf(perms): 应用授权规则序列类添加applications类型校验
2020-10-30 17:25:34 +08:00
xinwen
c90b9d70dc
perf(perms): 优化根据资产获取授权的系统用户
2020-10-30 15:59:19 +08:00
Bai
f6c24f809c
perf(application): 修改DoaminAPI返回application数量;修改Application数据库datbase字段required=False
2020-10-30 15:58:46 +08:00
Bai
e369a8d51f
perf(readme): 修改Readme
2020-10-30 15:44:42 +08:00
Bai
c74c9f51f0
perf(readme): 修改Readme
2020-10-30 15:44:05 +08:00
ibuler
57bf9ca8b1
perf(assets): 优化更新子节点名称的算法
2020-10-30 14:17:09 +08:00
Bai
ddc2d1106b
perf(perms): 修改授权授权应用API,添加category/type过滤字段
2020-10-30 12:54:33 +08:00
ibuler
15992c636a
perf: 优化node full value
2020-10-30 10:50:45 +08:00
Bai
36cd18ab9a
perf(perms): 修改变量名
2020-10-30 10:47:32 +08:00
Bai
676ee93837
perf(perms): 优化方法名称;授权查询语句;
2020-10-30 10:47:32 +08:00
fit2bot
c02f8e499b
feat: 添加资产导入时可以直接写节点 ( #4868 )
...
* feat: 优化资产导入, 可以添加节点全称,并自动创建
* feat: 添加资产导入时可以直接写节点
* fix: 修改错误
* fix: 添加node value校验,不能包含/
* chore: merge migrations
* perf: 去掉full value replace
Co-authored-by: ibuler <ibuler@qq.com >
2020-10-30 10:16:49 +08:00
ibuler
4ebb4d1b6d
chore: resolve conflict
2020-10-29 19:19:20 +08:00
Bai
5e7650d719
perf(application): RemoteApp应用序列类返回asset_info字段
2020-10-29 05:48:01 -05:00
Bai
bf302f47e5
perf(application): 修改RemoteA序列类asset required=False
2020-10-29 05:48:01 -05:00
Bai
1ddc228449
perf(application): RemoteApp序列类字段asset,设置为CharPrimaryKeyRelatedField,修改其他字段的required=Flase
2020-10-29 05:48:01 -05:00
Bai
c9065fd96e
perf(application): 优化一些小细节
2020-10-29 05:48:01 -05:00
Bai
4a09dc6e3e
feat(assets): 修改GatewayModel ip字段类型为CharField
2020-10-29 05:48:01 -05:00
Bai
55bfb942e2
perf(applications): 修改应用序列类字段label
2020-10-29 05:48:01 -05:00
Bai
9aed51ffe9
perf(applications): 修改应用序列类字段长度限制
2020-10-29 05:48:01 -05:00
Bai
a98816462f
perf(applications): 添加DB序列类字段翻译
2020-10-29 05:48:01 -05:00
Bai
abe32e6c79
perf(perms): 添加应用/应用授权API的type_display/category_display字段
2020-10-29 05:48:01 -05:00
Bai
77c8ca5863
perf(perms): 应用授权表添加字段,type和category
2020-10-29 05:48:01 -05:00
Bai
8fa15b3378
perf(assets/terminal): 资产系统用户和Session会话添加协议选项: mysql/oracle/postgresql
2020-10-29 05:48:01 -05:00
Bai
a3507975fb
perf(application): 修改获取远程应用连接参数的API(2)
2020-10-29 05:48:01 -05:00
Bai
76ca6d587d
perf(application): 修改获取远程应用连接参数的API
2020-10-29 05:48:01 -05:00
Bai
038582a8c1
feat(applications): 修改应用/应用授权的迁移文件,解决多种应用/应用授权name字段重复的问题
2020-10-29 05:48:01 -05:00
Bai
ca2fc3cb5e
feat(applications): 修改ApplicationAPI方法获取序列类的逻辑
2020-10-29 05:48:01 -05:00
Bai
cc30b766f8
feat(applications): 修改ApplicationAPI方法method判断->action
2020-10-29 05:48:01 -05:00
Michael Bai
b7bd88b8a0
feat(applications): 修改ApplicationAPI方法options
2020-10-29 05:48:01 -05:00
Bai
5518e1e00f
perf(application): 优化Application获取序列类attrs字段适配
2020-10-29 05:48:01 -05:00
Bai
0632e88f5d
feat(application): 修改Application Model的domain字段选项2
2020-10-29 05:48:01 -05:00
Bai
9dc2255894
feat(application): 修改Application Model的domain字段选项
2020-10-29 05:48:01 -05:00
Bai
1baf35004d
refactor(perms): 添加应用授权规则迁移文件;迁移旧的应用授权(db/remoteapp/k8sapp)到新的应用授权
2020-10-29 05:48:01 -05:00
Bai
5acff310f7
perf(application): 修改迁移文件,迁移应用包含id字段
2020-10-29 05:48:01 -05:00
Bai
fdded8b90f
refactor(perms): 修改授权规则的目录结构(asset、application)
2020-10-29 05:48:01 -05:00
Bai
1d550cbe64
feat(perms): 添加ApplicationPermission API(包含用户/用户组/授权/校验等API)
2020-10-29 05:48:01 -05:00
Bai
4847b7a680
feat(perms): 添加ApplicationPermission Model 和 API(包含ViewSet和RelationViewSet)
2020-10-29 05:48:01 -05:00
Bai
1c551b4fe8
feat(application): 迁移old_application到new_application
2020-10-29 05:48:01 -05:00
Bai
6ffba739f2
perf(requirements): 添加依赖django-mysql==3.9.0
2020-10-29 05:48:01 -05:00
ibuler
0282346945
perf: 修改创建
2020-10-29 05:48:01 -05:00
ibuler
f6d9af8beb
perf(application): 优化type优先级
2020-10-29 05:48:01 -05:00
ibuler
ba4e6e9a9f
refacter: 重构application
2020-10-29 05:48:01 -05:00
ibuler
874a3eeebf
perf(sessions): 优化命令
2020-10-29 18:27:36 +08:00
ibuler
dd793a4eca
perf: 优化日志保存策略
2020-10-29 18:27:36 +08:00
xinwen
f7e6c14bc5
fix(assets): 向资产推送系统用户bug
2020-10-28 21:40:40 -05:00
xinwen
f6031d6f5d
fix(logger): 把 drf 异常放到单独的日志文件中
2020-10-28 21:26:35 -05:00
xinwen
5e779e6542
fix(systemuser): 系统用户添加 ad_domain 字段
2020-10-28 21:23:29 -05:00
xinwen
7031b7f28b
fix(auth): 修复用户登录失败次数出现0次
2020-10-28 06:06:57 -05:00
xinwen
e2f540a1f4
fix(assets): 网关的密码不能包含特殊字符
2020-10-28 06:05:53 -05:00
ibuler
108a1da212
chore: 修改github 语言识别
2020-10-26 20:51:09 -05:00
xinwen
b4a8cb768b
fix(assets): 系统用户与用户组发生变化时报错
2020-10-26 05:31:30 -05:00
xinwen
6b2f606430
fix(tickets): 工单申请资产授权通过人显示不对
2020-10-26 02:03:12 -05:00
xinwen
70a8db895d
fix(migrations): 生成一下遗漏的 migrations
2020-10-23 17:00:37 +08:00
xinwen
0043dc6110
fix(assets): 资产列表添加默认 date_created 排序
2020-10-23 17:00:37 +08:00
xinwen
87d2798612
fix(assets): 资产列表不能用到assets_amount字段
2020-10-23 16:54:19 +08:00
ibuler
e2d8eee629
fix(i18n): 修改收藏夹的翻译
2020-10-23 16:52:06 +08:00
xinwen
8404db8cef
fix(assets): 修改 AssetViewSet.filter_fields
2020-10-23 02:25:04 -05:00
Bai
fd7f379b10
perf(requirements): 升级依赖django-timezone-field==4.0
2020-10-21 13:01:28 +08:00
ibuler
111c63ee6a
perf: 修改beat版本
2020-10-20 15:02:11 +08:00
ibuler
4eb5d51840
fix: domain端口可能随便填写的问题
2020-10-20 15:01:06 +08:00
ibuler
7f53a80855
fix: 修改textfield 不再限制长度
2020-10-20 15:00:22 +08:00
ibuler
90afabdcb2
fix(perms): 修复用户的资产不区分组织的问题
2020-10-20 14:56:23 +08:00
ibuler
de405be753
fix(perms): 修复asset permission导入的bug
2020-10-20 14:46:31 +08:00
Bai
f84b845385
perf(config): 升级依赖redis==3.5.3; 添加CACHES配置: health_check_interval=30; 解决因网络不稳定导致的redis连接失败异常
2020-10-19 04:45:34 -05:00
xinwen
b1ac3fa94f
fix(orgs): 更新用户时org_roles参数为None时不更新组织角色
2020-10-15 04:59:25 -05:00
Jiangjie.Bai
32fab08ed3
Merge pull request #4802 from jumpserver/dev
...
chore: merge dev to master
2020-10-15 14:08:36 +08:00
fit2bot
8943850ca9
perf(Dockerfile): 去掉多余的代码 ( #4801 )
...
* perf(Dockerfile): 优化构建docker,经常变动的包不使用镜像
Co-authored-by: ibuler <ibuler@qq.com >
2020-10-15 14:05:11 +08:00
ibuler
8fff57813a
perf(Dockerfile): 优化构建docker,经常变动的包不使用镜像
2020-10-15 00:59:58 -05:00
xinwen
9128210e87
Merge pull request #4798 from jumpserver/dev
...
Dev to master
2020-10-15 12:22:00 +08:00
xinwen
e3dd03f4c7
Dev ( #4791 )
...
* fix(xpack): 修复last login太长的问题 (#4786 )
Co-authored-by: ibuler <ibuler@qq.com >
* perf: 更新密码中也发送邮件 (#4789 )
Co-authored-by: ibuler <ibuler@qq.com >
* fix(terminal): 修复获取螺旋的异步api
* fix(terminal): 修复有的录像存储有问题的导致下载录像的bug
* fix(orgs): 修复组织添加用户bug
* perf(requirements): 修改jms-storage==0.0.34 (#4797 )
Co-authored-by: Bai <bugatti_it@163.com >
Co-authored-by: fit2bot <68588906+fit2bot@users.noreply.github.com >
Co-authored-by: ibuler <ibuler@qq.com >
Co-authored-by: Bai <bugatti_it@163.com >
2020-10-15 12:00:38 +08:00
fit2bot
aabb2aff1f
perf(requirements): 修改jms-storage==0.0.34 ( #4797 )
...
Co-authored-by: Bai <bugatti_it@163.com >
2020-10-15 11:51:45 +08:00
xinwen
f8bbca38e3
fix(orgs): 修复组织添加用户bug
2020-10-14 22:50:55 -05:00
ibuler
12b180ddea
fix(terminal): 修复有的录像存储有问题的导致下载录像的bug
2020-10-15 11:48:52 +08:00
ibuler
4917769964
fix(terminal): 修复获取螺旋的异步api
2020-10-15 11:48:52 +08:00
fit2bot
5868d56e18
perf: 更新密码中也发送邮件 ( #4789 )
...
Co-authored-by: ibuler <ibuler@qq.com >
2020-10-14 19:59:05 +08:00
fit2bot
bab76f3cda
fix(xpack): 修复last login太长的问题 ( #4786 )
...
Co-authored-by: ibuler <ibuler@qq.com >
2020-10-14 19:58:44 +08:00
xinwen
475c0e4187
Merge pull request #4784 from jumpserver/dev
...
Dev
2020-10-14 15:59:21 +08:00
老广
3d070231f4
Merge pull request #4783 from jumpserver/pr@dev@chore_merge
...
chore: merge with master
2020-10-14 02:55:28 -05:00
ibuler
c5b0cafabd
chore: merge with master
2020-10-14 15:53:06 +08:00
ibuler
a69bba8702
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2020-10-14 15:48:32 +08:00
xinwen
cfd0098019
fix(perms): 修复一次性获取所有资产与节点sql泛滥问题
2020-10-14 02:43:22 -05:00
ibuler
52f1dcf662
fix(users): 修复邀请用户的bug
2020-10-14 15:31:24 +08:00
xinwen
373c6c77e0
fix(perms): 未激活资产不能使用
2020-10-13 19:34:19 +08:00
xinwen
f3d052554d
fix(perms): 修复失效资产授权action 还在的问题
2020-10-13 19:34:19 +08:00
xinwen
a57ce482dd
fix(assets): 资产树批量删除资产数量不对
2020-10-13 19:34:19 +08:00
xinwen
a449d97f67
fix(orgs): 组织添加成员bug
2020-10-13 19:34:19 +08:00
ibuler
84e4238848
fix(ops): 修复任务schedule属性的bug
2020-10-13 19:34:19 +08:00
clannon
82dd1c35ea
Update config_example.yml
...
SECRET_KEY 和 BOOTSTRAP_TOKEN 后面默认留个空格,遇到好几个新手对yaml格式不注意了,虽然是个小问题……
2020-10-13 19:34:19 +08:00
ibuler
5ac974a44c
fix(deps): 修复依赖版本
2020-10-13 19:34:19 +08:00
fit2bot
c4caeb92ee
perf: 优化生成假数据 ( #4759 )
...
* perf: 优化生成假数据
2020-10-13 19:34:19 +08:00
ibuler
f4799d90c0
fix(assets): 修复点击节点更新硬件信息的bug
2020-10-13 19:34:19 +08:00
ibuler
f97685c788
perf(orgs): 优化组织用户添加
2020-10-13 19:34:19 +08:00
ibuler
0439376326
feat(users): 添加用户suggetion api
2020-10-13 19:34:19 +08:00
xinwen
dd2413edd8
fix(perms): 授权树与资产列表的一些 bug
2020-10-13 19:34:19 +08:00
xinwen
459c5c07c9
fix(perms): 未激活资产不能使用
2020-10-13 06:30:18 -05:00
xinwen
ef86a49c1e
fix(perms): 修复失效资产授权action 还在的问题
2020-10-13 06:20:43 -05:00
xinwen
0ad389515b
fix(assets): 资产树批量删除资产数量不对
2020-10-13 05:47:54 -05:00
xinwen
2432b9a553
fix(orgs): 组织添加成员bug
2020-10-13 03:38:25 -05:00
ibuler
12216a718a
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2020-10-13 10:52:18 +08:00
ibuler
2190db1bb5
fix(ops): 修复任务schedule属性的bug
2020-10-12 21:51:31 -05:00
ibuler
5d36537404
fix(ops): 修复任务schedule属性的bug
2020-10-12 19:08:13 +08:00
clannon
5a87634c26
Update config_example.yml
...
SECRET_KEY 和 BOOTSTRAP_TOKEN 后面默认留个空格,遇到好几个新手对yaml格式不注意了,虽然是个小问题……
2020-10-12 05:23:49 -05:00
老广
e5eb84999a
Merge pull request #4768 from jumpserver/pr@dev@chore_merge_with_master
...
Merge branch 'master' into dev
2020-10-12 05:22:25 -05:00
ibuler
426a86b52d
Merge branch 'master' into dev
2020-10-12 18:19:58 +08:00
ibuler
f84acfe282
fix(deps): 修复依赖版本
2020-10-12 05:13:52 -05:00
fit2bot
c73b49fe30
perf: 优化生成假数据 ( #4759 )
...
* perf: 优化生成假数据
2020-10-12 12:44:30 +08:00
ibuler
98238f71ae
fix(assets): 修复点击节点更新硬件信息的bug
2020-10-11 22:31:08 -05:00
ibuler
66e45f1c80
perf(orgs): 优化组织用户添加
2020-10-12 11:25:43 +08:00
ibuler
93a400f6e6
feat(users): 添加用户suggetion api
2020-10-12 11:18:11 +08:00
xinwen
535d7d8373
fix(perms): 授权树与资产列表的一些 bug
2020-10-11 21:43:44 -05:00
Bai
db268280b4
perf(requirements): 修改依赖包Pillow==7.1.0
2020-10-08 22:06:43 -05:00
Bai
873789bdab
perf(requirements): 修改依赖包Pillow==7.1.0
2020-10-08 22:04:23 -05:00
Jiangjie.Bai
6584890ab1
Merge pull request #4754 from jumpserver/dev
...
Dev
2020-10-09 10:37:47 +08:00
fit2bot
96d5c519ec
perf(i18n): 添加翻译信息 ( #4748 )
...
* perf(i18n): 添加翻译信息
* perf(users): 重置密码成功邮件添加DEBUG信息
* perf(i18n): 修改翻译信息
* perf(i18n): 修改翻译信息
Co-authored-by: Bai <bugatti_it@163.com >
2020-09-30 16:11:03 +08:00
Bai
6e91217303
perf(authentication): 修改用户登录页面,使用其他方式认证时点击忘记密码提示联系管理员
2020-09-30 02:05:14 -05:00
xinwen
5dd1dfc59e
fix(orgs): 用户修改组织角色报错
2020-09-30 11:40:52 +08:00
Bai
a53e930950
perf(tickets): 申请资产工单支持授权多个系统用户
2020-09-29 19:11:20 +08:00
xinwen
8f52f79d91
fix(migrations): 增加迁移脚本
2020-09-29 17:48:19 +08:00
xinwen
3af0e68c84
fix(perms): 用户授权树bug
2020-09-29 17:25:00 +08:00
Bai
3ccf32ed48
feat(authentication): 用户重置密码成功后,发送用户重置密码成功邮件
2020-09-29 16:28:14 +08:00
xinwen
d52ed2ffb9
fix(xpack): GatheredUser 点击资产树报错
2020-09-29 16:26:02 +08:00
ibuler
38588151d1
继续修改issue template
2020-09-29 14:28:27 +08:00
ibuler
2a95aca28f
chore: 修改issue模板
2020-09-29 14:18:14 +08:00
Bai
1915224063
fix(terminal): 修复正在使用的命令/录像存储可以被删除的问题
2020-09-29 13:37:48 +08:00
fit2bot
da4f9efb42
fix(perms): 修改检查资产授权过期策略 ( #4722 )
...
* fix(perms): 修改检查资产授权过期策略
* perf: 优化一行代码
Co-authored-by: xinwen <coderWen@126.com >
Co-authored-by: ibuler <ibuler@qq.com >
2020-09-29 13:34:55 +08:00
fit2bot
579c2c1d7a
feat(celery): 保证同时只有一个beat在运行 ( #4723 )
...
* feat(celery): 保证同时只有一个beat在运行
* fix: 修复代码拼写错误
* fix: 修复拼写
* fix: remove import
Co-authored-by: ibuler <ibuler@qq.com >
2020-09-29 13:33:53 +08:00
xinwen
2a86c3a376
fix(perms): 完善检查资产授权过期的celery task
2020-09-29 11:44:20 +08:00
Bai
5558e854de
perf(permms): 应用授权树返回授权应用的总数量
2020-09-29 11:43:31 +08:00
xinwen
31b6c3b679
feat(celery): 设置 node_tree celery work 为 2
2020-09-28 18:49:40 +08:00
fit2bot
2209a2c8d2
feat(orgs): 修改OrgMemberRelationAPI,支持通过查询参数控制是否忽略已存在的数据 ( #4720 )
...
* feat(orgs): 修改OrgMemberRelationAPI,支持通过查询参数控制是否忽略已存在的数据
* feat(orgs): 修改构建数据库查询参数的问题
Co-authored-by: Bai <bugatti_it@163.com >
2020-09-28 18:49:18 +08:00
xinwen
f596b65ed7
feat(auth): sso 生成的地址重复访问的时候,重定向到用户指定的 next 地址
2020-09-28 16:20:32 +08:00
fit2bot
2c9c64a13f
fix(jms): 启动脚本 task 添加 celery_node_tree, check_asset_perm_expired 两个 worker ( #4716 )
...
* fix(jms): 启动脚本 task 添加 celery_node_tree, check_asset_perm_expired 两个 worker
* fix: 修改脚本
Co-authored-by: xinwen <coderWen@126.com >
Co-authored-by: ibuler <ibuler@qq.com >
2020-09-28 16:19:49 +08:00
xinwen
1d49b3deca
fix(perms): 用户搜索全部授权资产报错
2020-09-28 13:17:45 +08:00
xinwen
6701a1b604
fix(perms): 用户添加到用户组报错
2020-09-27 20:53:34 +08:00
ibuler
b8ff3b38bf
fix: 修复middleware引起的bug
2020-09-27 17:58:41 +08:00
fit2bot
d3be16ffe8
fix ( #4680 )
...
* perf(perms): 资产授权列表关联数据改为 `prefetch_related`
* perf(perms): 优化一波
* dispatch_mapping_node_tasks.delay
* perf: 在做一些优化
* perf: 再优化一波
* perf(perms): 授权更改节点慢的问题
* fix: 修改一处bug
* perf(perms): ungrouped 资产数量计算方式
* fix: 修复dispatch data中的bug
* fix(assets): add_nodes_assets_to_system_users celery task
* fix: 修复ungrouped的bug
* feat(nodes): 添加 favorite 节点
* feat(node): 添加 favorite api
* fix: 修复clean keys的bug
Co-authored-by: xinwen <coderWen@126.com >
Co-authored-by: ibuler <ibuler@qq.com >
2020-09-27 16:02:44 +08:00
老广
e3648d11b1
feat: 录像存储server类型,可以设置如何存储了 ( #4699 )
...
feat: Server 类型的录像存储可以上传到 oss等上面
2020-09-27 14:34:47 +08:00
fit2bot
d4037998c8
perf: 优化middleware的使用 ( #4707 )
...
perf: 优化middleware的使用
2020-09-27 14:34:05 +08:00
fit2bot
82de636b5c
perf(common): 检查referer ( #4697 )
...
Co-authored-by: ibuler <ibuler@qq.com >
2020-09-27 11:48:21 +08:00
Bai
91f1280f97
perf(settings): public setting API返回LOGIN_TITLE字段
2020-09-27 11:37:38 +08:00
fit2bot
7c82f5aa2b
chore: 修改issue template ( #4703 )
...
* chore: 修改issue template
* perf: 又修改了些
Co-authored-by: ibuler <ibuler@qq.com >
2020-09-25 16:09:56 +08:00
老广
6a801eaf33
Update issue templates
2020-09-25 15:47:43 +08:00
xinwen
28da819735
perf(assets): 优化节点树
...
修改树策略,做读优化,写的速度降低
2020-09-21 10:23:09 +08:00
Jiangjie.Bai
cdf3cf3e8f
Merge pull request #4667 from jumpserver/dev
...
fix(command): 修复命令导出选中项问题
2020-09-16 19:55:18 +08:00
Bai
118564577e
fix(command): 修复命令导出选中项问题
2020-09-16 19:53:58 +08:00
Jiangjie.Bai
47f2df0a5b
Merge pull request #4665 from jumpserver/dev
...
fix(command): 修复命令导出选中项问题
2020-09-16 19:38:16 +08:00
Bai
e4aafc236d
fix(command): 修复命令导出选中项问题
2020-09-16 19:36:21 +08:00
Jiangjie.Bai
b1c530bba8
Merge pull request #4661 from jumpserver/dev
...
Dev
2020-09-16 19:03:38 +08:00
Bai
95aa9781c3
fix(command): 修复命令导出选中项会导出全部的问题
2020-09-16 19:02:49 +08:00
xinwen
9f6540afe3
fix(tickets): 调整登录确认工单 title
2020-09-16 18:03:15 +08:00
ibuler
832bb832ce
fix(authentication): 修复cas退出的bug
2020-09-16 17:53:01 +08:00
ibuler
501329a8db
fix: 再次修复
2020-09-16 17:51:45 +08:00
ibuler
8913aacd1e
fix(authentication): 修复同时开启radius, openid引起的问题
2020-09-16 17:51:45 +08:00
xinwen
e461fbdf50
fix(tickets): 修复已处理工单的 待处理人 字段
2020-09-16 17:47:26 +08:00
peijianbo
3941539408
fix(authentication):修复开启二次认证时,地址跳转出错问题
2020-09-16 16:46:28 +08:00
xinwen
605db2d905
fix(auth): 调整登录复核工单 title
2020-09-16 15:31:20 +08:00
Jiangjie.Bai
1ef3f24465
Merge pull request #4648 from jumpserver/dev
...
chore: merge dev to master
2020-09-15 17:23:48 +08:00
peijianbo
4090a0b123
feat(uathentication):登录表单回车可直接提交表单
2020-09-15 17:10:52 +08:00
ibuler
a55e28fc87
perf: 优化ldap超时时间
2020-09-15 15:26:18 +08:00
ibuler
82cf53181f
perf(settings): 修改默认超时时间为10s
2020-09-15 15:26:18 +08:00
ibuler
78232aa900
perf(terminal): 优化命令提交
2020-09-14 19:25:50 +08:00
ibuler
d2c93aff66
feat: 可以关闭工单菜单
2020-09-14 18:25:47 +08:00
peijianbo
516e2309c0
bug(authentication): 登录表单仅提交时加密(xpack)
2020-09-14 17:28:49 +08:00
peijianbo
4688e46f97
feat(authentication):将cas认证通过的登录日志记录到系统
2020-09-14 12:46:12 +08:00
peijianbo
1299f3da75
feat(authentication):登录表单仅提交时加密
2020-09-14 12:45:44 +08:00
Bai
fe502cbe41
fix(assets): 修复系统用户导入模版没有密码字段的问题
2020-09-14 12:43:39 +08:00
xinwen
09bfac34f1
fix(orgs): 修复 org-memeber-relation POST 报错
2020-09-14 11:00:10 +08:00
Jiangjie.Bai
12a86d7244
Merge pull request #4611 from jumpserver/dev
...
Dev
2020-09-08 20:08:53 +08:00
Jiangjie.Bai
269eea8802
Merge branch 'master' into dev
2020-09-08 19:32:38 +08:00
老广
72aa265dd7
doc: 修改readme,添加子项目连接 ( #4602 )
...
* Update README.md
* Update README.md
* Update README.md
* Update README.md
* Update README.md
* Update README.md
2020-09-08 14:31:54 +08:00
老广
e26716e1e1
Update README.md
...
docs: 添加 developer wanted
2020-09-08 14:30:31 +08:00
Bai
80b9db417c
feat(ldap): 获取ldap用户列表,采用线程方式
2020-09-08 11:57:45 +08:00
Bai
d944b5f4ff
feat(tickets): 工单添加comment字段
2020-09-07 20:00:09 +08:00
peijianbo
1b84afee0c
feat(audits):修改日志默认保存时间(90->9999)
2020-09-07 18:35:19 +08:00
fit2bot
172b6edd28
feat(user):同一个账号仅允许在一台终端设备登录 ( #4590 )
...
* feat(user):同一个账号仅允许在一台终端设备登录
* feat(user):同一个账号仅允许在一台终端设备登录
* feat(user):同一个账号仅允许在一台终端设备登录
* feat(user):同一个账号仅允许在一台终端设备登录
* feat(user):同一个账号仅允许在一台终端设备登录
Co-authored-by: peijianbo <peijainbo3006@163.com >
2020-09-07 17:42:59 +08:00
Bai
e6f248bfa0
feat(i18n): 添加云同步实例任务hostname_strategy字段翻译信息
2020-09-07 17:39:35 +08:00
ibuler
1f037b1933
feat(i18n): 添加新翻译
2020-09-02 15:21:48 +08:00
Bai
ae9bbd2683
fix(common) 修复管理员未设置Email主题前缀导致发送邮件失败的问题
2020-09-02 10:23:44 +08:00
xinwen
a0085c4eab
feat(README): 添加企业版试用链接
2020-09-01 16:50:43 +08:00
ibuler
ddb71c43c4
fix(users): 修复用户在不同组织引起的问题
2020-09-01 16:47:13 +08:00
herealways
8227f44058
feat: 添加AES GCM模式为默认的加密方式
2020-09-01 14:48:40 +08:00
ibuler
e81762d692
ci(Dockerfile): 修改依赖的setuptools版本,导致的ldap无法安装问题
2020-09-01 13:39:08 +08:00
老广
5b8fa1809c
Update README.md
...
docs: 添加 developer wanted
2020-08-24 10:04:03 +08:00
BaiJiangJie
90ba6442dd
Merge pull request #4523 from jumpserver/dev
...
fix(orgs): 完善组织与用户变化时的信号
2020-08-20 16:40:07 +08:00
xinwen
a28334b6d8
fix(orgs): 完善组织与用户变化时的信号
2020-08-20 16:34:10 +08:00
BaiJiangJie
692dd6c8c4
Merge pull request #4519 from jumpserver/dev
...
Dev
2020-08-20 12:48:19 +08:00
xinwen
15992ad5b3
fix(tickets): 修复工单comment
2020-08-20 10:51:24 +08:00
Bai
072c3155ca
style(orgs): 修改组织删除失败翻译信息
2020-08-19 21:56:03 +08:00
fit2bot
9cb5985947
fix(orgs): 创建组织用户不必填 ( #4515 )
...
* fix(role): 更改role的顺序
* fix(tickets): 修复工单邮件跳转地址
* fix(tickets): 修复工单复制链接地址不对
* fix(orgs): 创建组织用户不必填
Co-authored-by: xinwen <coderWen@126.com >
2020-08-19 21:44:20 +08:00
ibuler
0fd2f18240
fix(authentication): 修复登录时有时解密失败
2020-08-19 21:42:07 +08:00
xinwen
9ca8ab218c
fix(authentication): 登录复核Not found
2020-08-19 07:42:05 -05:00
xinwen
fcd8356e90
fix(users): 组织管理员,移除组织成员报错500 #231
2020-08-19 07:42:05 -05:00
xinwen
64d093e677
fix(users): 用户接口添加org_roles字段
2020-08-19 07:42:05 -05:00
xinwen
11493b9f3d
fix(tickets): 修复申请资产工单不能关闭
2020-08-19 07:42:05 -05:00
xinwen
5a9c91d9dd
fix(authentication): 组织成员禁用再激活,登录报错 #239
2020-08-19 07:42:05 -05:00
xinwen
25dcb9510c
fix(audits): 修复超级审计员登录-日志审计-批量命令-单击主机列链接报错误信息 403
2020-08-19 07:42:05 -05:00
Bai
a38a1868ca
style(ticket): 修改工单状态翻译: Open:待处理;Closed:已完成 2
2020-08-19 07:21:31 -05:00
Bai
bec9b97092
style(ticket): 修改工单状态翻译: Open:待处理;Closed:已完成
2020-08-19 07:21:31 -05:00
ibuler
d5b9596e7d
perf(config): 修改默认登录日志保存时间
2020-08-18 05:17:40 -05:00
xinwen
af85d551ad
fix(users): 修改用户角色显示名称
2020-08-14 17:13:01 +08:00
BaiJiangJie
ab8c57894e
Merge pull request #4488 from jumpserver/dev
...
Dev
2020-08-14 11:45:42 +08:00
xinwen
0e0c9275bd
fix(application): 远程应用MySQL Workbench添加port字段
2020-08-13 16:50:54 +08:00
xinwen
21b4a8600c
fix(terminal): Session can_join 添加 k8s
2020-08-13 14:14:20 +08:00
xinwen
4cf5573c36
fix(users): 修复用户与用户组关系变化时没触发信号
2020-08-12 18:28:18 +08:00
xinwen
962ea67b84
refactor(authentication): 密码解密抽取成方法
2020-08-12 18:27:41 +08:00
xinwen
31720c9dcc
feat(assets): 系统用户添加 home system_groups 字段
2020-08-12 15:05:46 +08:00
xinwen
54fe4835f6
fix(authentication): SSO登录添加 next_url
2020-08-11 19:36:34 +08:00
xinwen
91649a3908
feat(applications): 添加 k8s 应用
2020-08-11 12:56:54 +08:00
xinwen
0a242c3e81
fix(audis): 生成操作日志时间字段索引迁移脚本
2020-08-11 11:27:19 +08:00
huamaolin
25d1b3334f
fix(OperateLog): 修复操作日志按时间查询慢
...
增加表OperateLog datetime字段索引
2020-08-10 19:28:26 -07:00
xinwen
ffde306a04
fix(assets): 修复批量删除资产失败问题
2020-08-11 10:15:14 +08:00
xinwen
f1e29a91f7
fix(users): 用户接口添加汇总角色字段
2020-08-07 18:53:03 +08:00
xinwen
ec2b3b4cda
fix(user): 调整User接口字段
2020-08-07 13:57:22 +08:00
xinwen
1a9d9e4145
feat(ticket): 申请资产工单添加actions字段
2020-08-06 15:21:54 +08:00
xinwen
a14f121fad
fix(orgs): 组织成员关系接口添加role_display字段
2020-08-05 19:24:28 +08:00
xinwen
a25da8d479
feat(authentication): 超级管理员密码不能是admin
2020-08-05 17:23:58 +08:00
fit2bot
15fe7f810b
perf(url): 优化 /api/docs/? 都可以访问文档 ( #4446 )
...
Co-authored-by: ibuler <ibuler@qq.com >
2020-08-05 14:09:23 +08:00
xinwen
f6a4253936
feat(ticket): 工单关闭生成 Comment
2020-08-05 11:13:23 +08:00
xinwen
c3c5801d2e
refactor(orgs): 重构组织与用户关系接口
2020-08-04 11:33:15 +08:00
Orange
f0d564180c
perf: 优化Issues Template
2020-08-04 10:39:13 +08:00
ibuler
8ee7230ead
fix(auth): 修复radius decode error的问题
2020-08-03 10:31:44 +08:00
xinwen
90f03dda62
feat(authentication): 类似腾讯企业邮单点登录功能
2020-07-31 19:37:51 +08:00
ibuler
4e7a5d8d4f
ci: 修改docker构建的问题
2020-07-29 19:50:41 +08:00
xinwen
2ed0927b18
fix(login): 用户登录堡垒机的时候偶尔会出现“密码解密失败”,导致无法正常登录。 #4408
2020-07-29 17:54:59 +08:00
xinwen
e98235ca27
refactor(serializer): 设置 BulkSerializerMixin 的默认 ListSerializer 为 AdaptedBulkListSerializer
2020-07-29 17:09:48 +08:00
xinwen
1b052a8729
feat(terminal): 终端管理添加批量更新接口
2020-07-29 15:14:50 +08:00
xinwen
34b188bbe7
fix(csv): 修复JMSCSVParser调用serializer导致循环调用问题
2020-07-29 10:45:41 +08:00
ibuler
3e6cd1c1d3
ci(dockerfile): 修改dockerfile构建
2020-07-28 19:29:15 +08:00
xinwen
f8e248f0af
feat(ticket): 调整申请资产工单
2020-07-28 19:19:37 +08:00
xinwen
b331730422
fix(users): 替换旧有角色常量
2020-07-28 18:24:53 +08:00
xinwen
de3865fa1d
refactor(orgs): 重构组织表结构
2020-07-28 10:16:26 +08:00
xinwen
1bc913ab13
feat(perms): 资产授权添加GUI复制粘贴动作
2020-07-27 15:24:09 +08:00
OrangeM21
2f11a70341
fix(authentication): 调整登录页面样式
2020-07-24 18:39:17 +08:00
xinwen
c277aec561
feat(authenticaion): 添加登录页面验证码与MFA开关
2020-07-24 17:40:41 +08:00
ibuler
2a53a20808
perf(assets): 修改 系统用户 管理用户 等的用户名长度到128
2020-07-24 11:40:36 +08:00
Bai
674ad40f67
fix(perms): 修复perms api UserPermissionMixin 中 kwargs 参数传递(未发现引出其他问题)
2020-07-23 11:09:01 +08:00
github-actions
78089e01a3
fix(cas): 修复cas校验不同的问题
2020-07-22 17:20:39 +08:00
ibuler
1b71350199
fix(es): 修复es7数据结构引起的命令无法查询的问题
...
- 更新了 jms-storage版本依赖
2020-07-22 17:14:23 +08:00
老广
5d08438dad
feat(ops): 项目启动时,清除指定的celery定时任务;添加获取celery定时任务的函数 ( #4378 )
...
* feat(ops): 添加获取celery定时任务的函数
* feat(ops): 项目启动时,清除指定的celery定时任务
* feat(ops): 项目启动时,清除指定的celery定时任务 2
Co-authored-by: Bai <bugatti_it@163.com >
2020-07-21 15:33:33 +08:00
github-actions
31ba0564e4
ci(github): 添加通用action
2020-07-21 14:57:52 +08:00
github-actions
ea5b7cd921
ci(github): 添加通用action
2020-07-21 14:32:35 +08:00
Bai
3e541162e3
fix(authentication): 修复用户认证Radius认证中参数传递错误问题 *kwargs -> **kwargs
2020-07-21 10:30:19 +08:00
BaiJiangJie
6e19384231
chore(readme): 更新README ( #4359 )
...
* Update README.md
* Update README.md
2020-07-17 16:31:54 +08:00
老广
19903c80c3
Merge pull request #4345 from jumpserver/dev
...
fix(radius): 修复radius认证失败问题 (#4342 )
2020-07-16 18:20:15 +08:00
BaiJiangJie
070af8c491
fix(radius): 修复radius认证失败问题 ( #4342 ) ( #4343 )
...
* fix(radius): 修复radius认证失败问题,添加get_django_user方法参数(django-radius==1.4.0 中添加了额外参数)
* fix(radius): 修复radius认证失败问题,重写authenticate方法(django-radius 不接受public_key参数)
2020-07-16 18:08:44 +08:00
BaiJiangJie
0fca33d874
fix(radius): 修复radius认证失败问题 ( #4342 )
...
* fix(radius): 修复radius认证失败问题,添加get_django_user方法参数(django-radius==1.4.0 中添加了额外参数)
* fix(radius): 修复radius认证失败问题,重写authenticate方法(django-radius 不接受public_key参数)
2020-07-16 17:07:40 +08:00
BaiJiangJie
08fdc57543
Merge pull request #4338 from jumpserver/dev
...
merge(master): Merge from dev to master
2020-07-16 10:50:26 +08:00
Bai
bb60d2a1d9
fix(users): 组织管理员创建用户时,角色只能选择: 用户
2020-07-15 20:14:14 +08:00
xinwen
0014bd0cb9
fix(audits): 操作日志中的动作搜索条件,删除文件字段改成删除 ( #4334 )
2020-07-15 20:13:21 +08:00
xinwen
9488c8bd97
fix(cmd_filter): 命令过滤器唯一应该为 name + org_id ( #4325 )
2020-07-15 20:04:46 +08:00
Bai
1f30d459ae
fix(command): 修复命令记录没有根据sesion进行过滤的问题
2020-07-15 17:30:55 +08:00
Bai
4e933fc1ca
feat(session + db): 会话搜索添加登录来源选项
2020-07-15 17:25:43 +08:00
Bai
c0f3a1f64a
fix(all): 修复创建资源时,created_by字段长度限制导致创建失败的问题
2020-07-15 16:27:40 +08:00
Bai
0f70f5eccf
fix(orgs): 删除组织失败时返回对应错误信息
2020-07-15 16:25:34 +08:00
Bai
eef942c155
fix(gather_asset_users): 修复收集资产用户日志中用户名显示不完整的问题
2020-07-15 16:16:11 +08:00
xinwen
061592fa6b
fix(terminal): 移除CommandQueryMixin.get_filter_fields
2020-07-14 19:35:18 +08:00
Bai
c7a02586c1
chore(jms): 修改celery队列数量: 2 -> 4
2020-07-14 19:34:17 +08:00
Bai
ddcd4ebbfc
fix(asset_user): 修改创建AuthBook对象锁机制,使用select_for_update替换redis_lock3
2020-07-14 19:06:06 +08:00
Bai
9550ea62fb
fix(asset_user): 修改创建AuthBook对象锁机制,使用select_for_update替换redis_lock2
2020-07-14 19:06:06 +08:00
Bai
abcb589658
fix(asset_user): 修改创建AuthBook对象锁机制,使用select_for_update替换redis_lock
2020-07-14 19:06:06 +08:00
Bai
1bb366ad94
fix(authbook): 修改创建AuthBook对象锁机制,解决并发操作堵塞问题
2020-07-14 19:06:06 +08:00
xinwen
a5df7738f6
fix(audits): 日志审计模块 Serializer 添加 org_id 字段
2020-07-14 18:05:21 +08:00
xinwen
da858c8998
fix(tickets): 隐藏申请资产工单URL ( #4307 )
2020-07-13 17:49:00 +08:00
BaiJiangJie
724a8f6324
fix(assets): 修复用户name字段长度与资产created_by字段长度不一致导致创建资产失败的问题 ( #4302 )
...
* fix(assets): 修复用户name字段长度与资产created_by字段长度不一致导致创建资产失败的问题
* fix(assets): 修复用户name字段长度与资产created_by字段长度不一致导致创建资产失败的问题(修改迁移文件名称 0050_auto_20200702_1602.py -> 0051_auto_20200713_1143.py)
2020-07-13 12:00:44 +08:00
ibuler
437df9a533
fix(assets): node asset 关系发生变化是,关联系统用户引起的问题
2020-07-10 17:31:51 +08:00
ibuler
f2c70d0bba
ci(fix): 修改构建脚本
2020-07-09 17:44:54 +08:00
ibuler
ea913a5b6e
ci(build): 修改构建逻辑
2020-07-09 17:44:54 +08:00
ibuler
c0cd8878dc
ci(fix): 修改构建脚本
2020-07-09 17:41:27 +08:00
ibuler
15e995ade6
ci(build): 修改构建逻辑
2020-07-09 17:41:27 +08:00
BaiJiangJie
cadf42f3fa
Merge pull request #4280 from jumpserver/dev
...
merge: Merge to master from branch dev
2020-07-09 15:02:47 +08:00
BaiJiangJie
f588093cd3
Merge pull request #4282 from jumpserver/dev_master
...
merge: Merge to master from branch dev
2020-07-09 14:51:03 +08:00
Bai
7c12f8f462
merge: Merge to dev from branch master
2020-07-09 14:27:08 +08:00
xinwen
6f5a92c21f
[Update] assets/gathered_user 添加过滤字段
2020-07-09 14:08:46 +08:00
xinwen
17a76994dc
[Update] 系统用户添加过滤字段
2020-07-09 14:08:46 +08:00
jym503558564
39d793bc47
fix:修改 ftp 日志按开始日期排序
2020-07-09 14:08:46 +08:00
xinwen
c3eafbee8c
[Fix] X-Pack/云管中心 i18n
2020-07-09 14:08:46 +08:00
ibuler
10f99be100
添加example api
2020-07-09 14:08:46 +08:00
xinwen
8eb6cfa9c9
fix(ticket): 修改工单获取系统用户的字段 ( #4274 )
...
fix(ticket): 申请资产工单修改bug
2020-07-09 14:06:06 +08:00
xinwen
f430c9e435
Merge pull request #4270 from jumpserver/request-asset-ticket-dev
...
feat(ticket): 添加申请资产工单
2020-07-08 15:42:04 +08:00
BaiJiangJie
10c428a432
Merge pull request #4269 from jumpserver/dev_user_group
...
fix(user_group): 用户组中添加用户,取消审计员的限制
2020-07-08 15:23:45 +08:00
Bai
a30c603bdc
fix(user_group): 用户组中添加用户,取消审计员的限制
2020-07-08 15:17:07 +08:00
xinwen
39a75074af
[Feature] 添加申请资产工单
2020-07-08 15:09:44 +08:00
BaiJiangJie
452ed2baf1
Merge pull request #4268 from jumpserver/dev_adminuser
...
fix(assets): 修复测试管理用户/系统用户资产可连接性问题
2020-07-08 14:47:09 +08:00
Bai
8c7240193a
fix(system_user): 修复系统用户测试可连接性失败问题(所有资产)(不应该执行校验系统用户是否可以推送的逻辑)
2020-07-08 11:30:37 +08:00
Bai
b622aca9af
fix(admin_user): 修复管理用户单独测试某台资产可连接性失败的情况(private_key_file)
2020-07-08 10:48:25 +08:00
ibuler
ce7edc1612
ci(release): 修改 release 使用的tag,而不是自动生成的
2020-07-08 10:36:43 +08:00
BaiJiangJie
ebf1a9d5e2
Merge pull request #4255 from jumpserver/dev_asset
...
feat(assets): 资产序列类修改字段名 _name 为 _display
2020-07-07 14:36:27 +08:00
ibuler
23ef185b7e
fix(build): 修改调用action jumpserver/action-build-upload-asset的参数
2020-07-07 14:30:34 +08:00
Bai
69f49f7776
feat(i18n): 修改翻译
2020-07-07 14:13:20 +08:00
ibuler
6b16aa6bc0
ci(build): 修改 构建脚本
...
- sed 在不同系统下表现不同
2020-07-07 13:52:50 +08:00
ibuler
43741dc9b2
ci(build): 修改 workflow
...
- 修改使用action jumpserver/action-build-upload-assets
2020-07-07 13:38:26 +08:00
ibuler
18174e2867
fix(build): 修稿构建
2020-07-07 13:28:59 +08:00
ibuler
3077d11483
ci(release&build): 添加 github workflows, 自动构建 release
...
- 添加 utils/build.sh 脚本,构建后放到 release 目录中
- 当 push tags时,自动创建 Release Draft
- 自动生成 Release Change Log
- 自动构建包,上传到 Release Assets
2020-07-07 13:03:48 +08:00
Bai
fcd684e2db
feat(assets): 资产序列类修改字段名 _name 为 _display
2020-07-07 11:09:43 +08:00
BaiJiangJie
afcb6bd77c
Merge pull request #4242 from jumpserver/dev_cloud
...
feat(node + domain + domain_migrate): NodeModel添加get_or_create_child()方法,修改网域唯一字段 org_id+name
2020-07-06 15:18:13 +08:00
Bai
1c264399bb
feat(domain + migrate): 修改网域唯一字段为:org_id + name
2020-07-02 18:51:16 +08:00
Bai
872e2546e9
feat(node): NodeModel添加方法get_or_create_child()
2020-07-02 18:49:17 +08:00
BaiJiangJie
8f347eee4d
Merge pull request #4216 from jumpserver/dev_org
...
feat(Cloud): 组织管理ViewSet添加搜索字段
2020-07-01 14:57:50 +08:00
BaiJiangJie
fa886b90c2
Merge pull request #4211 from jumpserver/dev_command_execute
...
feat(Command execute): 批量命令执行配置添加默认值True
2020-07-01 14:57:37 +08:00
Bai
caf312c5be
feat(Cloud): 组织管理ViewSet添加搜索字段
2020-07-01 14:38:03 +08:00
Bai
ac6168a06c
feat(Command execute): 批量命令执行配置添加默认值True
2020-07-01 11:19:57 +08:00
BaiJiangJie
eba9f2325a
Merge pull request #4204 from jumpserver/dev_login_password_encrypt
...
feat(Login password ecrypt): 登录密码加密传输
2020-06-30 18:57:51 +08:00
Bai
b46e772d09
feat(login password ecrypt): 登录密码加密传输 4
2020-06-30 18:35:01 +08:00
Bai
183df82a75
feat(login password ecrypt): 登录密码加密传输 3
2020-06-30 18:14:53 +08:00
Bai
98c91d0f18
feat(login password ecrypt): 登录密码加密传输(添加翻译)
2020-06-30 17:37:16 +08:00
Bai
e17d875206
feat(login password ecrypt): 登录密码加密传输2
2020-06-30 17:23:56 +08:00
Bai
4b1e84ed8a
Merge branch 'dev' into dev_login_password_encrypt
2020-06-30 17:13:08 +08:00
Bai
71ee33e3be
feat(login password ecrypt): 登录密码加密传输
2020-06-30 17:12:38 +08:00
xinwen
5dd24f5cf9
Merge pull request #4188 from jumpserver/limit-upload-csv
...
[Update] 限制上传CSV文件的大小
2020-06-28 19:13:53 +08:00
xinwen
2b6e818943
[Update] 限制上传CSV文件的大小
2020-06-28 19:02:20 +08:00
老广
8c4e9720d3
Merge pull request #4183 from jumpserver/fix_template
...
docs(github): 修改 github issue 模板
2020-06-28 15:22:41 +08:00
ibuler
d43709f584
docs(github): 修改 github issue 模板
...
更改版本号说明,1.4及之前不再提供支持
2020-06-28 15:17:15 +08:00
BaiJiangJie
89496baae5
Merge pull request #4148 from jumpserver/v2.0
...
V2.0
2020-06-28 10:47:56 +08:00
BaiJiangJie
ea6d995f55
Merge pull request #4147 from jumpserver/v2.0_bugfix_csv
...
[Update] 修改csv导出,最大限制条目数从100->10000条
2020-06-28 10:46:31 +08:00
Bai
cf6aba1f38
[Update] 修改csv导出,最大限制条目数从100->10000条
2020-06-28 10:43:47 +08:00
BaiJiangJie
fdcda83c93
Merge pull request #4142 from jumpserver/sftp-log-i18n
...
Sftp log i18n
2020-06-24 17:30:57 +08:00
xinwen
6e3369c944
[Update] sftp log页面操作翻译
2020-06-24 17:22:53 +08:00
BaiJiangJie
d7e432a851
Merge pull request #4139 from jumpserver/dev_session
...
[Update] UserProfileAPI 判断是否设置session过期时间,解决前端关闭浏览器session未失效的问题
2020-06-24 16:14:36 +08:00
Bai
c0a153d13a
[Update] UserProfileAPI 判断是否设置session过期时间,解决前端关闭浏览器session未失效的问题
2020-06-24 10:52:05 +08:00
老广
2acc1dc875
Merge pull request #4134 from jumpserver/fix-mfa-1.5
...
Fix mfa 1.5
2020-06-22 19:05:15 +08:00
xinwen
32ed43ba7b
Merge branch 'v2.0' into fix-mfa-1.5
2020-06-22 19:04:42 +08:00
xinwen
3e993fd044
[Update] 调整MFA绑定策略 V2
2020-06-22 19:02:14 +08:00
xinwen
005573b53b
[Fix] 重新绑定 MFA 的漏洞
2020-06-22 18:03:45 +08:00
老广
e04e31eb30
Merge pull request #4129 from jumpserver/readme
...
feat: readme 添加docker pull
2020-06-22 12:08:28 +08:00
ibuler
ff747f9e42
feat: readme 添加docker pull
2020-06-22 12:06:42 +08:00
BaiJiangJie
c4bd093fd7
Merge pull request #4126 from jumpserver/v2.0
...
V2.0
2020-06-20 19:26:12 +08:00
BaiJiangJie
408b2d6dbd
Merge pull request #4125 from jumpserver/v2.0_bugfix
...
v2.0 添加改密计划安全模式配置项
2020-06-20 19:24:17 +08:00
BaiJiangJie
ebc63b9410
Merge pull request #4123 from jumpserver/v1.5_bugfix
...
[Update] 添加改密计划安全模式配置项
2020-06-20 16:20:53 +08:00
Michael Bai
f1e5c7c2bb
添加改密计划安全模式配置项
2020-06-20 16:18:58 +08:00
Michael Bai
fcb0aefe3c
更改改密计划安全模式配置项名
2020-06-20 15:47:39 +08:00
Bai
29666cc8d3
[Update] 添加改密计划安全模式配置项
2020-06-19 20:41:51 +08:00
xinwen
1d640eccf6
[Fix] /opt/jumpserver/apps/jumpserver/views/index.py redirect(assets:user-asset-list) ( #4121 )
2020-06-19 18:28:43 +08:00
BaiJiangJie
92fc0ceb16
Merge pull request #4118 from jumpserver/master
...
Update readme
2020-06-18 15:03:32 +08:00
BaiJiangJie
217ea03c18
Merge pull request #4117 from jumpserver/dev
...
Dev
2020-06-18 15:02:40 +08:00
BaiJiangJie
923f0ed477
Update README.md
2020-06-18 15:01:08 +08:00
BaiJiangJie
3c6cfaa6cf
Update README.md
2020-06-18 14:59:13 +08:00
BaiJiangJie
0bfe255966
Update README.md
2020-06-18 14:58:00 +08:00
BaiJiangJie
af5d531131
Merge pull request #4116 from jumpserver/dev
...
Dev
2020-06-18 10:56:36 +08:00
Bai
10d58ef424
[Update] Merge from master to dev
2020-06-17 19:30:37 +08:00
Bai
64064cb526
[Update] 注释节点树print
2020-06-17 17:47:45 +08:00
Eric_Lee
46941037dd
add SECURITY_COMMAND_EXECUTION ( #4114 )
2020-06-17 15:03:41 +08:00
xinwen
8ad71b6dd9
[Update] Move LOCAL_DYNAMIC_SETTINGS ( #4113 )
2020-06-16 18:11:23 +08:00
ibuler
220ccda04d
fix: 修改domain创建的assets不是必填的
2020-06-16 17:55:18 +08:00
Eric_Lee
6d30fe797c
fix ldap test bug ( #4110 )
2020-06-16 17:25:57 +08:00
xinwen
3318df1771
[Fix] 日志审计/FTP日志 ( #4109 )
2020-06-16 16:33:53 +08:00
Eric_Lee
0ccd806eca
add system user perm api ( #4108 )
2020-06-16 16:12:59 +08:00
xinwen
7ebe1c2916
[Update] 优化 dynamic settings ( #4107 )
2020-06-16 15:54:19 +08:00
ibuler
08904c2a9f
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2020-06-16 15:30:39 +08:00
ibuler
19e34270d1
feat: gather user添加搜索字段
2020-06-16 15:30:25 +08:00
Bai
afa515d570
Merge branch 'dev' of https://github.com/jumpserver/jumpserver into dev
2020-06-16 15:04:38 +08:00
Bai
bcba408517
[Update] 修改用户source默认local
2020-06-16 15:04:01 +08:00
ibuler
80d94074e7
feat: 修改资产的标签搜索
2020-06-16 14:56:19 +08:00
ibuler
9347405f08
feat: terminal增加搜索
2020-06-16 13:50:21 +08:00
ibuler
da4ad11a69
fix: 修改session command 翻译
2020-06-16 13:39:49 +08:00
ibuler
b81e424e80
fix: 修改翻译
2020-06-16 12:20:16 +08:00
ibuler
1f15937139
feat: 修改翻译,添加settings
2020-06-16 11:04:59 +08:00
Bai
f4fa011714
[Update] 修改mfa校验code无效翻译
2020-06-15 20:31:50 +08:00
xinwen
c5a9a85818
[Update] 完善 作业中心/任务列表 ( #4105 )
2020-06-15 19:42:36 +08:00
ibuler
e23bfa0f69
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2020-06-15 17:55:13 +08:00
ibuler
451690fe8b
fix: 修改重定向
2020-06-15 17:44:40 +08:00
Eric_Lee
5bea782b9f
add assignee field for ticket ( #4104 )
2020-06-15 17:24:05 +08:00
Bai
f26f7ca1e7
[Update] 修改parsers,处理dict字段值;解决remote-app csv导入时异常
2020-06-15 16:34:51 +08:00
BaiJiangJie
fb9ac54843
Merge pull request #4103 from jumpserver/master_mfa
...
[Update] 修改MFA应用下载图片
2020-06-15 13:57:35 +08:00
Bai
927ca162d0
[Update] 修改MFA应用下载图片
2020-06-15 13:55:56 +08:00
Bai
583d295fd1
Merge branch 'dev' of https://github.com/jumpserver/jumpserver into dev
2020-06-15 13:50:05 +08:00
Bai
b51af1f7d7
[Update] 修改MFA应用下载图片
2020-06-15 13:49:51 +08:00
xinwen
edcf9921fe
[Update] apps/assets/serializers/system_user.py ( #4102 )
2020-06-15 13:24:52 +08:00
Eric_Lee
eef172d0e2
Merge pull request #4098 from jumpserver/fix-ops-adhoc
...
[Fix] ops.models.adhoc (#4096 )
2020-06-12 12:23:05 +08:00
Eric_Lee
5b407fe8bc
Merge pull request #4095 from jumpserver/update-user
...
[Update] 修改 用户相关 Serializer
2020-06-12 12:22:16 +08:00
Bai
1bb9048910
[Update] 标签序列类assets字段required为False
2020-06-12 11:45:03 +08:00
xinwen
787cdbcadf
[Fix] ops.models.adhoc ( #4096 )
2020-06-12 11:44:29 +08:00
xinwen
b14ca14120
[Fix] ops.models.adhoc ( #4096 )
2020-06-11 20:30:59 +08:00
ibuler
4b2fd0d0da
fix: 修复系统用户过滤权限规则的bug
2020-06-11 19:36:34 +08:00
xinwen
3393f18399
[Update] 修改 用户相关 Serializer
2020-06-11 18:24:56 +08:00
ibuler
7e1a379e47
feat: 修改org返回的数据结构
2020-06-11 18:05:18 +08:00
ibuler
213fdd461b
fix: 修改翻译
2020-06-11 14:33:42 +08:00
ibuler
148c7ffb43
fix: 添加注释
2020-06-11 14:10:55 +08:00
ibuler
75be45ce43
feat: 使用新的对称加密方式: aes
2020-06-11 12:10:00 +08:00
ibuler
04eb670ada
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2020-06-11 11:29:28 +08:00
ibuler
66f3706142
feat: 添加aes fix: 修改时区的bug
2020-06-11 11:28:37 +08:00
xinwen
9ea98bf2b2
[Feature] 添加 会话管理/历史会话/下载 api ( #4093 )
2020-06-10 17:34:56 +08:00
ibuler
4695f80172
faet: 修改翻译
2020-06-10 17:17:16 +08:00
ibuler
0452d53c3f
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2020-06-10 16:00:24 +08:00
ibuler
ec30ef1f8b
feat: readme添加版本说明
2020-06-10 15:57:41 +08:00
Eric_Lee
1c0ad08d80
fix ldap test i18n msg ( #4092 )
2020-06-10 15:10:43 +08:00
ibuler
e1ab453780
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2020-06-10 12:58:43 +08:00
ibuler
1a6597b572
feat: 修改command filter数据结构
2020-06-10 12:58:18 +08:00
xinwen
865522953a
[Feature] 作业中心/任务列表/任务详情 最后运行成功或失败的主机 ( #4090 )
2020-06-09 20:26:23 +08:00
ibuler
4d4a107101
feat: 修改oid获取顺序,添加从cookie中获取
2020-06-09 16:43:07 +08:00
ibuler
82f70cb0dc
feat: ticket添加翻译
2020-06-09 16:10:31 +08:00
ibuler
820186c6d0
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2020-06-09 15:16:01 +08:00
ibuler
4468e2d379
feat: 限制gateway 仅有ssh协议
2020-06-09 15:08:15 +08:00
Eric_Lee
bd802e6a50
add logo urls ( #4088 )
2020-06-09 14:06:11 +08:00
ibuler
9362c272cb
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2020-06-09 10:19:07 +08:00
ibuler
ee4534ac4b
feat: public setting添加key
2020-06-09 10:17:16 +08:00
xinwen
7ef09a4ca1
[Update] UserSerializer 添加 login_confirm_settings ( #4086 )
2020-06-08 17:16:30 +08:00
ibuler
31daaed4cd
feat: 添加auth confirm 到public setting
2020-06-08 16:48:10 +08:00
ibuler
71202e83f5
feat: 修改用户的api
2020-06-05 20:15:23 +08:00
ibuler
b1640e5592
fix: 修改common resource api的权限,否则auditor无法使用
2020-06-05 14:43:40 +08:00
ibuler
076b7babcb
修改批量命令的api
2020-06-05 14:20:34 +08:00
ibuler
8569910658
feat: command exexution audit log的搜索
2020-06-05 14:07:23 +08:00
xinwen
34c556d375
[Fix] spm ( #4082 )
2020-06-05 10:42:03 +08:00
ibuler
a43d6ad34d
feat: 资产添加admin_user_display
2020-06-04 20:26:42 +08:00
ibuler
ca6825008b
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2020-06-04 20:00:48 +08:00
ibuler
9c6f118dbd
feat: 添加批量命令的relation
2020-06-04 20:00:39 +08:00
Bai
5730e60089
[Update] 修改用户profile序列类
2020-06-04 17:24:31 +08:00
Bai
afc7f3bb9c
[Update] 修改用户public_key生成密钥的view
2020-06-04 17:05:36 +08:00
Bai
c411b0a38e
Merge branch 'dev' of https://github.com/jumpserver/jumpserver into dev
2020-06-04 17:02:52 +08:00
Bai
403b6fc563
[Update] 修改用户更新Public_key的条件判断
2020-06-04 17:02:43 +08:00
xinwen
55ae8bb5e6
[Fix] 系统设置/邮件设置/测试链接失败 ( #4081 )
2020-06-04 16:47:43 +08:00
Eric_Lee
dbcf785e42
add flower view ( #4078 )
2020-06-04 15:10:02 +08:00
ibuler
e6cd126045
feat: 修改api的权限
2020-06-04 14:55:33 +08:00
Bai
420f3c0c4c
[Update] 添加celery task log view
2020-06-04 14:30:44 +08:00
Bai
9b2c5cb305
[Update] 修改用户profile序列类3
2020-06-03 21:00:37 +08:00
Bai
907f0068db
[Update] 修改用户profile序列类2
2020-06-03 20:21:28 +08:00
Bai
a16b3260ba
Merge branch 'dev' of https://github.com/jumpserver/jumpserver into dev
2020-06-03 18:20:43 +08:00
Bai
1845821f6c
[Update] 修改用户profile序列类
2020-06-03 18:20:33 +08:00
ibuler
27d906a877
feat: 去掉js i18n catalog
2020-06-03 16:26:10 +08:00
xinwen
431ba36a26
[Fix] 会话管理/命令记录 时间过滤 bug ( #4070 )
2020-06-03 15:05:55 +08:00
Eric_Lee
229c782157
change PAGE_SIZE_CHOICE to string value ( #4069 )
2020-06-03 14:06:44 +08:00
ibuler
5bacab7475
fix: 重置密钥到auth中
2020-06-03 12:44:45 +08:00
ibuler
999286a089
fix: 修复用户公钥错误引起的profile bug
2020-06-03 12:32:52 +08:00
ibuler
68ccaf0cb3
feat: 去掉第一次登录的那个导航
2020-06-03 12:26:53 +08:00
ibuler
8d58d58519
feat: 修改profile view
2020-06-03 11:58:16 +08:00
ibuler
8efc0331de
feat: 删掉所有view, templates, forms
2020-06-03 11:43:43 +08:00
ibuler
7c479c2479
feat: 修改docs的url
2020-06-03 11:17:00 +08:00
ibuler
96551856a2
[Update] 部分view放到auth中
2020-06-03 11:06:44 +08:00
ibuler
b1f5cc7728
[Update] 禁用view
2020-06-03 10:38:44 +08:00
ibuler
1a84661ca9
feat: 修改filterset_fields => filter_fields,option方法不支持filterset
2020-06-02 20:02:22 +08:00
ibuler
c87b9f203f
feat: 修改依赖库版本
2020-06-02 15:51:24 +08:00
老广
9442acfb74
Celery version ( #4064 )
...
* [Update] 升级celery版本
* [Update] 修改redis-cache 版本
2020-06-02 15:44:45 +08:00
ibuler
50bea55732
merge: with dev
2020-06-02 15:43:42 +08:00
ibuler
a4ece2b271
feat: audits中添加id字段
2020-06-02 15:41:27 +08:00
xinwen
b460e4abaa
[Fix] 日志审计 日期过滤与排序bug ( #4063 )
2020-06-02 15:40:07 +08:00
BaiJiangJie
087ba9ae95
Merge pull request #4059 from jumpserver/lina
...
Lina
2020-06-01 14:05:22 +08:00
BaiJiangJie
19926e67e1
Merge pull request #4058 from jumpserver/dev
...
Dev
2020-06-01 14:02:56 +08:00
BaiJiangJie
af15622319
Merge pull request #4057 from jumpserver/dev_ldap
...
[Update] 添加LDAP USER_QUERY_FIELD字段值为username,解决数据库因大小敏感导致LDAP用户认证首次成功…
2020-06-01 12:51:30 +08:00
Bai
9850633350
[Update] 添加LDAP USER_QUERY_FIELD字段值为username,解决数据库因大小敏感导致LDAP用户认证首次成功,再次失败的问题;如果不配置此字段,则查询使用小写,创建可能会使用大写,最终导致username重复而创建用户失败;
2020-06-01 12:06:39 +08:00
ibuler
5f2345852d
Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
2020-06-01 11:41:55 +08:00
ibuler
ad1c17aa7b
feat: 仅支持fields_size=mini,small
2020-06-01 10:10:28 +08:00
xinwen
3a79bfd5f6
[Update] 添加一些 i18n ( #4052 )
2020-05-29 15:18:25 +08:00
Bai
5ee8519274
[Update] 修改AccessKey序列类
2020-05-29 14:04:50 +08:00
Bai
ff546774e9
Merge branch 'lina' of https://github.com/jumpserver/jumpserver into lina
2020-05-28 20:46:30 +08:00
Bai
1f4fc9b6f0
[Update] 修改API-Key序列类
2020-05-28 20:46:17 +08:00
xinwen
f8142e23cd
[Fix] 权限管理-> 资产与数据库 Bug ( #4049 )
2020-05-28 19:08:48 +08:00
Bai
196f1654ab
Merge branch 'lina' of https://github.com/jumpserver/jumpserver into lina
2020-05-28 17:47:27 +08:00
Bai
3b8a24eeb7
[Update] 添加用户profile public-key序列类
2020-05-28 17:47:18 +08:00
xinwen
7dde15cb04
[Feature] 权限管理-> 远程应用 添加 api ( #4040 )
...
* [Feature] 权限管理-> 远程应用 添加 api
* [Feature] 添加 RelationMixin
2020-05-28 17:00:42 +08:00
Bai
3e5d949610
[Update] 添加用户profile password序列类
2020-05-28 16:10:28 +08:00
Bai
25c3691f6b
Merge branch 'lina' of https://github.com/jumpserver/jumpserver into lina
2020-05-28 15:03:07 +08:00
Bai
f3bc6c0b22
[Update] 修改用户profile序列类
2020-05-28 15:02:53 +08:00
ibuler
caf0d85939
[feat] 修改remote app, database app的过滤参数
2020-05-28 14:47:30 +08:00
ibuler
a463f632e8
[Update] 优化重定向
2020-05-27 20:33:09 +08:00
ibuler
a0e6d09770
Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
2020-05-27 19:51:45 +08:00
BaiJiangJie
54623a5b06
Merge pull request #4047 from jumpserver/lina_dev
...
Lina dev
2020-05-27 18:46:48 +08:00
Bai
7afff5e392
[Update] merge from dev to lina
2020-05-27 18:44:12 +08:00
ibuler
9a5fee5a4c
Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
2020-05-27 18:03:14 +08:00
ibuler
a840e611cd
[Update] 修改core 的base url
2020-05-27 18:02:18 +08:00
Bai
566419cac4
Merge branch 'lina' of https://github.com/jumpserver/jumpserver into lina
2020-05-27 17:27:38 +08:00
Bai
7b362bfc76
[Update] 用户序列类添加mfa相关字段
2020-05-27 17:27:28 +08:00
ibuler
f528dd4888
Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
2020-05-26 19:00:00 +08:00
ibuler
3c95c6fe11
[Feat] 添加失效用户权限的api
2020-05-26 18:56:03 +08:00
BaiJiangJie
0b17d55f30
Merge pull request #4041 from jumpserver/dev_oidc
...
[Update] 修改依赖版本号 jumpserver-django-oidc-rp==0.3.7.5
2020-05-26 14:23:52 +08:00
Bai
3861943518
[Update] 修改依赖版本号 jumpserver-django-oidc-rp==0.3.7.5
2020-05-26 14:23:04 +08:00
老广
71a72dd957
Merge pull request #4033 from jumpserver/update-i18n
...
[Update] i18n
2020-05-25 01:53:02 -05:00
老广
78ac1968dd
Merge pull request #4039 from jumpserver/asset_permission-add-field
...
[Update] perms.serializers.asset_permission.AssetPermissionSerializer…
2020-05-25 01:52:35 -05:00
xinwen
93453cc8c3
[Update] perms.serializers.asset_permission.AssetPermissionSerializer 添加字段
2020-05-25 14:50:07 +08:00
xinwen
11527b9033
[Update] i18n
2020-05-22 18:18:40 +08:00
ibuler
2ff2266417
[Update] 修改 SerializerMixin 还原之前的更改
2020-05-21 20:35:44 +08:00
老广
1ef1bea703
Merge pull request #4029 from jumpserver/dev
...
修改了readme,增加安全建议
2020-05-21 07:06:49 -05:00
ibuler
6804f23b51
[Update] 修改readme
2020-05-21 20:01:53 +08:00
ibuler
ea7e1f19b2
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2020-05-21 19:55:36 +08:00
ibuler
3320e6105c
[Update] 删掉没用的内容
2020-05-21 19:00:47 +08:00
老广
072e74ce49
Merge pull request #4027 from jumpserver/update-org-user
...
[Update] org retrieve api
2020-05-21 03:15:05 -05:00
xinwen
492b1c4311
[Update] org retrieve api
2020-05-21 16:09:42 +08:00
老广
0babada459
Merge pull request #4025 from jumpserver/update-org-user-add-id
...
[Update] orgs.serializers.OrgReadSerializer add `id`
2020-05-21 02:43:35 -05:00
xinwen
7b0993959e
[Update] orgs.serializers.OrgReadSerializer add id
2020-05-21 15:40:41 +08:00
ibuler
701582fe38
[Update] 修改license的判断方法
2020-05-21 14:47:00 +08:00
BaiJiangJie
d289960ff2
Merge pull request #3998 from jumpserver/dev
...
Dev
2020-05-21 14:00:37 +08:00
BaiJiangJie
6adf37a30d
Merge pull request #4022 from jumpserver/dev_tran
...
[Update] 修改翻译信息
2020-05-20 19:43:43 +08:00
ibuler
b371676813
Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
2020-05-20 19:35:48 +08:00
Bai
2e0eab9289
[Update] 修改翻译信息
2020-05-20 19:35:35 +08:00
ibuler
0cac8d66b3
[Update] 修改index api
2020-05-20 19:35:33 +08:00
BaiJiangJie
2053e9210e
Merge pull request #4021 from jumpserver/dev_asset
...
[Bugfix] 修复只显示当前节点下资产不生效的问题
2020-05-20 18:21:59 +08:00
Bai
7c44f74068
[Bugfix] 修复只显示当前节点下资产不生效的问题
2020-05-20 18:20:01 +08:00
老广
3e0f5af848
Merge pull request #4019 from jumpserver/update-some-i18n
...
[Update] 一些本地化
2020-05-20 05:17:12 -05:00
xinwen
245d28b03d
[Update] 一些本地化
2020-05-20 17:45:50 +08:00
Bai
75f4f6d0a2
[Update] 资产授权序列类is_expired, is_valid设置为read_only
2020-05-19 20:50:33 +08:00
Bai
f9e167cb0e
Merge branch 'lina' of https://github.com/jumpserver/jumpserver into lina
2020-05-19 20:36:41 +08:00
Bai
f224e49de7
[Update] 去掉资产授权序列类中不存在的字段
2020-05-19 20:36:17 +08:00
BaiJiangJie
4ec4869896
Merge pull request #4012 from jumpserver/dev_permsasset
...
[Update] 授权资产树返回org_id字段值
2020-05-19 19:37:13 +08:00
Bai
63ff868553
[Update] 授权资产树返回org_id字段值
2020-05-19 19:36:19 +08:00
BaiJiangJie
234130091b
Merge pull request #4011 from jumpserver/dev_conf
...
[Update] 修改配置文件demo
2020-05-19 18:38:47 +08:00
Bai
216e0f28b9
[Update] 修改配置文件demo
2020-05-19 18:36:56 +08:00
BaiJiangJie
f3483484d7
Merge pull request #4010 from jumpserver/dev_openid
...
Dev openid
2020-05-19 18:35:30 +08:00
Bai
d704a35ead
[Update] 修改依赖版本号 jumpserver-django-oidc-rp==0.3.7.4
2020-05-19 18:33:33 +08:00
Bai
b97deec1de
[Update] openid 继续使用配置项 base_site_url
2020-05-19 18:24:26 +08:00
BaiJiangJie
5b6488e1b2
Merge pull request #4008 from jumpserver/dev_bugfix
...
Dev bugfix
2020-05-19 15:31:10 +08:00
Bai
be3fdac8a9
[Update] 修复API-key不能删除的问题
2020-05-19 15:28:31 +08:00
Bai
96afd82341
[Update] 修复任务列表,执行历史中stat汇总数据显示问题
2020-05-19 15:15:17 +08:00
Bai
728e4b7edd
[Update] 修复授权模块的信号处理监听不到的问题
2020-05-19 11:47:49 +08:00
Bai
73c3de97b8
[Update] 取消用户资产页面中,资产详情系统用户值为undefine的问题
2020-05-18 18:14:19 +08:00
Bai
e98626988b
[Update] 解决开启OpenID,为用户强制启用MFA导致,登录时报错的问题
2020-05-18 18:02:37 +08:00
Bai
01a52812f0
[Update] 修改用户MFA禁用/更新的View
2020-05-18 15:49:53 +08:00
Bai
041d99f0be
[Update] 更新remote-app用户/用户组时自动刷新页面
2020-05-18 15:40:54 +08:00
Bai
75edc26a10
[Update] 修改翻译,禁用资产提示不支持ansible的错误提示
2020-05-18 15:25:24 +08:00
Bai
2f7b169405
[Update] 修改授权用户/用户组页面删除用户组失败的问题
2020-05-18 15:24:55 +08:00
ibuler
76ef9b292b
[Update] 修改public api
2020-05-18 14:55:16 +08:00
ibuler
1540cbdcaa
[Update] 修改csv render
2020-05-18 11:52:50 +08:00
BaiJiangJie
eefe0709f8
Merge pull request #4007 from maninhill/patch-1
...
Update README.md
2020-05-17 07:44:37 +08:00
maninhill
5ae6e81a1d
Update README.md
2020-05-17 00:02:35 +08:00
BaiJiangJie
8a62488cb9
Merge pull request #4003 from jumpserver/dev_v
...
[Update] 修改版本号1.5.9
2020-05-14 16:15:17 +08:00
Bai
e951b64b0a
[Update] 修改版本号1.5.9
2020-05-14 16:14:17 +08:00
ibuler
5d129fd0da
Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
2020-05-14 14:51:05 +08:00
ibuler
b529127461
[Update] 修改user role
2020-05-14 14:49:54 +08:00
BaiJiangJie
2e40b9607e
Merge pull request #4002 from jumpserver/dev_bai
...
[Update] 用户资产详情Modal添加comment
2020-05-14 14:28:24 +08:00
Bai
d878089ebd
[Update] 用户资产详情Modal添加comment
2020-05-14 14:26:00 +08:00
BaiJiangJie
9d32285446
Merge pull request #3997 from jumpserver/dev_bai
...
[Update] 修改向导文案
2020-05-14 11:01:35 +08:00
Bai
4658a4c90f
[Update] 修改向导文案
2020-05-14 11:00:24 +08:00
Bai
d06ea2944e
[Update] 修改Dashboard API
2020-05-14 10:53:30 +08:00
wojiushixiaobai
d50ea83f40
[Fix]修改文档链接
2020-05-13 15:21:04 +08:00
ibuler
154aad1e22
Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
2020-05-13 11:06:24 +08:00
ibuler
17163dd909
[Update] 用户Profile添加在当前组织的角色
2020-05-13 11:05:58 +08:00
BaiJiangJie
b789a8bb05
Merge pull request #3994 from jumpserver/lina_assetuser
...
[Update] 修复AssetUserViewSet 使用Option方法时error
2020-05-12 20:32:58 +08:00
Bai
9341ce9f84
[Update] 修复AssetUserViewSet 使用Option方法时error
2020-05-12 20:31:32 +08:00
ibuler
4d0f7d0254
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2020-05-12 17:57:51 +08:00
ibuler
195cbbbe42
[Update] 修改profile serialzier
2020-05-12 17:57:35 +08:00
xinwen
6e5e340a25
Merge pull request #3993 from jumpserver/update-assets-filter
...
[Update] Asset filter 添加 platform__base 字段
2020-05-12 17:26:59 +08:00
xinwen
eb74d13059
[Update] Asset filter 添加 platform__base 字段
2020-05-12 17:24:51 +08:00
老广
16f916c40a
Merge pull request #3992 from jumpserver/update-assets-filter
...
Update assets filter
2020-05-12 04:11:49 -05:00
xinwen
4dd6d4498b
[Update] Asset filter 添加 platform__name 字段
2020-05-12 17:09:36 +08:00
ibuler
dd5bf546df
[Update] 修改serialzier_class
2020-05-12 15:37:37 +08:00
ibuler
d6debde566
Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
2020-05-11 19:28:24 +08:00
ibuler
efc66cc7ee
[Update] 默认关闭debug
2020-05-11 19:28:02 +08:00
BaiJiangJie
b310731ba7
Merge pull request #3990 from jumpserver/lina_dev
...
Lina dev
2020-05-11 17:45:51 +08:00
Bai
4bd2681bf0
[Update] Merge from dev to lina
2020-05-11 17:43:48 +08:00
BaiJiangJie
38e09753f4
Merge pull request #3989 from jumpserver/dev_master
...
Dev master
2020-05-11 17:38:46 +08:00
Bai
98e3adbb11
[Update] Merge from master to dev
2020-05-11 17:38:01 +08:00
BaiJiangJie
c700b101c1
Merge pull request #3988 from jumpserver/master_otp
...
[Bugfix] 修复用户页面更新MFA时解除管理员强制启用的Bug
2020-05-11 16:58:40 +08:00
Bai
7b3647e78a
[Bugfix] 修复用户页面更新MFA时解除管理员强制启用的Bug
2020-05-11 16:56:52 +08:00
BaiJiangJie
f4f042c407
Merge pull request #3987 from jumpserver/master_index
...
[Update] 仪表盘缓存key添加组织id
2020-05-11 15:20:00 +08:00
Bai
0a8eeca629
[Update] 仪表盘缓存key添加组织id
2020-05-11 15:12:42 +08:00
BaiJiangJie
fdd55511a6
Merge pull request #3986 from jumpserver/lina_dev
...
Lina dev
2020-05-11 14:04:52 +08:00
Bai
0cff6ab29b
[Update] Merge fromo dev to lina
2020-05-11 14:03:24 +08:00
ibuler
cda677a30f
[update] 修改remote apps的serializer
2020-05-11 12:35:33 +08:00
ibuler
5571651c02
[Update] 升级requirements
2020-05-09 16:13:06 +08:00
ibuler
2680396680
Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
2020-05-09 16:08:32 +08:00
ibuler
227f97c2f5
[Update] 修改remote apps 字段
2020-05-09 16:08:09 +08:00
老广
ad3231c8a3
Merge pull request #3982 from jumpserver/update-ops-migrate
...
[Update] 重建 ops 0018 迁移脚本
2020-05-09 01:54:37 -05:00
ibuler
e39d8dce3c
[Update] 修改fields
2020-05-09 14:52:44 +08:00
ibuler
0bdc425c55
Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
2020-05-09 14:51:47 +08:00
ibuler
0a7f63cc5e
[Update] 修改remote app api
2020-05-09 14:51:19 +08:00
xinwen
c6e0e9a79a
[Update] 重建 ops 0018 迁移脚本
2020-05-09 14:50:22 +08:00
BaiJiangJie
4cebfc7f6a
[Update] 修改翻译 ( #3981 )
...
* [Update] 修改翻译
* [Update] 修改翻译2
2020-05-09 13:29:39 +08:00
老广
7fde392774
Merge pull request #3980 from jumpserver/update-audits-verbose
...
[Update] audits 模块为一些 models 字段添加 verbose 信息
2020-05-08 22:40:34 -05:00
xinwen
3ee051303a
[Update] audits 模块为一些 models 字段添加 verbose 信息
2020-05-09 11:29:25 +08:00
老广
9fa31be4bf
Merge pull request #3976 from jumpserver/add-audits-apis
...
[Add] audits apis
2020-05-08 08:04:14 -05:00
老广
ae2e4049db
Merge pull request #3979 from jumpserver/lina_setting_dict_field
...
AUTH_LDAP_USER_ATTR_MAP to Dict field
2020-05-08 08:02:04 -05:00
Eric
48b71bb11b
AUTH_LDAP_USER_ATTR_MAP to Dict field
2020-05-08 20:58:13 +08:00
BaiJiangJie
7e4edc3c63
Merge pull request #3978 from jumpserver/dev_index
...
[Update] 修改dashboard中使用的变量名
2020-05-08 20:03:08 +08:00
Bai
11b3c57c92
[Update] 修改dashboard中使用的变量名
2020-05-08 20:02:00 +08:00
xinwen
e339ed1fb3
[Add] audits apis
2020-05-08 17:59:58 +08:00
BaiJiangJie
2d48c8028b
Merge pull request #3975 from jumpserver/dev_master
...
Dev master
2020-05-08 16:42:32 +08:00
Bai
185c53d311
[Update] Merge from master to dev
2020-05-08 16:40:07 +08:00
BaiJiangJie
2f030c02ec
Merge pull request #3973 from jumpserver/master_org
...
[Update] 优化仪表盘、组织详情页
2020-05-08 16:27:49 +08:00
老广
f4457ff1e2
Merge pull request #3972 from jumpserver/PERM_CACHE_CONFIG
...
Bugfix Perm cache config
2020-05-08 03:04:33 -05:00
ibuler
c6ed6d8acb
[Update] 去掉debug信息
2020-05-08 15:58:00 +08:00
ibuler
331cfe2aed
[Bugfix] 修复节点数量缓存显示不对的bug
2020-05-08 15:53:58 +08:00
Bai
e48dbabef2
[Update] 修改翻译
2020-05-08 15:50:01 +08:00
Bai
181973f235
[Update] 优化仪表盘页面加载
2020-05-08 15:41:56 +08:00
ibuler
440a2ad241
Merge branch 'PERM_CACHE_CONFIG' into dev
2020-05-08 14:25:36 +08:00
ibuler
1936a6d5ee
[Update] 去掉perms cache enable settings
2020-05-08 14:25:28 +08:00
老广
4517a92b2b
Merge pull request #3971 from jumpserver/add-ftp-log-api
...
[Add] ftp-logs api
2020-05-08 00:52:03 -05:00
ibuler
44a2a51f59
Merge branch 'PERM_CACHE_CONFIG' into dev
2020-05-08 13:13:47 +08:00
ibuler
2d4498578a
[Update] 修改授权缓存配置的默认值
2020-05-08 13:13:38 +08:00
xinwen
ac902501ec
[Add] ftp-logs api
2020-05-08 12:46:18 +08:00
老广
363b5d04d9
Merge pull request #3969 from jumpserver/update-login-logs
...
[Update] login-logs api 添加 `mfa_display`
2020-05-07 22:23:37 -05:00
xinwen
dec89ae5ee
[Update] login-logs api 添加 mfa_display
2020-05-08 10:08:57 +08:00
老广
5d37269a6c
Merge pull request #3967 from jumpserver/lina_status_code
...
[Update] Reponse status code from 401 to 400
2020-05-07 04:03:34 -05:00
Eric
9a39ccd37d
[Update] Reponse status code from 401 to 400
2020-05-07 16:57:57 +08:00
BaiJiangJie
5896ea9c63
Merge pull request #3963 from jumpserver/dev_oidc
...
[Update] 修改依赖版本jumpserver-django-oidc-rp==0.3.7.3
2020-05-06 21:06:27 +08:00
Bai
8323de1c07
[Update] 修改依赖版本jumpserver-django-oidc-rp==0.3.7.3
2020-05-06 21:05:23 +08:00
ibuler
8c0bf0b71b
[Update] Login log 添加display field
2020-05-06 19:35:19 +08:00
老广
5812c50a33
Merge pull request #3960 from jumpserver/lina_setting
...
[Update] save settings
2020-05-06 04:05:51 -05:00
Eric
7b339df430
[Update] save settings
2020-05-06 16:36:36 +08:00
Bai
aec78dc3c7
[Update] 添加组织详情->组织用户tab页,解决组织详情页面加载超时问题
2020-05-06 15:31:08 +08:00
ibuler
6bb13a26f5
[Update] 修改用户serializer
2020-04-30 16:58:08 +08:00
ibuler
b92137afd9
Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
2020-04-30 16:53:21 +08:00
老广
962763dc7b
Merge pull request #3954 from xuxinwen/feature-audits-apis
...
[Feature] 添加 login-logs API
2020-04-30 03:52:57 -05:00
xuxinwen
f4eca83a49
[feature] 添加 login-logs API
2020-04-30 16:40:55 +08:00
老广
02135ea04f
Merge pull request #3948 from jumpserver/settings_api
...
[Update] Add settings api
2020-04-29 18:25:10 +08:00
Eric
79eb838250
[Update] setting fields automatically generated by serializer
2020-04-29 18:10:42 +08:00
Eric
82710294f4
Merge branch 'lina' of https://github.com/jumpserver/jumpserver into settings_api
2020-04-29 17:09:50 +08:00
Eric
2d18acf6f7
[Update] settings api
2020-04-29 17:04:58 +08:00
BaiJiangJie
a860bed34f
[Update] 修改config_example配置(openid) ( #3951 )
...
* [Update] 修改config_example配置(openid)
* [Update] 修改config_example配置(openid)2
2020-04-29 16:57:10 +08:00
ibuler
f8c323cf5c
[Update] 优化user group serializer
2020-04-29 16:01:14 +08:00
ibuler
b6f5b335bd
Merge branch 'api_perf' into lina
2020-04-29 15:47:46 +08:00
Eric
f451f8a979
Merge branch 'lina' of https://github.com/jumpserver/jumpserver into settings_api
2020-04-29 14:33:22 +08:00
ibuler
5c4dfabc48
[Update] 修改settings
2020-04-29 14:32:51 +08:00
BaiJiangJie
72ccaf7b1c
Merge pull request #3949 from jumpserver/dev_openid
...
Dev openid
2020-04-29 14:25:32 +08:00
Bai
e4b788a012
[Update] 修改依赖版本 jumpserver-dajngo-oidc-rp (0.3.7.2)
2020-04-29 14:07:54 +08:00
Bai
6eaba4e2fb
[Update] openid配置分块
2020-04-29 14:03:48 +08:00
ibuler
0c0c0e6d6f
Merge branch 'dev' into lina
2020-04-29 13:00:47 +08:00
Eric
20cf7c7c52
[Update] Add settings api
2020-04-29 11:09:35 +08:00
ibuler
230d6137f3
Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
2020-04-29 10:21:06 +08:00
ibuler
aa9533eb5b
[Update] Groups users字段可以显示
2020-04-29 10:19:25 +08:00
Bai
23f9454e5d
[Update] 修改Url name (oidc => openi)
2020-04-29 01:12:00 +08:00
Bai
9eee79f7d4
[Update] 调整openid backend顺序;openid 用户创建/更新添加日志输出
2020-04-29 00:43:54 +08:00
Bai
c0089a98f4
[Update] 修改openid信号名称
2020-04-28 22:29:56 +08:00
Bai
87242c13a1
[Update] 修改信号监听kwargs
2020-04-28 21:06:13 +08:00
Bai
184432a2a6
[Update] 更新OpenID的配置项以及对应的信号监听
2020-04-28 21:00:22 +08:00
BaiJiangJie
555861c319
Merge pull request #3943 from jumpserver/dev_conf
...
[Update] 修改config_example(openid)
2020-04-27 12:50:03 +08:00
Bai
a505995f49
[Update] 修改config_example(openid)
2020-04-27 11:36:11 +08:00
BaiJiangJie
b477b649f5
Merge pull request #3942 from jumpserver/dev_docker
...
[Update] 修改Dockerfile pypi 镜像源(阿里=>清华)
2020-04-26 22:41:49 +08:00
Michael Bai
6e18383531
[Update] 修改Dockerfile pypi 镜像源(阿里=>清华)
2020-04-26 22:40:56 +08:00
BaiJiangJie
7833ff6671
Dev oidc ( #3941 )
...
* [Update] oidc_rp获取token添加headers base64编码
* [Update] 移除对oidc_rp的支持
* [Update] 移除对oidc_rp的支持2
* [Update] 修改OpenID配置(添加新配置项,并对旧配置项做兼容)
* [Update] 移除所有与Keycloak相关的模块
* [Update] 添加jumpserver-django-oidc-rp的使用
* [Update] 更新登录重定向地址(oidc)
* [Update] oidc添加一些配置参数;处理用户登录/创建/更新等信号
* [Update] 修改退出登录逻辑
* [Update] 添加oidc user登录成功的信号机制
* [Update] 修改mfa认证choices内容 (otp => code)
* [Update] 添加OpenID backend password 认证失败信号机制;修改引入common包问题
* [Update] 用户Token/Auth API 校验用户时,传入request参数(解决登录成功日志记录的问题)
* [Update] 添加依赖jumpserver-django-oidc-rp==0.3.7.1
* [Update] oidc认证模块说明
2020-04-26 20:36:17 +08:00
BaiJiangJie
5d433456d4
Merge pull request #3937 from jumpserver/dev_index
...
[Update] 更新仪表盘数据显示问题
2020-04-24 11:30:30 +08:00
Bai
fc5ec3f21c
[Update] 更新仪表盘数据显示问题
2020-04-24 11:29:01 +08:00
ibuler
efb5d4135a
[Update] 优化api字段显示
2020-04-23 11:14:02 +08:00
ibuler
5f2c9c3801
[Update] 添加 authentication backend header
2020-04-22 15:13:04 +08:00
BaiJiangJie
56f38e57bc
Merge pull request #3932 from jumpserver/dev_oidc
...
[Update] 添加oidc-op配置信息
2020-04-22 11:11:47 +08:00
Bai
586c04cba6
[Update] 添加oidc-op配置信息
2020-04-22 11:09:13 +08:00
Bai
306605915c
[Update] 添加依赖 django-oidc-rp==0.3.4
2020-04-22 00:31:59 +08:00
BaiJiangJie
272701a8fd
Dev oidc ( #3930 )
...
* [Update] 添加django-oidc-rp支持
* [Update] 添加django-oidc-rp支持2
* [Update] 调试django-oidc-rp对keycloak的支持
* [Update] 调试django-oidc-rp对keycloak的支持2
* [Update] 修改oidc_rp创建用户/更新用户的功能
* [Update] oidc_rp添加支持password认证
* [Update] 重写oidc_rp end session view
* [Update] 优化 oidc_rp view backend url 等引用关系
2020-04-22 00:22:24 +08:00
BaiJiangJie
9febe488b5
Merge pull request #3929 from jumpserver/lina_terminal
...
[Update] add terminal model fileds
2020-04-21 22:23:53 +08:00
Eric
c8c6ba1c19
[Update] add terminal model fileds
2020-04-21 17:37:29 +08:00
老广
2df7bd8510
Merge pull request #3926 from jumpserver/fix_otp_error
...
Fix otp error
2020-04-20 17:00:54 +08:00
老广
c16a986c4b
Merge pull request #3925 from jumpserver/bugfix_many_sqlquery_perm_asset
...
[Bugfix] 修复查询授权时额外查询platform的问题
2020-04-20 16:58:14 +08:00
ibuler
44db0e8a5d
[Bugfix] 修复查询授权时额外查询platform的问题
2020-04-20 16:56:47 +08:00
ibuler
91c994924f
[Update] 修改报错文案
2020-04-20 10:44:45 +08:00
ibuler
61407331bc
[Bugfix] 修复otp登录时导致的500
2020-04-20 10:37:07 +08:00
BaiJiangJie
1b1a686b96
Merge pull request #3922 from jumpserver/dev
...
Dev
2020-04-18 23:19:11 +08:00
BaiJiangJie
cc30a20b7c
Merge pull request #3921 from jumpserver/dev
...
Dev
2020-04-18 23:15:42 +08:00
BaiJiangJie
0379e5160c
[Bugfix] 修复真实组织下,新建的用户角色显示不稳定的问题2 ( #3919 )
...
* [Bugfix] 修复真实组织下,新建的用户角色显示不稳定的问题2
* [Bugfix] 修复真实组织下,新建的用户角色显示不稳定的问题3
* [Bugfix] 修复真实组织下,新建的用户角色显示不稳定的问题4
2020-04-18 23:14:25 +08:00
BaiJiangJie
386ce629ac
Merge pull request #3918 from jumpserver/fix_connectivity
...
[Update] 修复资产页面可连接性
2020-04-18 10:42:55 +08:00
BaiJiangJie
5677bf0995
Merge pull request #3915 from jumpserver/dev
...
Dev
2020-04-18 01:27:09 +08:00
BaiJiangJie
c17dc26f8c
Merge pull request #3916 from jumpserver/dev_org
...
[Bugfix] 修复真实组织下,新建的用户角色显示不稳定的问题
2020-04-18 01:24:21 +08:00
Bai
b4cc2bbff9
[Bugfix] 修复真实组织下,新建的用户角色显示不稳定的问题
2020-04-18 01:22:48 +08:00
BaiJiangJie
e74289b223
[Update] 修改用户密码重置页面错误信息提示2 ( #3914 )
2020-04-17 23:41:50 +08:00
ibuler
98afa032a7
[Update] 修复资产页面可连接性
2020-04-17 16:32:38 +08:00
BaiJiangJie
0d3fab216b
Merge pull request #3910 from jumpserver/dev_user
...
[Update] 修改用户密码重置页面错误信息提示
2020-04-17 11:27:26 +08:00
Bai
081f4b1c0a
[Update] 修改用户密码重置页面错误信息提示
2020-04-17 11:26:29 +08:00
BaiJiangJie
e9fe5b3004
Merge pull request #3908 from jumpserver/dev
...
Dev
2020-04-16 18:30:54 +08:00
BaiJiangJie
1de2923dd3
Merge pull request #3907 from jumpserver/dev_user
...
[Update] 修改忘记密码页面的错误信息提示
2020-04-16 18:30:07 +08:00
Bai
6890d549ed
[Update] 修改忘记密码页面的错误信息提示
2020-04-16 18:29:02 +08:00
老广
9426f58a6b
Merge pull request #3904 from jumpserver/dev
...
[Bugfix] 修复显示未授权资产的bug
2020-04-15 23:17:08 -05:00
ibuler
6a2a0013a8
[Update] 去掉debug
2020-04-16 12:12:24 +08:00
ibuler
864a4c0485
[Bugfix] 修复显示未授权资产的bug
2020-04-16 12:08:52 +08:00
BaiJiangJie
8fa08d7ea3
Merge pull request #3902 from jumpserver/dev
...
Dev
2020-04-16 11:31:38 +08:00
ibuler
3648a1458b
[Update] 修改command options get view filter
2020-04-16 11:27:46 +08:00
BaiJiangJie
5001f48982
Merge pull request #3899 from jumpserver/dev
...
Dev
2020-04-14 19:46:36 +08:00
BaiJiangJie
93bf15adc9
Merge pull request #3898 from jumpserver/dev_email
...
[Update] 修改测试邮件后,配置获取不稳定的Bug(显示给settings赋值导致)
2020-04-14 19:45:06 +08:00
Bai
83eb8f77d1
[Update] 修改测试邮件后,配置获取不稳定的Bug(显示给settings赋值导致)
2020-04-14 19:40:56 +08:00
BaiJiangJie
4eaaa2462b
Merge pull request #3897 from jumpserver/dev
...
Dev
2020-04-14 17:53:52 +08:00
BaiJiangJie
0910236f12
Merge pull request #3896 from jumpserver/dev_bai
...
Dev bai
2020-04-14 17:52:49 +08:00
Bai
77149bf36c
[Update] 修改监控多个会话时,总是覆盖同一个tab页
2020-04-14 17:50:47 +08:00
Bai
6337d0d0a1
[Update] 修改会话can_join为property
2020-04-14 16:12:24 +08:00
BaiJiangJie
093e3924a2
Merge pull request #3894 from jumpserver/dev
...
Dev
2020-04-14 16:00:08 +08:00
BaiJiangJie
e143408e57
Merge pull request #3893 from jumpserver/dev_req
...
[Update] 修改依赖版本jms-storage=0.0.29
2020-04-14 15:58:24 +08:00
Bai
dfdf33bbb5
[Update] 修改依赖版本jms-storage=0.0.29
2020-04-14 15:54:59 +08:00
BaiJiangJie
8fd5e6521f
Merge pull request #3892 from jumpserver/dev_bai
...
Dev bai
2020-04-14 13:20:50 +08:00
BaiJiangJie
6a2b9cd9bf
Merge pull request #3891 from jumpserver/dev_bai
...
[Update] 修复系统设置-终端设置-资产排序设置不生效的Bug
2020-04-14 13:19:57 +08:00
Bai
55fa5800b1
[Update] 修复系统设置-终端设置-资产排序设置不生效的Bug
2020-04-14 13:18:33 +08:00
BaiJiangJie
6cdba2e8d2
Merge pull request #3890 from jumpserver/dev_bai
...
Dev bai
2020-04-14 12:56:20 +08:00
BaiJiangJie
043aa08f23
Merge pull request #3889 from jumpserver/dev_bai
...
Dev bai
2020-04-14 12:55:35 +08:00
Bai
63519ec076
[Update] 修改命令记录/操作/改密日志搜索字段没清空的问题
2020-04-14 12:51:13 +08:00
Bai
48fa26a3bc
[Update] 修改操作日志搜索字段没清空的问题
2020-04-14 11:03:12 +08:00
Bai
d969563e43
[Update] 修复自定义平台列表在详情页删除失败的bug
2020-04-14 10:42:40 +08:00
BaiJiangJie
287236a447
Merge pull request #3885 from jumpserver/dev_trans
...
[Update] 更新翻译
2020-04-13 19:23:38 +08:00
Bai
4fb4a9f622
[Update] 更新翻译
2020-04-13 19:21:53 +08:00
BaiJiangJie
4dcd4749c3
Merge pull request #3884 from jumpserver/dev
...
Dev
2020-04-13 18:24:54 +08:00
BaiJiangJie
508d1c2c1f
Merge pull request #3883 from jumpserver/master_bai
...
Master bai
2020-04-13 18:23:43 +08:00
BaiJiangJie
600ea42633
Merge pull request #3882 from jumpserver/master_bai
...
[Update] 修改OpenID用户获取username的问题
2020-04-13 18:22:23 +08:00
Bai
41cbd3e0f6
[Update] 修改OpenID用户获取username的问题
2020-04-13 18:21:49 +08:00
BaiJiangJie
e593ccb01c
Merge pull request #3879 from jumpserver/dev_bai
...
Dev bai
2020-04-13 14:22:31 +08:00
Bai
d5e1ca7908
[Update] 添加翻译
2020-04-13 14:19:42 +08:00
Bai
06fb502a1d
[Update] 修改文案: 加入 -> 监控
2020-04-13 14:17:08 +08:00
Bai
3f6d7637c3
[Update] 更新用户添加CAS来源选项
2020-04-13 13:40:13 +08:00
ibuler
0d2b4d7ca3
[Update] 添加ids filter
2020-04-13 10:40:13 +08:00
BaiJiangJie
42c5c02709
Merge pull request #3871 from jumpserver/lina_dev
...
Lina dev
2020-04-10 14:50:05 +08:00
Bai
d1d73da322
[Update] Merge from dev
2020-04-10 14:46:35 +08:00
BaiJiangJie
88fcf8dbd7
Merge pull request #3869 from jumpserver/lina_user
...
[Update] 修改用户Profile序列类返回的admin_orgs
2020-04-10 12:49:57 +08:00
Bai
396bc9b6ae
[Update] 修改用户ViewSet序列类返回的admin_orgs(解决组织管理员登录的Bug)
2020-04-10 12:47:16 +08:00
BaiJiangJie
27ffed1be9
Merge pull request #3868 from jumpserver/dev_user
...
[Update] 修改用户ViewSet序列类返回的admin_orgs(解决组织管理员登录的Bug)
2020-04-10 12:40:12 +08:00
Bai
af9d42695f
[Update] 修改用户ViewSet序列类返回的admin_orgs(解决组织管理员登录的Bug)
2020-04-10 12:38:05 +08:00
BaiJiangJie
422b4424fe
Merge pull request #3867 from jumpserver/dev_ab
...
[Update] 修复AuthBook删除失败的Bug
2020-04-09 23:40:18 +08:00
Michael Bai
dc172e1ef0
[Update] 修复AuthBook删除失败的Bug
2020-04-09 23:39:17 +08:00
ibuler
cd7946f3f0
[Update] 修改一些bug
2020-04-09 18:58:22 +08:00
BaiJiangJie
4994a4a387
Dev bai ( #3865 )
...
* [Update] 更新config-example(CAS)
* [Update] 更新config-example(CAS)2
* [Update] 更新config-example(CAS)3
2020-04-09 13:39:11 +08:00
BaiJiangJie
e26eba9919
Merge pull request #3864 from jumpserver/1.5.8
...
1.5.8
2020-04-09 11:36:38 +08:00
Bai
44cd82f3e1
[Update] 修改翻译
2020-04-09 10:59:00 +08:00
Bai
adf14b0f2e
[Update] 修改版本号
2020-04-09 10:46:24 +08:00
Bai
f5a7c4131d
[Update] 修改校验join session的url-name
2020-04-09 10:43:25 +08:00
ibuler
e7031d0ac1
[Update] 修改serailizer mixin
2020-04-09 10:33:20 +08:00
Bai
ef27188f86
[Update] 修改Bug: CommandViewSet的Option方法Error
2020-04-08 18:08:22 +08:00
BaiJiangJie
a7734812fc
Merge pull request #3860 from jumpserver/1.5.8_bai
...
[Update] 命令记录导出: 只导出满足搜索条件的数据
2020-04-08 01:35:16 +08:00
Michael Bai
fb62fbde6c
[Update] 命令记录导出: 只导出满足搜索条件的数据
2020-04-08 01:34:10 +08:00
BaiJiangJie
521f4ea86b
Merge pull request #3857 from jumpserver/1.5.8_bai
...
1.5.8 bai
2020-04-07 12:32:54 +08:00
Bai
e9827c8b25
[Update] 添加会话加入校验API
2020-04-07 12:26:47 +08:00
Bai
29b099efc0
[Update] 添加加入会话按钮
2020-04-02 19:45:56 +08:00
Bai
e9fc56c056
[Update] 修改日志日期显示问题
2020-04-02 16:02:55 +08:00
Bai
e9103ee608
[Update] 对自定义MetaDict字段值进行strip
2020-04-02 15:14:30 +08:00
ibuler
f8dae2a3c9
[Update] 时区允许设置
2020-04-01 17:27:32 +08:00
BaiJiangJie
52c6244b2b
Merge pull request #3842 from jumpserver/dev
...
Dev
2020-03-28 21:36:54 +08:00
BaiJiangJie
7977294c5c
Merge pull request #3841 from jumpserver/dev
...
Dev
2020-03-28 21:36:09 +08:00
BaiJiangJie
e1331084e5
Merge pull request #3840 from jumpserver/dev_readme
...
Dev readme
2020-03-28 21:35:23 +08:00
Michael Bai
5268c0faae
[Update] OpenID登录成功后,如果用户没有email字段则构造默认的email
2020-03-28 21:34:17 +08:00
Michael Bai
b2d9b69874
[Update] 修改readme
2020-03-28 21:26:27 +08:00
BaiJiangJie
336589af98
Merge pull request #3836 from jumpserver/1.5.8_cap
...
1.5.8 cap
2020-03-27 11:28:39 +08:00
Bai
5087c0e06f
Merge branch 'dev' into 1.5.8_cap
2020-03-27 11:26:09 +08:00
BaiJiangJie
43ecd39d0e
Merge pull request #3835 from jumpserver/dev
...
Dev
2020-03-27 11:09:09 +08:00
BaiJiangJie
209b23c5ce
Merge pull request #3834 from jumpserver/dev_req
...
[Update] 修改依赖jms-storage==0.0.28
2020-03-27 11:08:42 +08:00
Bai
7e7d4401e6
[Update] 修改依赖jms-storage==0.0.28
2020-03-27 11:07:55 +08:00
BaiJiangJie
b4c3471d2c
Merge pull request #3833 from jumpserver/dev
...
Dev
2020-03-27 10:48:09 +08:00
BaiJiangJie
f4a822062f
Merge pull request #3829 from jumpserver/dev_bai
...
[Update] 优化创建AuthBook对象
2020-03-26 13:13:35 +08:00
Bai
4583beaec0
[Update] 创建AuthBook对象的方法从ModelManager中移动到Model中,保留原生的对象create方法;同时添加事务处理;
2020-03-26 13:11:38 +08:00
BaiJiangJie
42a6feb35e
Merge pull request #3822 from jumpserver/dev_lock
...
[Update] 优化创建AuthBook逻辑;添加锁机制(基于redis-lock);
2020-03-24 23:20:38 +08:00
Bai
4503df910d
[Update] 优化创建AuthBook逻辑;添加锁机制(基于redis-lock);
2020-03-24 18:40:20 +08:00
BaiJiangJie
a09b0c6c06
Merge pull request #3818 from jumpserver/dev_bai
...
[Update] 修改任务执行日期显示本地时间
2020-03-24 08:57:45 +08:00
Michael Bai
55c7e06185
[Update] 修改任务执行日期显示本地时间
2020-03-24 01:37:09 +08:00
老广
a95a0da6f7
Merge pull request #3816 from jumpserver/dev
...
[Bugfix] 修复因数据不支持timezone引起的仪表盘数据为空的bug
2020-03-23 17:56:45 +08:00
ibuler
0fd43f48f0
[Bugfix] 修复因数据不支持timezone引起的仪表盘数据为空的bug
2020-03-23 17:55:28 +08:00
ibuler
dffd05cd20
[Update] 修改组织获取优先级
2020-03-23 10:52:26 +08:00
BaiJiangJie
681046119d
Merge pull request #3811 from jumpserver/dev
...
Dev
2020-03-23 03:22:00 +08:00
BaiJiangJie
b19c49da41
Merge pull request #3810 from jumpserver/dev_bai
...
[Update] 修改翻译;升级依赖;
2020-03-23 03:20:30 +08:00
Michael Bai
cc31c04b5f
[Update] 升级依赖
2020-03-23 03:15:51 +08:00
Michael Bai
89f62d8e6b
[Update] 更新翻译
2020-03-23 03:06:53 +08:00
Michael Bai
41b73c3701
[Update] 修改提示播放器下载地址
2020-03-23 03:02:22 +08:00
BaiJiangJie
cff3a790ef
Merge pull request #3809 from jumpserver/dev_bai
...
[Update] 修改Node generate fake时死循环的问题
2020-03-23 02:50:06 +08:00
Michael Bai
8328edd69c
[Update] 修改Node generate fake时死循环的问题
2020-03-23 02:32:24 +08:00
ibuler
9bf5d6dd45
[Update] 用户profile中添加orgs
2020-03-20 18:21:27 +08:00
BaiJiangJie
ac9a0c6d26
Merge pull request #3803 from jumpserver/dev
...
[Update] 禁用ansible连接复用
2020-03-20 17:55:38 +08:00
ibuler
064cb16d25
[Update] 禁用ansible连接复用
2020-03-20 16:45:38 +08:00
BaiJiangJie
f89b1fd44b
Merge pull request #3798 from jumpserver/dev
...
[Bugfix] 修复重置并下载ssh key的bug
2020-03-19 16:28:34 +08:00
ibuler
b25096925b
[Bugfix] 修复重置并下载ssh key的bug
2020-03-19 16:28:08 +08:00
BaiJiangJie
e8ff576324
Merge pull request #3797 from jumpserver/dev
...
[Update] 修复收藏资产数量不对的问题
2020-03-19 15:43:44 +08:00
ibuler
5ac1467564
[Update] 修复收藏数量不对的问题
2020-03-19 15:41:41 +08:00
BaiJiangJie
1c54e5acd8
Merge pull request #3796 from jumpserver/dev
...
Dev
2020-03-19 14:26:23 +08:00
ibuler
b8d0272e37
[Update] 修改测试系统用户显示
2020-03-19 11:47:39 +08:00
ibuler
0b7a90b83c
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2020-03-19 11:13:34 +08:00
ibuler
7cf000262d
[Update] django cas ng 退出逻辑有问题,暂时屏蔽
2020-03-19 11:11:18 +08:00
BaiJiangJie
fa7e0d84f9
Merge pull request #3794 from jumpserver/dev_bai
...
[Update] 修改批量移除节点时不选择节点给出提示信息
2020-03-19 10:27:26 +08:00
Bai
98f6d0146c
[Update] 修改批量移除节点时不选择节点给出提示信息
2020-03-19 10:21:19 +08:00
ibuler
d0fac3f838
[Bugfix] 修复task 列表、
2020-03-18 19:58:08 +08:00
ibuler
a41988d2b5
[Bugfix] 修改配置文件,支持cas proxy
2020-03-18 19:10:27 +08:00
BaiJiangJie
b801d2f2e9
Update README.md
2020-03-18 17:16:53 +08:00
BaiJiangJie
6bed9210dd
Merge pull request #3793 from jumpserver/dev_bai
...
[Update] 修改readme2
2020-03-18 17:15:15 +08:00
Bai
eac4630272
[Update] 修改readme2
2020-03-18 17:14:21 +08:00
BaiJiangJie
11a0d72b01
Merge pull request #3792 from jumpserver/dev_readme
...
[Update] 修改readme
2020-03-18 17:09:21 +08:00
Bai
7dcd04ca1a
[Update] 修改readme
2020-03-18 17:03:49 +08:00
BaiJiangJie
ccfb151fb1
Merge pull request #3791 from jumpserver/dev_version
...
[Update] 更新版本号
2020-03-18 16:43:12 +08:00
Bai
ae98eee0c7
[Update] 更新版本号
2020-03-18 16:34:37 +08:00
BaiJiangJie
829a4406a2
Merge pull request #3790 from jumpserver/dev_bai
...
[Update] 修改执行task时切换root组织2
2020-03-18 14:04:14 +08:00
Bai
91c42e8530
[Update] 修改执行task时切换root组织2
2020-03-18 14:02:36 +08:00
BaiJiangJie
250acea751
Merge pull request #3789 from jumpserver/dev_bai
...
[Update] 修改执行task时切换root组织
2020-03-18 13:49:04 +08:00
Bai
00d9f71384
[Update] 修改执行task时切换root组织
2020-03-18 13:45:49 +08:00
BaiJiangJie
ffce909ee3
Merge pull request #3783 from jumpserver/bugfix
...
Bugfix
2020-03-18 11:05:51 +08:00
BaiJiangJie
0e62ea787c
Merge pull request #3785 from jumpserver/login_image_2
...
[Fix] 修改登录图片亮度
2020-03-18 10:44:55 +08:00
jym503558564
cedb862420
[Fix] 修改登录图片亮度
2020-03-17 17:28:53 +08:00
Bai
a6054ff6a5
[Update] 修复批量删除资产,当待删除数量和资产总数相等时,提示删除失败。
2020-03-17 17:06:59 +08:00
Bai
a67b445026
[Update] 修复录像存储ceph的help_text
2020-03-17 16:15:37 +08:00
BaiJiangJie
8d33990050
Merge pull request #3782 from jumpserver/login_image_2
...
[Fix] 修改登录界面LOGO
2020-03-17 15:32:18 +08:00
jym503558564
516e75cbf4
[Fix] 修改登录界面LOGO
2020-03-17 15:30:59 +08:00
Bai
15ca775005
[Update] 删除推送系统用户时关于task的log
2020-03-17 15:21:12 +08:00
Bai
41ca43bf33
Merge branch 'bugfix' of https://github.com/jumpserver/jumpserver into bugfix
2020-03-17 15:02:56 +08:00
Bai
c6a604fd5f
[Update] 修复显示创建者字段值的问题
2020-03-17 15:02:44 +08:00
ibuler
8e84efb296
[Update] 修改一些文案和翻译
2020-03-17 13:51:41 +08:00
ibuler
caee286973
[Update] 修改华为云始终有效的bug
2020-03-17 10:59:49 +08:00
ibuler
672b82c3d6
[Bugfix] 修复可能无法找到command execution的bug
2020-03-16 19:24:48 +08:00
ibuler
55554a025f
[Bugfix] 修复动态系统用户更新用户时无法推送的bug, 修复通过relation api无法触发m2m_change的bug
2020-03-16 19:15:29 +08:00
ibuler
c91ce2b99f
[Bugfix] 修复动态系统用户返回auth info的bug
2020-03-16 16:59:45 +08:00
ibuler
02a901467b
[Bugfix] 修复动态系统用户登录windows的bug
2020-03-16 16:13:54 +08:00
ibuler
00b3c7c945
[Bugfix] 修复动态系统用户执行批量命令的bug
2020-03-16 15:23:15 +08:00
ibuler
2f9598ba49
[Update] 修复ops task中任务某版本任务的bug
2020-03-16 14:41:24 +08:00
ibuler
3138abb00c
[Bugfix] 修复ops列表任务无法删除的bug
2020-03-16 14:18:29 +08:00
ibuler
3afb8647bd
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2020-03-13 13:57:42 +08:00
ibuler
0682f4fc90
[Update] 修改readme
2020-03-13 13:57:21 +08:00
BaiJiangJie
44ec69fdbd
Merge pull request #3775 from jumpserver/dev_bai
...
[Update] 修改只有local用户需要发送创建成功邮件、发送密码过期邮件;
2020-03-13 12:36:40 +08:00
Bai
04945809a5
[Update] 修改只有local用户需要发送创建成功邮件、发送密码过期邮件;
2020-03-13 12:33:09 +08:00
BaiJiangJie
e38b113d7e
Merge pull request #3771 from jumpserver/dev_trans
...
[Update] 更新翻译
2020-03-12 19:05:50 +08:00
Bai
eb448dc3f2
[Update] 更新翻译
2020-03-12 19:00:22 +08:00
BaiJiangJie
954a97bba7
Merge pull request #3770 from jumpserver/dev_req
...
[Update] 更新依赖jms-storage=0.0.27
2020-03-12 16:34:33 +08:00
Bai
41e03c629f
[Update] 更新依赖jms-storage=0.0.27
2020-03-12 16:33:33 +08:00
老广
1fd2e782f8
1.5.7 Merge to dev ( #3766 )
...
* [Update] 暂存,优化解决不了问题
* [Update] 待续(小白)
* [Update] 修改asset user
* [Update] 计划再次更改
* [Update] 修改asset user
* [Update] 暂存与喜爱
* [Update] Add id in
* [Update] 阶段性完成ops task该做
* [Update] 修改asset user api
* [Update] 修改asset user 任务,查看认证等
* [Update] 基本完成asset user改造
* [Update] dynamic user only allow 1
* [Update] 修改asset user task
* [Update] 修改node admin user task api
* [Update] remove file header license
* [Update] 添加sftp root
* [Update] 暂存
* [Update] 暂存
* [Update] 修改翻译
* [Update] 修改系统用户改为同名后,用户名改为空
* [Update] 基本完成CAS调研
* [Update] 支持cas server
* [Update] 支持cas server
* [Update] 添加requirements
* [Update] 为方便调试添加mysql ipython到包中
* [Update] 添加huaweiyun翻译
* [Update] 增加下载session 录像
* [Update] 只有第一次通知replay离线的使用方法
* [Update] 暂存一下
* [Bugfix] 获取系统用户信息报错
* [Bugfix] 修改system user info
* [Update] 改成清理10天git status
* [Update] 修改celery日志保留时间
* [Update]修复部分pip包依赖的版本不兼容问题 (#3672 )
* [Update] 修复用户更新页面会清空用户public_key的问题
* Fix broken dependencies
Co-authored-by: BaiJiangJie <32935519+BaiJiangJie@users.noreply.github.com >
* [Update] 修改获取系统用户auth info
* [Update] Remove log
* [Bugfix] 修复sftp home设置的bug
* [Update] 授权的系统用户添加sftp root
* [Update] 修改系统用户关联的用户
* [Update] 修改placeholder
* [Update] 优化获取授权的系统用户
* [Update] 修改tasks
* [Update] tree service update
* [Update] 暂存
* [Update] 基本完成用户授权树和资产树改造
* [Update] Dashbaord perf
* [update] Add huawei cloud sdk requirements
* [Updte] 优化dashboard页面
* [Update] system user auth info 添加id
* [Update] 修改系统用户serializer
* [Update] 优化api
* [Update] LDAP Test Util (#3720 )
* [Update] LDAPTestUtil 1
* [Update] LDAPTestUtil 2
* [Update] LDAPTestUtil 3
* [Update] LDAPTestUtil 4
* [Update] LDAPTestUtil 5
* [Update] LDAPTestUtil 6
* [Update] LDAPTestUtil 7
* [Update] session 已添加is success,并且添加display serializer
* [Bugfix] 修复无法删除空节点的bug
* [Update] 命令记录分组织显示
* [Update] Session is_success 添加迁移文件
* [Update] 批量命令添加org_id
* [Update] 修复一些文案,修改不绑定MFA,不能ssh登录
* [Update] 修改replay api, 返回session信息
* [Update] 解决无效es导致访问命令记录页面失败的问题
* [Update] 拆分profile view
* [Update] 修改一个翻译
* [Update] 修改aysnc api框架
* [Update] 命令列表添加risk level
* [Update] 完成录像打包下载
* [Update] 更改登陆otp页面
* [Update] 修改command 存储redis_level
* [Update] 修改翻译
* [Update] 修改系统用户的用户列表字段
* [Update] 使用新logo和统一Jumpserver为JumpServer
* [Update] 优化cloud task
* [Update] 统一period task
* [Update] 统一period form serializer字段
* [Update] 修改period task
* [Update] 修改资产网关信息
* [Update] 用户授权资产树资产信息添加domain
* [Update] 修改翻译
* [Update] 测试可连接性
* 1.5.7 bai (#3764 )
* [Update] 修复index页面Bug;修复测试资产用户可连接性问题;
* [Update] 修改测试资产用户可连接
* [Bugfix] 修复backends问题
* [Update] 修改marksafe依赖版本
* [Update] 修改测试资产用户可连接性
* [Update] 修改检测服务器性能时获取percent值
* [Update] 更新依赖boto3=1.12.14
Co-authored-by: Yanzhe Lee <lee.yanzhe@yanzhe.org >
Co-authored-by: BaiJiangJie <32935519+BaiJiangJie@users.noreply.github.com >
Co-authored-by: Bai <bugatti_it@163.com >
2020-03-12 16:24:38 +08:00
老广
1f6a8e8f02
Merge pull request #3698 from jumpserver/readme
...
[Update] 修改README中 jumpserver ==> JumpServer
2020-03-12 10:39:26 +08:00
老广
eca0a9a7d7
Merge pull request #3723 from jumpserver/settings_bug
...
Settings bug
2020-02-26 16:19:39 +08:00
老广
775f8f2ffd
Merge pull request #3722 from jumpserver/settings_bug
...
Settings bug
2020-02-26 16:18:24 +08:00
ibuler
1e8ef8c925
[Update] Merge with master
2020-02-26 16:15:42 +08:00
ibuler
c354b55f61
[update] 修复获取settings有问题的bug
2020-02-26 16:12:41 +08:00
ibuler
76ac0215fe
[update] 修复获取settings有问题的bug
2020-02-26 16:12:08 +08:00
老广
4f93a3ca92
Merge pull request #3716 from jumpserver/dev
...
Dev
2020-02-24 12:08:32 +08:00
ibuler
bcae30814d
[Update] 修改导入
2020-02-24 12:06:02 +08:00
老广
98bb6c63f5
[Update] 修改切换组织后页面跳转 ( #3715 )
2020-02-24 12:00:20 +08:00
老广
8b8b11ce1e
[Update] 恢复到原来的sql ( #3707 )
2020-02-15 20:49:20 +08:00
BaiJiangJie
5f61f2b555
Merge pull request #3702 from jumpserver/dev_interface
...
[Update] 修改终端获取登录标题配置的逻辑
2020-02-14 10:45:37 +08:00
Bai
62d2e01cdf
[Update] 修改终端获取登录标题配置的逻辑
2020-02-14 10:40:18 +08:00
jym503558564
5e89ee9202
[Update] 修改README中 jumpserver ==> JumpServer
2020-02-13 19:58:14 +08:00
老广
5d313a827b
[Update] 优化session 索引 is_finished ( #3697 )
2020-02-13 15:17:13 +08:00
ibuler
edf6baa52d
[Update] 修改api创建的token有效期是600s
2020-02-07 17:24:52 +08:00
老广
3c69860b24
[Update] 优化sql, or方式改为union ( #3682 )
...
* [Update] 优化sql, or方式改为union
* [Update] 优化union操作,直接union后,queryset 的一些参数不能使用,如annoate, 如filter assets__isnull=True
2020-02-05 15:56:28 +08:00
老广
aa2255a87e
[Update] sql优化,查询用户资产权限时,使用union替代or ( #3681 )
2020-02-05 12:10:24 +08:00
BaiJiangJie
3cc9e0a66c
Merge pull request #3680 from jumpserver/dev
...
Dev
2020-02-03 14:25:24 +08:00
BaiJiangJie
ec1f6677ec
Merge pull request #3679 from jumpserver/dev_session
...
[Bugfix] 处理心跳时guacamole上报的session为str处理为list
2020-02-03 14:08:37 +08:00
Bai
ae98fb4332
[Bugfix] 处理心跳时guacamole上报的session为str处理为list
2020-02-03 13:54:59 +08:00
Yanzhe Lee
29730757b8
Infer User.name from OpenID UserInfo.name ( #3674 )
...
Signed-off-by: YanzheL <lee.yanzhe@yanzhe.org >
2020-01-27 10:15:06 +08:00
BaiJiangJie
1c2feedb27
Merge pull request #3661 from jumpserver/dev
...
Dev
2020-01-20 11:36:18 +08:00
BaiJiangJie
b227d9cdc1
Merge pull request #3660 from jumpserver/dev_auth
...
[Update] 修复用户更新页面会清空用户public_key的问题
2020-01-20 11:28:40 +08:00
Bai
da6a0c286d
[Update] 修复用户更新页面会清空用户public_key的问题
2020-01-20 11:27:34 +08:00
BaiJiangJie
13a042bc0f
Merge pull request #3658 from jumpserver/dev_loginip
...
[Update] 修改获取用户登录的ip和type
2020-01-19 12:14:34 +08:00
Bai
7f9644dbac
[Update] 修改获取用户登录的ip和type
2020-01-19 12:13:42 +08:00
BaiJiangJie
ece9b16351
Merge pull request #3651 from jumpserver/dev
...
Dev
2020-01-16 11:39:26 +08:00
BaiJiangJie
23b896b301
Merge pull request #3650 from jumpserver/dev_i18n
...
[Update] 翻译应用树更节点(API)
2020-01-16 11:31:55 +08:00
Bai
dd52baae12
[Update] 翻译应用树更节点(API)
2020-01-16 11:31:08 +08:00
BaiJiangJie
eb1ca4c0f2
Merge pull request #3649 from jumpserver/dev_copyright
...
[Update] 修改copyright
2020-01-16 10:36:48 +08:00
Bai
8e75e519fa
[Update] 修改copyright
2020-01-16 10:35:00 +08:00
BaiJiangJie
389c6b5a84
Merge pull request #3648 from jumpserver/dev_i18n
...
[Update] 更新翻译
2020-01-16 09:59:22 +08:00
Bai
6fc7a4cb21
[Update] 更新翻译
2020-01-16 09:58:00 +08:00
BaiJiangJie
68455156a3
Merge pull request #3646 from jumpserver/dev_ops
...
[Update] 更新命令批量执行资产树(将没有ssh协议的资产设置为nocheck)
2020-01-15 10:47:39 +08:00
Bai
2827a64095
[Update] 更新命令批量执行资产树(将没有ssh协议的资产设置为nocheck)
2020-01-15 10:46:41 +08:00
BaiJiangJie
c21505e92d
Merge pull request #3644 from jumpserver/dev_ops
...
[Update] 批量命令执行开放rdp系统用户
2020-01-14 17:34:40 +08:00
Bai
7d855e5ad8
[Update] 批量命令执行开放rdp系统用户
2020-01-14 17:33:41 +08:00
BaiJiangJie
17956bf0db
Merge pull request #3633 from jumpserver/dev
...
Dev
2020-01-14 16:56:04 +08:00
BaiJiangJie
267a7fc9f7
Merge pull request #3643 from jumpserver/dev_i18n
...
[Update] 更新翻译
2020-01-14 16:55:44 +08:00
Bai
9ef4762817
[Update] 更新翻译
2020-01-14 16:54:52 +08:00
八千流
29457ad867
Assets_permission_action 优化 ( #3585 )
...
* [Update] 初步实现 actions的checkbox层叠嵌套
* [Update] 优化actions的checkbox层叠嵌套
* [Update] 修改校验用户/系统用户/资产的权限API可能会出现的问题
* [Update] 更新资产授权中动作的展示
* [Update] 更新资产授权中动作的展示 2
* [Update] 更新资产授权中动作的展示 3
Co-authored-by: BaiJiangJie <32935519+BaiJiangJie@users.noreply.github.com >
2020-01-14 16:44:28 +08:00
BaiJiangJie
d5082d1379
Merge pull request #3639 from jumpserver/dev_su_detail
...
[Update] 系统用户详情(mysql)开放命令过滤器
2020-01-14 11:08:32 +08:00
Bai
c07536b26f
[Update] 系统用户详情(mysql)开放命令过滤器
2020-01-14 11:07:35 +08:00
BaiJiangJie
678999b9f5
Merge pull request #3638 from jumpserver/dev_su_mysql
...
[Update] 系统用户(mysql)开放命令过滤器
2020-01-14 11:03:29 +08:00
Bai
4295aec492
[Update] 系统用户(mysql)开放命令过滤器
2020-01-14 10:53:52 +08:00
BaiJiangJie
75a2b9eac2
Merge pull request #3636 from jumpserver/dev_perms
...
[Update] 授权的 RemoteApp/DatabaseApp 进行去重
2020-01-13 18:57:33 +08:00
Bai
2fc68ca6f1
[Update] 授权的 RemoteApp/DatabaseApp 进行去重
2020-01-13 18:56:58 +08:00
BaiJiangJie
56a156b717
Merge pull request #3634 from jumpserver/dev_req
...
[Update] 修改依赖
2020-01-13 17:28:44 +08:00
Bai
7c59134635
[Update] 修改依赖
2020-01-13 17:28:00 +08:00
BaiJiangJie
f98f0e2c06
Merge pull request #3632 from jumpserver/dev_i18n
...
Dev i18n
2020-01-13 14:24:41 +08:00
Bai
63746accf9
[Update] 修改js默认语言为中文
2020-01-13 14:23:33 +08:00
Bai
670e2d7352
[Update] 更新翻译
2020-01-13 14:13:45 +08:00
BaiJiangJie
db3b60faf9
Merge pull request #3631 from jumpserver/dev_admin_user
...
[Update] 修改删除管理用户(存在关联资产)的Bug
2020-01-13 14:09:39 +08:00
Bai
f1b8c1965d
[Update] 修改删除管理用户(存在关联资产)的Bug
2020-01-13 14:07:42 +08:00
BaiJiangJie
aa2a77ee7e
Merge pull request #3630 from jumpserver/dev_req
...
[Update] 修改依赖
2020-01-13 13:52:31 +08:00
Bai
b107d15097
[Update] 修改依赖
2020-01-13 13:51:59 +08:00
BaiJiangJie
52b9c400eb
Merge pull request #3629 from jumpserver/dev
...
Dev
2020-01-13 12:51:13 +08:00
BaiJiangJie
851bd99eaf
Merge pull request #3628 from jumpserver/dev_node
...
[Update] 修改资产树移动资产的问题
2020-01-13 12:50:49 +08:00
Bai
0c0eb843ab
[Update] 修改资产树移动资产的问题
2020-01-13 12:50:01 +08:00
BaiJiangJie
bd19f8afe8
Merge pull request #3624 from jumpserver/dev
...
Dev
2020-01-10 18:27:49 +08:00
BaiJiangJie
bafffc95b8
Merge pull request #3621 from jumpserver/dev_node
...
[Update] 资产节点添加资产时,祖先节点授权的系统用户关联对应资产
2020-01-10 16:47:44 +08:00
Bai
14581ac775
[Update] 资产节点添加资产时,祖先节点授权的系统用户关联对应资产
2020-01-10 16:46:18 +08:00
BaiJiangJie
6ddd48bfb1
Merge pull request #3618 from jumpserver/dev_swift
...
[Update] 修改Swift录像存储创建参数及API返回值
2020-01-10 11:44:23 +08:00
Bai
ff1828bdd6
[Update] 修改Swift录像存储创建参数及API返回值
2020-01-10 11:42:53 +08:00
BaiJiangJie
84e5177ce2
Merge pull request #3614 from jumpserver/dev_ldap
...
[Update] 修改LDAP认证逻辑,密码为空时认证失败
2020-01-09 11:18:12 +08:00
Bai
1c9be184fd
[Update] 修改LDAP认证逻辑,密码为空时认证失败
2020-01-09 11:16:13 +08:00
BaiJiangJie
57155c2469
[Update] 更新 Readme ( #3608 )
...
* [Update] readme 1
* [Update] readme 2
* [Update] readme 3
* [Update] readme 4
* [Update] readme 5
2020-01-08 12:17:56 +08:00
BaiJiangJie
f9578f4474
Merge pull request #3606 from jumpserver/dev
...
Dev
2020-01-07 17:34:07 +08:00
BaiJiangJie
a37e14221e
Merge pull request #3603 from jumpserver/dev_systemuser
...
[Update] 更新系统用户认证信息private_key转换
2020-01-07 15:56:16 +08:00
Bai
005272cdc0
[Update] 更新系统用户认证信息private_key转换
2020-01-07 15:53:53 +08:00
BaiJiangJie
f88cb3da20
Merge pull request #3600 from jumpserver/dev_i18n
...
[Update] dateRange插件支持i18n
2020-01-06 18:24:14 +08:00
Bai
9f42dfb26e
[Update] dateRange插件支持i18n 2
2020-01-06 18:23:35 +08:00
Bai
f702fc7d93
[Update] dateRange插件支持i18n
2020-01-06 18:21:12 +08:00
BaiJiangJie
05adb4e95f
Merge pull request #3598 from jumpserver/dev_terminal
...
[Update] 更新Session表asset字段长度128
2020-01-06 15:36:51 +08:00
Bai
210a2d7fe6
[Update] 更新Session表asset字段长度128
2020-01-06 15:36:03 +08:00
BaiJiangJie
c9dc1ea254
Merge pull request #3596 from jumpserver/dev_ops
...
[Update] 修改作业中心批量命令资产树收藏夹循环现实的问题
2020-01-06 14:48:08 +08:00
Bai
79b5618756
[Update] 修改作业中心批量命令资产树收藏夹循环现实的问题
2020-01-06 14:46:59 +08:00
BaiJiangJie
bf922459ff
[Update] 修改创建按钮样式;Open 数据库应用;取消资产/系统用户/组织等名称对于特殊字符的限制; ( #3594 )
...
* [Update] 修改创建按钮样式
* [Update] Open数据库应用
* [Update] 取消资产/系统用户/组织等名称对于特殊字符的限制
2020-01-06 11:43:37 +08:00
BaiJiangJie
a27fb18a17
Merge pull request #3591 from jumpserver/dev
...
Dev
2020-01-03 17:03:37 +08:00
BaiJiangJie
f62f750266
Merge pull request #3588 from jumpserver/dev_mfa
...
Dev mfa
2020-01-03 15:31:43 +08:00
BaiJiangJie
b072e98148
[Update] 修改确认用户认证成功和绑定MFA的前后逻辑(解决绕过绑定MFA的漏洞;解决管理员重置用户MFA后自动退出的问题)
2020-01-03 15:26:38 +08:00
BaiJiangJie
352bfeeb7a
[Update] 绑定MFA页面(二维码显示)
2020-01-03 11:41:07 +08:00
BaiJiangJie
1d7bdd5f5f
Merge pull request #3586 from jumpserver/dev_bai
...
[Bugfix] 修改BlockLoginError的msg值在初始化中设置(数据表没生成之前启动会有问题)
2020-01-02 16:25:07 +08:00
BaiJiangJie
8702761303
[Bugfix] 修改BlockLoginError的msg值在初始化中设置(数据表没生成之前启动会有问题)
2020-01-02 16:24:13 +08:00
BaiJiangJie
ce3cc80037
Merge pull request #3583 from jumpserver/dev_version
...
[Update] 修改版本号(v1.5.6)
2019-12-31 18:50:56 +08:00
BaiJiangJie
9556d33d1c
[Update] 修改版本号(v1.5.6)
2019-12-31 18:49:21 +08:00
BaiJiangJie
02650c9cdc
Merge pull request #3582 from jumpserver/dev_session
...
[Update] 添加清除幽灵mysql会话
2019-12-31 16:49:20 +08:00
BaiJiangJie
75c6047236
[Update] 添加清除幽灵mysql会话
2019-12-31 16:47:25 +08:00
BaiJiangJie
e6c369cfd8
Merge pull request #3581 from jumpserver/dev_session
...
[Update] 添加清除幽灵rdp会话
2019-12-31 15:39:04 +08:00
BaiJiangJie
131496bfee
[Update] 添加清除幽灵rdp会话
2019-12-31 15:38:10 +08:00
BaiJiangJie
c084412e53
[Update] 解决Vault翻页再次选择资产时不能设置到select框的问题:select.style === single 时 ( #3579 )
...
* [Update] 解决Vault翻页再次选择资产时不能设置到select框的问题:select.style === single 时
* [Update] 优化1
2019-12-30 16:40:38 +08:00
BaiJiangJie
ad81d6c28e
Merge pull request #3576 from jumpserver/dev_audit
...
[Update] 修改操作日志title文案:操作者
2019-12-30 12:27:58 +08:00
BaiJiangJie
08fb8f5d92
[Update] 修改操作日志title文案:操作者
2019-12-30 12:27:14 +08:00
BaiJiangJie
4df08f0521
Merge pull request #3575 from jumpserver/dev_storage
...
[Update] 命令存储ES字段设置为required
2019-12-30 11:55:25 +08:00
BaiJiangJie
c963937f00
[Update] 命令存储ES字段设置为required
2019-12-30 11:54:36 +08:00
BaiJiangJie
b64ae358fb
Merge pull request #3572 from jumpserver/dev_bai
...
[Update] 修改右击节点rMenu菜单show offset
2019-12-27 16:59:30 +08:00
BaiJiangJie
42c5783e43
[Update] 修改右击节点rMenu菜单show offset
2019-12-27 16:42:36 +08:00
BaiJiangJie
a2350e7f1d
Merge pull request #3571 from jumpserver/bugfix
...
[Bugfix] 修复vault导出选择id的bug
2019-12-27 16:05:28 +08:00
ibuler
b3114a1f3d
[Bugfix] 修复vault导出选择id的bug
2019-12-27 16:03:45 +08:00
BaiJiangJie
b4cf540e51
[Update] 操作日志添加新的Record Model;用户登录日志采用同步机制;修改DatabaseAppAPI权限(加入AppUser); ( #3570 )
...
* [Update] 操作日志 Model Need Record 添加RemoteApp、DatabaseApp、DatabaseAppPermission
* [Update] 用户登录日志,采用同步机制
* [Update] 修改DatabaseApp API权限OrgAdmin和AppUser
2019-12-27 16:00:32 +08:00
BaiJiangJie
deeb9cdfa6
Merge pull request #3564 from jumpserver/dev_bai
...
[Update] 修改校验用户资产权限API不使用缓存
2019-12-25 10:30:45 +08:00
BaiJiangJie
7a6a1b9b59
[Update] 修改校验用户资产权限API不使用缓存
2019-12-25 10:29:58 +08:00
BaiJiangJie
15d1e021de
Merge pull request #3559 from jumpserver/dev_command
...
[Update] 支持Windows批量命令
2019-12-23 11:23:46 +08:00
BaiJiangJie
f063832bc6
[Update] 支持Windows批量命令2
2019-12-23 11:22:46 +08:00
BaiJiangJie
1d30c1900d
[Update] 支持Windows批量命令
2019-12-21 19:44:25 +08:00
BaiJiangJie
78a227af3e
Merge pull request #3557 from jumpserver/dev_bai_bugfix
...
[Update] 修改Adhoc字段become可以为None
2019-12-20 17:38:56 +08:00
BaiJiangJie
e978308335
[Update] 修改Adhoc字段become可以为空
2019-12-20 17:36:06 +08:00
BaiJiangJie
7193d7fc1b
Merge pull request #3556 from jumpserver/dev_trans
...
[Update] 更新翻译(用户详情页)
2019-12-20 16:20:43 +08:00
BaiJiangJie
d6a95d3f1a
[Update] 更新翻译(用户详情页)
2019-12-20 16:19:51 +08:00
BaiJiangJie
829e1f4cac
[Update] 修改用户详情页面 ( #3555 )
...
* [Update] 用户详情添加远程应用授权页面
* [Update] 用户详情添加授权的远程应用页面
* [Update] 用户详情添加授权的数据库应用页面
* [Update] 用户详情添加数据库应用授权页面
* [Update] 修改用户详情nav的active属性设置
* [Update] 修改用户详情页面导航
* [Update] 抽象用户详情页面
* [Update] 修改用户详情页面
* [Update] 修改用户详情页面nav header
2019-12-20 15:55:59 +08:00
BaiJiangJie
33dc7dec84
Merge pull request #3554 from jumpserver/master_auth
...
[Update] 修改校验用户有效性逻辑
2019-12-20 10:26:09 +08:00
BaiJiangJie
b90960e6e1
[Update] 修改校验用户有效性逻辑
2019-12-20 10:24:09 +08:00
BaiJiangJie
b365ba7982
[Update] 修改用户列表批量删除判断条件 ( #3553 )
2019-12-19 16:23:21 +08:00
BaiJiangJie
9cfccf8a1b
[Update] 更新翻译 ( #3552 )
...
* [Update] 更新翻译(数据库应用)
* [Update] 更新翻译(数据库应用)2
* [Update] 更新翻译(数据库应用)3
2019-12-19 16:08:02 +08:00
BaiJiangJie
16f727c60d
[Feature] 添加功能:数据库应用 ( #3551 )
...
* [Update] 添加数据库应用Model
* [Update] 添加数据库应用ViewSet
* [Update] 添加数据库应用HTML
* [Update] 更新数据库应用迁移文件
* [Update] 添加数据库应用授权Model
* [Update] 添加数据库应用授权ViewSet(待续)
* [Update] 添加数据库应用授权ViewSet(完结)
* [Update] 添加数据库应用授权View(待续)
* [Update] 添加数据库应用授权View(待续2)
* [Update] 修改远程应用授权View(小问题)
* [Update] 添加数据库应用授权View(待续3)
* [Update] 添加数据库应用授权View(完结)
* [Update] 添加数据库应用授权相关API
* [Update] 添加数据库应用View(用户页面)
* [Update] 修改数据库应用授权Model/View/API(系统用户)
* [Update] 修改系统用户Model/View(添加mysql协议)
* [Update] 修改用户页面(我的应用)
* [Update] 添加迁移文件
* [Update] 添加迁移文件2
* [Update] 续添加迁移文件2(Model更改)
* [Update] 修改系统用户序列类(mysql协议自动生成密码问题)
* [Update] 修改数据库应用/资产等授权序列类
* [Update] 修改命令列表/会话详情命令溢出
* [Update] 修改授权详情中添加系统用户的过滤
* [Update] 修改列表动作的宽度
2019-12-19 15:28:17 +08:00
BaiJiangJie
ac2ba63856
[Update] 修改资产授权url ( #3550 )
2019-12-19 10:48:18 +08:00
老广
55c95c58f6
Add new model to operate log ( #3546 )
...
* [Update] 添加一下model到operate log, [platform,remoteapppermission,changeauthplan,gatherusertask]
* [Bugfix] 修改了返回platform的几个位置,修改了command execution的url
* [Update] 优化ops task表结构,避免列表页查询几十次sql, 优化了基础的encryptjsonfield
* [Update] 修改adhoc 返回的become字段,避免密码泄露
* [Update] 修改变量名称
2019-12-18 15:37:53 +08:00
八千流
907703d911
[Update] 修复 工单按用户搜索无效的问题 ( #3540 )
2019-12-18 15:09:51 +08:00
老广
e1919d0a62
Asset meta ( #3539 )
...
- 更改了资产表单,影响
- 资产创建和更新
- 增加了资产平台数据库,影响
- 平台创建更新和删除
- 更改了资产的platform字段,又一个字符字段,改为一个外键,影响
- 资产创建和更新
- 资产连接 [windows,linux]
- 测试连接等ansible任务
- 自动化云导入
- 更改了资产的序列化器,影响
- 资产创建更新列表
- 统一了树列表基础模板,影响
- 资产列表页,权限列表页,vault页,资产收集页
- 统一了导入导出组件,影响
- 资产导入导出
- 用户导入导出
- 用户组导入导出
- 系统用户导入导出
- 管理用户导入导出
- vault导出导出
- 收集用户列表导入导出
- 修改用户更新密码信号,影响
- 修改用户密码产生的改密日志
- 新增Model instance序列化工具函数,影响
- 操作日志生成
- 修改api mixin,新增 serializer_classes字段,serializer_classes = {"default": "", "display": "", "list": .., "other_action": ""}, 根据用户请求的方式返回不同的serializer_class,影响
- 用户的viewset
- 资产权限的viewset
- 统一系统配置中的tab切换
- 统一没有nav的页面,影响
- 重置密码
- 忘记密码
- 重置中设置密码
- 独立的message页面
- 修改用户组列表页,不再返还用户组下的用户,仅有数量
- 组织的一些方法变为layzproperty,避免重复计算
- 修改用户组详情页,影响
- 用户组增加删除用户
2019-12-16 16:53:29 +08:00
BaiJiangJie
4ac4b517f4
[Update] 更新依赖(psutil) ( #3529 )
2019-12-11 12:03:30 +08:00
BaiJiangJie
f296dce935
[Update] 修改config 加载逻辑 ( #3528 )
2019-12-11 11:53:46 +08:00
BaiJiangJie
bc5a240121
[Update] 更新迁移文件(ReplayStorage Type,RemoteApp Type) ( #3524 )
2019-12-10 17:06:44 +08:00
BaiJiangJie
b4498f2267
[Update] 修改 RemoteApp 前端 Form 渲染逻辑 ( #3523 )
...
* [Update] 修改 RemoteApp 前端 Form 渲染逻辑
* [Update] RemoteApp 表单添加默认值
2019-12-10 15:16:16 +08:00
BaiJiangJie
b2932803b0
[Update] 修改settings DEFAULT_AUTO_SCHEMA_CLASS 路径 ( #3518 )
2019-12-09 16:33:02 +08:00
BaiJiangJie
cea336a8ce
[Update] 用户第三方认证后,只在创建时修改用户来源信息;修改检验用户有效性逻辑; ( #3517 )
...
* [Update] 用户第三方认证后,只在创建时修改用户来源信息
* [Update] 修改检验用户有效性逻辑(解决启用LDAP等认证时,显示用户名不存在)
* [Update] 修改检验用户有效性逻辑(解决启用LDAP等认证时,显示用户名不存在)2
2019-12-09 16:12:48 +08:00
BaiJiangJie
16864ca34e
[Update] 用户列表添加移除操作(在其他组织中) ( #3513 )
...
* [Update] 用户列表添加移除操作(在其他组织中)
* [Update] 用户列表添加移除操作(在其他组织中)2
2019-12-09 11:50:52 +08:00
BaiJiangJie
c5785e17aa
Dev node ( #3511 )
...
* [Update] 添加节点详情Modal
* [Update] 更新翻译
2019-12-06 15:29:01 +08:00
BaiJiangJie
f89c6124a6
[Update] 修改获取录像失败的问题 ( #3509 )
2019-12-06 11:36:36 +08:00
BaiJiangJie
47b1a13bea
[Update] 添加存储类型:Ceph、Swift ( #3508 )
2019-12-05 18:19:27 +08:00
BaiJiangJie
df52240227
[Update] 修复录像回放 Bug ( #3506 )
2019-12-05 16:21:11 +08:00
老广
4944ac8e75
Config ( #3502 )
...
* [Update] 修改config
* [Update] 移动存储设置到到terminal中
* [Update] 修改permission 查看
* [Update] pre merge
* [Update] 录像存储
* [Update] 命令存储
* [Update] 添加存储测试可连接性
* [Update] 修改 meta 值的 key 为大写
* [Update] 修改 Terminal 相关 Storage 配置
* [Update] 删除之前获取录像/命令存储的代码
* [Update] 修改导入失败
* [Update] 迁移文件添加default存储
* [Update] 删除之前代码,添加help_text信息
* [Update] 删除之前代码
* [Update] 删除之前代码
* [Update] 抽象命令/录像存储 APIView
* [Update] 抽象命令/录像存储 APIView 1
* [Update] 抽象命令/录像存储 DictField
* [Update] 抽象命令/录像存储列表页面
* [Update] 修复CustomDictField的bug
* [Update] RemoteApp 页面添加 hidden
* [Update] 用户页面添加用户关联授权
* [Update] 修改存储测试可连接性 target
* [Update] 修改配置
* [Update] 修改存储前端 Form 渲染逻辑
* [Update] 修改存储细节
* [Update] 统一存储类型到 const 文件
* [Update] 修改迁移文件及Model,创建默认存储
* [Update] 修改迁移文件及Model初始化默认数据
* [Update] 修改迁移文件
* [Update] 修改迁移文件
* [Update] 修改迁移文件
* [Update] 修改迁移文件
* [Update] 修改迁移文件
* [Update] 修改迁移文件
* [Update] 修改迁移文件
* [Update] 限制删除默认存储配置,只允许创建扩展的存储类型
* [Update] 修改ip字段长度
* [Update] 修改ip字段长度
* [Update] 修改一些css
* [Update] 修改关联
* [Update] 添加操作日志定时清理
* [Update] 修改记录syslog的instance encoder
* [Update] 忽略登录产生的操作日志
* [Update] 限制更新存储时不覆盖原有AK SK 等字段
* [Update] 修改迁移文件添加comment字段
* [Update] 修改迁移文件
* [Update] 添加 comment 字段
* [Update] 修改默认存储no -> null
* [Update] 修改细节
* [Update] 更新翻译(存储配置
* [Update] 修改定时任务注册,修改系统用户资产、节点关系api
* [Update] 添加监控磁盘任务
* [Update] 修改session
* [Update] 拆分serializer
* [Update] 还原setting原来的manager
2019-12-05 15:09:25 +08:00
BaiJiangJie
a88db3d9db
Merge pull request #3501 from jumpserver/dev
...
Dev
2019-12-04 17:55:26 +08:00
BaiJiangJie
fd1b9d97c0
Merge pull request #3500 from jumpserver/dev_c
...
[Update] 更新配置文件
2019-12-04 17:54:59 +08:00
BaiJiangJie
5e95f262b2
[Update] 更新配置文件
2019-12-04 17:53:15 +08:00
BaiJiangJie
4493a82425
Merge pull request #3497 from jumpserver/dev
...
Dev
2019-12-04 17:14:35 +08:00
BaiJiangJie
078751979e
Merge pull request #3496 from jumpserver/gateway_bug
...
[Update] 修复获取网关bug
2019-12-04 17:14:10 +08:00
jym503558564
1fd98ae404
[Update] 修复获取网关bug
2019-12-04 17:07:57 +08:00
BaiJiangJie
560de55c3c
Merge pull request #3495 from jumpserver/dev
...
Dev
2019-12-04 17:01:31 +08:00
BaiJiangJie
dd6e0f548c
Merge pull request #3494 from jumpserver/dev_bai
...
[Update] 修改用户详情中审批人设置显示条件
2019-12-04 17:01:11 +08:00
BaiJiangJie
a07a90f1c9
[Update] 修改用户详情中审批人设置显示条件
2019-12-04 16:59:57 +08:00
BaiJiangJie
64642ab48b
Merge pull request #3492 from jumpserver/dev
...
Dev
2019-12-04 15:49:02 +08:00
BaiJiangJie
12f51c9474
Merge pull request #3491 from jumpserver/dev_v
...
[Update] 修改版本号(1.5.5)
2019-12-04 15:24:49 +08:00
BaiJiangJie
50106474d4
[Update] 修改版本号(1.5.5)
2019-12-04 15:22:18 +08:00
BaiJiangJie
b3e2b30e71
Merge pull request #3488 from jumpserver/1.5.5
...
1.5.5
2019-12-04 12:33:03 +08:00
BaiJiangJie
7427f02e0b
Merge pull request #3489 from jumpserver/bai_1.5.5
...
1.5.5(Merge dev)
2019-12-04 12:24:03 +08:00
BaiJiangJie
330c078597
[Update] Merge dev
2019-12-04 12:22:09 +08:00
BaiJiangJie
eb05588776
Merge pull request #3486 from jumpserver/dev
...
Dev
2019-12-04 11:14:43 +08:00
BaiJiangJie
98d3a36d98
Merge pull request #3485 from jumpserver/task_search
...
[Update] 修复任务列表页面无法搜索问题
2019-12-04 10:42:38 +08:00
jym503558564
fedf50f9dc
[Update] 修复任务列表页面无法搜索问题
2019-12-03 15:31:42 +08:00
BaiJiangJie
1876b7dfba
Merge pull request #3483 from jumpserver/gateway_search
...
[Update] 修复网关搜索报500错误;密码为空时,测试连接报500错误
2019-12-03 12:07:20 +08:00
BaiJiangJie
873d909879
Merge pull request #3449 from jumpserver/user_detail_template
...
[Update] 修改用户详情页中用户组标签不显示的问题
2019-12-03 12:06:32 +08:00
jym503558564
15b8a2efb9
[Update] 修改小问题
2019-12-03 12:03:18 +08:00
BaiJiangJie
45444149dd
Merge pull request #3482 from jumpserver/domain_search
...
[Update] 修复网域列表页面无法搜索问题
2019-12-03 12:01:05 +08:00
jym503558564
a5485011c8
[Update] 修复网关搜索报500错误;密码为空时,测试连接报500错误
2019-12-03 11:24:12 +08:00
jym503558564
7c5592fa36
[Update] 修复网域列表页面无法搜索问题
2019-12-03 10:40:55 +08:00
ibuler
715b04e2b2
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2019-12-02 10:50:19 +08:00
ibuler
73086328e4
[Update] 去掉elfinder包
2019-12-02 10:49:58 +08:00
BaiJiangJie
7f126ab652
Merge pull request #3475 from jumpserver/dev_bai
...
[Update] 修改Dockerfile,安装 wheel 依赖
2019-11-29 19:13:56 +08:00
BaiJiangJie
5bcd122de9
[Update] 修改Dockerfile,安装 wheel 依赖
2019-11-29 19:13:02 +08:00
jym503558564
a92aec2775
Merge branch 'dev' into user_detail_template
2019-11-25 15:55:44 +08:00
jym503558564
cc9554cdb4
[Update] 修改用户详情页中添加用户组标签的显示条件是:当前组织的普通用户或组管理员
2019-11-25 15:30:11 +08:00
BaiJiangJie
100dd24ff5
Merge pull request #3457 from jumpserver/dev
...
Dev
2019-11-22 16:53:16 +08:00
BaiJiangJie
3a812c2267
Merge pull request #3456 from jumpserver/dev_bai
...
[Update] 发送重置密钥邮件时,清除用户公钥
2019-11-22 16:52:47 +08:00
BaiJiangJie
f47781a330
[Update] 发送重置密钥邮件时,清除用户公钥
2019-11-22 16:48:20 +08:00
BaiJiangJie
f96dd15f20
Merge pull request #3454 from jumpserver/1.5.5_bai
...
[Update] 修改工单管理列表可以按照类型排序 以及 日期显示格式
2019-11-22 16:17:51 +08:00
BaiJiangJie
ffdc1eb198
[Update] 修改工单管理列表可以按照类型排序 以及 日期显示格式
2019-11-22 16:16:29 +08:00
BaiJiangJie
91d1a62c98
Merge pull request #3453 from jumpserver/dev
...
Dev
2019-11-22 13:54:37 +08:00
BaiJiangJie
793adbccab
Merge pull request #3452 from jumpserver/dev
...
Dev
2019-11-22 13:54:08 +08:00
BaiJiangJie
72ea036a29
Merge pull request #3451 from jumpserver/dev_bai
...
[Update] 删除 LDAP 查询时抛出的自定义异常类( LDAPOUGroupException),解决多有 OU 下导入用户时的问题
2019-11-22 13:53:25 +08:00
BaiJiangJie
9e322323f3
[Update] LDAP 分页获取 cookie 取值添加异常捕获
2019-11-22 13:52:29 +08:00
BaiJiangJie
6951f4dd97
[Update] 删除 LDAP 查询时抛出的自定义异常类( LDAPOUGroupException),解决多有 OU 下导入用户时的问题
2019-11-22 12:25:49 +08:00
jym503558564
54887a3460
[Update] 修改用户详情页中用户组标签不显示的问题
2019-11-20 17:27:49 +08:00
老广
dafe71af42
Merge pull request #3446 from jumpserver/dev
...
[Update] 修改jms
2019-11-20 14:47:12 +08:00
ibuler
82b9c2519b
[Update] Merge it
2019-11-20 12:04:52 +08:00
ibuler
d563a11acf
[Update] 修改jms
2019-11-20 11:57:53 +08:00
老广
c5438fd65d
Merge pull request #3445 from jumpserver/dev
...
Dev
2019-11-20 10:26:34 +08:00
ibuler
66b8e59ae7
[Update] 修改nav
2019-11-19 15:49:41 +08:00
ibuler
e424315d93
[Update] 修改用户列表serializer
2019-11-19 15:25:28 +08:00
ibuler
4c801bb828
[Update] 修改用户列表
2019-11-19 15:23:19 +08:00
ibuler
1bba00412a
[Update] 修改user list 页面字段宽度
2019-11-19 11:25:36 +08:00
ibuler
bf40aa8df0
[Update] 修改user list api
2019-11-19 11:20:26 +08:00
ibuler
0c349f9350
[Update] 更改翻译
2019-11-19 10:30:32 +08:00
ibuler
4dc5d7d70e
[Update] 换做lazyproperty
2019-11-19 10:26:01 +08:00
ibuler
3fc30aa96c
[Update] 修改tickets
2019-11-18 18:44:21 +08:00
ibuler
bb1349e962
[Update] 修改MFA
2019-11-18 18:12:03 +08:00
ibuler
c9ee8edeaf
[Update] 修改mfa
2019-11-18 16:30:26 +08:00
ibuler
bfd8a9c66d
[Update] 修改asset permission搜索
2019-11-18 15:18:47 +08:00
ibuler
030551d987
[Update] 工单提交
2019-11-18 12:14:16 +08:00
ibuler
2f4096bf3d
[Update] 修改ticket
2019-11-18 11:54:12 +08:00
ibuler
ebe129b3c2
[Update] 修改工单
2019-11-15 18:55:35 +08:00
BaiJiangJie
61a8d6a5ca
Merge pull request #3440 from jumpserver/dev_au
...
[Update] 资产用户列表支持模糊搜索
2019-11-15 15:03:27 +08:00
BaiJiangJie
c6e7872ba8
[Update] 资产用户列表支持模糊搜索
2019-11-15 14:58:43 +08:00
BaiJiangJie
096d4a4221
Merge pull request #3438 from jumpserver/dev_terminal
...
[Update] 修改终端注册条件判断逻辑(从 serializer -> view)
2019-11-15 12:20:08 +08:00
BaiJiangJie
9b5cb8b0c5
[Update] 限制通过 POST 方法调用 TerminalViewSet API
2019-11-15 12:11:58 +08:00
BaiJiangJie
bea5dadbac
[Update] 修改终端注册条件判断逻辑(从 serializer -> view)
2019-11-15 11:56:51 +08:00
ibuler
18f8864720
[Update] public config 添加超时时间
2019-11-14 19:35:44 +08:00
ibuler
f71290d645
[Update] 左侧组织dropdown增加过滤
2019-11-14 15:38:22 +08:00
ibuler
e69d283af9
[Update] 增加过滤
2019-11-14 15:37:39 +08:00
ibuler
31f5b2c06c
Merge remote-tracking branch 'origin/1.5.5' into 1.5.5
2019-11-14 14:54:20 +08:00
ibuler
611d5fc1fa
[Update] Message可以关闭
2019-11-14 14:53:57 +08:00
ibuler
8dba54e7c5
[Update] 优化table页数
2019-11-14 12:12:34 +08:00
ibuler
2ef487a92f
[Update] 修改收集用户
2019-11-14 11:46:42 +08:00
BaiJiangJie
aebf32d7be
[Update] 删除 py-radius 依赖
2019-11-14 10:56:29 +08:00
BaiJiangJie
870e04feac
[Update] 添加 py-radius 依赖
2019-11-13 18:46:22 +08:00
BaiJiangJie
4b2fbbfb84
[Update] 添加 MFA Radius py-radius 测试类
2019-11-13 18:44:59 +08:00
老广
0946645783
Merge pull request #3433 from jumpserver/dev
...
Dev
2019-11-13 17:04:01 +08:00
BaiJiangJie
f3d2e5d1b3
Merge pull request #3434 from jumpserver/dev_ldap
...
[Update] 修改设置 LDAP 同步任务在任务外部设置running状态
2019-11-13 16:46:46 +08:00
BaiJiangJie
6bfb026e47
[Update] 修改设置 LDAP 同步任务在任务外部设置running状态
2019-11-13 16:45:38 +08:00
ibuler
aa428b0299
[Update] 修改测试网关提示,不能包含特殊字符
2019-11-13 16:40:34 +08:00
BaiJiangJie
0a74602df3
[Update] 修改设置 LDAP 同步任务在任务外部设置running状态
2019-11-13 15:08:54 +08:00
ibuler
05e7311b0b
Merge branch 'dev' into 1.5.5
2019-11-13 14:56:02 +08:00
ibuler
f40d51c84f
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2019-11-13 14:55:29 +08:00
ibuler
46a2311e30
[Update] 暂时关闭celery处理请求数量
2019-11-13 11:25:33 +08:00
BaiJiangJie
76e59f5bcd
Merge pull request #3430 from jumpserver/dev_auth_info
...
[Update] 修改 sytem-user-asset-auth-info API 的权限(只允许 App)访问
2019-11-13 11:19:49 +08:00
BaiJiangJie
e731c01cc4
[Update] 修改 sytem-user-asset-auth-info API 的权限(只允许 App)访问
2019-11-13 11:18:29 +08:00
BaiJiangJie
6067dbcf21
Merge pull request #3429 from jumpserver/dev_auth_info
...
[Update] 修改获取系统用户-资产-认证信息API,添加 NeedMFAVerify 权限类
2019-11-12 19:04:14 +08:00
BaiJiangJie
4057064b7f
[Update] 修改获取系统用户-资产-认证信息API,添加 NeedMFAVerify 权限类
2019-11-12 19:00:53 +08:00
BaiJiangJie
3f1e75c6f9
Merge pull request #3428 from jumpserver/1.5.5_bai
...
1.5.5 bai
2019-11-12 14:14:46 +08:00
BaiJiangJie
5434b65773
[Update] Merge branch dev to 1.5.5
2019-11-12 14:11:34 +08:00
ibuler
a01126c6c7
[Update] 修改radius MFA
2019-11-11 20:10:49 +08:00
BaiJiangJie
200ca65dc5
Merge pull request #3426 from jumpserver/dev_ldap2
...
Dev ldap2
2019-11-11 19:00:00 +08:00
BaiJiangJie
78a7bfbd30
[Update] 修复取消 LDAP 同步用户任务失败的问题
2019-11-11 18:50:05 +08:00
BaiJiangJie
fc58906bce
[Update] 修改翻译信息
2019-11-11 18:15:25 +08:00
BaiJiangJie
e0d7a0e239
[Update] 重构 LDAP/AD 同步功能,添加缓存机制 4
2019-11-11 18:10:21 +08:00
BaiJiangJie
82077f4a0e
[Update] 重构 LDAP/AD 同步功能,添加缓存机制 3
2019-11-11 18:05:32 +08:00
BaiJiangJie
c31b56ddd9
[Update] Merge local branch dev to dev_ldap2
2019-11-11 17:54:28 +08:00
BaiJiangJie
0a08ba3b9c
[Update] 修改翻译信息
2019-11-11 17:50:46 +08:00
BaiJiangJie
2ea3ad4ca5
[Update] 重构 LDAP/AD 同步功能,添加缓存机制 2
2019-11-11 17:45:39 +08:00
老广
0d2fc27a97
Merge pull request #3420 from jumpserver/bugfix
...
Bugfix
2019-11-11 17:02:01 +08:00
ibuler
f53cf8d544
[Bugfix] 修复用户登陆工单
2019-11-11 16:43:09 +08:00
BaiJiangJie
596e5a6dd1
[Update] 重构 LDAP/AD 同步功能,添加缓存机制
2019-11-11 16:41:32 +08:00
ibuler
aeff0ab5f3
[Update] 修改public key 校验
2019-11-11 12:43:00 +08:00
ibuler
0b211d33b2
[Bugfix] 修复没有backend的问题
2019-11-11 11:54:32 +08:00
ibuler
f4136decde
[Update] Stash
2019-11-11 11:37:34 +08:00
ibuler
74f22274b4
[Update] 修改登录验证
2019-11-11 10:58:11 +08:00
ibuler
9e4874834f
[Update] 修改tickets
2019-11-08 20:17:25 +08:00
ibuler
bd323d608e
[Update] 修改api
2019-11-08 16:32:00 +08:00
ibuler
f9e41d71dc
[Update] 修改登录工单
2019-11-08 15:48:01 +08:00
ibuler
08775551c2
[Update] Rename app
2019-11-07 18:06:58 +08:00
ibuler
fb9e2ac9f6
[Update] 修改用户和用户组关系发生变化时,刷新权限
2019-11-06 17:18:39 +08:00
ibuler
edce831e46
[Update] 修改api
2019-11-06 16:59:54 +08:00
ibuler
12e1e559b5
[Update] 修改bug
2019-11-06 14:40:41 +08:00
ibuler
fa02e3fb75
[Update] Merge with bugfix
2019-11-06 14:38:06 +08:00
ibuler
ed5a57042a
[Update] windows跳过手动输入密码
2019-11-06 14:28:49 +08:00
ibuler
6fbc4ce4fb
[Update] MFA
2019-11-06 12:06:30 +08:00
ibuler
eedaaddbf5
[Update] 用户创建支持修改source
2019-11-06 11:57:00 +08:00
ibuler
bae4387068
[Update] tree出现滚动条
2019-11-05 19:44:34 +08:00
ibuler
8de863525a
[Update] 修改消息
2019-11-05 19:05:29 +08:00
ibuler
6ce9815d51
[Update] 基本完成登录逻辑
2019-11-05 18:46:29 +08:00
ibuler
9d201bbf98
[Update] 修改 token api
2019-11-01 20:34:56 +08:00
BaiJiangJie
96adaca3c3
Merge pull request #3409 from jumpserver/dev
...
Dev
2019-11-01 20:21:17 +08:00
BaiJiangJie
cf65e9bfe3
Merge pull request #3408 from jumpserver/dev_nodes
...
[Update] 修复初始化 Default 节点的 Bug(原因:在其他组织下 Default 节点默认的 key 1 已经存在)
2019-11-01 20:20:55 +08:00
BaiJiangJie
b51ad05a4b
[Update] 修复初始化 Default 节点的 Bug(原因:在其他组织下 Default 节点默认的 key 1 已经存在)5
2019-11-01 20:18:36 +08:00
BaiJiangJie
ca178c534e
[Update] 修复初始化 Default 节点的 Bug(原因:在其他组织下 Default 节点默认的 key 1 已经存在)4
2019-11-01 20:02:34 +08:00
BaiJiangJie
d7948425df
[Update] 修复初始化 Default 节点的 Bug(原因:在其他组织下 Default 节点默认的 key 1 已经存在)3
2019-11-01 19:45:56 +08:00
BaiJiangJie
a0be7333fb
[Update] 修复初始化 Default 节点的 Bug(原因:在其他组织下 Default 节点默认的 key 1 已经存在)2
2019-11-01 19:41:28 +08:00
BaiJiangJie
fde8702916
[Update] 修复初始化 Default 节点的 Bug(原因:在其他组织下 Default 节点默认的 key 1 已经存在)
2019-11-01 19:38:56 +08:00
BaiJiangJie
bf0575b74d
Merge pull request #3404 from jumpserver/dev
...
Dev
2019-11-01 15:13:45 +08:00
BaiJiangJie
3dfb2d6af2
Merge pull request #3405 from jumpserver/bugfix
...
[Update] 修改 AuthBook set_version / set_latest
2019-11-01 15:07:31 +08:00
ibuler
c25335cf95
[Update] 修改authbook
2019-11-01 14:52:37 +08:00
ibuler
ebbe49fab2
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2019-11-01 14:10:12 +08:00
ibuler
28ad362b8d
[Update] 修改设置最新版本
2019-11-01 14:09:44 +08:00
BaiJiangJie
b595ac9bc5
Merge pull request #3403 from jumpserver/dev_ops
...
[Bugfix] 修复执行任务,没有保存 history 的问题
2019-10-31 18:45:30 +08:00
ibuler
11f0024c33
[Update] 添加登录复核开关
2019-10-31 18:43:47 +08:00
ibuler
dc3a9561c2
[Update] 基本完成登陆审核
2019-10-31 18:23:43 +08:00
BaiJiangJie
4f7ab69508
[Bugfix] 修复执行任务,没有保存 history 的问题
2019-10-31 18:05:52 +08:00
ibuler
23b777b23b
Merge branch 'dev' into 1.5.5
2019-10-31 11:09:59 +08:00
ibuler
fe235823b4
[Update] 修改工单
2019-10-30 19:30:49 +08:00
老广
2afeba8b5f
Merge pull request #3400 from jumpserver/dev
...
Dev
2019-10-30 13:24:15 +08:00
ibuler
87247da0ec
[Bugfix] 修复获取数量是报错
2019-10-30 13:23:06 +08:00
ibuler
d0ba67ed50
[Update] 基本完成登录二次审核
2019-10-30 13:18:11 +08:00
BaiJiangJie
c163427db2
Merge pull request #3397 from jumpserver/dev_bai
...
Dev bai
2019-10-29 18:00:42 +08:00
BaiJiangJie
c7ecfd7943
[Bugfix] 修复当终端设置包含多个命令存储时,访问 /docs/ 页面错误的问题
2019-10-29 17:58:58 +08:00
BaiJiangJie
db5ff0f922
[Update] 修改用户 LDAP/AD Source 时排除 admin 用户
2019-10-29 16:37:25 +08:00
BaiJiangJie
c29381e657
Merge pull request #3395 from jumpserver/dev_loginlog
...
[Update] 登录日志导出按照组织进行过滤
2019-10-29 12:30:56 +08:00
BaiJiangjie
ff62968bf6
[Update] 登录日志导出按照组织进行过滤
2019-10-29 12:29:15 +08:00
BaiJiangJie
4e1e60046a
Merge pull request #3392 from jumpserver/api_key_table
...
[Update] 修改api_key_table显示不友好问题
2019-10-28 17:24:16 +08:00
jym503558564
82c4705350
[Update] 修改api_key_table显示不友好问题
2019-10-28 17:21:28 +08:00
ibuler
517c682201
[Update] 修改登录路基
2019-10-25 19:20:28 +08:00
BaiJiangJie
bf92b61b78
Merge pull request #3389 from jumpserver/dev
...
Dev
2019-10-25 18:08:00 +08:00
BaiJiangJie
f6d2ac9b7b
Merge pull request #3388 from jumpserver/dev_bai
...
[Update] 优化 config_example.py 中 AUTH_LDAP 配置项
2019-10-25 17:48:12 +08:00
BaiJiangJie
98a8ef1526
[Update] 优化 config_example.py 中 AUTH_LDAP 配置项
2019-10-25 17:46:26 +08:00
BaiJiangJie
4167987d67
Merge pull request #3387 from jumpserver/dev_ldap
...
[Update] LDAP 认证添加配置项 OPT_REFERRALS(解决问题: In order to perform this op…
2019-10-25 17:29:54 +08:00
BaiJiangJie
ef41ba3117
[Update] LDAP 认证添加配置项 OPT_REFERRALS(解决问题: In order to perform this operation a successful bind must be completed on the connection)
2019-10-25 17:09:22 +08:00
ibuler
458bee9a19
Merge branch 'dev' into 1.5.5
2019-10-25 15:33:02 +08:00
ibuler
d22f60364a
[Update] 修改js
2019-10-25 12:52:21 +08:00
ibuler
90321ab68c
[Update] 修改js
2019-10-25 12:50:48 +08:00
ibuler
a5814c8100
[Update] 修改js
2019-10-25 12:49:22 +08:00
ibuler
87fd342b68
[Update] 修改model
2019-10-25 12:35:38 +08:00
ibuler
d544f7f936
Merge branch 'dev' into 1.5.5
2019-10-25 12:13:14 +08:00
ibuler
fbe4f4c119
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2019-10-25 12:10:46 +08:00
ibuler
4d53b6f078
[Update] 去掉debug信息
2019-10-25 12:09:27 +08:00
ibuler
d2c65dd783
[Update] 修改table过滤
2019-10-25 12:08:49 +08:00
ibuler
0c1463bc8b
[Update] 修改支持工单
2019-10-25 11:27:50 +08:00
BaiJiangJie
39b4145868
Merge pull request #3385 from jumpserver/dev_char
...
[Update] 修改主机名/系统用户名称/组织名称的特殊字符限制(修改为特殊字符黑名单)[/ \]
2019-10-25 11:17:45 +08:00
BaiJiangJie
a57df0e05f
[Update] 修改主机名/系统用户名称/组织名称的特殊字符限制(修改为特殊字符黑名单)[/ \]
2019-10-25 10:55:28 +08:00
BaiJiangJie
36d98a237f
[Update] 资产授权 Action 添加 Help text ( #3383 )
...
* [Update] 资产授权 Action 添加 Help text
* [Update] 资产授权 Action 添加 Help text(修改翻译)
2019-10-24 18:35:03 +08:00
ibuler
cf719f492d
[Update] 修改user group relations api
2019-10-24 14:36:01 +08:00
BaiJiangJie
69bcf3de2e
Merge pull request #3381 from jumpserver/dev
...
Dev
2019-10-24 12:43:05 +08:00
BaiJiangJie
d3cf2afb51
Merge pull request #3380 from jumpserver/dev_req
...
[Update] 更新依赖版本号
2019-10-24 12:27:04 +08:00
BaiJiangJie
3c5ebeeb20
[Update] 更新依赖版本号
2019-10-24 12:23:39 +08:00
BaiJiangJie
58f564b028
Merge pull request #3379 from jumpserver/dev
...
Dev
2019-10-24 12:22:25 +08:00
BaiJiangJie
8fd65a372e
Merge pull request #3378 from jumpserver/dev_req
...
[Update] 更新依赖包版本
2019-10-24 12:10:49 +08:00
BaiJiangJie
f8f1aee997
[Update] 更新依赖包版本
2019-10-24 12:08:48 +08:00
ibuler
9bb7c1adc1
[Update] 更改命令执行超时提示
2019-10-24 10:23:31 +08:00
ibuler
d5cb0a2e59
[Update] Merge with dev
2019-10-23 15:25:06 +08:00
BaiJiangJie
7c4dee324f
Merge pull request #3377 from jumpserver/dev
...
Dev
2019-10-23 15:25:04 +08:00
BaiJiangJie
4c1821e42e
Merge pull request #3376 from jumpserver/dev_v
...
[Update] 修改版本号(1.5.4)
2019-10-23 15:23:57 +08:00
BaiJiangJie
f31ed0afb8
[Update] 修改版本号(1.5.4)
2019-10-23 15:20:56 +08:00
BaiJiangJie
5e5f3ad383
Merge pull request #3375 from jumpserver/dev
...
[Update] Add debug message
2019-10-23 15:18:35 +08:00
ibuler
f802fb645d
[Update] Add debug message
2019-10-23 11:01:39 +08:00
老广
93e8c9e534
Merge pull request #3374 from jumpserver/dev
...
Dev
2019-10-23 10:17:45 +08:00
老广
0b405fdefa
Merge pull request #3373 from jumpserver/bugfix
...
Bugfix
2019-10-23 10:17:09 +08:00
ibuler
c995050ed7
[Update] 修改ws read celery log file
2019-10-23 10:14:07 +08:00
ibuler
0dbf2ab2e5
[Update] 修改websocket读取日志
2019-10-22 19:45:03 +08:00
老广
22cc8ffbdd
Merge pull request #3370 from jumpserver/bugfix
...
Bugfix
2019-10-22 19:33:01 +08:00
ibuler
6b8b0f4a0b
[Update] 修改terminal字体
2019-10-22 19:30:53 +08:00
ibuler
b3502a9291
[Update] 修改terminal字体
2019-10-22 19:30:39 +08:00
BaiJiangJie
1c92516fd0
Merge pull request #3369 from jumpserver/dev
...
Dev
2019-10-22 19:11:55 +08:00
BaiJiangJie
c3f02dbaab
Merge pull request #3368 from jumpserver/dev_icon
...
[Update] 修改icon图片
2019-10-22 19:11:11 +08:00
jym503558564
214c4d2f75
[Update] 修改icon图片
2019-10-22 19:07:23 +08:00
BaiJiangJie
5a98b61c1e
Merge pull request #3367 from jumpserver/dev
...
Dev
2019-10-22 18:57:39 +08:00
BaiJiangJie
11ae5a4a4a
Merge pull request #3365 from jumpserver/login_log_bugfix
...
[Bugfix] 修改导出登录日志的日期选择从开始时间的00:00:00,到结束时间的23:59:59
2019-10-22 17:43:57 +08:00
BaiJiangJie
5f3583279c
[Update] 优化登录日志时间范围 2
2019-10-22 17:42:28 +08:00
BaiJiangJie
950358f5ba
[Update] 优化登录日志时间范围
2019-10-22 17:40:55 +08:00
BaiJiangJie
84b3e29db6
Merge pull request #3366 from jumpserver/bugfix
...
Bugfix
2019-10-22 17:30:22 +08:00
ibuler
a33d5cc53b
[Update] 修改返回asset tree带上组织
2019-10-22 17:21:54 +08:00
jym503558564
3c7fa1b60b
[Update] 修改小问题
2019-10-22 16:26:46 +08:00
jym503558564
f4fc757379
[Bugfix] 修改导出登录日志的日期选择从开始时间的00:00:00,到结束时间的23:59:59
2019-10-22 16:17:42 +08:00
ibuler
7cf617c3fc
[Update] 修改jms启动脚本,stop时增加超时检测
2019-10-22 16:09:21 +08:00
ibuler
87deb18791
[Update] 修改command 批量执行左侧选择系统用户
2019-10-22 15:53:24 +08:00
ibuler
82a6369568
[Update] 修改term大小
2019-10-22 15:38:49 +08:00
ibuler
3a10fd4160
[Update] 修改查看auth info可以关闭mfa
2019-10-22 12:16:50 +08:00
ibuler
a2f8f43321
[Update] 修改查看auth info可以关闭mfa
2019-10-22 11:31:15 +08:00
ibuler
6ebe8e16bd
[Update] 修改读取日志时可能解码失败
2019-10-21 19:28:33 +08:00
ibuler
86522627d3
[Update] 优化提交api报错时滚动到,优化table页面某些列宽度
2019-10-21 19:07:35 +08:00
BaiJiangJie
334e3bef0e
Merge pull request #3363 from jumpserver/dev_ug
...
[Update] 优化用户组详情,用户选择下拉列表使用异步加载;命令过滤详情绑定到系统用户点击不关闭;
2019-10-21 18:46:43 +08:00
BaiJiangJie
0930716a54
[Update] 优化用户组详情,用户选择下拉列表使用异步加载;命令过滤详情绑定到系统用户点击不关闭;
2019-10-21 18:45:12 +08:00
ibuler
f984acf1b2
[Bugfix] 修复导致favorite 和 empty 同时出现
2019-10-21 17:14:49 +08:00
ibuler
87c7452d19
[Update] 修改email msg
2019-10-21 17:02:16 +08:00
ibuler
792fc3b0f0
[Update] 添加koko访问错误说明
2019-10-21 15:29:26 +08:00
ibuler
673ebbec1b
[Update] Merge with dev
2019-10-21 15:19:21 +08:00
ibuler
c2f78b1170
[Update] 修改jumpserver,支持url前缀
2019-10-21 15:15:47 +08:00
BaiJiangJie
20f8c12576
Merge pull request #3358 from jumpserver/dev
...
Dev
2019-10-18 18:52:07 +08:00
BaiJiangJie
1bc6492064
Merge pull request #3359 from jumpserver/dev_fav
...
[Update] 优化收藏资产功能,不刷新页面的情况下,可以在收藏资产列表取消收藏
2019-10-18 18:07:32 +08:00
BaiJiangJie
a7ae132b2b
[Update] 优化收藏资产功能,不刷新页面的情况下,可以在收藏资产列表取消收藏
2019-10-18 18:06:07 +08:00
BaiJiangJie
a978bf990d
Merge pull request #3342 from jumpserver/perms_assets_search_bug
...
[Bugfix] 修复资产授权列表搜索 【node:node_name】/【node_id:node_id】/【is_valid:false】 出现500错误
2019-10-18 16:21:26 +08:00
BaiJiangJie
491f59026c
Merge pull request #3356 from jumpserver/dev_tree
...
[Bugfix] 修复 TreeNode bug
2019-10-18 15:25:43 +08:00
BaiJiangJie
a6531fedb5
[Bugfix] 修复 TreeNode bug
2019-10-18 15:23:46 +08:00
BaiJiangJie
e5250294b0
Dev export ( #3355 )
...
* [Update] 修复导出资产csv文件为空的问题
* [Update] 修改获取系统用户 API 只返回节点数量
2019-10-18 15:12:17 +08:00
BaiJiangJie
f3dc9b886b
Asset favor ( #3352 )
...
* [Update] 拆分filter org
* [Update] 修改session支持protocol搜索
* [Bugfix] 修复判断问题
* [Update] 支持收藏资产
* [update] 修改org resource queryset
* [Update] 修改form serializer 对应的多对多字段
* [Bugfix] 修复其他组织取消收藏的bug
* [Update] 去掉debug信息
* [Update] 修改remote app get queryset
* [Update] 修改remote app get queryset
* [Update] 修改没有授权时显示情况
* [Bugfix] 修复组织管理员查看用户权限失败问题
* [Update] 优化forms assets queryset设置
2019-10-18 15:05:45 +08:00
jym503558564
70664d435f
[Update] 修改小问题
2019-10-17 11:59:18 +08:00
jym503558564
ee97144a10
[Bugfix] 修复资产授权列表 节点搜索报500错误
2019-10-17 11:03:06 +08:00
ibuler
9870d3aa85
[Bugfix] 修复判断问题
2019-10-16 15:31:48 +08:00
ibuler
c3699889e2
[Update] 修改session支持protocol搜索
2019-10-16 15:29:44 +08:00
ibuler
237d51cff9
[Update] 拆分filter org
2019-10-16 13:31:42 +08:00
BaiJiangJie
ccdb770972
Merge pull request #3344 from jumpserver/dev_ug
...
[Update] 更新创建/更新用户组是取消按钮->重置按钮(避免引起歧义)
2019-10-15 17:41:12 +08:00
BaiJiangJie
8fcfcf7ad3
[Update] 更新创建/更新用户组是取消按钮->重置按钮(避免引起歧义)
2019-10-15 17:38:48 +08:00
ibuler
31280a3869
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2019-10-15 16:27:39 +08:00
ibuler
70a4f137b8
[Update] 添加脚本
2019-10-15 16:27:22 +08:00
jym503558564
01ead7c8e1
[Bugfix] 修复资产授权列表搜索 无效的 出现500错误
2019-10-15 12:41:29 +08:00
BaiJiangJie
ad3524f942
Merge pull request #3337 from jumpserver/dev_cmds_es
...
[Bugfix] 修复命令记录从 es 中获取失败(原因:时间日期格式不匹配)
2019-10-14 16:02:35 +08:00
BaiJiangJie
1a1f20920d
[Bugfix] 修改终端命令类型 MAPPING(elasticsearch -> es)
2019-10-14 15:15:06 +08:00
BaiJiangJie
b4d164954d
[Bugfix] 修复命令记录从 es 中获取失败(原因:时间日期格式不匹配)
2019-10-14 11:59:24 +08:00
ibuler
52d0961519
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2019-10-14 11:37:31 +08:00
ibuler
e093475351
[Update] 修改jms stop
2019-10-14 11:37:13 +08:00
BaiJiangJie
13822cbf6d
Merge pull request #3334 from jumpserver/dev_su_asset
...
[Bugfix] 修改调用系统用户资产 API 时 Connectivity is not JSON serializable 的 Bug
2019-10-12 18:14:59 +08:00
BaiJiangJie
b732f4e32c
[Bugfix] 修改调用系统用户资产 API 时 Connectivity is not JSON serializable 的 Bug
2019-10-12 18:00:40 +08:00
BaiJiangJie
c0d1bf8ecc
Merge pull request #3332 from jumpserver/dev_char
...
[Update] 限制 组织和系统用户 名称中使用的特殊字符
2019-10-12 17:42:57 +08:00
BaiJiangJie
1f5cdc3fa4
[Update] 添加翻译: 限制 组织/系统用户名称 中的特殊字符
2019-10-12 17:42:00 +08:00
BaiJiangJie
21b17ca41a
[Update] 系统用户 name 限制使用特殊字符
2019-10-12 17:05:49 +08:00
BaiJiangJie
70713af95a
[Update] 限制组织名称中使用的特殊字符
2019-10-12 16:51:09 +08:00
BaiJiangJie
2f2b0b28b3
Merge pull request #3325 from jumpserver/dev_assets
...
[Bugfix] 修复组织管理员在资产详情页面不显示(删除/更新)按钮的问题
2019-10-11 11:41:37 +08:00
BaiJiangJie
7574966ccf
[Bugfix] 修复组织管理员在资产详情页面不显示(删除/更新)按钮的问题
2019-10-11 11:22:11 +08:00
BaiJiangJie
3986bbf7ac
Merge pull request #3323 from jumpserver/dev_nodes
...
[Update] 优化节点删除 API,返回删除失败原因(包含子节点或资产)
2019-10-10 18:06:47 +08:00
BaiJiangJie
4102dc6842
Merge pull request #3324 from jumpserver/dev_ldap
...
[Update] LDAP 登录认证添加配置项:只有在用户列表中的用户会被允许认证
2019-10-10 18:05:41 +08:00
BaiJiangJie
d1dc3342a2
[Update] 配置项 AUTH_LDAP_USER_LOGIN_ONLY_IN_USERS 添加到 config_example.yml 中
2019-10-10 18:04:31 +08:00
BaiJiangJie
dfedfc7e7a
[Update] LDAP 登录认证添加配置项:只有在用户列表中的用户会被允许认证
2019-10-10 17:53:22 +08:00
BaiJiangJie
7ff6391801
[Update] 修改删除节点 API 返回的状态码
2019-10-10 16:59:57 +08:00
BaiJiangJie
5f96f8c229
[Update] 优化节点删除 API,添加删除失败原因
2019-10-10 16:18:29 +08:00
老广
7e7583e4fc
Merge pull request #3321 from jumpserver/bugfix
...
[Update] 修改celery log
2019-10-10 12:50:13 +08:00
ibuler
74b4ff4993
[Update] 修改celery log
2019-10-10 12:47:21 +08:00
BaiJiangJie
ca50c0a9b3
Merge pull request #3319 from jumpserver/dev_muiltselect
...
[Update] 更新 select2 js/css 依赖版本(4.0.10):解决多选下拉框自动回跳到顶部的问题
2019-10-10 11:27:59 +08:00
BaiJiangJie
cea6ea4826
[Update] 更新 select2 js/css 依赖版本(4.0.10):解决多选下拉框自动回跳到顶部的问题
2019-10-10 11:22:09 +08:00
BaiJiangJie
3bd3564b2b
Merge pull request #3317 from jumpserver/bugfix
...
Bugfix
2019-10-09 19:13:25 +08:00
ibuler
9ee9be3339
Merge remote-tracking branch 'origin/bugfix' into bugfix
2019-10-09 19:10:54 +08:00
ibuler
ce530e417c
[Update] 修改cmd filter rules pattern
2019-10-09 19:10:36 +08:00
BaiJiangJie
c8cade622a
[Update] 优化 LDAP 导入/搜索 逻辑
2019-10-09 18:36:38 +08:00
BaiJiangJie
f65ee12b16
Merge pull request #3316 from jumpserver/dev
...
Dev
2019-10-09 17:32:02 +08:00
BaiJiangJie
230b3edf7b
Merge pull request #3315 from jumpserver/dev_bai
...
[Update] 更新定时测试管理用户可连接性 PERIOD_TASK_ENABLED 判断
2019-10-09 17:24:20 +08:00
BaiJiangJie
670e8afe76
[Update] 更新定时测试管理用户可连接性 PERIOD_TASK_ENABLED 判断
2019-10-09 17:23:22 +08:00
ibuler
e52178811c
[Update] 修改command显示
2019-10-09 16:52:38 +08:00
ibuler
74ab311d3e
[Update] 修改ldap和command
2019-10-09 16:49:36 +08:00
老广
719bea683a
Merge pull request #3313 from jumpserver/dev
...
Dev
2019-10-09 10:50:12 +08:00
ibuler
dc5598f8dc
[Update] 修改settings
2019-10-09 10:43:51 +08:00
ibuler
c6fef20390
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2019-10-08 19:14:43 +08:00
ibuler
87d5b6c473
[Update] 修改启动脚本
2019-10-08 19:14:23 +08:00
ibuler
6b377ec5ef
[Update] 修改启动脚本
2019-10-08 18:17:48 +08:00
BaiJiangJie
aebb98189c
Merge pull request #3311 from jumpserver/dev_email
...
[Update] 邮件设置添加测试邮件收件人配置项
2019-10-08 17:27:49 +08:00
BaiJiangJie
c9ca81e80f
[Update] 邮件设置添加测试邮件收件人配置项
2019-10-08 17:14:33 +08:00
BaiJiangJie
90ec6a2962
[Bugfix] 修复创建资产节点的Bug ( #3308 )
2019-10-08 11:57:22 +08:00
BaiJiangJie
7502a372b5
Merge pull request #3299 from jumpserver/master_readme
...
[Update] 删除 README 访问量统计图标信息
2019-09-29 12:15:19 +08:00
BaiJiangJie
d366b711da
[Update] 删除 README 访问量统计图标信息
2019-09-29 12:14:11 +08:00
BaiJiangJie
16d2b0f1f3
Merge pull request #3298 from jumpserver/dev_readme
...
[Update] 删除 README 访问量统计图标信息
2019-09-29 12:13:03 +08:00
BaiJiangJie
87e485bfe2
[Update] 删除 README 访问量统计图标信息
2019-09-29 12:11:52 +08:00
BaiJiangJie
2f48595cd8
Merge pull request #3295 from jumpserver/dev_ldap_sync_timing
...
[Feature] LDAP/AD 添加定时同步任务
2019-09-27 18:31:40 +08:00
BaiJiangJie
fa1a167f8e
[Feature] 添加同步 LDAP/AD 用户的定时任务3
2019-09-27 18:30:13 +08:00
BaiJiangJie
8b7c5b1545
[Feature] 添加同步 LDAP/AD 用户的定时任务2(添加同步参数配置项)
2019-09-27 18:19:19 +08:00
ibuler
44f8b978f9
[Update] 添加failover ws
2019-09-27 17:48:54 +08:00
BaiJiangJie
8081a864da
Merge branch 'dev' into dev_ldap_sync_timing
2019-09-27 16:56:52 +08:00
BaiJiangJie
674731f7d9
Merge pull request #3294 from jumpserver/dev
...
Dev
2019-09-27 16:25:58 +08:00
ibuler
1a82b8586d
[Update] 修改 access key文档地址引用
2019-09-27 15:40:56 +08:00
BaiJiangJie
892e0562b7
Merge pull request #3293 from jumpserver/bugfix
...
[Update] 表单中用户使用异步
2019-09-27 14:38:51 +08:00
ibuler
9e12f3cd17
[Update] 表单中用户使用异步
2019-09-27 14:18:51 +08:00
BaiJiangJie
4b7cd79682
[Feature] 添加同步 LDAP/AD 用户的定时任务1
2019-09-27 14:04:10 +08:00
ibuler
ed5b2f8bf8
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2019-09-27 10:36:25 +08:00
ibuler
d85c893e3a
[update] 修改默认监听的端口
2019-09-27 10:36:06 +08:00
ibuler
2c46707c2b
[Update] 修改websocket监听端口
2019-09-27 10:20:20 +08:00
BaiJiangJie
2ff295e3b2
Merge pull request #3292 from jumpserver/dev_bai
...
[Update] LDAP 搜索添加分页配置
2019-09-26 19:23:12 +08:00
ibuler
c96d165d3f
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2019-09-26 19:22:32 +08:00
老广
cff009e758
Support ws ( #3291 )
...
* [Update] add ws support
* [Update] 修改log使用websocket
* [Update] 修复 资产用户 右侧动作菜单,字体颜色
* [Update] 修改Dockerfile
* [Bugfix] 修复settings中WSG_APPLICATION
2019-09-26 19:22:17 +08:00
BaiJiangJie
e3c68071b9
[Update] Merge local branch dev to dev_bai
2019-09-26 19:21:15 +08:00
BaiJiangJie
ffc8ddd92e
Merge pull request #3289 from jumpserver/v52_ldap_page
...
V52 LDAP Page
2019-09-26 19:15:28 +08:00
BaiJiangJie
587e3fdd74
[Update] LDAP 搜索分页配置默认值修改为1000
2019-09-26 19:02:26 +08:00
BaiJiangJie
e4ecb19e38
[Update] LDAP 测试连接性也使用分页配置
2019-09-26 18:58:39 +08:00
BaiJiangJie
25fcbf37c3
[Update] LDAP 导入搜索添加分页配置
2019-09-26 18:55:20 +08:00
ibuler
408b27c561
[Update] Add krb-devel
2019-09-26 16:35:56 +08:00
ibuler
e35ba52236
[Update] 修改jms-storage依赖版本
2019-09-26 15:50:41 +08:00
ibuler
b75c525df7
[Update] 添加到 gcc到依赖,避免忘记安装
2019-09-26 15:42:46 +08:00
ibuler
77682611c1
[Update] 添加到wget gcc到依赖,避免忘记安装
2019-09-26 15:42:13 +08:00
ibuler
865cc30d16
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2019-09-26 15:09:21 +08:00
老广
c75fd3c108
Bugfix ( #3286 )
...
* [Update] 用户资产页面链接是 新窗口打开
* [Bugfix] 修复切换组织时, refer为空导致的bug
* [Update] 修复执行命令时报错
* [Bugfix] 修复用户树节点资产数量不对的问题
* [Update] 修改初始化tree
2019-09-26 15:09:10 +08:00
老广
8387c8dbe4
Merge pull request #3285 from jumpserver/dev
...
Bugfix (#3284 )
2019-09-26 10:33:15 +08:00
ibuler
4b322fe9f6
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2019-09-26 10:32:49 +08:00
老广
f87db2f4fc
Bugfix ( #3284 )
...
* [Update] 用户资产页面链接是 新窗口打开
* [Bugfix] 修复切换组织时, refer为空导致的bug
* [Update] 修复执行命令时报错
2019-09-26 10:32:39 +08:00
ibuler
78aba7ae87
[Update] 用户资产页面链接是 新窗口打开
2019-09-25 18:08:58 +08:00
老广
91f64eccda
Merge pull request #3283 from jumpserver/dev
...
Dev
2019-09-25 17:23:00 +08:00
八千流
3c12c33911
[Update] 修改当仅是当前组织审计员时,隐藏终断会话按钮 ( #3275 )
...
* [Update] 修改会话列表中终断按钮,批量终断,SessionViewSet 的权限控制
2019-09-25 16:58:40 +08:00
老广
118fc8c42f
Dev beta ( #3281 )
...
* [Update] 修改发送command日志
* [Update] 修复用户树显示资产数量不对的bug
2019-09-25 16:31:58 +08:00
老广
9f56ac8a21
[Update] 修改可能导致的树创建问题 ( #3280 )
2019-09-25 16:31:18 +08:00
BaiJiangJie
a8c2a348aa
Merge pull request #3279 from jumpserver/dev_asset
...
[Update] 修改资产主机名匹配正则表达式
2019-09-25 15:31:21 +08:00
BaiJiangJie
d7bc8516ff
[Update] 修改资产主机名允许输入中文3
2019-09-25 15:29:59 +08:00
BaiJiangJie
26ef7b7be3
[Update] 修改资产主机名允许输入中文 ( #3278 )
...
* [Update] 修改资产主机名允许输入中文
* [Update] 修改资产主机名允许输入中文2
2019-09-25 15:14:43 +08:00
老广
d3d72f85fd
[Update] 修改启动的参数,修改inventory参数名称 ( #3276 )
2019-09-25 14:40:19 +08:00
BaiJiangJie
40ce9256fc
Merge pull request #3274 from jumpserver/v52
...
V52
2019-09-25 12:38:08 +08:00
BaiJiangJie
a6d87f6de4
Merge pull request #3273 from jumpserver/v52_ldap
...
[Bugfix] 修复 LDAP 用户导入会重复显示的问题(场景:AD 用户在多个 OU 下面)
2019-09-25 12:37:27 +08:00
BaiJiangJie
b2836b9f4f
[Bugfix] 修复 LDAP 用户导入会重复显示的问题(场景:AD 用户在多个 OU 下面)
2019-09-25 12:34:12 +08:00
BaiJiangJie
09565375b5
Merge pull request #3260 from jumpserver/dev
...
Dev
2019-09-24 18:42:16 +08:00
BaiJiangJie
864bcb27ca
Merge pull request #3270 from jumpserver/dev_v52
...
Dev v52
2019-09-24 18:19:26 +08:00
ibuler
47abac000e
[Merge] with v52
2019-09-24 18:17:44 +08:00
BaiJiangJie
326f2160d5
Merge pull request #3268 from jumpserver/v52_bugfix
...
[Update] 修复密码匣子的bug
2019-09-24 18:11:52 +08:00
ibuler
0a13b4bb99
[Update] 修复密码匣子的bug
2019-09-24 18:06:50 +08:00
BaiJiangJie
02087e00fa
Merge pull request #3267 from jumpserver/dev_ra
...
[Update] 优化用户授权 RemoteApp API 逻辑
2019-09-24 16:38:36 +08:00
BaiJiangJie
e805e9cede
[Update] 优化用户授权的 RemoteApp API 过滤逻辑
2019-09-24 16:36:46 +08:00
BaiJiangJie
3f9e2f0af7
[Bugfix] 用户远程应用页面,连接远程应用传递 type 参数
2019-09-24 16:16:52 +08:00
BaiJiangJie
ffb4a26215
Merge pull request #3266 from jumpserver/bugfix
...
[Update] 修改正则表达式
2019-09-24 15:31:03 +08:00
ibuler
5055a9f352
[Update] 修改获取资产的逻辑
2019-09-24 15:18:12 +08:00
ibuler
28afd1f6f9
[Update] 修改正则表达式
2019-09-24 15:00:32 +08:00
BaiJiangJie
11f710b30a
Merge pull request #3265 from jumpserver/dev_v
...
[Update] 修改版本号
2019-09-24 13:13:58 +08:00
BaiJiangJie
b8b4cc2621
[Update] 修改获取 jumpserver.js 的递增值
2019-09-24 13:12:39 +08:00
BaiJiangJie
0078089cdf
[Update] 修改版本号 1.5.3
2019-09-24 13:05:43 +08:00
BaiJiangJie
715c9a1242
Merge pull request #3264 from jumpserver/dev_bai
...
Dev bai
2019-09-24 11:40:56 +08:00
BaiJiangJie
d5af966623
[Update] Merge branch 'master' into dev_bai
2019-09-24 11:39:43 +08:00
BaiJiangJie
cbfcc75c82
Merge pull request #3263 from jumpserver/dev_bugfix
...
[Bugfix] 修复资产授权规则去重
2019-09-24 11:36:41 +08:00
BaiJiangJie
08a19550b2
[Bugfix] 修复资产授权规则去重
2019-09-24 11:35:57 +08:00
BaiJiangJie
ec0cf38c3c
Merge pull request #3262 from jumpserver/dev_trans
...
Dev trans
2019-09-24 11:14:27 +08:00
BaiJiangJie
62e21d9fc0
[Update] 添加翻译
2019-09-24 11:13:37 +08:00
BaiJiangJie
e7cafe86d1
[Update] 添加 js 翻译
2019-09-24 11:10:02 +08:00
BaiJiangJie
df429d56d5
V52 ( #3158 ) ( #3261 )
...
* [Update] 优化切换组织时重定向页面逻辑 (#3133 )
* [Update] 优化切换组织时重定向页面逻辑
* [Update] 优化切换组织时重定向页面逻辑 2
* [Update] WebTerminal 跳转添加时间戳
* [Update] 修复创建授权规则授权节点时,系统用户不自动推送的问题
2019-09-24 10:57:27 +08:00
BaiJiangJie
39dfbc734e
[Bugfix] 修复页面中点击删除按钮时,提示 name 信息为 undefined 的问题 ( #3259 )
...
* [Bugfix] 修复页面中点击删除按钮时,提示 name 信息为 undefined 的问题
* [Bugfix] 修复页面中点击删除按钮时,提示 name 信息为 undefined 的问题 2
2019-09-23 20:36:49 +08:00
BaiJiangJie
9428c186b3
Merge pull request #3258 from jumpserver/dev_ak
...
Dev ak
2019-09-23 20:13:06 +08:00
BaiJiangJie
6db57424aa
[Bugfix] 修改 API key table 的前端变量名 ak_table
2019-09-23 20:11:48 +08:00
BaiJiangJie
7dc8b128d6
[Bugfix] 修复 API Key table 加载时报错(在日志审计模块中)
2019-09-23 20:05:01 +08:00
BaiJiangJie
0ed08c2f4c
[Update] 修改 API Key 页面显示布局
2019-09-23 19:43:47 +08:00
BaiJiangJie
afdf0062eb
Merge pull request #3257 from jumpserver/dev_perms
...
[Update] 添加资产授权规则 generate_fake 方法
2019-09-23 18:37:10 +08:00
BaiJiangJie
fad842a8a0
[Update] 添加资产授权规则 generate_fake 方法
2019-09-23 18:36:02 +08:00
BaiJiangJie
02944d407c
Merge pull request #3256 from jumpserver/dev_i18n
...
[Update] 添加翻译
2019-09-23 16:50:03 +08:00
BaiJiangJie
ddb34a0f59
[Update] 添加翻译
2019-09-23 16:48:59 +08:00
BaiJiangJie
1603d0f146
Merge pull request #3254 from jumpserver/dev_hostname
...
[Update] 资产主机名提示、限制不被允许的特殊字符
2019-09-23 16:40:06 +08:00
BaiJiangJie
1cba714b00
[Update] 资产主机名提示、限制不被允许的特殊字符
2019-09-23 16:37:08 +08:00
BaiJiangJie
ef122ec169
Merge pull request #3253 from jumpserver/dev_session
...
[Update] Session protocol 添加 telnet 选项
2019-09-23 15:35:56 +08:00
BaiJiangJie
b5f94d84f7
[Update] Session protocol 添加 telnet 选项
2019-09-23 15:31:09 +08:00
ibuler
471ed51360
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2019-09-23 14:42:03 +08:00
ibuler
86c5a0ba8b
[Update] 去掉一些filter
2019-09-23 14:41:34 +08:00
BaiJiangJie
6f4d7dd6c6
Merge pull request #3251 from jumpserver/dev_bugfix
...
[Bugfix] 修复改密计划菜单不高亮的问题
2019-09-23 10:46:31 +08:00
BaiJiangJie
76e2f750ce
[Bugfix] 修复改密计划菜单不高亮的问题
2019-09-23 10:45:28 +08:00
ibuler
f15dc881b6
[Update] 修改requirements
2019-09-20 21:05:11 +08:00
BaiJiangJie
fa7150850f
Merge pull request #3243 from jumpserver/gather_asset_user
...
[Feature] 收集资产用户
2019-09-20 12:41:04 +08:00
ibuler
6fc666e60d
[Update] 优化获取系统用户
2019-09-19 22:12:53 +08:00
ibuler
89fa0658e1
[Update] 修改任务执行
2019-09-19 21:21:05 +08:00
ibuler
847e37e641
[Update] 修改一些bug
2019-09-19 17:27:49 +08:00
ibuler
b7021b5ecb
[Update] 支持收集资产上的用户
2019-09-19 14:48:25 +08:00
ibuler
5464c884db
[Update] 修改swagger
2019-09-18 22:06:46 +08:00
BaiJiangJie
dea9151abd
Merge pull request #3242 from jumpserver/v52_config
...
[Update] OpenID 认证共享session配置默认值修改为 True
2019-09-18 20:23:24 +08:00
BaiJiangJie
737f0bc512
Merge pull request #3241 from jumpserver/dev_config
...
[Update] OpenID 认证共享session配置默认值修改为 True 2
2019-09-18 20:22:35 +08:00
BaiJiangJie
36d8eebecf
[Update] OpenID 认证共享session配置默认值修改为 True 2
2019-09-18 20:20:52 +08:00
BaiJiangJie
ecd3317428
[Update] OpenID 认证共享session配置默认值修改为 True
2019-09-18 20:19:30 +08:00
BaiJiangJie
fe5dfcf73f
Merge pull request #3240 from jumpserver/dev_config
...
[Update] OpenID 认证共享session配置默认值修改为 True
2019-09-18 20:17:12 +08:00
BaiJiangJie
9bfee3fce2
[Update] OpenID 认证共享session配置默认值修改为 True
2019-09-18 20:14:49 +08:00
BaiJiangJie
c4bd35bb8a
Merge pull request #3239 from jumpserver/dev_ra
...
[Update] 远程应用授权列表添加系统用户数量显示
2019-09-18 18:40:52 +08:00
BaiJiangJie
9925a270e1
[Update] 远程应用授权列表添加系统用户数量显示
2019-09-18 18:39:07 +08:00
BaiJiangJie
83d7290448
Merge pull request #3236 from jumpserver/dev_usergroups
...
[Bugfix] 修复用户组创建页面Bug
2019-09-17 20:22:27 +08:00
BaiJiangJie
124e042565
[Bugfix] 修复用户组创建页面Bug
2019-09-17 20:08:00 +08:00
ibuler
0db3e41bde
[Update] 拆分asset tasks
2019-09-17 18:59:54 +08:00
ibuler
3681bfc015
[Update] 修改用户组授权api
2019-09-17 17:46:18 +08:00
BaiJiangJie
143ed8e4ed
Merge pull request #3234 from jumpserver/v52_perms
...
[Bugfix] 修复授权规则列表显示重复问题
2019-09-17 15:20:28 +08:00
BaiJiangJie
0625c8121e
[Bugfix] 修复授权规则列表显示重复问题
2019-09-17 15:18:26 +08:00
八千流
82b00008d9
[Update] 修改更新资产的协议组,不能删除协议的问题 ( #3228 )
...
* [Update] 修改更新资产的协议组,不能删除协议的问题
* [Update] 修改前端属性名,避免冲突
2019-09-17 12:35:18 +08:00
老广
1457281b73
Bugfix ( #3232 )
...
* [Update] 拆分user permission
* [Update] 修改 ops command
* [Update] 修改setting无法生效的问题
* [Update] 修复授权详情-授权资产或节点添加资产失败
* [Bugfix] 修复组织管理员运行命令时的问题
* [Update] 修复命令执行左侧树点击问题
2019-09-17 12:34:47 +08:00
BaiJiangJie
4931737164
Merge pull request #3230 from jumpserver/dev_auth
...
[Bugfix] 修复用户认证序列类获取 request 的问题
2019-09-16 18:00:21 +08:00
BaiJiangJie
4797f99f60
[Bugfix] 修复用户认证序列类获取 request 的问题
2019-09-16 17:59:21 +08:00
BaiJiangJie
5828897503
Merge pull request #3227 from jumpserver/dev_users
...
[Update] API允许批量删除用户,修改前端提示信息逻辑
2019-09-16 15:52:28 +08:00
BaiJiangJie
f4c080dd19
[Update] API允许批量删除用户,修改前端提示信息逻辑
2019-09-16 15:45:26 +08:00
BaiJiangJie
b3e20b8b13
Merge pull request #3225 from jumpserver/dev_migrations
...
[Update] 修改perms迁移文件之间的依赖关系,添加迁移文件
2019-09-16 11:07:36 +08:00
BaiJiangJie
354c3c563b
[Update] 修改perms迁移文件之间的依赖关系,添加迁移文件
2019-09-16 11:04:32 +08:00
八千流
a2376d3afd
超级管理员可创建超级审计员并可设置审计员为组织审计员 ( #3141 )
...
* [Update] 超级管理员可创建超级审计员并可设置审计员为组织审计员
* [Update] 修改小问题
* [Update] 修改普通用户角色可以是组织审计员
* [Update] 更改组织审计员切换组织问题
* [Update] 修改小问题
* [Update] 普通用户是组织审计员的页面左侧栏显示
* [Update] 修改删除权限问题和组织显示问题
* [Update] 优化逻辑
* [Update] 优化类名
* [Update] 修改小问题
* [Update] 优化逻辑
* [Update] 优化切换到某一个组织逻辑
* [Update] 修改用户详情页的 删除/更新 按钮是否可点击
* [Update] 优化代码
* [Update] 组织管理列表增加审计员显示
* [Update] 优化代码细节
* [Update] 优化权限类逻辑
* [Update] 优化导航菜单控制
* [Update] 优化页面控制逻辑
* [Update] 修改变量名错误问题
* [Update] 修改页面上的小问题
* [Update] 审计员或组织审计员能够更新个人部分信息
* [Update] 用户名为admin的用户不能被删除
* [Update] 不同用户在不同组织下扮演不同角色的权限不同,为了避免切换组织时出现403,重定向到index
* [Update] 一个用户在同一个组织既是管理员又是审计员,隐藏个人信息模块,仅当是审计员,在当前组织显示个人信息模块
* [Update] 修改方法命名
* [Update] 优化代码细节
* [Update] 修改命令执行列表方法
* [Update] 优化用户之间操作的权限逻辑;添加 UserModel 的 property 属性;修改 Organization 的 related name 名称;
* [Update] 修改OrgProcessor Anonymous问题
* [Update] 修改用户序列类校验组织和转换raw密码的逻辑
2019-09-12 18:56:26 +08:00
ibuler
5f23c358da
[Update] 修改remote app tree node
2019-09-12 18:27:03 +08:00
BaiJiangJie
bdcf9ba153
Dev remoteapp ( #3205 )
...
* [Update] 修改RemoteApp关联的系统用户:从RemoteApp中转移到RemoteAppPermission中(未提交迁移文件)
* [Update] 修改RemoteApp关联的系统用户:提交迁移文件
* [Update] 修改RemoteApp关联的系统用户:修改迁移文件
* [Update] 修改迁移文件1
* [Update] 修改迁移文件2
* [Update] 修改迁移文件3
* [Update] 修改RemoteAppPermsUtil获取系统用户的逻辑
2019-09-12 18:25:22 +08:00
老广
3a8fad7c7d
[Update] 修复页面bug和popover的问题 ( #3219 )
...
* [Update] 修复页面bug和popover的问题
* [Update] 修改asset modal table
* [Update] 修改翻译
* [Update] 修改id cache api mixin
* [Update] 去掉asset permission中不用的代码
2019-09-12 18:18:34 +08:00
ibuler
df9ef23034
[Update] 去掉asset permission中不用的代码
2019-09-12 18:18:19 +08:00
ibuler
ec0bdcce9e
[Update] 修改id cache api mixin
2019-09-12 18:08:00 +08:00
ibuler
1ba6fa65e0
[Update] 修改翻译
2019-09-12 18:02:30 +08:00
ibuler
a8ac99f642
[Update] 修改asset modal table
2019-09-12 17:58:52 +08:00
KubeOperator
6ef0686978
Update README.md ( #3217 )
...
* Update README.md
2019-09-12 11:20:15 +08:00
ibuler
8ddda8e5af
[Update] 修复页面bug和popover的问题
2019-09-12 11:17:15 +08:00
ibuler
444f494c0b
[Update] 修改节点资产数量的bug
2019-09-11 21:35:48 +08:00
ibuler
3fdec62e25
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2019-09-11 21:23:20 +08:00
ibuler
80415afa9f
[Update] 修改asset 过滤资产api
2019-09-11 21:22:56 +08:00
老广
9bcc325c1e
Bugfix ( #3216 )
...
* [Update] 添加 asset permission默认排序,去掉node permission model
* [Update] 修复刷新节点的bug
2019-09-11 21:22:25 +08:00
老广
c1d274028f
[Update] 添加 asset permission默认排序,去掉node permission model ( #3214 )
2019-09-11 19:10:22 +08:00
int32bit
041bab88c0
Assure group when push system user to asset ( #3155 )
...
Some OS like SUSE12SP3 may not create group when create an OS user. In this case, the task "Set home dir permission" will always fail as the group doesn't exist in the system.
2019-09-11 19:04:12 +08:00
Eric_Lee
996da2d90e
upgrade elfinder jquery related files ( #3212 )
2019-09-11 18:57:42 +08:00
老广
dbb441dfb6
Perm cache ( #3211 )
...
* [Update] 修改用户树的cache
* [Update] 修改用户树缓存
* [Update] telnet (beta) => telnet
2019-09-11 18:52:42 +08:00
BaiJiangJie
4f7c668c45
Merge pull request #3209 from jumpserver/dev_initnodes
...
[Bugfix] 修改初始化一些节点时,assets_node表不存在的问题
2019-09-11 14:52:32 +08:00
BaiJiangJie
9f2e49c9e9
[Bugfix] 修改初始化一些节点时,assets_node表不存在的问题
2019-09-11 14:46:39 +08:00
老广
c0afeba215
Merge pull request #3208 from jumpserver/dev_serializer
...
[Bugfix] 解决批量创建系统用户等资源时,initial_data.get() 失败的问题
2019-09-11 14:44:35 +08:00
BaiJiangJie
1eb2038ec4
[Bugfix] 解决批量创建系统用户等资源时,initial_data.get() 失败的问题
2019-09-11 14:40:09 +08:00
老广
c2ea867d95
Merge pull request #3204 from jumpserver/dev_session
...
[Update] 在线会话列表允许终端 RDP session
2019-09-11 11:03:24 +08:00
BaiJiangJie
1b7294f714
[Update] 在线会话列表允许终端 RDP session
2019-09-11 10:50:34 +08:00
ibuler
d1f37d4bbf
[Update] 修改 remote app api
2019-09-10 21:11:22 +08:00
ibuler
6cb9ae69b2
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2019-08-31 12:07:26 +08:00
老广
de43980ee2
Dev beta2 ( #3177 )
...
* [Update] 添加loading
* [Update] stash
* [Update] 修改permission
2019-08-31 12:07:03 +08:00
ibuler
3977b73185
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2019-08-30 10:36:50 +08:00
BaiJiangJie
d5dcab15a8
Dev v52 ( #3171 )
...
* [Update] WebTerminal 跳转添加时间戳
* [Update] 修复创建授权规则授权节点时,系统用户不自动推送的问题
* [Update] remote app tree添加 User (#3159 )
* fix web sftp select all items display (#3162 )
* [Update] 更新翻译(批量改密) (#3170 )
* [Update] 更新翻译(批量改密)
* [Update] 更新翻译(批量改密)2
2019-08-28 18:41:09 +08:00
BaiJiangJie
f08d317bfd
[Update] 更新翻译(批量改密) ( #3170 )
...
* [Update] 更新翻译(批量改密)
* [Update] 更新翻译(批量改密)2
2019-08-28 16:17:40 +08:00
ibuler
3fb79c7726
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2019-08-28 11:44:09 +08:00
老广
8cd8f41cb0
Dev beta ( #3167 )
...
* [Update] 添加loading
* [Update] 修改避免游离资产
* [Update] 修改nodes
* [Update] 修改支持未分组
2019-08-28 11:43:55 +08:00
Eric_Lee
d8e5c64826
fix web sftp select all items display ( #3162 )
2019-08-26 19:09:53 +08:00
老广
ede7365da8
[Update] remote app tree添加 User ( #3159 )
2019-08-26 12:15:29 +08:00
BaiJiangJie
05818671a7
V52 ( #3158 )
...
* [Update] 优化切换组织时重定向页面逻辑 (#3133 )
* [Update] 优化切换组织时重定向页面逻辑
* [Update] 优化切换组织时重定向页面逻辑 2
* [Update] WebTerminal 跳转添加时间戳
* [Update] 修复创建授权规则授权节点时,系统用户不自动推送的问题
2019-08-26 11:58:06 +08:00
BaiJiangJie
57eed7fab6
Merge pull request #3157 from jumpserver/v52_perms
...
[Update] 修复创建授权规则授权节点时,系统用户不自动推送的问题
2019-08-26 11:56:40 +08:00
BaiJiangJie
fb94050732
[Update] 修复创建授权规则授权节点时,系统用户不自动推送的问题
2019-08-26 11:54:20 +08:00
ibuler
02d3ae37aa
[Update] 添加loading
2019-08-26 10:17:59 +08:00
老广
1fe18e8073
Bugfix ( #3153 )
...
* [Update] 修改一部分bug
* [Update] 修改一些
2019-08-23 18:23:07 +08:00
BaiJiangJie
de1a08a52f
[Update] WebTerminal 跳转添加时间戳 ( #3149 )
2019-08-22 12:41:28 +08:00
BaiJiangJie
f47f8a66fe
Merge pull request #3148 from jumpserver/v52_luna
...
[Update] WebTerminal 跳转添加时间戳
2019-08-22 12:40:40 +08:00
BaiJiangJie
f6722c5a26
[Update] WebTerminal 跳转添加时间戳
2019-08-22 12:39:32 +08:00
BaiJiangJie
42a0e30891
Merge pull request #3146 from jumpserver/dev_req
...
[Update] 更新依赖
2019-08-22 10:24:12 +08:00
BaiJiangJie
01b08710d1
[Update] 更新依赖
2019-08-22 10:23:21 +08:00
老广
164f48e131
Dev beta ( #3048 )
...
* [Update] 统一url地址
* [Update] 修改api
* [Update] 使用规范的签名
* [Update] 修改url
* [Update] 修改swagger
* [Update] 添加serializer class避免报错
* [Update] 修改token
* [Update] 支持api key
* [Update] 支持生成api key
* [Update] 修改api重定向
* [Update] 修改翻译
* [Update] 添加说明文档
* [Update] 修复浏览器关闭后session不失效的问题
* [Update] 修改一些内容
* [Update] 修改 jms脚本
* [Update] 修改重定向
* [Update] 修改搜索trim
* [Update] 修改搜索trim
* [Update] 添加sys log
* [Bugfix] 修改登陆错误
* [Update] 优化User操作private_token的接口 (#3091 )
* [Update] 优化User操作private_token的接口
* [Update] 优化User操作private_token的接口 2
* [Bugfix] 解决授权了一个节点,当移动节点后,被移动的节点下的资产会放到未分组节点下的问题
* [Update] 升级jquery
* [Update] 默认使用page
* [Update] 修改使用Orgmodel view set
* [Update] 支持 nv的硬盘 https://github.com/jumpserver/jumpserver/issues/1804
* [UPdate] 解决命令执行宽度问题
* [Update] 优化节点
* [Update] 修改nodes过多时创建比较麻烦
* [Update] 修改导入
* [Update] 节点获取更新
* [Update] 修改nodes
* [Update] nodes显示full value
* [Update] 统一使用nodes select2 函数
* [Update] 修改磁盘大小小数
* [Update] 修改 Node service
* [Update] 优化授权节点
* [Update] 修改 node permission
* [Update] 修改asset permission
* [Stash]
* [Update] 修改node assets api
* [Update] 修改tree service,支持资产数量
* [Update] 修改暂时完成
* [Update] 修改一些bug
2019-08-21 20:27:21 +08:00
BaiJiangJie
fe6f7bcfc1
Merge pull request #3134 from jumpserver/v52
...
V52
2019-08-16 16:34:20 +08:00
BaiJiangJie
48826a9ad9
[Update] 优化切换组织时重定向页面逻辑 ( #3133 )
...
* [Update] 优化切换组织时重定向页面逻辑
* [Update] 优化切换组织时重定向页面逻辑 2
2019-08-16 16:33:05 +08:00
老广
7d4e9c5669
Merge pull request #3131 from jumpserver/dev
...
Dev
2019-08-16 10:48:16 +08:00
BaiJiangJie
088f815a30
Merge pull request #3129 from jumpserver/v52_remoteapp
...
V52 remoteapp
2019-08-15 19:10:18 +08:00
BaiJiangJie
7d1e8d258c
Merge pull request #3128 from jumpserver/v52_remoteapp
...
[Bugfix] 修复remote-app应用创建/更新时,参数设置不成功的bug
2019-08-15 19:09:29 +08:00
BaiJiangJie
50f50a4f28
[Bugfix] 修复remote-app应用创建/更新时,参数设置不成功的bug
2019-08-15 19:08:04 +08:00
BaiJiangJie
820dcaaae7
Merge pull request #3127 from jumpserver/v52_manager
...
V52 manager
2019-08-15 15:30:06 +08:00
BaiJiangJie
10de4f4ef8
Merge pull request #3126 from jumpserver/v52_manager
...
[Update] 修复资产用户管理器获取 __name__ 的问题
2019-08-15 15:28:40 +08:00
BaiJiangJie
214b4026ec
[Update] 修复资产用户管理器获取 __name__ 的问题
2019-08-15 15:26:14 +08:00
老广
a5e59e6787
Merge pull request #3121 from jumpserver/dev
...
Dev
2019-08-14 20:26:46 +08:00
ibuler
907d93bcad
[Update] 还原一些
2019-08-14 20:26:05 +08:00
ibuler
c84df42ff4
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2019-08-14 20:23:26 +08:00
ibuler
8fb0d6315d
[Update] 修改导入bug
2019-08-14 20:23:02 +08:00
BaiJiangJie
72e746181f
Merge pull request #3118 from jumpserver/dev_perms
...
[Update] 优化资产授权详情页面,添加系统用户后自动reload页面
2019-08-14 18:00:14 +08:00
BaiJiangJie
a10fa3c55b
[Update] 优化资产授权详情页面,添加系统用户后自动reload页面
2019-08-14 17:59:11 +08:00
老广
d0633adc38
Merge pull request #3109 from KubeOperator/patch-1
...
Update README.md
2019-08-12 19:15:04 +08:00
老广
d8ee6d6092
Merge pull request #3110 from jumpserver/dev
...
[Update] 修改nodes
2019-08-12 19:14:08 +08:00
ibuler
a315df29ca
[Update] 暂时不更改这里逻辑
2019-08-12 19:11:32 +08:00
ibuler
2e9711ae8a
[Update] 修改nodes
2019-08-12 19:03:10 +08:00
KubeOperator
75f66a3809
Update README.md
2019-08-12 19:01:18 +08:00
老广
fff9f31913
Merge pull request #3108 from jumpserver/dev
...
Dev
2019-08-12 17:45:34 +08:00
老广
ef73469d5d
Merge pull request #3107 from jumpserver/bugfix
...
[Update] 修改避免每次刷新asset user的可连接性
2019-08-12 17:42:35 +08:00
ibuler
05e4e7301c
[Update] 修改避免每次刷新asset user的可连接性
2019-08-12 17:41:18 +08:00
老广
2d7d9d4de7
Merge pull request #3105 from jumpserver/bugfix
...
Bugfix
2019-08-12 17:14:50 +08:00
ibuler
fdef282c57
[Bugfix] 修复批量更新用户的bug, 导出字段添加 *
2019-08-12 17:05:01 +08:00
老广
39528a935b
Merge pull request #3100 from jumpserver/elfinder_theme
...
fix selected item display bug
2019-08-09 16:40:18 +08:00
Eric
22b0b77b83
fix selected item display bug
2019-08-09 16:13:31 +08:00
ibuler
a188968e5d
[Update] 修复Model过长的bug
2019-08-08 19:04:50 +08:00
ibuler
3c9814191d
[Update] 修改缩进
2019-08-08 18:33:48 +08:00
ibuler
785b375f4a
[Bugfix] 修复授权列表用户无法搜索的bug
2019-08-08 18:32:44 +08:00
ibuler
fbfbfcc274
[Update] 修复磁盘显示单位问题
2019-08-08 17:59:51 +08:00
ibuler
42ff5a382a
[Update] 修改设置session的时间,避免sdk等报错
2019-08-08 15:14:08 +08:00
老广
acc03f14dd
Merge pull request #3094 from jumpserver/dev
...
Dev
2019-08-08 14:27:45 +08:00
ibuler
0ee5d3b79f
[Update] Add to english readme
2019-08-08 14:26:01 +08:00
ibuler
53a5c53857
[Update] 添加访问数量
2019-08-08 14:24:37 +08:00
老广
e14bbb2698
Merge pull request #3093 from jumpserver/allow_show_all_nodes
...
[Update] 控制是否显示未分组节点
2019-08-08 13:38:19 +08:00
ibuler
6b56c43a3a
[Update] 控制是否显示未分组节点
2019-08-08 13:03:03 +08:00
老广
d222376b1f
Merge pull request #3075 from jumpserver/dev
...
Dev
2019-08-05 10:15:20 +08:00
ibuler
c3a206b291
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2019-08-05 10:01:33 +08:00
ibuler
afffb50b94
[UPdate] 修改手动模式问题
2019-08-05 10:01:03 +08:00
老广
45e06d215e
Merge pull request #3071 from jumpserver/i18n
...
修改elfinder中文翻译
2019-08-02 19:51:42 +08:00
Eric
2208320049
修改elfinder中文翻译
2019-08-02 19:49:25 +08:00
BaiJiangJie
af2b6742cf
Merge pull request #3066 from jumpserver/dev
...
Dev
2019-08-01 17:13:53 +08:00
BaiJiangJie
4254775149
Bugfix ( #3065 )
...
* [Update] 修复浏览器关闭后session不失效的问题
* [Update] 修改一些内容
* [Update] 解决命令执行找不到对象的问题
* [Update] 修改Permission判断
* [Update] 修改session
* [Update] 修改创建系统用户时没有public key
2019-08-01 17:10:02 +08:00
BaiJiangJie
44d41e86c9
Merge pull request #3059 from jumpserver/dev_users
...
[Update] 添加用户过期邮件提醒
2019-07-31 17:07:27 +08:00
BaiJiangJie
586d6e6abb
[Update] 添加用户过期邮件提醒
2019-07-31 16:57:21 +08:00
BaiJiangJie
9ab6c58676
Merge pull request #3055 from jumpserver/dev_login
...
[Update] 用户登录失败次数提示
2019-07-30 19:12:39 +08:00
BaiJiangJie
3d9c0a212e
[Update] 用户登录失败次数提示
2019-07-30 19:10:06 +08:00
老广
f51c6efddc
Merge pull request #3054 from jumpserver/dev
...
获取子节点资产时 使用 in
2019-07-30 17:48:24 +08:00
老广
bb235f3e88
[Update] 修改获取资产时使用in ( #3053 )
2019-07-30 17:46:27 +08:00
ibuler
c706a410a2
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2019-07-30 16:50:05 +08:00
ibuler
d0c74a7704
[Bugfix] 修复只设置公钥不推送的问题
2019-07-30 16:49:54 +08:00
BaiJiangJie
32dacecd24
Merge pull request #3052 from jumpserver/dev_bai
...
[Update] htmlEscape
2019-07-30 15:11:02 +08:00
BaiJiangJie
a7066a5c85
[Update] htmlEscape
2019-07-30 15:10:14 +08:00
BaiJiangJie
4fe74e9e25
Merge pull request #3051 from jumpserver/dev_bai
...
[Update] 密码过期邮件发送(密码未过期用户&有效用户)
2019-07-30 12:57:55 +08:00
BaiJiangJie
637fc91413
[Update] 密码过期邮件发送(密码未过期用户&有效用户)
2019-07-30 12:52:45 +08:00
BaiJiangJie
b5aa69db61
Merge pull request #3045 from jumpserver/dev_bai
...
[Update] 修改翻译(Cloud)
2019-07-29 18:44:30 +08:00
BaiJiangJie
89a98be6ce
[Update] 修改翻译(Cloud)
2019-07-29 18:24:43 +08:00
老广
c6ec00e84d
[Update] 修改collect static file机制 ( #3044 )
2019-07-29 17:01:27 +08:00
AnJia
99ce688a70
added Vagrantfile to support windows dev ( #3036 )
2019-07-29 17:00:31 +08:00
BaiJiangJie
3cdabaf883
[Update] 系统用户资产管理页面获取相关的所有资产 ( #3038 )
...
* [Update] 系统用户资产管理页面获取相关的所有资产
* [Update] 系统用户资产管理页面获取相关的所有资产2
2019-07-26 16:16:06 +08:00
BaiJiangJie
be59bff3d0
Merge pull request #3035 from jumpserver/dev
...
Dev
2019-07-26 10:50:30 +08:00
BaiJiangJie
28f0302e4d
Merge pull request #3034 from jumpserver/dev_bai
...
[Update] 是否允许用户更改/使用密钥登录,根据settings配置进行控制
2019-07-26 10:49:46 +08:00
BaiJiangJie
947f16e371
[Update] 是否允许用户更改/使用密钥登录,根据settings配置进行控制
2019-07-26 10:46:43 +08:00
BaiJiangJie
7e8f734301
Merge pull request #3033 from jumpserver/dev
...
Dev
2019-07-25 16:58:27 +08:00
BaiJiangJie
69841a4198
[Feature] 资产授权规则页面添加刷新授权缓存按钮 ( #3032 )
...
* [Feature] 资产授权规则页面添加刷新授权缓存按钮
* [Feature] 添加注释
2019-07-25 16:25:12 +08:00
BaiJiangJie
4f7daa96a7
Merge pull request #3026 from jumpserver/dev_bai
...
[Update] 授权资产变动过期所有缓存(cache_key和cache_meta_key)
2019-07-24 17:48:19 +08:00
BaiJiangJie
31c220605e
[Update] 授权资产变动过期所有缓存(cache_key和cache_meta_key)
2019-07-24 17:45:38 +08:00
BaiJiangJie
2f439fd417
Merge pull request #3024 from jumpserver/dev_bai
...
[Bugfix] 解决用户登录日志记录错误的问题(coco端登录记录类型为Web)
2019-07-24 15:53:27 +08:00
BaiJiangJie
f4c835d47a
[Bugfix] 解决用户登录日志记录错误的问题(coco端登录记录类型为Web)
2019-07-24 15:49:37 +08:00
BaiJiangJie
c929c1a87e
[Bugfix] 解决下载导入模版时KeyError的问题(数据为空时) ( #3017 )
...
* [Bugfix] 解决下载导入模版时KeyError的问题(数据为空时)
* [Bugfix] 解决下载导入模版时KeyError的问题(数据为空时)2
* [Bugfix] 解决下载导入模版时KeyError的问题(数据为空时)3
* [Update] 解决LDAP用户禁用后,终端还可以登录成功一次的问题
* [Update] 解决LDAP用户禁用后,终端还可以登录成功一次的问题2
* [Update] LDAP AD Server可以通过UserAccountControl映射is_active字段
* [Update] 限制只有local用户可以更新ssh key
* [Update] 限制只有local用户可以更新ssh key 2
2019-07-24 12:50:39 +08:00
老广
b7915ccdeb
Merge pull request #3015 from jumpserver/dev
...
Bugfix (#3014 )
2019-07-23 14:49:21 +08:00
老广
421e98696c
Bugfix ( #3014 )
...
* [Bugfix] 修复英文时间时期的bug
* [bugfix] 修复session时间日期的问题
* [Bugfix] 修改时间日志格式化错误
* [Update] 修改函数名称
* [Update] 修改函数顺序
* [Bugfix] 修复节点刷新菜单一直append的bug
2019-07-23 14:48:37 +08:00
老广
00e1bf6cff
Merge pull request #3013 from jumpserver/dev
...
Dev
2019-07-23 14:41:36 +08:00
老广
9454854f6c
Merge pull request #2684 from yubinhong/master
...
add gcc libc-dev linux-headers make autoconf
2019-07-23 12:01:42 +08:00
BaiJiangJie
74ae8636a8
Merge pull request #3011 from jumpserver/dev_bai
...
[Bugfix] 解决邮件设置不成功的问题(提交前点击测试按钮)
2019-07-22 18:55:26 +08:00
BaiJiangJie
d93305f6a4
[Bugfix] 解决邮件设置不成功的问题(提交前点击测试按钮)
2019-07-22 18:53:51 +08:00
老广
332d75b62a
Merge pull request #3009 from jumpserver/dev
...
Bugfix (#3007 )
2019-07-22 17:16:29 +08:00
老广
5db704f793
Bugfix ( #3007 )
...
* [Bugfix] 修复英文时间时期的bug
* [bugfix] 修复session时间日期的问题
* [Bugfix] 修改时间日志格式化错误
* [Update] 修改函数名称
* [Update] 修改函数顺序
* [Update] 注释部分迁移文件内容
2019-07-22 17:15:24 +08:00
老广
37be53f334
Merge pull request #3004 from jumpserver/dev
...
修改显示节点下的所有资产
2019-07-22 11:39:50 +08:00
老广
5f59c729b7
Perm for assets ( #3003 )
...
* [Update] 授权显示节点下所有的资产
* [Update] 修改返回资产的comment
* [Update] 修改节点返回字段
2019-07-22 11:38:09 +08:00
老广
a8af4e8804
Perm for assets ( #3002 )
...
* [Update] 授权显示节点下所有的资产
* [Update] 修改返回资产的comment
2019-07-22 11:25:04 +08:00
老广
8f5e91bc34
[Update] 授权显示节点下所有的资产 ( #3001 )
2019-07-22 11:12:38 +08:00
BaiJiangJie
277bbc0798
Merge pull request #2996 from jumpserver/dev
...
Dev
2019-07-19 13:13:01 +08:00
BaiJiangJie
d97654b851
Merge pull request #2995 from jumpserver/bugfix
...
Bugfix
2019-07-19 13:12:32 +08:00
BaiJiangJie
7ec82cbc60
[Update] 修改列表日期2
2019-07-19 13:10:34 +08:00
BaiJiangJie
63c2343d2c
[Update] 修改列表日期
2019-07-19 12:55:43 +08:00
ibuler
d93fe11373
[Bugfix] 修复date format错误
2019-07-19 12:01:17 +08:00
BaiJiangJie
fedfbba30c
Merge pull request #2991 from jumpserver/dev
...
Dev
2019-07-18 18:02:48 +08:00
ibuler
49ccba85a2
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2019-07-18 16:33:18 +08:00
ibuler
9903adf71b
[Update] 修改cache policy 开关
2019-07-18 16:32:46 +08:00
BaiJiangJie
48cfc4d4ce
Merge pull request #2990 from jumpserver/dev
...
Dev
2019-07-18 13:58:47 +08:00
BaiJiangJie
1f5cc1eef1
Merge pull request #2989 from jumpserver/dev_bai
...
[Update] 解决授权资产页面资产重复的问题
2019-07-18 13:57:05 +08:00
BaiJiangJie
ce1bb66f23
[Update] 解决授权资产页面资产重复的问题
2019-07-18 13:56:08 +08:00
BaiJiangJie
6f9528d78d
Merge pull request #2987 from jumpserver/dev
...
Dev
2019-07-18 13:42:37 +08:00
BaiJiangJie
fc01b952b3
Merge pull request #2986 from jumpserver/dev_trans
...
[Update] 修改翻译
2019-07-18 13:23:40 +08:00
BaiJiangJie
51f4c1cde0
[Update] 修改翻译
2019-07-18 13:21:10 +08:00
ibuler
8bb82d168b
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2019-07-18 13:01:38 +08:00
ibuler
1ef16d55ef
[Update] 优化详情页获取nodes
2019-07-18 13:01:07 +08:00
BaiJiangJie
a242bdd3b1
Merge pull request #2983 from jumpserver/dev
...
Dev
2019-07-18 11:20:09 +08:00
BaiJiangJie
97bc3d5e7c
Merge pull request #2984 from jumpserver/gateway_conn_bug
...
[Bugfix] 修复网关测试连接失败未捕获导致报500的bug
2019-07-18 11:16:36 +08:00
jym503558564
dbb27a7771
[Bugfix] 修复网关测试连接失败未捕获导致报500的bug
2019-07-18 11:13:58 +08:00
八千流
ea11aa4abb
[Bugfix] 修改排序,去掉标签 ( #2982 )
...
* [Update] 修改排序,去掉标签
* [Bugfix] 修改排序
* [Bugfix] 修改小问题
* [Bugfix] 修改小问题
2019-07-18 11:01:28 +08:00
ibuler
1af40b6ca0
[Update] 支持etag
2019-07-17 22:14:39 +08:00
老广
1b220326bf
Merge pull request #2981 from jumpserver/dev
...
Bugfix (#2980 )
2019-07-17 19:55:29 +08:00
老广
8ed3bb8586
Bugfix ( #2980 )
...
* [Update] 修改排序,去掉标签
* [Update] 修改批量更新后刷新页面
* [Update] 修改面包屑
* [Update] 修改用户排序
* [Update] 处理未登录主机显示为负数
* [Update] 支持单个资产的搜索
2019-07-17 19:52:33 +08:00
老广
887cda3287
Merge pull request #2978 from jumpserver/dev
...
Dev 修改private key校验
2019-07-17 13:46:04 +08:00
ibuler
40de7d64c6
[Update] 修改private创建
2019-07-17 13:41:26 +08:00
ibuler
fbc948fd7c
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2019-07-17 12:54:44 +08:00
ibuler
12b2f2f499
[Update] 刷新session有效期
2019-07-17 12:54:00 +08:00
BaiJiangJie
37c10c6cf5
Merge pull request #2976 from jumpserver/dev
...
[Update] 解决授权资产显示禁用资产的问题 (#2975 )
2019-07-17 12:11:40 +08:00
BaiJiangJie
3451c2b418
[Update] 解决授权资产显示禁用资产的问题 ( #2975 )
...
* [Update] 解决授权资产显示禁用资产的问题
* [Bugfix] 解决资产更新页面取消激活失败的问题
* [Bugfix] 解决资产详情页面禁用资产时会清除协议的问题
* [Bugfix] 解决创建/更新管理用户、系统用户提交密钥错误时报错的问题
2019-07-17 12:10:14 +08:00
BaiJiangJie
158e2a9112
Merge pull request #2973 from jumpserver/dev
...
Merge pull request #2972 from jumpserver/dev_bai
2019-07-16 19:08:15 +08:00
BaiJiangJie
1c7a09c9e3
Merge pull request #2972 from jumpserver/dev_bai
...
[Update] 修改CommandFilter的system_users字段为不必填
2019-07-16 19:05:44 +08:00
BaiJiangJie
28b7768601
Merge pull request #2971 from jumpserver/dev_bai
...
[Update] 修改CommandFilter的system_users字段为不必填
2019-07-16 18:49:33 +08:00
BaiJiangJie
d21bb5207b
[Update] 修改CommandFilter的system_users字段为不必填
2019-07-16 17:55:43 +08:00
BaiJiangJie
7a82c91bc8
Merge pull request #2970 from jumpserver/dev
...
Dev
2019-07-16 17:16:03 +08:00
BaiJiangJie
bf2ed21020
Merge pull request #2969 from jumpserver/dev_bai
...
[Update] 修改翻译
2019-07-16 17:14:11 +08:00
BaiJiangJie
560be610fe
[Update] 修改翻译
2019-07-16 17:06:33 +08:00
BaiJiangJie
3d1d652cfb
Merge pull request #2968 from jumpserver/dev
...
Dev
2019-07-16 17:00:41 +08:00
BaiJiangJie
f70567f44b
Merge pull request #2966 from jumpserver/perms_detail_delete_bug
...
[Bugfix] 修复资产授权详情页 删除弹出框的权限名显示不对
2019-07-16 16:57:26 +08:00
BaiJiangJie
0b9308282f
Merge pull request #2967 from jumpserver/dev_bai
...
[Update] 修改版本号
2019-07-16 16:54:43 +08:00
BaiJiangJie
2259bc5ea2
[Update] 修改版本号
2019-07-16 16:49:43 +08:00
BaiJiangJie
eb93e634e0
Merge pull request #2964 from jumpserver/dev
...
Dev
2019-07-16 15:42:23 +08:00
BaiJiangJie
e0802ef2c3
Merge pull request #2965 from jumpserver/dev_bai
...
[Update] 添加命令过滤器Model中字段name改为unique的迁移文件
2019-07-16 15:40:47 +08:00
jym503558564
1993dba2e0
[Bugfix] 修复资产授权详情页 删除弹出框的权限名显示不对
2019-07-16 15:40:41 +08:00
BaiJiangJie
018bf80930
[Update] 添加命令过滤器Model中字段name改为unique的迁移文件
2019-07-16 15:38:44 +08:00
BaiJiangJie
6eaa1bc3f9
Merge pull request #2963 from jumpserver/cmd_filter_detail_delete_bug
...
[Bugfix] 修复命令过滤器详情页 删除功能无效的bug
2019-07-16 15:33:08 +08:00
BaiJiangJie
d8d9174454
Merge pull request #2962 from jumpserver/domain_detail_delete_bug
...
[Bugfix] 修复网域详情页 删除功能无效的bug
2019-07-16 15:30:08 +08:00
BaiJiangJie
bd2f0168a1
Merge pull request #2961 from jumpserver/command_filter_model_bug
...
[Bugfix] 修复命令过滤器名称可重复问题
2019-07-16 15:27:00 +08:00
BaiJiangJie
a81601b0a1
Merge pull request #2959 from jumpserver/command_list_html_bug
...
[Bugfix] 修复命令记录页面的时间转换bug
2019-07-16 15:26:30 +08:00
jym503558564
3c166abd2d
[Bugfix] 修复命令过滤器详情页 删除功能无效的bug
2019-07-16 15:25:49 +08:00
BaiJiangJie
25d40388da
Merge pull request #2958 from jumpserver/cmd_detail_add_system_user_bug
...
[Bugfix] 修复命令过滤器详情添加不了系统用户的bug
2019-07-16 15:08:15 +08:00
jym503558564
74aa51578b
[Bugfix] 修复网域详情页 删除功能无效的bug
2019-07-16 15:06:25 +08:00
jym503558564
48cde91dc1
[Bugfix] 修复命令过滤器名称可重复问题
2019-07-16 14:33:27 +08:00
BaiJiangJie
9455a1c3c0
Merge pull request #2960 from jumpserver/dev_bai
...
[Update] 获取用户授权资产时只返回资产协议支持的系统用户
2019-07-16 13:33:47 +08:00
BaiJiangJie
f19f28cf3e
[Update] 获取用户授权资产时只返回资产协议支持的系统用户
2019-07-16 13:24:16 +08:00
jym503558564
59426d4aa9
[Bugfix] 修复命令记录页面的时间转换bug
2019-07-16 12:01:09 +08:00
jym503558564
e9e601fe45
[Bugfix] 修复命令过滤器详情添加不了系统用户的bug
2019-07-16 11:02:05 +08:00
ibuler
4d1da1d292
[Update] 给jumpserver.js添加版本号
2019-07-16 10:29:20 +08:00
老广
341b654078
Merge pull request #2957 from jumpserver/dev
...
Dev
2019-07-16 10:12:14 +08:00
ibuler
875a069a18
[Update] 修改校验规则
2019-07-16 10:09:36 +08:00
ibuler
106abc24f8
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2019-07-16 10:08:06 +08:00
八千流
ab520ee345
[Bugfix] 缺少引入翻译 ( #2956 )
2019-07-16 10:03:00 +08:00
BaiJiangJie
e212d413dc
Merge pull request #2954 from jumpserver/dev_bai
...
[Bugfix] 修改资产列表数量显示的Bug
2019-07-15 19:04:14 +08:00
BaiJiangJie
6f2f025b04
[Bugfix] 修改资产列表数量显示的Bug
2019-07-15 19:02:00 +08:00
BaiJiangJie
a884d0d531
[Bugfix] 修改Bug ( #2952 )
...
* [Bugfix] 取消管理用户列表按资产数量字段排序
* [Bugfix] 修复后去用户资产权限动作的Bug
2019-07-15 18:47:17 +08:00
八千流
6cf11ab411
[Update] 优化mfa验证身份页面水平线在大屏幕无自动对其问题 ( #2948 )
...
* [Update] 优化mfa验证身份页面水平线在大屏幕无自动对其问题
* [Update] 修改小问题
2019-07-15 15:38:34 +08:00
老广
c8623c3b8c
Merge pull request #2947 from jumpserver/dev
...
Dev
2019-07-15 15:11:30 +08:00
老广
9d54baac09
Secure ( #2946 )
...
* [Update] 修改assets
* [Update] 添加关闭terminal注册的设置
* [Update] 去掉sql打印
2019-07-15 15:11:01 +08:00
BaiJiangJie
382bb89e8e
Merge pull request #2945 from jumpserver/dev_bai
...
[Update] 优化创建RemoteApp前端逻辑
2019-07-15 15:02:36 +08:00
BaiJiangJie
92aeecbc3e
[Update] 优化创建RemoteApp前端逻辑
2019-07-15 14:57:57 +08:00
八千流
9219786f2d
[Update] 创建/更新 远程应用 使用api ( #2940 )
...
* [Update] 创建/更新 远程应用 使用api
* [Update] 优化 params
* [Update] 修改小问题
2019-07-15 14:42:54 +08:00
ibuler
d2516cc328
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2019-07-15 14:37:18 +08:00
老广
ab9744d529
Bugfix ( #2944 )
...
* [Update] 修改assets
* [Update] 修改nodes
2019-07-15 14:36:11 +08:00
ibuler
3ac3581622
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2019-07-15 14:35:34 +08:00
BaiJiangJie
13ca70b328
Merge pull request #2942 from jumpserver/remote_app_perms_api
...
[Update] 创建/更新 远程应用授权 使用api
2019-07-15 14:25:06 +08:00
BaiJiangJie
911abeddd0
Merge pull request #2943 from jumpserver/dev_bai
...
[Bugfix] 修改授权规则详情用户组数量显示错误
2019-07-15 14:20:49 +08:00
BaiJiangJie
4ba306f597
[Bugfix] 修改授权规则详情用户组数量显示错误
2019-07-15 14:14:23 +08:00
jym503558564
cc7ce04402
[Update] 创建/更新 远程应用授权 使用api
2019-07-15 09:53:22 +08:00
ibuler
dfcf0995cd
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2019-07-12 18:33:17 +08:00
老广
55b049c86a
Bugfix ( #2938 )
...
* [Update] 修改assets
* [Update] 修复用户组页面权限
* [Update] 统一授权资产页面,修改apiUpdateAttr函数名称
2019-07-12 18:31:55 +08:00
BaiJiangJie
e5bdceed58
[Update] 优化授权规则资产列表页面 ( #2937 )
...
* [Update] 优化授权规则资产列表页面
* [Update] 优化授权规则资产列表页面2
* [Update] 优化授权规则资产列表页面3
* [Update] 优化授权规则资产列表页面4
* [Update] 优化授权规则资产列表页面5
* [Update] 优化授权规则资产列表页面6
2019-07-12 18:31:14 +08:00
八千流
7bda48bd9f
[Bugfix] 修复创建用户 数据库报1062 Duplicate entry .. for key PRIMARY 错误 ( #2934 )
...
* [Bugfix] 修复创建用户 数据报1062 Duplicate entry .. for key PRIMARY 错误
* [Bugfix] 修改小问题
2019-07-12 15:43:36 +08:00
八千流
63a502ba62
[Update] 创建/更新 用户 使用api ( #2918 )
...
* [Update] 创建/更新 用户 使用api
* [Update] 修改小问题
* [Update] 修改小问题
2019-07-11 18:54:30 +08:00
八千流
e0d492f599
[Update] 创建/更新 过滤器规则 使用api ( #2925 )
...
* [Update] 创建/更新 过滤器规则 使用api
* [Update] 修改小问题
2019-07-11 18:50:22 +08:00
八千流
48e74ed0ea
[Bugfix] 创建/更新 系统用户使用api 在选择命令过滤器时的bug ( #2924 )
...
* [Bugfix] 创建/更新 系统用户使用api 在选择命令过滤器时的bug
* [Update] 修改小问题
2019-07-11 18:45:18 +08:00
八千流
95f1a19a0a
[Update] 创建/更新 标签 使用api ( #2919 )
...
* [Update] 创建/更新 标签 使用api
* [Update] 修改小问题
* [Update] 修改小问题
2019-07-11 18:44:16 +08:00
八千流
63f3fa98db
[Update] 创建/更新 网域使用api ( #2915 )
...
* [Update] 创建/更新 网域使用api
* [Update] 修改小问题
* [Update] 修改小问题
2019-07-11 18:21:19 +08:00
ibuler
fdfd2f97d2
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2019-07-11 18:18:04 +08:00
八千流
4e3e166132
[Update] 创建/更新 用户组使用api ( #2914 )
...
* [Update] 创建/更新 用户组使用api
* [Update] 修改小问题
2019-07-11 18:17:47 +08:00
ibuler
21ffa8b28a
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2019-07-11 18:17:34 +08:00
BaiJiangJie
5f9f970abd
Perf ( #2929 )
...
* [Update] 优化性能
* [Update] 修改assets
* [Update] 优化处理
* [Update] Youhua
* [Update] 修改ungroup
* [Update] 修改perms的api地址,去掉sysuser adminuser的可连接性
* [Update] 修改perms urls兼容
* [Update] 修改分类
* [Update] 修改信号
* [Update] 优化获取授权资产
* [Update] 添加注释 (#2928 )
* [update] 去掉nodes 的部分字段
* [Update] 删除不用的代码
* [Update] 拆分users
* [Update] 修改用户的属性
2019-07-11 18:12:14 +08:00
八千流
ff85e2ef57
[Update] 创建/更新 命令过滤器 使用api ( #2926 )
2019-07-11 12:02:51 +08:00
ibuler
d40d231e9a
[Update] 修改assets
2019-07-09 19:58:16 +08:00
八千流
6e86e3f118
[Update] 创建/更新 网关使用api ( #2911 )
...
* [Update] 创建/更新 网关使用api
* [Update] 修改小问题
* [Update] 修改小问题
* [Update] 修改网关一些信息可读
2019-07-09 17:30:53 +08:00
老广
cedf0e4532
Merge pull request #2910 from jumpserver/bugfix
...
[Update] 修改日期显示差8小时
2019-07-09 12:06:18 +08:00
ibuler
05438baad9
[Update] 修改日期显示差8小时
2019-07-09 12:05:31 +08:00
老广
e603730320
Merge pull request #2908 from jumpserver/dev
...
[Update] 修复创建资产是协议bug
2019-07-08 19:04:31 +08:00
ibuler
c0cff6d1fe
[Update] 修复创建资产是协议bug
2019-07-08 19:03:45 +08:00
老广
65060a9416
Merge pull request #2907 from jumpserver/dev
...
[Update] 修改系统用户校验用户名
2019-07-08 18:31:26 +08:00
ibuler
e2f1754a8e
[Update] 修改系统用户校验用户名
2019-07-08 18:30:18 +08:00
老广
cf10a8898f
Merge pull request #2906 from jumpserver/dev
...
[Update] 修改授权页面不显示资产的问题
2019-07-08 18:17:26 +08:00
ibuler
533f32ed48
[Update] 修改授权页面不显示资产的问题
2019-07-08 18:16:08 +08:00
老广
8918da48f8
Merge pull request #2904 from jumpserver/dev
...
Dev
2019-07-08 16:05:24 +08:00
老广
f3b5823cce
Bugfix ( #2903 )
...
* [Update] 去掉session协议搜索
* [Update] 去掉adhoc wanging
2019-07-08 16:04:32 +08:00
老广
6b43ad60b3
[Update] 去掉session协议搜索 ( #2902 )
2019-07-08 15:59:55 +08:00
BaiJiangJie
1a60f38c19
Merge pull request #2898 from jumpserver/admin_user_template
...
[Update] 优化管理用户的资产列表页显示不友好问题
2019-07-08 15:54:08 +08:00
老广
6330f2d42d
[Update] 修改获取禁用资产的问题 ( #2901 )
2019-07-08 15:52:03 +08:00
八千流
033b44f9d2
[Bugfix] 修复禁用的资产在luna页面显示的问题 ( #2900 )
2019-07-08 15:51:19 +08:00
老广
bf5acf7ef1
[Update] 修复系统用户管理用户提及重置密码的bug ( #2899 )
...
* [Update] 修复系统用户管理用户提及重置密码的bug
* [Update] 去掉forms
* [Update] 修改翻译
* [Update] 去掉debug信息
2019-07-08 15:35:20 +08:00
jym503558564
522d19a7e7
[Update] 优化管理用户的资产列表页显示不友好问题
2019-07-08 15:08:17 +08:00
八千流
4c34246750
[Bugfix] 修复批量执行命令没有选择资产bug ( #2894 )
...
* [Bugfix] 修复批量执行命令没有选择资产bug
* [Bugfix] 修复批量执行命令没有选择资产bug(2)
2019-07-08 10:44:53 +08:00
老广
52d528613e
Merge pull request #2893 from jumpserver/dev
...
Dev
2019-07-06 16:01:34 +08:00
ibuler
0809916b01
[Update] Merge with master
2019-07-06 15:58:41 +08:00
ibuler
cc56c92562
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2019-07-06 15:15:27 +08:00
ibuler
447c3f3146
[Update] 修改一个bug
2019-07-06 15:14:55 +08:00
老广
eba8e54261
Merge pull request #2891 from jumpserver/dev_perms
...
[Update] 修复Action转化的bug
2019-07-06 15:10:16 +08:00
BaiJiangJie
a8c95093c4
[Update] 修复Action转化的bug
2019-07-06 14:46:01 +08:00
BaiJiangJie
0d72c4a7e0
Merge pull request #2890 from jumpserver/dev_bai
...
[Update] 资产model.__all__添加ProtocolsMixin
2019-07-06 14:07:21 +08:00
BaiJiangJie
963b0911cf
[Update] 资产model.__all__添加ProtocolsMixin
2019-07-06 14:06:12 +08:00
BaiJiangJie
e8f68eb6c1
[Update] 解决授权规则actions字段为空列表或只填一个action的问题 ( #2888 )
...
* [Update] 解决授权规则actions字段为空列表或只填一个action的问题
* [Update] Action NO改为NULL
* [Update] Action NULL改为NONE
2019-07-06 14:02:56 +08:00
老广
59927ffcd9
Merge pull request #2889 from jumpserver/perf
...
[Update] 优化协议
2019-07-05 18:29:19 +08:00
ibuler
aac5eed9fc
[Update] 去掉debug
2019-07-05 18:28:56 +08:00
ibuler
a412864c80
[Update] 去掉protocol model
2019-07-05 18:10:27 +08:00
ibuler
3c825440f0
[Update] 优化协议
2019-07-05 18:07:10 +08:00
BaiJiangJie
303cf41bb9
Merge pull request #2887 from jumpserver/dev_bugfix
...
[Update] 修复授权规则更新失败的bug
2019-07-05 16:41:17 +08:00
BaiJiangJie
0512988979
[Update] 修复授权规则更新失败的bug
2019-07-05 16:34:37 +08:00
BaiJiangJie
423a487bd1
Merge pull request #2886 from jumpserver/dev_users
...
[Update] 限制用户通过API删除自己
2019-07-05 14:00:52 +08:00
BaiJiangJie
e415ef8354
[Update] 限制用户通过API删除自己
2019-07-05 13:59:38 +08:00
BaiJiangJie
ece8f082fb
Merge pull request #2885 from jumpserver/dev_perm
...
[Update] 用户授权资产树进行排序
2019-07-05 12:41:30 +08:00
BaiJiangJie
c52ea089da
[Update] 用户授权资产树进行排序
2019-07-05 12:40:15 +08:00
ibuler
64e1e6191b
[Update] 修改版本号
2019-07-04 21:25:05 +08:00
老广
58875d9a95
Bugfix ( #2831 )
...
* [Update] 修改小问题
* [Update] 添加重传guacamole的脚本
* [Update] 添加debug
* [Update] 优化可连接性
* [Update] 修改connectivity
* [Update] 更改查看认证需要的MFA时间间隔
* [Update] 修改表结构
* [Update] 修改users public_key等字段
* [Update] 修改用户表结构
* [Update] 修改assets users api
* [Update] 修改org mixin
* [Update] 解决连接windows资产出现幽灵会话的问题
* [Update] 优化树结构
* [Update] 修改Permission
* Stash
* [Update] 修改serializer
* [Update] 修改用户有权限的资产
* [Update] 修改upgrouped_node key的获取(解决操作日志中出现coco/gua的问题)
* [Update] 修改一些bug
* [Update] Debug cache
* [Bugfix] 修复用户页面不走cache的bug
* ipython
* [Update] 修改action
* [Bugfix] 修改校验系统用户资产动作权限的API逻辑
* [Update] 去掉原来批量的view
* [Bugfix] 会话/命令列表中获取用户列表排除app用户
* [Update] 修改用户授权资产API返回的queryset
* [Update] 修正migrations
* [Bugfix] 解决进入授权详情页的资产管理页面bug
* [Update] 修改Minxs
* [Update] 修改migrations
* [Update] 资产授权Model模块添加导入
* [Update] 优化命令记录列表
* [Update] 修改command列表
* [Update] 解决用户授权资产/节点为空时,前端构建资产授权树的bug (#2874 )
* [Update] 解决用户授权资产/节点为空时,前端构建资产授权树的bug
* [Update] 如果用户授权节点为空,返回时添加空节点
* [Update] 修改command导出和搜索
* [Update] 修改session
* [Update] 修改Permission响应层缓存key
* [Update] 准备优化 asset user
* [Update] 修改去掉一些print
* [Bugfix] 修复initDataTable表格搜索栏位置错乱的问题,显示不友好问题 (#2880 )
* [Bugfix] 修复创建用户的View,使用密码创建用户时没有校验密码规则 (#2877 )
* [Bugfix] 修复创建用户的View,使用密码创建用户时没有校验密码规则
* [Bugfix]修复小问题
* [Update] 优化创建用户和更新用户密码的校验
* [Update] 优化用户表单校验password逻辑
* [Update] 小问题
* [Update] 修改command搜索
* [Update] 修改user group serialzier
* [Update] 优化资产
* [Update] 优化节点
* [Update] 优化用户组列表用户显示问题 (#2882 )
* [Update] 解决select_for_update的错误
* [update] 修改Node无法被删除的bug
* [Update] 添加翻译
* [update] 修改资产导出的permssions
* [Bugfix] 修复删除节点bug (#2883 )
* [update] 修改一些性能问题
2019-07-04 21:23:19 +08:00
ibuler
782bad916e
Merge branch 'bugfix' of github.com:jumpserver/jumpserver into bugfix
2019-07-04 21:18:04 +08:00
ibuler
1472f0437f
[update] 修改一些性能问题
2019-07-04 21:17:39 +08:00
八千流
1256944b96
[Bugfix] 修复删除节点bug ( #2883 )
2019-07-04 18:31:53 +08:00
ibuler
218e425333
Merge branch 'bugfix' of github.com:jumpserver/jumpserver into bugfix
2019-07-04 17:29:32 +08:00
ibuler
5562a04f79
[update] 修改资产导出的permssions
2019-07-04 17:26:05 +08:00
BaiJiangJie
75409519a1
[Update] 添加翻译
2019-07-04 17:22:04 +08:00
ibuler
62689b240b
Merge branch 'bugfix' of github.com:jumpserver/jumpserver into bugfix
2019-07-04 17:21:01 +08:00
ibuler
6f570bcbf1
[update] 修改Node无法被删除的bug
2019-07-04 17:20:42 +08:00
BaiJiangJie
b5962a098a
[Update] 解决select_for_update的错误
2019-07-04 17:09:36 +08:00
BaiJiangJie
371aff3251
[Update] 优化用户组列表用户显示问题 ( #2882 )
2019-07-04 16:44:46 +08:00
ibuler
bab4326aeb
[Update] 优化节点
2019-07-04 16:41:38 +08:00
ibuler
dc4ee2f0fa
[Update] 优化资产
2019-07-04 16:41:25 +08:00
ibuler
bf9a2714d3
Merge branch 'bugfix' of github.com:jumpserver/jumpserver into bugfix
2019-07-04 16:30:38 +08:00
ibuler
29824fb7d2
[Update] 修改user group serialzier
2019-07-04 16:30:26 +08:00
ibuler
5b1ee67820
[Update] 修改command搜索
2019-07-04 16:28:42 +08:00
八千流
3598bc79c3
[Bugfix] 修复创建用户的View,使用密码创建用户时没有校验密码规则 ( #2877 )
...
* [Bugfix] 修复创建用户的View,使用密码创建用户时没有校验密码规则
* [Bugfix]修复小问题
* [Update] 优化创建用户和更新用户密码的校验
* [Update] 优化用户表单校验password逻辑
* [Update] 小问题
2019-07-04 16:14:00 +08:00
八千流
17e1fe2acb
[Bugfix] 修复initDataTable表格搜索栏位置错乱的问题,显示不友好问题 ( #2880 )
2019-07-04 16:13:05 +08:00
ibuler
858c7df86b
Merge branch 'bugfix' of github.com:jumpserver/jumpserver into bugfix
2019-07-04 16:09:14 +08:00
ibuler
2d07eeb16b
[Update] 修改去掉一些print
2019-07-04 16:08:52 +08:00
ibuler
1448d23ca6
[Update] 准备优化 asset user
2019-07-04 15:36:57 +08:00
BaiJiangJie
2eb942a947
[Update] 修改Permission响应层缓存key
2019-07-04 11:31:31 +08:00
ibuler
cdbdc853ea
Merge branch 'bugfix' of github.com:jumpserver/jumpserver into bugfix
2019-07-03 22:28:45 +08:00
ibuler
c3a54a8927
[Update] 修改session
2019-07-03 22:28:20 +08:00
ibuler
dfcbdb0c35
[Update] 修改command导出和搜索
2019-07-03 18:03:01 +08:00
BaiJiangJie
28ec1eb0ad
[Update] 解决用户授权资产/节点为空时,前端构建资产授权树的bug ( #2874 )
...
* [Update] 解决用户授权资产/节点为空时,前端构建资产授权树的bug
* [Update] 如果用户授权节点为空,返回时添加空节点
2019-07-03 16:33:21 +08:00
ibuler
5f6af8c07d
[Update] 修改command列表
2019-07-03 16:29:39 +08:00
ibuler
e7d600ee50
Merge branch 'bugfix' of github.com:jumpserver/jumpserver into bugfix
2019-07-02 22:09:12 +08:00
ibuler
b9f82fd0ac
[Update] 优化命令记录列表
2019-07-02 22:08:50 +08:00
BaiJiangJie
186c22decd
[Update] 资产授权Model模块添加导入
2019-07-02 19:30:59 +08:00
BaiJiangJie
9a20ec9c09
Merge branch 'bugfix' of github.com:jumpserver/jumpserver into bugfix
2019-07-02 18:24:13 +08:00
ibuler
1b44172bc5
[Update] 修改migrations
2019-07-02 18:23:47 +08:00
BaiJiangJie
bbf5e28571
Merge branch 'bugfix' of github.com:jumpserver/jumpserver into bugfix
2019-07-02 18:01:20 +08:00
ibuler
7bf1555c67
[Update] 修改Minxs
2019-07-02 17:51:50 +08:00
BaiJiangJie
003601bbdd
[Bugfix] 解决进入授权详情页的资产管理页面bug
2019-07-02 17:48:29 +08:00
ibuler
58182712a2
Merge branch 'bugfix' of github.com:jumpserver/jumpserver into bugfix
2019-07-02 16:47:10 +08:00
ibuler
930eb1d2e1
[Update] 修正migrations
2019-07-02 16:45:26 +08:00
BaiJiangJie
98260b5b52
[Update] 修改用户授权资产API返回的queryset
2019-07-02 16:34:38 +08:00
BaiJiangJie
9a3065ad4c
[Bugfix] 会话/命令列表中获取用户列表排除app用户
2019-07-02 16:01:45 +08:00
ibuler
79554b47d3
[Update] Merge
2019-07-02 14:19:45 +08:00
ibuler
31d2f2a799
[Update] 去掉原来批量的view
2019-07-02 14:17:56 +08:00
BaiJiangJie
1983533e76
[Bugfix] 修改校验系统用户资产动作权限的API逻辑
2019-07-02 12:44:53 +08:00
ibuler
e4880a247f
[Update] 修改action
2019-07-02 12:08:25 +08:00
ibuler
e43da3d6e1
ipython
2019-07-02 10:51:48 +08:00
ibuler
b064be3ec0
[Bugfix] 修复用户页面不走cache的bug
2019-07-01 22:09:04 +08:00
ibuler
c33084421d
[Update] Debug cache
2019-07-01 21:48:25 +08:00
ibuler
7f7853dbc9
Merge remote-tracking branch 'origin/bugfix' into bugfix
2019-07-01 20:02:17 +08:00
ibuler
4d3856975b
[Update] 修改一些bug
2019-07-01 20:01:47 +08:00
BaiJiangJie
8905c27b86
[Update] 修改upgrouped_node key的获取(解决操作日志中出现coco/gua的问题)
2019-07-01 19:39:10 +08:00
ibuler
034fee0f75
[Update] 修改用户有权限的资产
2019-07-01 19:30:18 +08:00
ibuler
d41d58e30f
[Update] 修改serializer
2019-07-01 19:08:47 +08:00
ibuler
ae690050e7
Stash
2019-07-01 18:22:40 +08:00
八千流
6273e6be9b
[Bugfix] 修复用户批量命令View的bug ( #2864 )
2019-07-01 17:38:33 +08:00
BaiJiangJie
85d13c03e0
Merge pull request #2865 from jumpserver/dev_bugfix
...
[Bugfix] 解决审计员查看录像回放失败的问题
2019-07-01 17:38:01 +08:00
BaiJiangJie
a8e20ac1c1
[Bugfix] 解决审计员查看录像回放失败的问题
2019-07-01 17:36:47 +08:00
KayneWang
582365967d
允许配置email密码为空 ( #2833 )
...
[issue 2577](https://github.com/jumpserver/jumpserver/issues/2577 )
2019-07-01 11:31:16 +08:00
八千流
768cfc7561
[Bugfix] 修复用户无权限执行批量命令却可直接访问批量执行页面的bug ( #2857 )
...
* [Bugfix] 修复用户无权限执行批量命令却可直接访问批量执行页面的bug
* [Update] 更改小问题
* [Update] 优化小问题
* [Update] 优化变量名
* [Update] 优化变量名(2)
2019-07-01 11:22:05 +08:00
八千流
297820b65a
[Update] 优化组织名字过长显示不友好问题 ( #2855 )
...
* [Update] 优化组织名字过长显示不友好问题
* [Update] 优化组织名字前端盒子默认最小宽度为220px
2019-07-01 11:21:26 +08:00
BaiJiangJie
abad929485
[Update] 优化MFA认证允许时间差1min ( #2858 )
2019-07-01 11:07:28 +08:00
BaiJiangJie
43412d7ef6
[Update] 优化OpenID登录逻辑,配置文件添加禁用证书认证选项 ( #2854 )
...
* [Update] 优化OpenID登录逻辑,配置文件添加禁用证书认证选项
* [Update] 优化OpenID细节
* [Update] 优化OpenID, 可配置是否启用共享Session选项
* [Update] 配置文件添加OpenID默认配置项
2019-07-01 11:04:15 +08:00
ibuler
8f699fa366
[Update] 修改Permission
2019-06-30 20:10:34 +08:00
ibuler
8e9b3f134b
[Update] 修改permission actions
2019-06-28 22:07:22 +08:00
ibuler
48ba1993e0
Merge remote-tracking branch 'origin/bugfix' into bugfix
2019-06-27 21:43:44 +08:00
ibuler
1a0ff422fe
[Update] 优化树结构
2019-06-27 21:43:10 +08:00
BaiJiangJie
5de6563ab2
[Update] 解决连接windows资产出现幽灵会话的问题
2019-06-26 17:29:52 +08:00
ibuler
6d96b5dbaf
[Update] 修改org mixin
2019-06-25 20:32:12 +08:00
BaiJiangJie
9ca4a8c941
Dev ( #2838 )
...
* Dev ansible windows 2 (#2783 )
* [Update] 改密支持windows
* [Update] 修改asset表结构
* [Feature] Windows支持批量改密、测试可连接性等功能
* [Update] 处理创建资产时labels的问题
* [Update] 优化测试管理系统、系统用户可连接性任务执行逻辑
* [Update] 优化ansible任务逻辑;添加自动推送rdp系统用户功能
* [Update] 添加翻译
* [Update] 优化ansible任务逻辑(测试系统用户可连接性, 通过协议过滤资产)
* [Update] 更新翻译
* [Update] 更新翻译
* [Update] 推送windows系统用户,默认添加到Users、Remote Desktop Users组中
* [Update] 优化小细节
* [Update] 更新翻译,删除多余代码
* [Update] 更新翻译信息
* [Bugfix] 修复windows推送系统用户小bug (#2794 )
* [Update] 邮件设置添加配置项:发送账号 (#2796 )
* [Bugfix] 和资产相关的Serializer添加protocols字段; (#2800 )
* [Bugfix] 和资产相关的Serializer添加protocols字段;
* [Bugfix] RemoteApp Form 修改过滤RDP协议资产
* [Bugfix] 修改小问题
* [Update] 用户授权相关API,如果需要切换到root org (#2803 )
* [Update] 用户授权相关API,如果需要切换到root org
* [Update] 优化小问题
* [Update] 增加审计员权限控制 (#2792 )
* [Update] 审计员
* [Update] 增加审计员的权限控制
* [Update] 增加审计员Api全校的控制
* [Update] 优化auditor的api权限控制
* [Update] 优化审计员权限控制
* [Update]优化管理员权限的View
* [Update] 优化超级管理权限的View
* [Update] 添加审计员切换组织查询会话管理数据
* [Update] 前端禁用审计员在线会话终断按钮
* [Update]优化细节问题
* [Update] Auth Info (#2806 )
* [Update] 修改支持auth info导出
* [Update] 统一认证查看
* [Update] 修改auth book manager
* [Update] 修改auth info
* [Update] 完成修改auth info
* [Update] 优化api
* [Update] 修改assets 的related
* [Update] serializer mixin继承 (#2810 )
* [Update] serializer mixin继承
* [Update] 修改system user更新serialzier
* [Update] 修改success message
* [Update] 添加一键禁用LDAP认证脚本 (#2813 )
* [Update] 修改资产创建格式
* [Update] 兼容之前的protocols格式
* [Update] Merge master_bugfix to dev_bugfix (#2817 )
* [Update] 邮件设置添加配置项:发送账号 (#2795 )
* [Bugfix] 修复普通用户被授权的RemoteApp列表加载为空的bug
* [Bugfix] 修复普通用户加载被授权的RemoteApp为空的bug
* [Update] 修改邮件测试的接受者为发送者
* [Update] 修改小问题
* [Update] 修改资产授权序列类返回资产protocols的协议格式/, 同时添加protocol和port字段
* [Update] 修改文案 (#2823 )
* [Update] 修改文案
* [Update] 修改文案2
* [Bugfix] 修复资产没有管理用户时获取connectivity字段失败的bug
* [Update] 优化测试可连接性时结果获取 (#2825 )
* [Update] 修改资产使用patch方法更新时页面不提示messages信息
* [Update] 添加迁移文件,修改设置资产可连接性时管理用户为None的bug
* [Update] 修改org.middleware自动切换组织的bug (#2829 )
* [Update] 修改org.middleware自动切换组织的bug
* [Update] 将切换组织逻辑移动到PermsUtil中
* [Update] 修改首页组织名称显示来源
2019-06-25 15:24:41 +08:00
BaiJiangJie
320b17c8db
[Update] Merge local branch dev to master
2019-06-25 15:23:39 +08:00
ibuler
e8ebc94191
[Update] 修改assets users api
2019-06-25 14:32:25 +08:00
ibuler
f10a7a75ae
[Update] 修改用户表结构
2019-06-25 11:51:25 +08:00
ibuler
e08d542c87
[Update] 修改users public_key等字段
2019-06-25 11:22:17 +08:00
ibuler
824ba433f6
[Update] 修改表结构
2019-06-24 22:16:39 +08:00
ibuler
327febaf59
[Update] 更改查看认证需要的MFA时间间隔
2019-06-24 20:39:45 +08:00
ibuler
0f8d4f5b32
[Update] 统一可连接性,添加sql debug
2019-06-24 20:16:18 +08:00
ibuler
63216addf6
[Update] 修改connectivity
2019-06-24 14:23:29 +08:00
ibuler
9dd951dd0d
[Update] 优化可连接性
2019-06-21 20:57:51 +08:00
BaiJiangJie
ed8ae300ae
[Update] 修改org.middleware自动切换组织的bug ( #2829 )
...
* [Update] 修改org.middleware自动切换组织的bug
* [Update] 将切换组织逻辑移动到PermsUtil中
* [Update] 修改首页组织名称显示来源
2019-06-21 17:09:18 +08:00
ibuler
2e6ba2ffb2
[Update] 添加debug
2019-06-21 16:03:37 +08:00
ibuler
dd4ef4c383
[Update] 添加重传guacamole的脚本
2019-06-21 16:00:59 +08:00
ibuler
ef717f888b
Merge branch 'dev' into bugfix
2019-06-21 14:00:34 +08:00
BaiJiangJie
b15e06ffec
Merge pull request #2828 from jumpserver/dev_bai2
...
[Update] 添加迁移文件,修改设置资产可连接性时管理用户为None的bug
2019-06-21 13:52:29 +08:00
BaiJiangJie
583fd410f5
[Update] 添加迁移文件,修改设置资产可连接性时管理用户为None的bug
2019-06-21 13:34:20 +08:00
ibuler
3e73dbdb11
[Update] 修改小问题
2019-06-21 12:45:32 +08:00
BaiJiangJie
908905918e
Merge pull request #2827 from jumpserver/dev_bai
...
[Update] 修改资产使用patch方法更新时页面不提示messages信息
2019-06-21 12:02:11 +08:00
BaiJiangJie
3da43bf01d
[Update] 修改资产使用patch方法更新时页面不提示messages信息
2019-06-21 12:01:18 +08:00
BaiJiangJie
bb1a941240
[Update] 优化测试可连接性时结果获取 ( #2825 )
2019-06-21 11:19:53 +08:00
BaiJiangJie
4fbb4c6082
Merge pull request #2824 from jumpserver/dev_bai
...
[Bugfix] 修复资产没有管理用户时获取connectivity字段失败的bug
2019-06-21 10:59:56 +08:00
BaiJiangJie
d563216e3f
[Bugfix] 修复资产没有管理用户时获取connectivity字段失败的bug
2019-06-21 10:59:08 +08:00
BaiJiangJie
9a5c00e148
[Update] 修改文案 ( #2823 )
...
* [Update] 修改文案
* [Update] 修改文案2
2019-06-20 18:10:44 +08:00
BaiJiangJie
7e16ce41e3
Merge pull request #2820 from jumpserver/dev_perms
...
[Update] 修改资产授权序列类返回资产protocols的协议格式/, 同时添加protocol和port字段
2019-06-20 15:52:13 +08:00
BaiJiangJie
152c59365f
[Update] 修改资产授权序列类返回资产protocols的协议格式/, 同时添加protocol和port字段
2019-06-20 15:50:28 +08:00
BaiJiangJie
895dfe475c
Merge pull request #2818 from jumpserver/dev_remoteapp
...
[Update] 修改小问题
2019-06-20 15:12:41 +08:00
BaiJiangJie
29239e8b77
[Update] 修改小问题
2019-06-20 14:41:44 +08:00
BaiJiangJie
8bead0a33b
[Update] Merge master_bugfix to dev_bugfix ( #2817 )
...
* [Update] 邮件设置添加配置项:发送账号 (#2795 )
* [Bugfix] 修复普通用户被授权的RemoteApp列表加载为空的bug
* [Bugfix] 修复普通用户加载被授权的RemoteApp为空的bug
* [Update] 修改邮件测试的接受者为发送者
2019-06-20 11:45:45 +08:00
BaiJiangJie
844f9bf409
Merge pull request #2815 from jumpserver/master_bugfix
...
[Bugfix] 修复普通用户被授权的RemoteApp列表加载为空的bug
2019-06-20 11:45:26 +08:00
BaiJiangJie
c17d95dae0
[Update] 修改邮件测试的接受者为发送者
2019-06-20 11:38:37 +08:00
BaiJiangJie
50443de888
[Bugfix] 修复普通用户被授权的RemoteApp列表加载为空的bug
2019-06-20 11:25:35 +08:00
ibuler
04655b9042
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2019-06-19 19:29:29 +08:00
ibuler
8a87f316df
[Update] 兼容之前的protocols格式
2019-06-19 19:29:12 +08:00
ibuler
2cd092af42
[Update] 修改资产创建格式
2019-06-19 19:25:21 +08:00
BaiJiangJie
7a8e616f17
[Update] 添加一键禁用LDAP认证脚本 ( #2813 )
2019-06-19 16:47:39 +08:00
老广
10616b8d9e
[Update] serializer mixin继承 ( #2810 )
...
* [Update] serializer mixin继承
* [Update] 修改system user更新serialzier
* [Update] 修改success message
2019-06-19 16:45:14 +08:00
ibuler
d6165e5975
[Update] 修改assets 的related
2019-06-19 11:35:50 +08:00
BaiJiangJie
9cd75390bf
[Update] Auth Info ( #2806 )
...
* [Update] 修改支持auth info导出
* [Update] 统一认证查看
* [Update] 修改auth book manager
* [Update] 修改auth info
* [Update] 完成修改auth info
* [Update] 优化api
2019-06-19 11:31:38 +08:00
八千流
8adaf629b4
[Update] 增加审计员权限控制 ( #2792 )
...
* [Update] 审计员
* [Update] 增加审计员的权限控制
* [Update] 增加审计员Api全校的控制
* [Update] 优化auditor的api权限控制
* [Update] 优化审计员权限控制
* [Update]优化管理员权限的View
* [Update] 优化超级管理权限的View
* [Update] 添加审计员切换组织查询会话管理数据
* [Update] 前端禁用审计员在线会话终断按钮
* [Update]优化细节问题
2019-06-19 10:47:26 +08:00
BaiJiangJie
c71f417ebf
[Update] 用户授权相关API,如果需要切换到root org ( #2803 )
...
* [Update] 用户授权相关API,如果需要切换到root org
* [Update] 优化小问题
2019-06-17 19:27:02 +08:00
BaiJiangJie
795807ddbe
[Bugfix] 和资产相关的Serializer添加protocols字段; ( #2800 )
...
* [Bugfix] 和资产相关的Serializer添加protocols字段;
* [Bugfix] RemoteApp Form 修改过滤RDP协议资产
* [Bugfix] 修改小问题
2019-06-17 16:46:01 +08:00
BaiJiangJie
7715e62def
[Update] 邮件设置添加配置项:发送账号 ( #2796 )
2019-06-14 10:51:18 +08:00
BaiJiangJie
41a5a69164
[Update] 邮件设置添加配置项:发送账号 ( #2795 )
2019-06-14 10:36:29 +08:00
BaiJiangJie
5286bf3ac1
[Bugfix] 修复windows推送系统用户小bug ( #2794 )
2019-06-13 19:46:27 +08:00
老广
ddafd7ba26
Dev ansible windows 2 ( #2783 )
...
* [Update] 改密支持windows
* [Update] 修改asset表结构
* [Feature] Windows支持批量改密、测试可连接性等功能
* [Update] 处理创建资产时labels的问题
* [Update] 优化测试管理系统、系统用户可连接性任务执行逻辑
* [Update] 优化ansible任务逻辑;添加自动推送rdp系统用户功能
* [Update] 添加翻译
* [Update] 优化ansible任务逻辑(测试系统用户可连接性, 通过协议过滤资产)
* [Update] 更新翻译
* [Update] 更新翻译
* [Update] 推送windows系统用户,默认添加到Users、Remote Desktop Users组中
* [Update] 优化小细节
* [Update] 更新翻译,删除多余代码
* [Update] 更新翻译信息
2019-06-13 18:58:43 +08:00
BaiJiangJie
08a32028c1
Merge pull request #2790 from jumpserver/dev
...
Dev
2019-06-12 18:09:37 +08:00
BaiJiangJie
9f9f22548f
[Update] Merge branch master to local dev
2019-06-12 17:57:58 +08:00
八千流
69b91df96b
[Update]优化资产设置节点的问题 ( #2786 )
...
* [Update]优化资产设置节点的问题
* [Update]优化资产创建的节点设置
2019-06-12 17:49:30 +08:00
ibuler
3e86c07411
[Update] 修改授权节点显示
2019-06-12 17:04:49 +08:00
BaiJiangJie
eafef9fc7f
Dev ( #2785 )
...
* [Update]优化用户页面的资产标签过滤功能 (#2781 )
* [Update] 优化用户页面的资产标签下拉框选项
* [Update]增加用户页面的过滤资产标签功能
* [Update]优化用户页面的资产标签过滤
* [Update]优化用户页面的资产标签过滤代码
* [Update] 优化用户页面的资产标签过滤
* [Update] 优化用户API,创建用户添加组织关系 (#2776 )
* [Update] 优化前端高度显示css (#2749 )
* [Update] 修改授权树显示策略 (#2784 )
* [Update] 修改授权树显示策略
* [Update] 是否允许用户执行批量命令
* [Update] 优化授权节点构建
* [Update] 修改节点大小判断
* [Update] 修改节点大小判断
2019-06-11 13:45:19 +08:00
老广
44d33f70e4
[Update] 修改授权树显示策略 ( #2784 )
...
* [Update] 修改授权树显示策略
* [Update] 是否允许用户执行批量命令
* [Update] 优化授权节点构建
* [Update] 修改节点大小判断
* [Update] 修改节点大小判断
2019-06-11 13:30:45 +08:00
BaiJiangJie
0574b43971
[Update] 优化前端高度显示css ( #2749 )
2019-06-11 10:10:04 +08:00
八千流
03d9570895
[Update] 优化用户API,创建用户添加组织关系 ( #2776 )
2019-06-11 10:09:40 +08:00
八千流
c300f0b549
[Update]优化用户页面的资产标签过滤功能 ( #2781 )
...
* [Update] 优化用户页面的资产标签下拉框选项
* [Update]增加用户页面的过滤资产标签功能
* [Update]优化用户页面的资产标签过滤
* [Update]优化用户页面的资产标签过滤代码
* [Update] 优化用户页面的资产标签过滤
2019-06-11 10:09:08 +08:00
BaiJiangJie
e5185ebd57
Merge pull request #2770 from jumpserver/dev
...
Dev
2019-06-03 16:35:58 +08:00
ibuler
1ba9351957
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2019-06-03 16:28:56 +08:00
ibuler
505b801423
[Update] 当授权规则发生改变时刷新所有缓存
2019-06-03 16:28:34 +08:00
BaiJiangJie
35a0b42bea
Merge pull request #2769 from jumpserver/dev
...
[Update] 修改录像回放判断逻辑 (#2768 )
2019-06-03 15:06:16 +08:00
BaiJiangJie
4f289963d1
[Update] 修改录像回放判断逻辑 ( #2768 )
2019-06-03 14:47:33 +08:00
BaiJiangJie
1631c32868
Merge pull request #2767 from jumpserver/dev
...
[Update] 解决csv导入导出的问题
2019-05-31 18:25:34 +08:00
ibuler
9721b805f3
[Update] 解决csv导入导出的问题
2019-05-31 18:20:24 +08:00
BaiJiangJie
d2b1b19404
Merge pull request #2765 from jumpserver/dev
...
Dev
2019-05-31 17:49:50 +08:00
ibuler
49632241b6
[Update] 导入解析csv coding
2019-05-31 17:40:57 +08:00
ibuler
b4f23f9731
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2019-05-31 17:04:23 +08:00
ibuler
1cdcc66dba
[Update] 修改excel打开乱码
2019-05-31 17:04:00 +08:00
zbhlove100
0a1a260a22
Update README.md
2019-05-31 11:45:01 +08:00
BaiJiangJie
0e377cd0e9
Merge pull request #2762 from jumpserver/dev
...
[Bugfix] 修复RemoteApp用户列表显示Bug (#2761 )
2019-05-31 10:40:51 +08:00
BaiJiangJie
3f3cc6359a
[Bugfix] 修复RemoteApp用户列表显示Bug ( #2761 )
2019-05-31 10:39:33 +08:00
BaiJiangJie
eb0a6f00b5
Merge pull request #2758 from jumpserver/dev
...
Dev
2019-05-30 16:42:34 +08:00
BaiJiangJie
a87610a8d8
Merge pull request #2757 from jumpserver/dev_bai
...
[Update] 修改依赖版本号
2019-05-30 16:41:40 +08:00
BaiJiangJie
e3630a9961
[Update] 修改依赖版本号
2019-05-30 16:38:46 +08:00
BaiJiangJie
6ba78e2cf3
Merge pull request #2756 from jumpserver/dev
...
Dev
2019-05-30 16:08:44 +08:00
BaiJiangJie
63a06b5dd8
Merge pull request #2755 from jumpserver/dev_bai
...
[Update] 修改获取资产信息时返回org_id字段值
2019-05-30 16:07:42 +08:00
BaiJiangJie
ec60697912
[Update] 修改细节
2019-05-30 16:07:19 +08:00
BaiJiangJie
d6a8c04d45
[Update] 修改获取资产信息时返回org_id字段值
2019-05-30 16:02:03 +08:00
BaiJiangJie
d46f5858f8
Merge pull request #2737 from jumpserver/dev
...
Dev
2019-05-29 11:34:43 +08:00
BaiJiangJie
a8491eafea
Merge pull request #2747 from jumpserver/dev_bai
...
[Update] 修改版本号
2019-05-29 10:44:23 +08:00
BaiJiangJie
0d046d8356
[Update] 修改版本号
2019-05-29 10:22:13 +08:00
八千流
9c55450a9e
[Bugfix] 修复资源表可以选择多页的资源数据 ( #2744 )
...
* [Bugfix] 修复资源表可以选择多页的资源数据
* [Bugfix]修改小问题
2019-05-29 10:13:19 +08:00
BaiJiangJie
00e986a64e
[Update] 优化LDAP用户导入功能,可导入跨页选取的所有用户 ( #2745 )
2019-05-29 10:11:58 +08:00
BaiJiangJie
dc4bf669b0
[Update] 修改RemoteApp迁移文件 ( #2742 )
2019-05-28 17:05:31 +08:00
BaiJiangJie
059a8de44a
[Bufix] 修复用户更新时password_strategy字段不能为空的bug ( #2741 )
2019-05-28 12:11:55 +08:00
ibuler
aa25b7745c
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2019-05-28 10:28:49 +08:00
ibuler
1097b11115
[Update] 修改ldap支持ssl
2019-05-28 10:28:03 +08:00
BaiJiangJie
9f67daeb1e
[Update] 优化AssetPermissionUtil动态设置系统用户actions属性逻辑 ( #2739 )
...
* [Update] 优化AssetPermissionUtil动态设置系统用户actions属性逻辑
* [Bugfix] 修复can't pickle dict_keys objects的bug
2019-05-27 20:04:41 +08:00
ibuler
2065692199
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2019-05-27 16:39:02 +08:00
ibuler
33e342f03f
[Update] 修改菜单
2019-05-27 16:38:43 +08:00
八千流
7a6027f35a
[Update] csv翻译 ( #2736 )
2019-05-27 16:12:19 +08:00
BaiJiangJie
e46a6f1d12
[Update] 添加应用下载器地址;添加系统设置中字段的最大、最小值限制 ( #2735 )
...
* [Update] 添加应用下载器地址
* [Update] 系统设置中的Form, 添加最大、最小值限制
* [Update] 更新翻译
2019-05-27 15:52:25 +08:00
ibuler
0f3996369b
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2019-05-27 15:50:54 +08:00
ibuler
0847539e02
[Update] 修改导出的csv名称
2019-05-27 15:50:44 +08:00
八千流
f576f2eda2
[Bugfix]修复解析器顺序bug,csv解析器需在file解析器前 ( #2734 )
2019-05-27 15:21:33 +08:00
BaiJiangJie
21ac3eaf8b
[Update] 用户创建添加密码设置策略 ( #2731 )
...
* [Update] 优化创建用户的密码策略功能
* [Update] 优化用户初始密码设置以及清除初始密码
* [Update] 优化创建用户的密码策略功能
* [Update]统一变量名前缀
* [Update] 用户密码策略去掉自定义策略
* [Update] 修改小问题
* [Update] 优化创建用户密码策略
* [Update] 翻译
* [Update] 优化mfa按钮排布和间距
* [Update] 优化mfa按钮样式由前端控制
* [Update] 优化前端密码策略按钮的显示与隐藏
* [Update] 用户创建设置密码添加密码校验弹窗
2019-05-24 19:41:07 +08:00
ibuler
b237cbb20f
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2019-05-24 18:34:35 +08:00
ibuler
9b5b48dd1a
[Update] 修改settings conf配置
2019-05-24 18:34:21 +08:00
八千流
b7eac837f7
[Update] 创建用户自定义邮件内容 ( #2703 )
...
* [Update] 增加创建用户自定义邮件内容功能
* [Update] 优化自定义创建用户邮件功能
* [Update] 修改自定义邮件内容的小图标icon
* [Update] 发送邮件引入样式,避免不同浏览器不显示邮件格式问题
* [Update] 优化创建用户自定义邮件内容
* [Update] 修改翻译
* [Update] 优化邮件内容的变量名
* [Update]优化自定义邮件内容
* [Update] 修改小问题
2019-05-24 18:12:58 +08:00
BaiJiangJie
217bb81722
[Update] 优化LDAPUtil逻辑 ( #2728 )
2019-05-24 11:11:50 +08:00
xiaomao
b791073802
[Update] 解决ldap映射is_active等字段为bool值的问题 ( #2716 ) ( #2721 )
2019-05-23 18:55:28 +08:00
BaiJiangJie
45cb39e971
[Update] RemoteApp设置type vSphere Client的默认路径 ( #2725 )
2019-05-23 18:52:39 +08:00
BaiJiangJie
2df1dd2bb1
[Bugfix] LDAP同步用户列表中如果API获取到的用户名中有空格,在设置为id的时候默认会取第一个空格前的字符串作为用户名,导致不会导入用户 ( #2726 )
2019-05-23 18:52:19 +08:00
BaiJiangJie
4cd3dd3670
[Update] 更新RemoteApp ( #2720 )
...
* [Update] RemoteAppForm添加RemoteApp各类型参数保存逻辑
* [Update] RemoteApp添加默认应用路径
2019-05-22 18:56:34 +08:00
BaiJiangJie
b18ca8c94f
[Update] 校验用户对RemoteApp权限API添加权限控制 ( #2715 )
2019-05-22 12:35:14 +08:00
ibuler
75fb37d247
Merge branch 'password' into dev
2019-05-22 10:26:26 +08:00
ibuler
f863ed0f4f
[Update] 修改获取common store
2019-05-22 10:25:53 +08:00
BaiJiangJie
3eaf4cd142
[Update] 修改翻译 ( #2714 )
2019-05-22 10:01:41 +08:00
ibuler
7859499c97
[Update] 更新dockerfile
2019-05-21 17:46:39 +08:00
ibuler
e8ceb58292
[Update] 允许资产ip填写为host地址
2019-05-21 17:07:47 +08:00
BaiJiangJie
84610f2a2c
[Bugfix] 修改PermsModel抽象后的objects-bug ( #2713 )
...
* [Bugfix] 修改PermsModel抽象后的objects-bug
* [Bugfix] 删除无用代码
2019-05-21 17:01:47 +08:00
BaiJiangJie
d906df5b00
[Update] 抽象BasePermission ( #2710 )
...
* [Update] AssetPermission/RemoteAppPermission抽象BasePermission
* [Update] Perms模块添加迁移文件
* [Update] Perms删除多余迁移文件
* [Update] Perms重新生成RemoteAppPermission迁移文件
2019-05-21 16:27:01 +08:00
八千流
22f362aab3
Dev csv ( #2640 )
...
* [Update] 封装JMSCSVRender和JMSCSVParser
* [Update] 更改JMSCSVRender,根据请求参数控制导出csv的字段和下载csv模板的字段
* [Update] 导入空数据,提示错误消息
* [Update] 修改用户导入和导出功能代码
* [Update] 修改导入路由为动态反向解析
* [Update] 修改JMSCSVRender和JMSCSVParser以及用户导入导出代码
* [Update] 优化parsers逻辑
* [Update] 优化parsers csv代码结构
* [Update] 优化renders csv代码逻辑
* [Update] 删除parsers csv多余代码
* [Update] 删除parsers csv多余变量
* [Update] 优化renders csv代码结构
* [Update] 优化renders csv代码结构2
* [Update] 优化renders csv获取header逻辑
* [Update] 优化Cache Resources ID View逻辑
* [Update] 优化ViewSet IDCacheFilterMixin逻辑
* [Update] csv: parser render 添加异常捕获逻辑
* [Update] 删除多余代码
* [Update] 优化前端代码
* [Update] 修改小问题
* [Update] 修改前端导出用户的问题
* [Update] 前端 - 优化数据导出逻辑 APIExportData
* [Update] 修复批量创建用户时发送created信号的bug
* [Update] 优化导入时错误信息展示
* [Update] 优化parser、render时,对于多对多字段的处理
* [Update] 修改前端上传空文件问题
* [Update] 添加IDExportFilter,控制下载模版时的queryset
* [Update] 修改判断导出模版时参数变量名 action => template
* [Update] 修复导入用户数据时,用户组不生效的bug
* [Update] 修改前端导入信息展示
* [Update] 抽象资源导入模版
* [Update] 优化资源导入模版
* [Update] 修改js设置url的params逻辑
* [Update] 修改users序列类控制read_only字段方式
* [Update] 资产列表采用新的导入/导出csv文件逻辑
* [Update] 修改导入资产时设置资产所在节点逻辑
* [Update] 添加用户组导入/导出功能
* [Update] 修改前端变量名
* [Update] 修改下载导入模版,不包含org字段
* [Update] 增加管理用户导入/导出功能
* [Update] 导入模版提供id字段(为了资源备份后导入直接使用); 修复资源导入时联合唯一字段不校验导致创建时报错的bug
* [Update] 增加系统用户导入/导出功能
* [Update] 排序资源导入/导出字段
* [Update] 翻译导入/导出的字段和模版
* [Update] 更改csv导出和导出模版数据的控制在render实现
* [Update] 资产添加 更新导入 功能
* [Update] 用户/用户组/管理用户/系统用户/ 添加导入更新
* [Update] 翻译
* [Update] 优化资源序列化中的label
* [Update] 去掉资源IDInFilterMixin过滤
* [Update] 翻译
2019-05-21 16:24:01 +08:00
BaiJiangJie
4942900886
[Update] RemoteApp修改左侧菜单描述 ( #2709 )
2019-05-21 16:10:48 +08:00
BaiJiangJie
1e505d3d0f
[Update] OpenID Middleware去掉输出日志 ( #2711 )
2019-05-21 16:07:40 +08:00
BaiJiangJie
1eca517978
[Feature] 添加功能 RemoteApp ( #2706 )
...
* [Feature] RemoteApp添加Model
* [Feature] RemoteApp添加ViewSet API
* [Feature] RemoteApp添加获取connection-info API
* [Feature] Perms模块修改目录结构
* [Feature] RemoteAppPermission添加Model
* [Feature] RemoteAppPermission添加ViewSet API
* [Feature] RemoteAppPermission添加用户/用户组获取被授权的RemoteApp API
* [Feature] RemoteAppPermission添加校验用户对RemoteApp的权限 API
* [Feature] RemoteAppPermission添加获取用户授权的RemoteApp树 API
* [Feature] RemoteAppPermission添加<添加/移除>所授权的<用户/RemoteApp> API
* [Feature] RemoteApp添加创建、更新、详情、删除、用户RemoteApp等页面
* [Feature] RemoteAppPermission添加创建、更新、详情、删除、授权用户、授权RemoteApp等页面
* [Feature] RemoteApp从assets模块迁移到新添加的applications模块
* [Feature] RemoteApp/RemoteAppPermission添加迁移文件
* [Feature] RemoteApp/RemoteAppPermission修改小细节
* [Feature] RemoteApp/RemoteAppPermission修改小细节2
* [Feature] RemoteApp/RemoteAppPermission修改小细节3
* [Feature] RemoteApp更新迁移文件
* [Feature] RemoteApp/RemoteAppPermission添加翻译信息
* [Feature] RemoteApp/RemoteAppPermission删除迁移文件
* [Feature] RemoteApp/RemoteAppPermission添加迁移文件
* [Feature] RemoteApp/RemoteAppPermission修改代码风格
2019-05-20 19:39:53 +08:00
ibuler
38acce7460
[Update] 修改错误提示颜色
2019-05-20 12:36:35 +08:00
老广
3855fecc69
Password message ( #2702 )
...
* [Update] 密码信封
* [Update] 查看密码
* [Update] 支持查看密码
* [Update] 修改语言翻译
* [Update] 迁移ansible到2.8版本
* [Update] 修改auth book的可连接性
* [Update] 删除不使用的方法
2019-05-20 12:30:55 +08:00
ibuler
466b922ea0
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2019-05-16 14:41:40 +08:00
ibuler
9e52579ca6
[Update] 修改api meta data
2019-05-16 14:41:11 +08:00
老广
1ca1e519b6
Merge pull request #2695 from jumpserver/dev_bugfix
...
[Bugfix] 修复AssetUserManager.get获取username为""的AuthBook对象时,返回多个结果的bug
2019-05-16 10:38:47 +08:00
BaiJiangJie
54a9070c58
[Update] 资产节点API添加search功能
2019-05-16 10:36:47 +08:00
BaiJiangJie
e108aae3c0
[Bugfix] 修复AssetUserManager.get获取username为""的AuthBook对象时,返回多个结果的bug
2019-05-14 21:39:34 +08:00
syin
27c00410d3
add gcc libc-dev linux-headers make autoconf
...
add gcc libc-dev linux-headers make autoconf for pip install -r requirements
2019-05-10 11:52:03 +08:00
老广
74ae7d138e
Merge pull request #2683 from jumpserver/dev
...
[Update] 修改排序节点排序规则
2019-05-10 11:35:46 +08:00
ibuler
20ce5d11a6
[Update] 修改排序节点排序规则
2019-05-10 11:33:26 +08:00
老广
cbe919c4b3
Merge pull request #2682 from jumpserver/dev
...
Dev
2019-05-10 11:31:28 +08:00
ibuler
497cba6b13
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2019-05-10 11:30:01 +08:00
ibuler
e2849be72c
[Update] 修改节点树排序
2019-05-10 11:29:38 +08:00
老广
a025930957
Merge pull request #2642 from jumpserver/dev
...
Dev
2019-04-30 10:46:28 +08:00
老广
990c78e7cc
Merge branch 'master' into dev
2019-04-30 10:46:10 +08:00
BaiJiangJie
0ef12906d3
[Update] 修改翻译信息 ( #2643 )
...
* [Update] 更新翻译信息
* [Update] 更新翻译信息
2019-04-30 10:30:58 +08:00
ibuler
61a37731ec
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2019-04-30 10:20:57 +08:00
ibuler
d3217b6a67
[Update] 修改版本号
2019-04-30 10:20:48 +08:00
BaiJiangJie
04266cc20b
[Update] 修改Copyright ( #2649 )
2019-04-30 10:07:57 +08:00
ibuler
4f36cf7dd1
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2019-04-29 10:39:51 +08:00
ibuler
490041587b
[Update] 修改copyright
2019-04-29 10:39:31 +08:00
BaiJiangJie
3a3da94468
[Update] 修改预留/auth/login/页面方式(admin=1);解决luna页面刷新不跳转openid认证的问题 ( #2634 )
2019-04-25 18:55:48 +08:00
BaiJiangJie
b7ad6cfe62
[Update] 防止 XSS ( #2633 )
...
* [Bugfix] 修改管理用户列表显示bug
* [Bugfix] 修复刷新批量命令页面的bug
* [Update] 防止 XSS
2019-04-25 18:16:41 +08:00
ibuler
4463e7545d
[Update] 去掉多余的
2019-04-25 14:34:47 +08:00
ibuler
d0eafc8b8e
[Update] Merge
2019-04-25 14:32:53 +08:00
ibuler
8b98c20d68
[Update] xss
2019-04-25 14:31:34 +08:00
BaiJiangJie
caa5060ecd
[Update] 控制组织管理员不允许更新、删除超级用户;修复ViewSet API批量更新的bug ( #2629 )
...
* [Update] 控制组织管理员不允许编辑(更新、删除)超级用户 - 待续(控制批量更新API)
* [Update] 修改方法名称
* [Update] 控制组织管理员不允许批量更新包含超级用户的用户列表
* [Bugfix] 修复所有ViewSet API进行批量更新时rest_framework_bulk库内部的bug
* [Update] 修改 OpenID Middleware 日志输出模式 info => debug
2019-04-25 10:11:50 +08:00
BaiJiangJie
aabcf7f31c
[Update] 授权列表下拉信息添加action字段 ( #2618 )
2019-04-22 12:31:40 +08:00
ibuler
40d48cdfe4
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2019-04-22 12:07:59 +08:00
ibuler
8196537878
[Update] 去掉logger.info openid msg
2019-04-22 12:07:48 +08:00
BaiJiangJie
33a00f043b
[Bugfix] 修复创建azure类型的录像存储时前端的bug ( #2617 )
2019-04-22 11:55:14 +08:00
BaiJiangJie
f235e20153
[Feature] 授权规则添加 actions 选项,控制用户对资产的操作行为 ( #2610 )
...
* [Feature] 1. perms actions - 添加 Action Model
* [Feature] 2. perms actions - 添加 Action API
* [Feature] 3. perms actions - 授权规则: 添加actions字段
* [Feature] 4. perms actions - 授权规则创建页面: 设置 actions 默认 all
* [Feature] 5. perms actions - 资产授权工具: 动态给system_user设置actions属性; 修改授权相关的API-serializer类: 添加actions字段值
* [Feature] 6. perms actions - 更新API(用户使用系统用户连接资产时权限校验): 添加actions校验
* [Feature] 7. perms actions - 迁移文件中为已经存在的perms添加默认的action
* [Feature] 8. perms actions - 创建授权规则时设置默认action(如果actions字段值为空)
* [Feature] 9. check actions - 修改校验用户资产权限API逻辑(添加actions校验)
* [Feature] 10. check actions - 修改注释
* [Feature] 11. check actions - 添加API: 获取用户指定资产和系统用户被授权的actions
* [Feature] 12. check actions - 添加翻译信息
2019-04-22 11:42:20 +08:00
BaiJiangJie
cf2455c084
[Bugfix] 修复创建azure类型的录像存储时前端的bug ( #2608 )
2019-04-18 11:50:30 +08:00
BaiJiangJie
fc1068a9dc
[Update] 更新翻译 ( #2599 )
2019-04-15 16:34:56 +08:00
zhnxin
35a0ca1875
Update node.py ( #2527 )
...
bugfix: node get_all_children逻辑
2019-04-15 14:43:49 +08:00
八千流
56519354b6
Email reset password ( #2547 )
...
* [Update]更改英文登录界面标题,可两行
* [Update] 更改用户通过邮箱修改密码后,该链接就失效
* [Update]更改页面左上角logo_text图片
* [Update] 优化发送邮箱改密连接失效代码
* [Update] 优化发送邮箱改密连接失效代码(2)
* [Update] 优化发送邮箱改密连接失效代码(3)
* [Update] 更新interface一键恢复默认的翻译
* [Update] 更改登录失败 用户名密码错误信息的翻译
* [Update] 优化生成token并设置缓存的代码
2019-04-15 14:37:45 +08:00
jokimina
78e4e13fb9
[Bugfix] IsSuperUserOrAppUser deny app user ( #2558 )
2019-04-15 14:33:40 +08:00
八千流
699b8d9980
[Update] 修改批量更新资产url过长导致的错误 ( #2571 )
2019-04-15 14:33:16 +08:00
zbhlove100
ba9581801c
Update README.md
2019-04-09 16:57:01 +08:00
zbhlove100
0a5fdf4ea1
功能转为表格
2019-04-09 16:53:54 +08:00
zhangbohan
3849fa2b15
update readme
2019-04-09 15:27:37 +08:00
zhangbohan
0952cbc7c6
英文readme
2019-04-09 12:21:13 +08:00
zhangbohan
bb06c39dd4
更新readme
2019-04-09 12:09:11 +08:00
zhangbohan
d60dc31443
更新readme
2019-04-08 18:30:39 +08:00
老广
76b3cd8edd
Merge pull request #2583 from jumpserver/dev
...
Dev
2019-04-04 12:33:16 +08:00
老广
638ba31694
Merge pull request #2582 from jumpserver/dev_bugfix_assets
...
[Bugfix] 修复资产对象获取所有节点时的bug
2019-04-04 12:21:42 +08:00
BaiJiangJie
c31b169cae
[Bugfix] 修复资产对象获取所有节点时的bug
2019-04-04 12:17:53 +08:00
老广
fc167526ae
Merge pull request #2575 from jumpserver/dev
...
[Bugfix] 修复OpenID判断退出登录的中间件逻辑的bug (#2574 )
2019-04-03 12:19:23 +08:00
BaiJiangJie
55eff5eab9
[Bugfix] 修复OpenID判断退出登录的中间件逻辑的bug ( #2574 )
2019-04-03 12:18:58 +08:00
老广
f5a7f4e086
Merge pull request #2570 from jumpserver/dev
...
Bugfix (#2569 )
2019-04-02 16:26:28 +08:00
老广
f7b0932cdd
Bugfix ( #2569 )
...
* [Update] 修改Logo 的位置
* [Update] 修改镜像build
2019-04-02 16:25:39 +08:00
老广
ba89ce8fb9
Merge pull request #2560 from jumpserver/dev
...
[Update] 修复小问题 (#2557 )
2019-03-29 19:34:28 +08:00
BaiJiangJie
9d62deeabe
[Update] 修复小问题 ( #2557 )
...
* [Update] 修复小问题
* [Bugfix] 修复操作日志动作、资源类型过滤不成功的bug
2019-03-29 19:14:18 +08:00
老广
459b41f327
Merge pull request #2559 from jumpserver/dev
...
[Update] 修复重定向的问题
2019-03-29 15:54:20 +08:00
ibuler
3062e3f64a
[Update] 修复重定向的问题
2019-03-29 15:53:31 +08:00
老广
c1362ca4e2
Merge pull request #2552 from jumpserver/dev
...
Dev
2019-03-28 13:13:36 +08:00
ibuler
9d24912ad9
[Update] Merge
2019-03-28 13:12:19 +08:00
老广
db290609a8
Merge pull request #2551 from jumpserver/dev
...
Dev
2019-03-28 13:07:34 +08:00
ibuler
4bc5eced6c
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2019-03-28 13:07:04 +08:00
BaiJiangJie
b82a66c83d
[Update] 优化LDAP用户导入功能 ( #2550 )
2019-03-28 12:50:04 +08:00
ibuler
bf7079df9e
[Update] 修改logo
2019-03-28 12:35:16 +08:00
ibuler
f137c5740e
[Update] 添加openldap client
2019-03-28 11:53:52 +08:00
ibuler
ee47905966
[Update] 修改超时时间
2019-03-27 20:39:31 +08:00
fit2cloudrd
f6cd193f9e
Update README.md ( #2548 )
...
* Dev (#2544 )
* [Update] 更新翻译 (#2541 )
* [Update] 更新缓存机制
* [Update] 增加task最大允许事件,并设置命令最大运行时间为60s
* Update README.md
2019-03-27 18:47:38 +08:00
ibuler
a31775dd23
[Update] 整理 copyright 和 版本
2019-03-27 17:46:35 +08:00
老广
30ba1e5886
Merge pull request #2545 from jumpserver/dev
...
Dev
2019-03-27 13:04:58 +08:00
ibuler
f97bfa7bf1
[Update] 修复s3创建时端点不含协议的提示
2019-03-27 12:49:46 +08:00
ibuler
ace028fa7f
[Update] 统一可更改的interface
2019-03-27 12:20:43 +08:00
老广
69f6401e87
Dev ( #2544 )
...
* [Update] 更新翻译 (#2541 )
* [Update] 更新缓存机制
* [Update] 增加task最大允许事件,并设置命令最大运行时间为60s
2019-03-27 11:21:21 +08:00
ibuler
bd4d974df1
[Update] merge
2019-03-27 11:13:35 +08:00
ibuler
6e7446f530
[Update] 增加task最大允许事件,并设置命令最大运行时间为60s
2019-03-27 11:12:34 +08:00
ibuler
afe9471aa2
[Update] 更新缓存机制
2019-03-26 19:46:04 +08:00
BaiJiangJie
4d56b84861
[Update] 更新翻译 ( #2541 )
2019-03-26 15:47:24 +08:00
老广
8fede58c64
Merge pull request #2456 from jumpserver/dev
...
Dev
2019-03-26 11:39:43 +08:00
ibuler
370904212f
[Update] 修改翻译
2019-03-25 20:36:20 +08:00
ibuler
ae03a5aeb7
[Update] 翻译问题
2019-03-25 19:57:18 +08:00
ibuler
24a38841dd
[Update] 修改Dockerfile
2019-03-22 18:26:25 +08:00
ibuler
bbc6156bd7
[Update] 数据库支持CA
2019-03-22 18:06:46 +08:00
ibuler
f387df41d7
[Update] 修改版本
2019-03-22 17:23:02 +08:00
ibuler
ceb8b2f5b3
[Update] 修改翻译
2019-03-22 17:16:02 +08:00
ibuler
877781a6ca
[Update] 删掉一个migrations
2019-03-22 16:56:46 +08:00
BaiJiangJie
612d5efd1b
[Update] 抽象Inventory,更新翻译 ( #2530 )
...
* [Update] 抽象Inventory, 支持自定义用户名密码构建Inventory
* [Update] 更新翻译
2019-03-22 16:52:26 +08:00
ibuler
7ea03801d0
[Update] 修改翻译
2019-03-22 15:57:37 +08:00
八千流
ce8f4b4a48
Ldap synchronization ( #2512 )
...
* [Add]初步实现ldap一键导入用户到jumpserver用户表里
* [update]增加定时延迟一秒刷新页面
* [Update]更改前端以表格形式显示用户信息,优化代码结构
* [Update]增加用户显示表格
* [Update]settings配置文件取消注释
* [Update]优化ldap同步用功能代码
* [Update]删除ldap同步用户旧html模版
* [Update]修改登录页面图片拉伸问题
* [Update]增加 是否已经导入,在前端提示用户
* [Update]优化ldap同步用户的代码,以及翻译
* [Update] 更新翻译(改密计划) (#2525 )
* [Update] 更新翻译(添加改密计划)
* [Update] 更新翻译(改密计划)
* [Update] 更新翻译
* [Update] 更新翻译
* Export login log (#2511 )
* [Add]增加登录日志导出功能
* [Update]优化导出登录日志代码
* [Update]优化导出登录日志代码
* [Update]更改导出登录日志按钮
2019-03-22 15:55:46 +08:00
ibuler
15179d2450
[Update] 修改批量命令的翻译
2019-03-22 15:55:20 +08:00
ibuler
9aae106970
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2019-03-22 15:19:24 +08:00
ibuler
c82044f6bc
[Update] 修改一些bug
2019-03-22 15:18:47 +08:00
八千流
e4e6f59589
Export login log ( #2511 )
...
* [Add]增加登录日志导出功能
* [Update]优化导出登录日志代码
* [Update]优化导出登录日志代码
* [Update]更改导出登录日志按钮
2019-03-22 15:17:22 +08:00
BaiJiangJie
c8aa9d006f
[Update] 更新翻译(改密计划) ( #2525 )
...
* [Update] 更新翻译(添加改密计划)
* [Update] 更新翻译(改密计划)
* [Update] 更新翻译
* [Update] 更新翻译
2019-03-22 09:42:39 +08:00
老广
311538dcf8
Bugfix ( #2513 )
...
* [Update] 用户页面添加跳转
* [Update] 网关测试支持nat, 修复创建node等id不能指定的问题, 修复settings频繁redis, 没有has_replay录像不可以播放
2019-03-19 19:09:09 +08:00
老广
324cf2469f
Bugfix ( #2506 )
...
* [Update] 增加清理celery日志
* [Update] 修复两周前会话命令数量系那是问题
* [Update] 修复两周前会话命令数量系那是问题
* [Update] 修改结构
* [Update] 添加datatable失败的日志
* [Update] 转换配置文件格式
* [Update] 添加traceback
2019-03-18 11:34:13 +08:00
ibuler
01745ead1f
[Update] 添加migrations
2019-03-18 10:26:40 +08:00
BaiJiangJie
4e705a52eb
[Feature] 添加资产用户管理器 ( #2489 )
...
* [Feature] 1. 资产用户管理器
* [Feature] 2. 资产用户管理器: 更新AuthBook
* [Feature] 3. 资产用户管理器: 添加 AssetUser API
* [Feature] 4. AssetUser Model: 添加方法 load_related_asset_auth
* [Feature] 5. AdminUser: 更新管理用户获取认证信息时,先加载相关资产的认证
* [Feature] 6. SystemUser: 更新系统用户获取认证信息时,先加载相关资产的认证
* [Feature] 前端页面: 添加资产用户列表页面
* [Feature] 前端页面: 管理用户的资产管理页面添加按钮: 修改资产用户认证信息
* [Feature] 前端页面: 系统用户的资产管理页面添加按钮: 修改资产用户认证信息
* [Feature] 优化: 从管理用户和系统用户的backend中获取相关资产用户的逻辑
* [Update] Fix 1
* [Feature] 优化: SystemUserBackend之filter功能
* [Feature] 优化: AdminUserBackend之filter功能
* [Feature] 优化: AdminUserBackend和SystemUserBackend功能
* [Feature] 更新翻译: 资产用户管理器
* [Update] 更新资产用户列表页名称为: asset_asset_user_list.html
* [Bugfix] 修改bug: SystemUserBackend 根据用户名过滤系统用户
* [Feature] 添加: 资产用户列表中可测试资产用户的连接性
* [Update] 修改: AdHoc model的run_as字段从SystemUser外键修改为username字符串
* [Feature] 添加: 获取系统用户认证信息(对应某个资产)API
* [Update] 更新: API获取asset user时进行排序
* [Bugfix] 修改: 资产用户可连接性CACHE_KEY
* [Update] 更新翻译信息
* [Update] 修改获取资产用户认证信息API的返回响应(200/400)
* [Update] 修改BaseUser获取特定资产的方法名
* [Update] 修改logger输出,AuthBook set_version_and_latest
* [Update] 修改日志输出添加exc_info参数
* [Update] 移除AuthBook迁移文件0026
* [Bugfix] 修复AdminUserBackend获取instances为空的bug
2019-03-18 10:15:33 +08:00
ibuler
9bb58afee1
[Update] bugfix
2019-03-11 10:27:40 +08:00
老广
b45b33380c
Monitor ( #2485 )
...
* [Update]
* [Update] 修改fields
2019-03-11 10:06:45 +08:00
BaiJiangJie
c86a036ac6
[Update] OpenID认证流程添加详细日志 ( #2462 )
...
* [Update] OpenID认证流程添加详细日志
* [Update] 优化日志格式
2019-03-07 18:41:42 +08:00
ibuler
8694511d86
[Update] 完成
2019-03-06 14:58:25 +08:00
ibuler
58c4a46f6e
[Update] 用户权限增加cache
2019-03-05 19:47:14 +08:00
ibuler
dfd26d88d4
[Update] 用户资产添加缓存
2019-03-04 20:45:57 +08:00
ibuler
dcf6959cff
[Update] 每次启动失效设置的cache
2019-03-04 18:24:02 +08:00
ibuler
924affd978
[Update] 更新移动的model
2019-03-04 17:07:51 +08:00
ibuler
ad6d233c11
[Update] 修改表名称
2019-03-04 15:51:17 +08:00
ibuler
d84ab1d215
[Update] 修改迁移
2019-03-04 15:38:59 +08:00
ibuler
a5fc04e0ce
[Update] merge
2019-03-04 11:36:10 +08:00
ibuler
7f71513085
[Update] 去掉fixtures
2019-03-04 11:32:28 +08:00
ibuler
6004ef3f0d
[Update] 修改settings
2019-03-04 10:53:49 +08:00
ibuler
e76392a169
Merge branch 'stable' into dev
2019-03-04 10:47:31 +08:00
ibuler
53f0b2e9b0
[Update] 增加清理登陆日志的任务
2019-03-04 10:39:44 +08:00
ibuler
de79e36251
[Update] 增加配置
2019-03-04 10:17:35 +08:00
ibuler
c84e984eae
[Update] 任务列表去掉日期
2019-03-01 18:26:13 +08:00
ibuler
6d65c967b1
[Update] config example增加radius
2019-03-01 18:21:14 +08:00
ibuler
8199ea84f4
[Bugfix] 修复有时导致的token解析失败
2019-03-01 13:50:57 +08:00
ibuler
ce1b0da09d
[Update] Merge
2019-02-28 18:24:52 +08:00
ibuler
cd6bb848e9
[Update] Squash table
2019-02-28 18:23:39 +08:00
ibuler
34040fcd59
[Update] 移动model
2019-02-28 17:58:53 +08:00
ibuler
1969fb79fe
[Update] 修改authentication backends
2019-02-28 15:12:45 +08:00
BaiJiangJie
904f64604b
[Bugfix] 修复authentication模块之间引用的bug
2019-02-28 14:41:33 +08:00
ibuler
9b3509208d
[Update] 修改authentication目录结构
2019-02-28 11:58:48 +08:00
BaiJiangJie
6700dc969f
[Update] users认证逻辑迁移到authentication中
2019-02-27 20:55:28 +08:00
ibuler
21714cc411
[Update] Stash
2019-02-27 08:45:00 +08:00
ibuler
1a247d60e7
[Update] sudo命令添加help text
2019-02-26 16:49:55 +08:00
jokimina
adf8b1f7aa
[Bugfix] operation on closed file. ( #2438 )
2019-02-26 12:42:34 +08:00
老广
69f640daa4
Api ( #2439 )
...
* [Update] 迁移settings到独立app
* [Update] 修改settings migrations
* [Update] 修改docs说明
2019-02-26 12:38:20 +08:00
老广
a43314f5be
Merge pull request #2432 from jokimina/patch-5
...
[Bugfix] celery beat crontab task timezone issue
2019-02-25 10:43:52 +08:00
jokimina
599e8a7e37
[Bugfix] crontab task timezone issue
2019-02-24 21:34:45 +08:00
老广
0e00451e1f
Merge pull request #2425 from jumpserver/dev
...
[Update] 修改ldap test密码为空
2019-02-22 19:21:21 +08:00
ibuler
866e5d2011
[Update] 修改ldap test密码为空
2019-02-22 19:14:07 +08:00
老广
232674b1c1
Merge pull request #2423 from jumpserver/dev
...
Dev
2019-02-22 17:10:05 +08:00
ibuler
ddf60d2512
[Update] 添加jms日志和修改entrypoint
2019-02-22 16:33:27 +08:00
ibuler
3e6e0153cf
[Update] 修改entrypoint并增加debug日志
2019-02-22 16:14:50 +08:00
ibuler
6b984aac53
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2019-02-22 12:49:03 +08:00
ibuler
6d3ee8116e
[Update] 修改版本号
2019-02-22 12:48:43 +08:00
老广
904a0f67dd
Merge pull request #2422 from jumpserver/dev
...
Dev
2019-02-22 10:16:08 +08:00
BaiJiangJie
81e1ce2688
[Update] Interface - 1. settings 添加TERMINAL_HEADER_TITLE ( #2421 )
2019-02-21 19:36:15 +08:00
ibuler
7c422d2ed6
[Update] Merge
2019-02-21 19:24:52 +08:00
ibuler
2a5129c481
[Update] 修改支持记录cmd filter日志
2019-02-21 19:22:23 +08:00
BaiJiangJie
28cdfca14b
[Update] 优化 License ( #2420 )
...
* [Update] License - 1.添加标签过滤器
* [Update] License - 2.添加翻译信息
2019-02-21 18:49:40 +08:00
ibuler
202aba048b
[Update] 修改用户页面授权资产
2019-02-21 17:35:28 +08:00
ibuler
3c2a4703bc
[Update] ldap允许空密码
2019-02-21 16:37:36 +08:00
ibuler
4904aac2df
[Update] 更新依赖版本
2019-02-21 16:16:08 +08:00
ibuler
303f88d6ee
[Update] 更新replay storage 配置
2019-02-21 16:13:08 +08:00
老广
cccc74279d
Dev license ( #2409 )
...
* [Update] 更新用户组
* [Update] license - 更新翻译
* [Feature] interface - 自定义配置logo,修改前端(待续)
* [Update] interface更新前端页面,两个登陆首页的模版设
* [Update]修改新登陆模版全局变量,国际化翻译,登陆逻辑页面切换
* [Update] 优化Interface前端逻辑
* [Update] Interface 修改前端一些小问题
* [Update] License/Interface 生成翻译信息
2019-02-20 19:20:13 +08:00
老广
16db2abca5
Merge pull request #2419 from jumpserver/dev
...
Dev
2019-02-20 19:02:40 +08:00
ibuler
859f2d9795
[Update] 支持telnet自定义正则
2019-02-20 19:00:01 +08:00
ibuler
4fd9957bec
[Update] 修改celery日志显示
2019-02-20 17:51:53 +08:00
老广
0ac6e6ba2c
Merge pull request #2418 from jumpserver/dev
...
[Update] 修改gunicorn日志
2019-02-20 16:16:44 +08:00
ibuler
785cc04126
[Update] 修改gunicorn日志
2019-02-20 16:11:58 +08:00
老广
f269eae774
Merge pull request #2415 from jumpserver/dev
...
[Update] 修改导入
2019-02-20 10:41:59 +08:00
ibuler
6f19fcb702
[Update] 修改tasks
2019-02-20 10:40:43 +08:00
老广
b7b6218306
Merge pull request #2414 from jumpserver/dev
...
[Update] gunicorn的日志
2019-02-19 20:06:37 +08:00
ibuler
5cd809b48a
[Update] 修改导入
2019-02-19 20:03:02 +08:00
ibuler
5a1b894138
[Update] gunicorn的日志
2019-02-19 16:59:00 +08:00
老广
4d402617b6
Merge pull request #2410 from jumpserver/dev
...
Dev
2019-02-19 13:04:00 +08:00
ibuler
666ef366e7
[Bugfix] 修复session不显示在线的问题
2019-02-19 12:50:33 +08:00
ibuler
28d029a553
[Update] 修改settings
2019-02-19 12:18:39 +08:00
老广
00763e986a
Merge pull request #2408 from jumpserver/dev
...
[Update] 修改token有效期
2019-02-19 12:00:04 +08:00
ibuler
f9a7cca478
[Update] 修改token有效期
2019-02-19 10:29:25 +08:00
老广
d09b34e232
Merge pull request #2404 from jumpserver/dev
...
[Update] 修改配置文件判断
2019-02-18 15:10:36 +08:00
ibuler
2737675c36
[Update] 修改配置文件判断
2019-02-18 15:09:02 +08:00
老广
7591f40b2c
Merge pull request #2402 from jumpserver/dev
...
[Update] 创建子节点支持id
2019-02-18 13:02:15 +08:00
ibuler
c4af6fa72d
[Update] 创建子节点支持id
2019-02-18 12:59:36 +08:00
老广
19be7ac580
Merge pull request #2394 from jumpserver/dev
...
Dev
2019-02-15 11:16:54 +08:00
ibuler
49404f763d
[Update] 修改terminal字体
2019-02-15 11:15:46 +08:00
ibuler
87f2a67789
[Update] 修改录像获取
2019-02-15 11:14:37 +08:00
老广
041edb6177
Merge pull request #2392 from jumpserver/dev
...
Dev
2019-02-15 10:44:32 +08:00
ibuler
df2fad76c7
[Update] 修改Dockerfile 优先使用阿里云镜像
2019-02-14 16:23:56 +08:00
ibuler
94020a8fbb
[Update] 修改日志存储
2019-02-14 16:15:28 +08:00
ibuler
cb1e19d28f
[Update] 修改录像路径使用utc
2019-02-14 15:47:55 +08:00
ibuler
0980dffb47
[Update] 修复一下新建两个节点的bug
2019-02-13 19:38:51 +08:00
ibuler
4051225ecb
[Bugfix] 修复命令执行bug,修复修改日志级别后无法查看日志
2019-02-13 15:55:11 +08:00
老广
507518da04
Merge pull request #2369 from jumpserver/dev
...
[Update] 修改版本号
2019-01-29 19:33:06 +08:00
ibuler
d3bdbc0b81
[Update] 修改版本号
2019-01-29 19:24:28 +08:00
老广
3b56027edc
Merge pull request #2364 from jumpserver/dev
...
Dev
2019-01-29 17:45:31 +08:00
ibuler
8285610097
[Update] 创建Host Key
2019-01-29 14:07:46 +08:00
ibuler
6acac9cb3d
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2019-01-29 12:28:14 +08:00
ibuler
9d78f26807
[Update] 创建Host Key
2019-01-29 12:27:51 +08:00
BaiJiangJie
9d53ba22e1
[Update] 取消ceph录像存储,添加命令执行翻译 ( #2365 )
2019-01-28 14:59:06 +08:00
ibuler
0d0cf04543
[Update] 修改日志查看
2019-01-28 12:18:53 +08:00
ibuler
56a47b6ba3
[Update] 存储添加说明
2019-01-25 14:55:56 +08:00
ibuler
1dbcf4e3ab
[Update] 数据库make migration移动到gunicorn
2019-01-24 11:25:13 +08:00
ibuler
95fcd60f64
[Update] 兼容之前的node api
2019-01-22 12:44:01 +08:00
ibuler
178055eb57
[Update] 修改任务小写
2019-01-21 17:43:08 +08:00
老广
01a101a710
[Update] 修改一些terminal storage ( #2357 )
2019-01-21 17:05:31 +08:00
ibuler
eee6dd1436
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2019-01-21 12:27:28 +08:00
ibuler
27693c6288
[Update] 修改配置文件
2019-01-21 12:27:20 +08:00
ibuler
55b55f6162
[Update] 修改测试连接节点时,资产为下面的所有资产
2019-01-21 11:58:51 +08:00
ibuler
384cdfbc19
[Update] 启动脚本
2019-01-19 19:29:38 +08:00
ibuler
c8d007f9d7
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2019-01-19 16:52:59 +08:00
ibuler
d8069f47f2
[Update] 修改配置文件加载
2019-01-17 20:38:56 +08:00
ibuler
d664018bd7
[Update] 修改config.py
2019-01-17 20:32:10 +08:00
ibuler
0f32e78891
[Update] 修改dockerfile
2019-01-17 20:26:47 +08:00
ibuler
6e061d2da5
[Bugfix] 修改小bug
2019-01-17 18:39:38 +08:00
ibuler
b2717133ee
[Update] 修改日志目录
2019-01-17 18:06:47 +08:00
老广
2a0e68c58f
Bugfix ( #2350 )
...
* [Update] 权限页面增加过滤规则
* [Update] 修改terminal注册,更新以后使用api完成
* [Update] 修改terminal注册,更新以后使用api完成
* [Update] 修改更新注册逻辑
2019-01-16 18:13:16 +08:00
老广
176052e8e9
[Update] 权限页面增加过滤规则 ( #2349 )
2019-01-15 19:01:33 +08:00
老广
d026b31c9f
Bugfix ( #2346 )
...
* [Update] 修改command Post导致的output错误和定时任务创建问题
* [Update] 修改celery 日志
* [Update] 修改task日志方式
* [Update] 修改Docker file
2019-01-15 10:23:30 +08:00
老广
50c1b3ed4a
[Update] 统一coco host key ( #2336 )
2019-01-10 11:50:08 +08:00
mago960806
131e588d82
is_running()里的打开pid文件的操作已经在get_pid()中执行过了,不需要再次执行 ( #2335 )
2019-01-10 10:21:05 +08:00
xiaomao
4bf0dfcf7b
[bugfix] 解决日志中文报错以及各种utf8问题 ( #2328 )
2019-01-08 15:27:15 +08:00
老广
49a166552e
Bugfix ( #2327 )
...
* [Bugfix] 修复两个配置文件冲突问题
* [Update] Docker中不再提供配置文件
2019-01-08 11:15:09 +08:00
老广
0e1d3f93ff
[Update] 支持radius认证 ( #2323 )
...
* [Update] 支持radius认证
* [Update] 支持radius
* [Update] 增加requirements
* [Update] 修改copyright
* [Update] 修改migrations
2019-01-07 19:20:39 +08:00
老广
35403086ab
Config ( #2322 )
...
* [Update] 修改配置文件
* [Update] 修改配置文件形式
2019-01-07 18:55:02 +08:00
ibuler
2fde6cfe24
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2019-01-03 12:41:21 +08:00
老广
ed1dc7a984
Merge pull request #2300 from jumpserver/dev
...
Dev
2019-01-03 11:52:13 +08:00
老广
9ab3f0441f
Merge pull request #2298 from jumpserver/dev_bugfix
...
[Bugfix] 修复-用户页面资产详情显示bug
2019-01-03 10:41:48 +08:00
BaiJiangJie
d6567f0e57
[Bugfix] 修复-用户页面资产详情显示bug
2019-01-03 10:39:09 +08:00
老广
84bd465b30
Merge pull request #2296 from jumpserver/dev
...
Dev
2019-01-02 15:39:05 +08:00
ibuler
d0af8eba32
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2019-01-02 15:35:06 +08:00
ibuler
b2a8415f77
[Update] 修改创建子节点api
2019-01-02 15:33:35 +08:00
老广
545d4fa691
Merge pull request #2287 from jumpserver/dev
...
[Update] 禁用其他认证方式修改密码 (#2286 )
2018-12-27 18:58:52 +08:00
老广
560df5027a
[Update] 禁用其他认证方式修改密码 ( #2286 )
...
* [Update] 禁用其他认证方式修改密码
* [Update] 禁用其他认证方式修改密码
* [Update] 禁用其他认证方式修改密码
2018-12-27 16:47:40 +08:00
老广
e3db7462f7
Merge pull request #2284 from jumpserver/dev
...
Dev
2018-12-27 11:45:38 +08:00
老广
b55d137e7f
Merge pull request #2283 from jumpserver/dev_bai
...
[Update] 修改在线会话终端按钮vnc协议disable
2018-12-27 11:44:58 +08:00
BaiJiangJie
7c10f8743f
[Update] 修改在线会话终端按钮vnc协议disable
2018-12-27 11:39:11 +08:00
ibuler
c5d1ed126e
[Update] 修改Jms脚本
2018-12-26 19:20:32 +08:00
老广
6b02cdfc37
Merge pull request #2279 from jumpserver/dev
...
Dev
2018-12-26 14:56:25 +08:00
BaiJiangJie
340c615efe
[Bugfix] session model 添加 vnc 协议 ( #2278 )
...
* [Bugfix] session model 添加 vnc 协议
* [Update] 修改表结构
2018-12-26 14:43:43 +08:00
BaiJiangJie
8e51f97dc7
[Update] 添加资产树右击菜单: 刷新所有节点资产数量 ( #2274 )
...
* [Update] 添加资产树右击菜单: 刷新所有节点资产数量
* [Update] 修改右击菜单样式
2018-12-26 13:54:42 +08:00
BaiJiangJie
76a08c9039
[Bugfix] 修复创建/更新 Perms 时,名称重复不提示错误信息的问题 ( #2272 )
2018-12-26 12:59:09 +08:00
BaiJiangJie
b9b8c35a81
[Update] 修改创建资产选择vnc协议,默认端口5901 ( #2276 )
...
* [Update] 修改创建资产选择vnc协议,默认端口5901
* [update] 修改创建命令/录像存储时账户无效的提示信息
2018-12-26 12:57:59 +08:00
老广
e8fba2ec44
Merge pull request #2270 from jumpserver/dev
...
Dev
2018-12-25 16:56:02 +08:00
老广
61df6f55b9
Merge pull request #2269 from jumpserver/bugfix
...
[Update] 修改bug
2018-12-25 16:55:13 +08:00
ibuler
ef02b1f83a
[Update] 修改bug
2018-12-25 16:53:52 +08:00
老广
0798e3c466
Merge pull request #2266 from jumpserver/dev
...
Dev
2018-12-25 14:32:47 +08:00
老广
a990098744
[Update] 优化资产选择 ( #2267 )
...
* [Update] 优化资产选择
* [Update] 优化资产任务
2018-12-25 13:33:37 +08:00
BaiJiangJie
dab692c0eb
[Update] 限制终端设置中心跳间隔和会话保留时长的form最小值 ( #2262 )
...
* [Update] 限制终端设置中心跳间隔和会话保留时长的form最小值
* [Update] 删除terminal forms表单的初始化值
* [Update] 取消安全设置中forms的初始化值,并采用默认值;添加密码过期时间的最大值限制
2018-12-25 09:58:01 +08:00
BaiJiangJie
8e93bfecb0
[Bugfix] 修复DEFAULT组织下,批量删除(某组织下)一部分用户失败的bug ( #2261 )
2018-12-24 15:50:58 +08:00
ibuler
e5953e1932
Merge branch 'dev' of bitbucket.org:jumpserver/core into dev
2018-12-23 22:59:30 +08:00
老广
67b21f0489
Merge pull request #2254 from jumpserver/dev
...
Dev
2018-12-21 15:58:56 +08:00
ibuler
e15c9e6588
[Update] 修改小bug
2018-12-21 15:58:19 +08:00
ibuler
94d6525548
[Bugfix] 修复小bug
2018-12-21 15:57:23 +08:00
老广
a14d6b298d
Merge pull request #2253 from jumpserver/dev
...
Bugfix (#2252 )
2018-12-21 15:48:29 +08:00
老广
e7725e6910
Bugfix ( #2252 )
...
* [Update] 修改心跳偶人时间
* [Update] 修改Node比较
* [Bugfix] 修复bug
2018-12-21 15:47:52 +08:00
老广
23bf2b0f8e
Merge pull request #2250 from jumpserver/dev
...
Dev
2018-12-21 15:10:37 +08:00
BaiJiangJie
ac9178cb93
[Update] 更新deb_requirements依赖 ( #2239 )
2018-12-21 14:59:00 +08:00
老广
7ff39259af
Required opt ( #2246 )
...
* [Update] 修改心跳偶人时间
* [Update] 去掉required的label
* [Update] 修改默认心跳时间
* [Update] 去掉默认的placeholder
* [Update] 修改utils
2018-12-21 14:57:42 +08:00
ibuler
b2aef87fdd
[Update] 修改心跳偶人时间
2018-12-21 10:35:17 +08:00
老广
e1f1bed9c9
Merge pull request #2231 from jumpserver/dev
...
Dev
2018-12-20 11:44:34 +08:00
老广
08945f0a19
[Bugfix] 修复adhoc 日志查看的bug, 修改config example ( #2230 )
2018-12-20 11:42:00 +08:00
ibuler
a1b80f5f0b
[Update] 清理task adhoc和history
2018-12-20 11:05:36 +08:00
ibuler
7773c30240
[Update] 增加索引
2018-12-20 10:40:52 +08:00
jokimina
231c907c64
[Update] ops adhoc date_created index ( #2223 )
2018-12-20 10:34:42 +08:00
BaiJiangJie
db8882a2b9
[Bugfix] 修复创建网域时,选择资产的input和弹出table显示不一致的bug ( #2224 )
2018-12-20 10:32:41 +08:00
ibuler
e5285f312b
[Bugfix] 修复vnc录像的bug
2018-12-19 19:55:41 +08:00
老广
332be54b46
Vnc ( #2226 )
...
* [Update] 优化授权协议, 支持vnc
* [Update] 添加协议vnc
* [Update] 修改系统用户添加
* [Update] 修改vnc信息
2018-12-19 19:40:58 +08:00
老广
fe7c3c29ad
[Update] 优化授权协议, 支持vnc ( #2220 )
...
* [Update] 优化授权协议, 支持vnc
2018-12-19 17:03:10 +08:00
老广
0e9ebed19d
Merge pull request #2214 from jumpserver/dev
...
Dev
2018-12-19 13:57:15 +08:00
老广
4a3327bc4b
Merge pull request #2213 from jumpserver/bugfix
...
[Bugfix] 修复录像bug
2018-12-19 13:56:30 +08:00
ibuler
5d47bebb6b
[Bugfix] 修复录像bug
2018-12-19 13:55:49 +08:00
老广
2ece3545ed
Merge pull request #2210 from jumpserver/dev
...
Dev
2018-12-19 12:33:34 +08:00
ibuler
a9a1bae805
[Update] 修改列表页,显示可连接状态
2018-12-19 12:32:53 +08:00
ibuler
f35c02b346
[Update] 修改列表页,显示可连接状态
2018-12-19 12:30:51 +08:00
老广
32df515f4b
Merge pull request #2209 from jumpserver/dev
...
Dev
2018-12-19 12:02:16 +08:00
ibuler
71750970b2
[Update] 暂时去掉刷新资产树
2018-12-19 12:01:18 +08:00
ibuler
a85099ee60
[Update] 修改版本号
2018-12-19 11:43:13 +08:00
老广
a5b9b4e1d2
Merge pull request #2206 from jumpserver/dev
...
Dev
2018-12-19 10:53:00 +08:00
老广
b3079a4a9b
[Update] Add index ( #2208 )
2018-12-19 10:49:30 +08:00
ibuler
9a22874305
[Update] 去掉多余的任务
2018-12-18 20:14:44 +08:00
ibuler
179018bf67
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2018-12-18 20:07:16 +08:00
ibuler
583214e91a
[Update] 优化获取授权资产api
2018-12-18 20:01:59 +08:00
BaiJiangJie
fb44ef0986
[Bugfix] 修复 资产授权/标签 选择资产时,input框内的资产和弹出资产tabl显示不一致的bug ( #2205 )
...
* [Bugfix] 修复授权规则,选择资产时,输入框资产和弹出表格中资产显示不一致
* [Bugfix] 修复创建/更新资产标签,选择资产时,输入框资产和弹出表格中资产显示不一致的bug
* [Update] 修复标签/授权选择资产时, 2次初始化table的bug;资产input和弹出table统一的代码逻辑移到js中;
2018-12-18 18:50:02 +08:00
ibuler
90b77fdb08
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2018-12-18 17:30:59 +08:00
老广
a609f17078
[Update] Stash it ( #2197 )
...
* [Update] Stash it
* [Bugfix] 修复错误
* [Update] 修改jms
2018-12-18 17:28:45 +08:00
ibuler
068a280350
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2018-12-18 11:38:42 +08:00
老广
1293d72189
Session task ( #2196 )
...
* [Bugfix] 修复错误
* [Update] 增加会话定期清理
2018-12-18 11:29:21 +08:00
ibuler
164c5ebabd
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2018-12-18 09:52:25 +08:00
老广
b56d73ba9e
Node asset amount ( #2192 )
...
* [Bugfix] 修复错误
* [Update] 优化用户api
2018-12-17 20:09:25 +08:00
ibuler
dbdcdb722d
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2018-12-17 18:21:51 +08:00
老广
517a27ea33
Node asset amount ( #2191 )
...
* [Bugfix] 修复错误
* [Update] 修改树结构,统一api
2018-12-17 18:20:44 +08:00
vkill
ab6c88823d
Support for TOTP valid_window configuration ( #2187 )
2018-12-17 14:26:00 +08:00
ibuler
1ff9f0eaa6
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2018-12-17 11:50:18 +08:00
老广
b95f8a7d6b
[Update] 修复获取节点数量比较慢的问题 ( #2184 )
2018-12-17 11:49:57 +08:00
ibuler
29ff0efdc1
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2018-12-17 11:45:37 +08:00
老广
985bd6fc82
Bugfix2 ( #2183 )
...
* [Bugfix] 修复错误
* [Bugfix] 修复一些bug
2018-12-17 11:44:43 +08:00
BaiJiangJie
374039d287
[Update] 终端设置,添加coco端资产列表页面大小配置项 ( #2182 )
...
* [Update] 终端设置,添加coco端资产列表页面大小配置项
* [Update] 添加页面大小选项
2018-12-17 11:18:55 +08:00
ibuler
c7ac93fcc1
[Bugfix] 修复错误
2018-12-17 10:21:16 +08:00
老广
ac7e3e7f97
Merge pull request #2161 from jumpserver/dev
...
[Update] 更改readme
2018-12-13 10:16:08 +08:00
ibuler
4e0b25ae0f
[Update] 更改readme
2018-12-13 10:15:31 +08:00
老广
559f4d2f5c
Merge pull request #2160 from jumpserver/dev
...
[Bugfix] 修复access key的错误
2018-12-13 10:08:16 +08:00
ibuler
f40f6bc61e
[Bugfix] 修复accekt的错误
2018-12-13 10:06:51 +08:00
老广
0f61b36bff
Merge pull request #2155 from jumpserver/dev
...
Dev
2018-12-12 18:04:27 +08:00
ibuler
55ff82545a
[Bugfix] 修复任务执行args为空的bug
2018-12-12 18:03:28 +08:00
ibuler
a99d5609fa
[Bugfix] 修复运行测试硬件等报错的bug
2018-12-12 18:00:21 +08:00
老广
dbc2779b34
Merge pull request #2151 from jumpserver/dev
...
Dev
2018-12-12 15:58:57 +08:00
ibuler
33b1de0d85
[Update] 优化一下
2018-12-12 15:56:36 +08:00
ibuler
bcfe82f162
[Update] 优化错误颜色
2018-12-12 12:40:45 +08:00
ibuler
82af5f8f16
[Update] 资产详情页面增加网域
2018-12-12 12:28:13 +08:00
ibuler
84f52eb337
[Update] 修改api
2018-12-12 12:11:12 +08:00
老广
f00a650366
Merge pull request #2145 from jumpserver/dev
...
Dev
2018-12-12 10:54:41 +08:00
ibuler
2fedeb9834
[Update] 修改命令错误输出
2018-12-12 10:41:28 +08:00
ibuler
daadcedc21
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2018-12-12 09:57:26 +08:00
ibuler
951e8261ad
[Update] 修改版本
2018-12-12 09:57:02 +08:00
老广
9c0f00f625
[Update] 修改命令执行 ( #2148 )
...
* [Update] 修改命令执行
* Update forms.py
2018-12-11 20:32:55 +08:00
老广
6a23983331
Command ( #2142 )
...
* [Update] 修改节点
* [Update] 优化命令运行失败日志
2018-12-11 12:51:22 +08:00
BaiJiangJie
18e590effd
[Bugfix] 修复创建授权规则,选择资产导致其他输入框清空的bug - select2 ( #2141 )
2018-12-11 12:04:19 +08:00
vkill
9d1f5d3184
Add alpine_requirements.txt ( #2139 )
...
* Add alpine_requirements.txt
* Update alpine_requirements.txt
2018-12-11 11:21:07 +08:00
ibuler
b54d389c7c
[Update] 修改翻译
2018-12-11 11:12:47 +08:00
老广
31356e825f
[Update] 修改运行命令名称 ( #2140 )
2018-12-11 11:09:46 +08:00
ibuler
76aadad6fe
[Bugfix] 修复菜单选中bug
2018-12-10 19:54:50 +08:00
ibuler
c7510bcf19
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2018-12-10 19:51:57 +08:00
ibuler
52e5487e7d
[Update] 修改执行命令
2018-12-10 19:51:35 +08:00
BaiJiangJie
4a0d6842de
[Update] 修改select2 css ( #2125 )
...
* [Update] 修改select2 css
* [Update] 创建资产选择节点时,关闭自动收起下拉列表
2018-12-10 15:19:08 +08:00
老广
d6b22e9ff8
[Update] 修改gateway test connection ( #2135 )
2018-12-10 13:03:02 +08:00
Titan
2833f343b2
otp issuer配置项 ( #2133 )
...
多机房环境中otp issuer配置
2018-12-10 12:03:42 +08:00
老广
3d13f3a17d
Command ( #2134 )
...
* [Update] 任务区分org
* [Update] 修改翻译
* [Update] 使用id而不是hostname
* [Update] 执行命令
* [Update] 修改一些东西
* [Update] 暂存
* [Update] 用户执行命令
* [Update] 添加资产授权模块-tree
* [Update] 暂时这样
* [Update] 批量命令执行
* [Update] 修改表结构
* [Update] 更新翻译
* [Update] 删除cloud模块无效中文翻译
2018-12-10 10:11:54 +08:00
BaiJiangJie
d91599ffab
[Update] 更新依赖 ( #2117 )
...
* [Update] 更新依赖
* [Update] 修改翻译小细节
2018-12-04 10:01:40 +08:00
老广
e22e832d49
[Bugfix] 修复批量更新时 节点和标签是增加而不是覆盖 ( #2115 )
2018-11-30 15:39:13 +08:00
BaiJiangJie
8f479e364b
[Update] 修复小细节 ( #2111 )
...
* [Update] 命令/录像存储,禁用default删除按钮
* [Update] 修复 _asset_list_modal 取消资产全选时不能映射到资产选择框的bug
2018-11-29 16:01:03 +08:00
老广
0b0fdbfc82
[Update] 日志审计中改密日志权限 ( #2108 )
...
* [Update] 日志审计中改密日志权限
* [Update] 日志审计中改密日志权限
2018-11-28 18:15:02 +08:00
老广
24fe3ade9c
[Update] 默认中可以看到所有用户 ( #2106 )
2018-11-28 10:02:58 +08:00
老广
9499a16a8b
[Update] 默认中可以看到所有用户 ( #2102 )
2018-11-27 11:00:39 +08:00
BaiJiangJie
f380d82b55
[Update] 修改小问题 ( #2100 )
...
* [Update] 不修改admin用户的用户来源
* [Bugfix] 修复Default组织下用户列表会显示所有用户,并查看详情会报错
* [Update] 关闭telnet资产测试可连接性
* [Update] 只有ssh协议资产可测试连接性
2018-11-27 10:21:47 +08:00
老广
060248d1ca
Req ( #2098 )
...
* [Update] 修改requirements
* [Update] 修改requirements
* [Update] 编译语言
2018-11-26 18:50:30 +08:00
ibuler
da8fec77bb
[Update] 更新配置文件
2018-11-26 10:38:56 +08:00
ibuler
67f52888f6
[Update] 浏览器会话火气时间
2018-11-26 10:30:40 +08:00
ibuler
c4d6f32528
[Update] 增加启动超时时间
2018-11-26 10:22:17 +08:00
ibuler
2661bbb70a
[Update] 修改config example
2018-11-23 18:30:41 +08:00
ibuler
3e3ab556d3
[Update] 修改设置
2018-11-23 18:28:02 +08:00
BaiJiangJie
646a29108c
[Update] 修改安全设置模块排版,翻译 ( #2083 )
2018-11-23 17:00:35 +08:00
ibuler
c7f86cdde9
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2018-11-23 16:36:49 +08:00
BaiJiangJie
79208a95c1
[Update] authentication 添加自定义 LDAPBackends ( #2081 )
2018-11-23 16:36:28 +08:00
ibuler
091cf39e4e
[Bugfix] ldap可以修改密码问题,platform大小写问题
2018-11-23 16:24:30 +08:00
ibuler
0df7c6909e
[Update] 修改config_example
2018-11-23 11:30:31 +08:00
ibuler
f6def0b43f
[Update] 修改表结构
2018-11-23 11:15:11 +08:00
老广
9cfcadc2f6
服务账号注册机制更改 ( #2079 )
...
* [Update] 服务账号注册
* [Update] 修改settings配置
* [Update] 修改settings
* [Update] 整理terminal api
* [Update] 修改terminal api
* [Update] 修改terminal注册机制
2018-11-23 10:25:35 +08:00
BaiJiangJie
363985ee7a
[Feature] 添加功能,密码过期间隔时间配置,检测用户密码过期 ( #2043 )
...
* [Update] user model 添加date_password_last_updated字段, 并在用户详情/个人信息页进行展示、重置密码/修改密码时进行更新;安全设置添加密码过期时间配置项;
* [Update] 修改依赖,deb_requirements 删除 gcc automake
* [Update] 添加定时任务: 检测用户密码是否过期
* [Update] 登录页面添加检测用户密码是否过期,并给出过期提示,拒绝登录
* [update] 用户密码过期时间5天以内,每天发送重置密码邮件
* [Update] api 登录认证,添加密码过期检测
* [Update] 添加提示用户密码即将过期信息
* [Update] 修改小细节
* [Update] User model 添加密码即将过期/已过期 property属性
* [Update] 修改用户api auth检测用户密码过期逻辑
* [Update] 添加翻译,用户密码过期
* [Update] 用户密码即将过期,发送密码过期提醒邮件
* [Update] 修改检测用户密码过期任务,修改interval为crontab
* [Update] 修改翻译小细节
* [Update] 修改翻译小细节
* [Bugfix] 修复在用户更新页面修改密码时, 不更新最后密码修改时间的bug
* [Update] 修复小细节
* [Update] 修改系统设置成功提示翻译信息
2018-11-22 18:02:12 +08:00
老广
16cc4a0f4e
[Update] 修改settings配置 ( #2067 )
...
* [Update] 修改settings配置
* [Update] 修改settings
* [Update] 修改密码校验规则前后端逻辑
* [Update] 修改用户config机制
* [Update] 修改配置
* [Update] 修改config example增加翻译
2018-11-22 12:27:27 +08:00
ibuler
5931c5a032
[Update] terminal配置修改
2018-11-19 12:45:33 +08:00
ibuler
742200e462
Merge remote-tracking branch 'github/dev' into dev
2018-11-19 12:27:57 +08:00
ibuler
9d7b82085e
[Update] 修改common settings
2018-11-19 12:27:29 +08:00
ibuler
dda367a956
[Update] 修改common settings配置
2018-11-19 12:18:52 +08:00
老广
c0d51e22d7
Merge pull request #2035 from jumpserver/origin_dev
...
Origin dev
2018-11-14 12:49:47 +08:00
老广
2348c8c335
Merge pull request #2034 from jumpserver/origin_dev
...
[Bugfix] 修复luna不显示多组织资产的问题
2018-11-14 12:49:21 +08:00
ibuler
87abe63a20
[Bugfix] 修复luna不显示多组织资产的问题
2018-11-14 12:48:59 +08:00
ibuler
4d26fd8b56
[Bugfix] 修复luna不显示多组织资产的问题
2018-11-14 12:47:43 +08:00
ibuler
c9aab608a9
[Bugfix] 修复luna不显示多组织资产的问题
2018-11-14 12:42:26 +08:00
ibuler
641567be10
[Update] 修改docker file依赖
2018-11-13 16:18:25 +08:00
ibuler
5f68f6cb69
[Update] 增加脚本导入migration sql
2018-11-13 16:09:26 +08:00
ibuler
d50ad66b78
[Update] 维护统一的migrations
2018-11-13 15:57:44 +08:00
老广
69ab3e3542
Merge pull request #2028 from jumpserver/dev
...
Dev
2018-11-13 15:17:47 +08:00
ibuler
ff1b902b2e
Merge remote-tracking branch 'github/dev' into dev
2018-11-13 15:01:07 +08:00
BaiJiangJie
52647da79b
[Update] 修改jumpserver功能图片 ( #2020 )
2018-11-13 14:59:50 +08:00
BaiJiangJie
28b6144189
[Bugfix] 修复创建用户common_settings.SITE_URL 为None的bug ( #2027 )
2018-11-13 14:59:29 +08:00
ibuler
f7daf26a03
[Update] 修改celery运行,最大20个进程
2018-11-12 17:47:41 +08:00
ibuler
e1673334af
Merge remote-tracking branch 'github/dev' into dev
2018-11-12 16:46:21 +08:00
BaiJiangJie
fd6e561d4b
[Bugfix] 资产/用户等升序排序问题,显示创建oss录像存储bucket输入框 ( #2017 )
...
* [Bugfix] 修复资产列表,用户列表排序只有降序的问题
* [update] 系统设置创建oss录像存储, 添加bucket输入框
2018-11-12 16:45:57 +08:00
ibuler
4cdddaa493
[Bugfix] 修复网域网关列表的bug
2018-11-12 16:43:35 +08:00
老广
9491827e01
Merge pull request #2014 from jumpserver/dev
...
Dev
2018-11-11 12:04:00 +08:00
老广
5459d1114f
Merge branch 'master' into dev
2018-11-11 11:39:02 +08:00
ibuler
6acda27d67
[Update] 更新版本
2018-11-11 10:38:15 +08:00
BaiJiangJie
0f9326bd8f
[Update] 更新OpenID依赖 ( #2013 )
2018-11-09 15:00:37 +08:00
BaiJiangJie
e09f3ca4fd
[Update] 支持 OpenID 认证 ( #2008 )
...
* [Update] core支持openid登录,coco还不支持
* [Update] coco支持openid登录
* [Update] 修改注释
* [Update] 修改 OpenID Auth Code Backend 用户认证失败返回None, 不是Anonymoususer
* [Update] 修改OpenID Code用户认证异常捕获
* [Update] 修改OpenID Auth Middleware, check用户是否单点退出的异常捕获
* [Update] 修改config_example Auth OpenID 配置
* [Update] 登录页面添加 更多登录方式
* [Update] 重构OpenID认证架构
* [Update] 修改小细节
* [Update] OpenID用户认证成功后,更新用户来源
* [update] 添加OpenID用户登录成功日志
2018-11-09 14:54:38 +08:00
ibuler
1fcb272ddc
[Bugfix] 修复coco tree失败的问题,不应该过滤没有asset的node
2018-11-09 12:33:45 +08:00
ibuler
b577c626f7
[Bugfix] 修复luna取到协议不同的系统用户
2018-11-09 11:23:41 +08:00
ibuler
2e4e5503cc
[Bugfix] 修复获取common settings时数据库问题
2018-11-07 11:26:39 +08:00
liuzheng712
4212cb3600
feat: add tencentcloud-sdk-python==3.0.32
2018-11-05 12:48:32 +08:00
ibuler
b8874e1855
[Update] 修改版本号
2018-11-05 11:52:44 +08:00
ibuler
9bb498f7b3
[Update] 修改sdk版本
2018-11-05 11:25:22 +08:00
ibuler
e38d089056
Merge remote-tracking branch 'github/dev' into dev
2018-11-05 11:11:33 +08:00
BaiJiangJie
f9e9bf0b2d
[Update] 更新用户/授权规则过期时间精确到min ( #1993 )
2018-11-05 11:11:20 +08:00
BaiJiangJie
1e5387ef47
[Update] 更新组织管理api ( #1986 )
...
* [Update] 更新组织管理api
* [Update] 重写-组织管理员/用户API,采用through类
* [Update] 修改OrgMembershipSerializerMixin目录
* [Update] 修改组织管理API,限制http method
* [Update] 修改rpm依赖
2018-11-02 14:38:44 +08:00
BaiJiangJie
f87e08efff
[Update] 添加deb依赖,完善用户登录失败日志,修复资产标签bug ( #1983 )
...
* [Update] 修改deb依赖
* [Update] 修改记录用户登录失败日志,用户不存在的情况,但是显示登录日志列表还不全..
* [Update] 用户登录日志,记录用户名不存在的情况(Default组织显示所有用户的登录日志)
* [Bugfix] 修复标签名为search, limit时资产列表不显示的bug
2018-11-01 16:28:19 +08:00
BaiJiangJie
82d866db7d
[Update] 添加用户授权资产列表页的分页,搜索,排序 ( #1963 )
...
* [Update] 分页获取用户授权资产
* [Update] 修改前端-用户授权资产分页
* [Update] 用户授权资产支持搜索
* [Update] 用户授权资产支持排序
* [Update] 用户授权的节点with资产Api,对资产进行排序
* [Update] 获取用户授权的节点下的资产的api,进行分页、排序、查询
* [Update] 抽象用户授权资产列表的查询,排序
* [Update] 优化小细节
* [Update] 删除无用导入
* [Update] 修改AssetFilterMixins目录从common到perms
* [Update] 资产授权规则列表: 添加分页、搜索
* [Update] 添加管理用户,系统用户列表分页、搜索
* [Update] 用户组列表添加分页,搜索
* [Update] 资产标签列表添加分页、搜索
* [Update] 网域网关列表添加分页、搜索
* [Update] 命令过滤列表添加分页、搜索,修改翻译小细节
* [Update] 删除前端注释initDataTable
* [Update] 修改文案,资产组-节点
* [Update] 普通用户资产列表添加分页、搜索
2018-10-31 15:31:09 +08:00
老广
ba0d822734
Merge pull request #1971 from waiwaiku/master
...
修复子用户资产列表点击无法收起
2018-10-31 15:30:14 +08:00
fangjian
c8568eb244
修复子用户资产列表点击无法收起
2018-10-31 11:26:24 +08:00
ibuler
6e19b9d5bc
[Update] Luna支持异步加载
2018-10-30 12:06:39 +08:00
老广
354b728f75
Merge pull request #1945 from jumpserver/dev_storage
...
[Update] 更新命令/录像存储设置
2018-10-29 10:07:10 +08:00
老广
ce553710ba
Merge pull request #1958 from jumpserver/dev_bugfix_ops
...
[Bugfix] 修复组织管理员刷新硬件信息,获取资产为None(使用fullname)和查看celery log 403问题
2018-10-29 10:04:57 +08:00
BaiJiangJie
4f806f11f2
[Update] 修改命令/录像存储,创建/删除API的权限为SuperUser
2018-10-28 02:17:46 +08:00
ibuler
e9247dd578
[Update] default组织显示所有用户
2018-10-27 11:34:10 +08:00
老广
0a94a346a0
Merge pull request #1946 from jumpserver/dev_bugfix_perms
...
[Bugfix] 修复授权规则下Default节点下的资产不显示
2018-10-27 11:14:23 +08:00
老广
d8afe72d4c
Merge pull request #1947 from jumpserver/dev_user_paging
...
[Update] 用户列表页,添加分页,搜索
2018-10-27 11:14:03 +08:00
BaiJiangJie
e2072a1e02
[Update] 修复组织管理员刷新硬件信息,获取资产为None(使用fullname)和查看celery log 403问题
2018-10-26 21:03:09 +08:00
BaiJiangJie
cc387bf511
[Update] 用户列表页,添加分页,搜索
2018-10-24 14:55:04 +08:00
BaiJiangJie
5c002e91ee
[Update] 修改获取资产distinct
2018-10-24 13:05:32 +08:00
BaiJiangJie
41a8831034
[Bugfix] 修复授权规则下Default节点下的资产不显示
2018-10-24 12:13:47 +08:00
BaiJiangJie
ebd92c79c7
[Update] 修改翻译小细节
2018-10-24 11:05:39 +08:00
BaiJiangJie
6278900201
[Update] 创建es命令存储,添加提示信息
2018-10-24 10:57:55 +08:00
ibuler
4f580e0df8
[Update] 修改启动脚本
2018-10-24 10:53:00 +08:00
BaiJiangJie
1f502e02c7
[Update] 修改settings为common_settings
2018-10-24 10:48:03 +08:00
BaiJiangJie
cdf8398169
[Update] 修复创建es命令存储校验有效性异常
2018-10-24 10:29:40 +08:00
BaiJiangJie
1bfef829f3
[Update] 修改terminal表单获取storage, 删除无用代码
2018-10-24 10:11:38 +08:00
BaiJiangJie
cc0cf8ed1c
Merge branch 'dev' into dev_replay
2018-10-24 09:52:43 +08:00
BaiJiangJie
2791213844
[Update] 更新storage翻译
2018-10-23 20:41:01 +08:00
BaiJiangJie
284e8be45c
[Update] 修改系统设置-命令/录像存储页面(添加,删除)
2018-10-23 19:22:18 +08:00
老广
76109f1808
Merge pull request #1938 from jumpserver/dev
...
Dev
2018-10-23 10:10:53 +08:00
ibuler
54b6e06d1f
[Update] 暂时不支持上传目录
2018-10-19 16:30:52 +08:00
ibuler
5c30c76ea3
[Update] 修改jms-storage版本
2018-10-19 10:49:13 +08:00
老广
94b5eb8685
Merge pull request #1929 from jumpserver/dev
...
Dev
2018-10-19 09:56:52 +08:00
ibuler
c9f4b104c7
Merge remote-tracking branch 'github/dev' into dev
2018-10-19 09:38:18 +08:00
ibuler
3bf1c036c5
[Bugfix] 修改sshpubkey库版本
2018-10-19 09:27:33 +08:00
老广
09fbd3a5ab
Merge pull request #1922 from jumpserver/dev
...
Dev
2018-10-16 17:18:31 +08:00
ibuler
ebecd00581
[Update] 修改优先级逻辑
2018-10-16 16:47:47 +08:00
ibuler
143fa060d1
[Update] 修改节点信息
2018-10-16 13:44:26 +08:00
ibuler
2c18a27e3a
[Update] 修改节点创建规则
2018-10-16 12:37:42 +08:00
ibuler
910dd4e593
[Update] 修改节点生成规则
2018-10-16 12:03:11 +08:00
ibuler
11aefa479b
[Bugfix] 修复common设置问题
2018-10-16 10:56:25 +08:00
ibuler
abc56016f2
Merge remote-tracking branch 'github/dev' into dev
2018-10-16 10:19:00 +08:00
老广
f44db2a25b
Merge pull request #1916 from jumpserver/dev_tag_filter
...
[Update] 添加(减法)标签过滤器
2018-10-16 10:16:25 +08:00
BaiJiangJie
3fa6807837
[Update] 添加(减法)标签过滤器
2018-10-16 09:53:30 +08:00
ibuler
2c4195d619
Merge remote-tracking branch 'github/dev' into dev
2018-10-15 17:47:32 +08:00
老广
265ef0c8ac
Merge pull request #1913 from jumpserver/dev_requirements
...
[Update] 更新requirements
2018-10-15 17:47:10 +08:00
BaiJiangJie
0b0b06a5c2
[Update] 更新requirements-aliyun
2018-10-15 17:06:01 +08:00
ibuler
d77ba1d5ea
Merge remote-tracking branch 'github/dev' into dev
2018-10-15 16:30:08 +08:00
老广
a3bd7cee80
Merge pull request #1912 from jumpserver/dev_cloud_manager
...
[Update] 修改文案
2018-10-15 16:29:50 +08:00
BaiJiangJie
8d73cd43e1
Merge branch 'dev' into dev_cloud_manager
2018-10-15 16:09:55 +08:00
BaiJiangJie
7e3fd73ae5
[Update] 修改文案
2018-10-15 16:05:53 +08:00
ibuler
70960d2ae4
Merge remote-tracking branch 'github/dev' into dev
2018-10-15 11:34:20 +08:00
老广
d2c574fe9d
Merge pull request #1910 from jumpserver/dev_cloud_manager
...
[Feature] 添加xpack-云管中心模块
2018-10-15 11:30:38 +08:00
BaiJiangJie
a70fcf057b
[Update] 修改js,添加3级菜单active属性
2018-10-15 10:48:24 +08:00
ibuler
f37582ec53
[Update] 用户导航加上文件管理
2018-10-15 10:14:20 +08:00
BaiJiangJie
29b87c40fe
[Update] 修改云管理模块-文案
2018-10-14 00:03:04 +08:00
BaiJiangJie
1ec77c5bb9
[Update] 添加3级导航菜单-云管理模块
2018-10-12 20:29:04 +08:00
BaiJiangJie
21c71aba93
[Update] Merge branch dev_cloud_manager (baijiangjie_local) to dev
2018-10-12 18:41:01 +08:00
BaiJiangJie
f8db9f480e
[Update] 添加翻译-云管理模块
2018-10-12 18:26:56 +08:00