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
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
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
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
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
feng626
c8758f417d
feat: ldap一键导入及设置用户组织
2022-04-06 17:13:34 +08:00
Eric
ef36b2e662
perf: 完善 setting 的动态配置
2022-04-06 16:45:22 +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
老广
0665644fd0
Merge pull request #1905 from jumpserver/dev
...
支持命令过滤
2018-10-12 15:33:52 +08:00
ibuler
7bafa546b5
[Update] 修改版本
2018-10-12 15:05:04 +08:00
ibuler
666815b324
[Update] 修改文案
2018-10-12 15:04:01 +08:00
ibuler
532abb86b5
[Update] 添加文案说明和翻译
2018-10-11 11:10:47 +08:00
ibuler
76d4e4ad55
[Update] 修改翻译
2018-10-10 19:31:28 +08:00
ibuler
70fa43adaa
[Update] 修改一些逻辑
2018-10-10 19:29:53 +08:00
ibuler
44bf01d4ed
[Update] 支持命令过滤
2018-10-10 15:37:20 +08:00
老广
1341983fd3
Merge pull request #1878 from jumpserver/dev
...
[Update] 更改版本号
2018-10-08 19:13:12 +08:00
ibuler
78936bf9f2
[Update] 更改版本号
2018-10-08 19:03:02 +08:00
老广
9a5d3cb475
Merge pull request #1877 from jumpserver/dev
...
支持web sftp
2018-10-08 18:57:40 +08:00
ibuler
9bddc29da4
[Update] 暂时不存status数据
2018-09-29 10:44:52 +08:00
ibuler
d68a4d9cae
[Update] 修改背景色
2018-09-29 10:28:12 +08:00
ibuler
5457118fb6
[Update] 修改css
2018-09-21 22:49:38 +08:00
ibuler
7ee68f7eeb
[Update] 修改static
2018-09-21 20:35:58 +08:00
ibuler
2063f2f257
[Update] Add file to static
2018-09-21 16:37:33 +08:00
ibuler
2637c608a6
[Update] 修改gunicorn配置
2018-09-14 11:29:26 +08:00
老广
32519ea326
Merge pull request #1819 from jumpserver/dev
...
Dev
2018-09-14 11:08:03 +08:00
ibuler
3ce9d01b6d
[Bugfix] 修复coco无法查看资产的bug
2018-09-13 12:16:49 +08:00
ibuler
310bc6ad0b
[Update] 修复获取token的bug
2018-09-13 11:41:44 +08:00
ibuler
b54afbe7bb
[Bugfix] 修复组织管理员无法查看用户授权的bug
2018-09-13 11:17:55 +08:00
ibuler
ab848afdb9
[Bugfix] 修复创建节点bug
2018-09-12 15:19:40 +08:00
ibuler
5bb867d10d
[Update] 添加禁用用户mfa脚本
2018-09-12 11:36:27 +08:00
ibuler
0eda8865e6
[Bugfix] 修复首页显示问题
2018-09-12 11:24:07 +08:00
老广
2a37107abc
Merge pull request #1805 from jumpserver/dev
...
Dev
2018-09-11 16:04:18 +08:00
ibuler
c78107f62f
[Bugfix] Remote datepicker bug
2018-09-11 16:01:49 +08:00
ibuler
b022bf36ba
[Update] 使用gthread替代eventlet
2018-09-11 12:42:49 +08:00
ibuler
6dc2272a26
[Update] 修复无法取消授权资产的前端bug
2018-09-11 12:17:17 +08:00
老广
1d462aea1b
Merge pull request #1796 from jumpserver/dev
...
Dev
2018-09-07 12:42:55 +08:00
ibuler
88a29c0a93
[Update] 增加手动结束非正常关闭的连接
2018-09-07 12:40:26 +08:00
ibuler
9ffae722f3
[Update] 升级gunicorn版本
2018-09-05 12:26:46 +08:00
老广
9ab2f4bc56
Merge pull request #1780 from jumpserver/dev
...
[Update] 修改图标
2018-09-05 10:55:26 +08:00
ibuler
41e7f45c20
[Update] 修改图标
2018-09-05 10:53:12 +08:00
老广
9945ac172b
Merge pull request #1775 from jumpserver/dev
...
[Update] 修改web terminal访问bug
2018-09-04 17:10:13 +08:00
ibuler
67ddd42b3d
[Update] 修改web terminal访问bug
2018-09-04 17:09:37 +08:00
老广
03adddefa3
Merge pull request #1771 from jumpserver/dev
...
Dev
2018-09-04 16:05:19 +08:00
ibuler
60b7ccddc0
[Update] 更新翻译
2018-09-04 16:03:42 +08:00
老广
1194932bc0
Merge pull request #1770 from jumpserver/dev
...
settings加密存储
单独推送系统用户到某个资产
支持了 改密日志 操作日志
翻译更加完善,支持切换语言
2018-09-04 15:29:11 +08:00
ibuler
5c8fd91cf9
[Update] 修复上传录像文件,无法读取的问题
2018-09-04 12:19:20 +08:00
ibuler
bb13003a10
[Bugfix] 修复资产权限
2018-09-03 19:41:44 +08:00
ibuler
9a18817dbb
[Bugfix] 修复rdp系统用户密码无法成功的问题
2018-09-03 19:40:06 +08:00
ibuler
2c4966c678
[Update] 修改form
2018-09-03 15:33:35 +08:00
ibuler
d1390a1cd7
[Update] 修改版本
2018-09-03 11:28:56 +08:00
老广
fe45d839fb
Dev2 ( #1766 )
...
* [Update] 初始化操作日志
* [Feature] 完成操作日志记录
* [Update] 修改mfa失败提示
* [Update] 修改增加created by内容
* [Update] 增加改密日志
* [Update] 登录日志迁移到日志审计中
* [Update] change block user logic, if login success, clean block limit
* [Update] 更新中/英文翻译(ALL) (#1662 )
* Revert "授权页面分页问题"
* 增加命令导出 (#1566 )
* [Update] gunicorn不使用eventlet
* [Update] 添加eventlet
* 替换淘宝IP查询接口
* [Feature] 添加命令记录下载功能 (#1559 )
* [Feature] 添加命令记录下载功能
* [Update] 文案修改,导出记录、提交,取消全部命令导出
* [Update] 命令导出,修复时间问题
* [Update] paramiko => 2.4.1
* [Update] 修改settings
* [Update] 修改权限判断
* Dev (#1646 )
* [Update] 添加org
* [Update] 修改url
* [Update] 完成基本框架
* [Update] 修改一些逻辑
* [Update] 修改用户view
* [Update] 修改资产
* [Update] 修改asset api
* [Update] 修改协议小问题
* [Update] stash it
* [Update] 修改约束
* [Update] 修改外键为org_id
* [Update] 删掉Premiddleware
* [Update] 修改Node
* [Update] 修改get_current_org 为 proxy对象 current_org
* [Bugfix] 解决Node.root() 死循环,移动AdminRequired到permission中 (#1571 )
* [Update] 修改permission (#1574 )
* Tmp org (#1579 )
* [Update] 添加org api, 升级到django 2.0
* [Update] fix some bug
* [Update] 修改一些bug
* [Update] 添加授权规则org (#1580 )
* [Update] 修复创建授权规则,显示org_name不是有效UUID的bug
* [Update] 更新org之间隔离授权规则,解决QuerySet与Manager问题;修复创建用户,显示org_name不是有效UUID之bug;
* Tmp org (#1583 )
* [Update] 修改一些内容
* [Update] 修改datatable 支持process
* [Bugfix] 修复asset queryset 没有valid方法的bug
* [Update] 在线/历史/命令model添加org;修复命令记录保存org失败bug (#1584 )
* [Update] 修复创建授权规则,显示org_name不是有效UUID的bug
* [Update] 更新org之间隔离授权规则,解决QuerySet与Manager问题;修复创建用户,显示org_name不是有效UUID之bug;
* [Update] 在线/历史/命令model添加org
* [Bugfix] 修复命令记录,保存org不成功bug
* [Update] Org功能修改
* [Bugfix] 修复merge带来的问题
* [Update] org admin显示资产详情右侧选项卡;修复资产授权添加用户,会显示其他org用户的bug (#1594 )
* [Bugfix] 修复资产授权添加用户,显示其他org的用户bug
* [Update] org admin 显示资产详情右侧选项卡
* Tmp org (#1596 )
* [Update] 修改index view
* [Update] 修改nav
* [Update] 修改profile
* [Bugfix] 修复org下普通用户打开web终端看不到已被授权的资产和节点bug
* [Update] 修改get_all_assets
* [Bugfix] 修复节点前面有个空目录
* [Bugfix] 修复merge引起的bug
* [Update] Add init
* [Update] Node get_all_assets 过滤游离资产,条件nodes_key=None -> nodes=None
* [Update] 恢复原来的api地址
* [Update] 修改api
* [Bugfix] 修复org下用户查看我的资产不显示已授权节点/资产的bug
* [Bugfix] Fix perm name unique
* [Bugfix] 修复校验失败api
* [Update] Merge with org
* [Merge] 修改一下bug
* [Update] 暂时修改一些url
* [Update] 修改url 为django 2.0 path
* [Update] 优化datatable 和显示组织优化
* [Update] 升级url
* [Bugfix] 修复coco启动失败(load_config_from_server)、硬件刷新,测试连接,str 没有 decode(… (#1613 )
* [Bugfix] 修复coco启动失败(load_config_from_server)、硬件刷新,测试连接,str 没有 decode() method的bug
* [Bugfix] (task任务系统)修复资产连接性测试、硬件刷新和系统用户连接性测试失败等bug
* [Bugfix] 修复一些bug
* [Bugfix] 修复一些bug
* [Update] 更新org下普通用户的资产详情 (#1619 )
* [Update] 更新org下普通用户查看资产详情,只显示数据
* [Update] 优化org下普通用户查看资产详情前端代码
* [Update] 创建/更新用户的role选项;密码强度提示信息中英文; (#1623 )
* [Update] 修改 超级管理员/组织管理员 在 创建/更新 用户时role的选项 问题
* [Update] 用户密码强度提示信息支持中英文
* [Update] 修改token返回
* [Update] Asset返回org name
* [Update] 修改支持xpack
* [Update] 修改url
* [Bugfix] 修复不登录就能查看资产的bug
* [Update] 用户修改
* [Bugfix] ...
* [Bugfix] 修复跳转错误的问题
* [Update] xpack/orgs组织添加删除功能-js; 修复Label继承Org后bug; (#1644 )
* [Update] 更新xpack下orgs的翻译信息
* [Update] 更新model Label,继承OrgModelMixin;
* [Update] xpack/orgs组织添加删除功能-js; 修复Label继承Org后bug;
* [Bugfix] 修复小bug
* [Update] 优化一些api
* [Update] 优化用户资产页面
* [Update] 更新 xpack/orgs 删除功能:限制在当前org下删除当前org (#1645 )
* [Update] 修改版本号
* [Update] 添加功能: 语言切换(中/英);修改 header_bar <商业支持、文档>显示方式
* [Update] 中/英切换文案修改;修改django_language key 从 settings 中获取
* [Update] 修改Dashboard页面文案,支持英文
* [Update] 更新中/英文翻译(ALL)
* [Update] 解决翻译文件冲突
* [Update] 系统用户支持单独隋松
* [Update] 重置用户MFA
* [Update] 设置session空闲时间
* [Update] 加密setting配置
* [Update] 修改单独推送和测试资产可连接性
* [Update] 添加功能:用户个人详情页添加 更改MFA操作 (#1748 )
* [Update] 添加功能:用户个人详情页添加 更改MFA操作
* [Update] 删除print
* [Bugfix] 添加部分views的权限控制;从组织移除用户,同时从授权规则和用户组中移除此用户。 (#1746 )
* [Bugfix] 修复上传command log 为空
* [Update] 修复执行任务的bug
* [Bugfix] 修复将用户从组内移除,其依然具有之前的组权限的bug, perms and user_groups
* [Bugfix] 修复组管理员可以访问部分url-views的bug(如: /settings/)添加views权限控制
* [Update] 修改日志滚动
* [Bugfix] 修复组织权限控制的bug (#1763 )
* [Bugfix] 修复将用户从组内移除,其依然具有之前的组权限的bug, perms and user_groups
* [Bugfix] 修复组管理员可以访问部分url-views的bug(如: /settings/)添加views权限控制
2018-09-03 11:24:25 +08:00
老广
9f96f1c537
Merge pull request #1737 from jumpserver/dev
...
Dev
2018-08-24 12:12:38 +08:00
老广
dc918c031c
Merge pull request #1736 from jumpserver/bugfix_run_adhoc
...
[Update] 修复执行任务的bug
2018-08-24 12:11:27 +08:00
ibuler
6b047ca702
Merge remote-tracking branch 'github/dev' into bugfix_run_adhoc
2018-08-24 12:09:29 +08:00
ibuler
47d31005b5
[Update] 修复执行任务的bug
2018-08-24 12:08:42 +08:00
老广
57e1ca93f0
Merge pull request #1715 from jumpserver/dev
...
[Bugfix] 修复上传command log 为空
2018-08-20 08:41:15 -05:00
ibuler
483a7617ce
[Bugfix] 修复上传command log 为空
2018-08-20 21:39:15 +08:00
老广
5470ab752e
Merge pull request #1702 from jumpserver/dev
...
Dev
2018-08-16 06:19:27 -05:00
ibuler
2dbd6b6f6e
[Bugfix] 修复获取资产失败
2018-08-16 18:29:54 +08:00
老广
504d9242c6
Merge pull request #1700 from jumpserver/dev
...
Dev
2018-08-16 04:47:13 -05:00
ibuler
14b1e3fa13
[Update] 添加backup脚本
2018-08-16 17:08:45 +08:00
ibuler
7eeca511f1
[Bugfix] 修复打印日志的bug
2018-08-16 16:40:00 +08:00
ibuler
670c8a6d0b
[Bugfix] 修复唯一认证
2018-08-16 16:32:49 +08:00
老广
a2aa923abe
Merge pull request #1698 from jumpserver/dev
...
Dev
2018-08-15 23:53:49 -05:00
ibuler
2ac5786ba1
[Bugfix] 修复Hostname可能不唯一引起的任务执行失败
2018-08-16 12:44:39 +08:00
ibuler
5b93a1a0a5
[Bugfix] 修复单页面bug
2018-08-15 17:44:06 +08:00
ibuler
00928dd46d
[Update] 不选择节点默认导出所有
2018-08-15 15:01:27 +08:00
ibuler
7ddf7f2a79
[Update] 修改cpu的数量问题
2018-08-15 12:00:47 +08:00
ibuler
3533bf588b
[Bugfix] 修复修改资产报错无提示的问题
2018-08-14 18:08:07 +08:00
老广
dea007f27b
Merge pull request #1688 from jumpserver/dev
...
[Update] 支持full value
2018-08-14 03:01:12 -05:00
ibuler
cd2b88caee
[Update] 修改节点full value
2018-08-14 15:59:53 +08:00
ibuler
1877511acf
[Update] 更改组织同事更改节点名称
2018-08-14 10:16:38 +08:00
ibuler
1c5ce61ed0
[Update] 修改Org刷新cache
2018-08-13 18:26:13 +08:00
老广
b1132bfc37
Merge pull request #1683 from jumpserver/dev
...
Dev
2018-08-13 02:19:27 -05:00
ibuler
75e67410cf
[Bugfix] 修复批量更新资产和用户的bug
2018-08-13 15:01:56 +08:00
ibuler
c9d137bc20
[Update] 修改Mixin,允许org_id不填写
2018-08-13 11:44:44 +08:00
ibuler
d97e606503
[Update] 修改django版本
2018-08-13 11:02:00 +08:00
ibuler
e59b95e97a
Merge remote-tracking branch 'github/dev' into dev
2018-08-13 10:46:02 +08:00
ibuler
bb6394150d
[Update] 修改批量更新资产的bug
2018-08-12 15:52:16 +08:00
ibuler
2354f0c970
[Bugfix] 修复无法批量禁用启用的bug
2018-08-10 17:11:17 +08:00
老广
ae564ed0d4
Merge pull request #1670 from jumpserver/dev
...
Dev
2018-08-10 03:16:35 -05:00
ibuler
05ecd7497a
[Update] 不可以更改root节点名称
2018-08-10 16:11:40 +08:00
ibuler
6b86b8b485
[Bugfix] 修复资产数量不对的bug
2018-08-10 14:46:04 +08:00
老广
fa0bd85fd4
Merge pull request #1667 from jumpserver/dev
...
[Bugfix] 修复点击资产报错
2018-08-09 21:07:40 -05:00
ibuler
7da46354ca
[Update] 去掉debug
2018-08-10 09:29:26 +08:00
ibuler
e41aad1576
[Bugfix] 修复点击资产报错
2018-08-10 09:12:24 +08:00
ibuler
3f049440b7
[Bugfix] 修复可能引起的创建外键失败
2018-08-08 13:10:58 +08:00
老广
4f532f588b
Merge pull request #1651 from jumpserver/dev
...
Dev
2018-08-07 22:48:26 -05:00
老广
a792781b98
Merge branch 'master' into dev
2018-08-07 22:48:12 -05:00
ibuler
3a4c7846bf
[Bugfix] 修改创建第一个节点的Bug
2018-08-08 11:44:06 +08:00
ibuler
ccc292d9a9
[Update] 去掉debug信息
2018-08-07 18:38:46 +08:00
pufer
337338ebf3
增加多OU支持 ( #1262 )
...
* 增加多OU支持
* Update models.py
need to import LDAPSearchUnion
2018-08-07 05:11:46 -05:00
ibuler
aa3bc7b53a
[Update] 权限修改
2018-08-07 16:20:22 +08:00
老广
d5451a482a
Dev ( #1646 )
...
* [Update] 添加org
* [Update] 修改url
* [Update] 完成基本框架
* [Update] 修改一些逻辑
* [Update] 修改用户view
* [Update] 修改资产
* [Update] 修改asset api
* [Update] 修改协议小问题
* [Update] stash it
* [Update] 修改约束
* [Update] 修改外键为org_id
* [Update] 删掉Premiddleware
* [Update] 修改Node
* [Update] 修改get_current_org 为 proxy对象 current_org
* [Bugfix] 解决Node.root() 死循环,移动AdminRequired到permission中 (#1571 )
* [Update] 修改permission (#1574 )
* Tmp org (#1579 )
* [Update] 添加org api, 升级到django 2.0
* [Update] fix some bug
* [Update] 修改一些bug
* [Update] 添加授权规则org (#1580 )
* [Update] 修复创建授权规则,显示org_name不是有效UUID的bug
* [Update] 更新org之间隔离授权规则,解决QuerySet与Manager问题;修复创建用户,显示org_name不是有效UUID之bug;
* Tmp org (#1583 )
* [Update] 修改一些内容
* [Update] 修改datatable 支持process
* [Bugfix] 修复asset queryset 没有valid方法的bug
* [Update] 在线/历史/命令model添加org;修复命令记录保存org失败bug (#1584 )
* [Update] 修复创建授权规则,显示org_name不是有效UUID的bug
* [Update] 更新org之间隔离授权规则,解决QuerySet与Manager问题;修复创建用户,显示org_name不是有效UUID之bug;
* [Update] 在线/历史/命令model添加org
* [Bugfix] 修复命令记录,保存org不成功bug
* [Update] Org功能修改
* [Bugfix] 修复merge带来的问题
* [Update] org admin显示资产详情右侧选项卡;修复资产授权添加用户,会显示其他org用户的bug (#1594 )
* [Bugfix] 修复资产授权添加用户,显示其他org的用户bug
* [Update] org admin 显示资产详情右侧选项卡
* Tmp org (#1596 )
* [Update] 修改index view
* [Update] 修改nav
* [Update] 修改profile
* [Bugfix] 修复org下普通用户打开web终端看不到已被授权的资产和节点bug
* [Update] 修改get_all_assets
* [Bugfix] 修复节点前面有个空目录
* [Bugfix] 修复merge引起的bug
* [Update] Add init
* [Update] Node get_all_assets 过滤游离资产,条件nodes_key=None -> nodes=None
* [Update] 恢复原来的api地址
* [Update] 修改api
* [Bugfix] 修复org下用户查看我的资产不显示已授权节点/资产的bug
* [Bugfix] Fix perm name unique
* [Bugfix] 修复校验失败api
* [Update] Merge with org
* [Merge] 修改一下bug
* [Update] 暂时修改一些url
* [Update] 修改url 为django 2.0 path
* [Update] 优化datatable 和显示组织优化
* [Update] 升级url
* [Bugfix] 修复coco启动失败(load_config_from_server)、硬件刷新,测试连接,str 没有 decode(… (#1613 )
* [Bugfix] 修复coco启动失败(load_config_from_server)、硬件刷新,测试连接,str 没有 decode() method的bug
* [Bugfix] (task任务系统)修复资产连接性测试、硬件刷新和系统用户连接性测试失败等bug
* [Bugfix] 修复一些bug
* [Bugfix] 修复一些bug
* [Update] 更新org下普通用户的资产详情 (#1619 )
* [Update] 更新org下普通用户查看资产详情,只显示数据
* [Update] 优化org下普通用户查看资产详情前端代码
* [Update] 创建/更新用户的role选项;密码强度提示信息中英文; (#1623 )
* [Update] 修改 超级管理员/组织管理员 在 创建/更新 用户时role的选项 问题
* [Update] 用户密码强度提示信息支持中英文
* [Update] 修改token返回
* [Update] Asset返回org name
* [Update] 修改支持xpack
* [Update] 修改url
* [Bugfix] 修复不登录就能查看资产的bug
* [Update] 用户修改
* [Bugfix] ...
* [Bugfix] 修复跳转错误的问题
* [Update] xpack/orgs组织添加删除功能-js; 修复Label继承Org后bug; (#1644 )
* [Update] 更新xpack下orgs的翻译信息
* [Update] 更新model Label,继承OrgModelMixin;
* [Update] xpack/orgs组织添加删除功能-js; 修复Label继承Org后bug;
* [Bugfix] 修复小bug
* [Update] 优化一些api
* [Update] 优化用户资产页面
* [Update] 更新 xpack/orgs 删除功能:限制在当前org下删除当前org (#1645 )
* [Update] 修改版本号
2018-08-06 23:34:35 -05:00
ibuler
534734881c
[Update] 修改版本号
2018-08-07 11:32:11 +08:00
ibuler
8236c7baa0
Merge remote-tracking branch 'github/dev' into dev
2018-08-06 18:17:38 +08:00
BaiJiangJie
96ec5fac99
[Update] 更新 xpack/orgs 删除功能:限制在当前org下删除当前org ( #1645 )
2018-08-06 05:17:17 -05:00
ibuler
b7fcf80fc5
[Update] 优化用户资产页面
2018-08-06 18:16:25 +08:00
ibuler
de3695bf97
Merge remote-tracking branch 'github/dev' into dev
2018-08-06 17:17:49 +08:00
ibuler
7c814080b2
[Update] 优化一些api
2018-08-06 17:16:52 +08:00
BaiJiangJie
f5531b6065
[Update] xpack/orgs组织添加删除功能-js; 修复Label继承Org后bug; ( #1644 )
...
* [Update] 更新xpack下orgs的翻译信息
* [Update] 更新model Label,继承OrgModelMixin;
* [Update] xpack/orgs组织添加删除功能-js; 修复Label继承Org后bug;
* [Bugfix] 修复小bug
2018-08-06 03:08:05 -05:00
ibuler
b0aa9f197a
[Bugfix] 修复跳转错误的问题
2018-08-06 12:20:27 +08:00
ibuler
fc156e23f3
[Bugfix] ...
2018-08-06 10:39:22 +08:00
ibuler
1a05dab572
[Update] 修改user api权限
2018-08-06 10:28:30 +08:00
ibuler
b8ecb6f81d
[Update] 用户修改
2018-08-06 10:24:51 +08:00
ibuler
c01936facc
[Bugfix] 修复不登录就能查看资产的bug
2018-08-03 10:32:02 +08:00
ibuler
90c629c837
[Update] 修改url
2018-08-03 10:25:41 +08:00
ibuler
c9d192eefc
Merge remote-tracking branch 'github/org' into org
2018-08-02 12:37:17 +08:00
ibuler
9c4ebf9c75
[Update] 修改支持xpack
2018-08-02 12:36:31 +08:00
ibuler
37d89b4ea2
Merge branch 'tmp_org' into org
2018-08-01 13:07:12 +08:00
ibuler
87e0e1f2c4
[Update] Asset返回org name
2018-08-01 13:06:50 +08:00
ibuler
183ff09530
[Update] 修改token返回
2018-08-01 12:35:48 +08:00
BaiJiangJie
485a178c0a
[Update] 创建/更新用户的role选项;密码强度提示信息中英文; ( #1623 )
...
* [Update] 修改 超级管理员/组织管理员 在 创建/更新 用户时role的选项 问题
* [Update] 用户密码强度提示信息支持中英文
2018-07-31 21:44:43 -05:00
BaiJiangJie
227cc4e965
[Update] 更新org下普通用户的资产详情 ( #1619 )
...
* [Update] 更新org下普通用户查看资产详情,只显示数据
* [Update] 优化org下普通用户查看资产详情前端代码
2018-07-30 22:18:38 -05:00
ibuler
01bef95e6e
Merge remote-tracking branch 'github/org' into org
2018-07-31 11:01:31 +08:00
ibuler
672dd66023
[Bugfix] 修复一些bug
2018-07-31 11:00:48 +08:00
ibuler
c032294b14
[Bugfix] 修复一些bug
2018-07-31 11:00:21 +08:00
BaiJiangJie
6ce813faf8
[Bugfix] 修复coco启动失败(load_config_from_server)、硬件刷新,测试连接,str 没有 decode(… ( #1613 )
...
* [Bugfix] 修复coco启动失败(load_config_from_server)、硬件刷新,测试连接,str 没有 decode() method的bug
* [Bugfix] (task任务系统)修复资产连接性测试、硬件刷新和系统用户连接性测试失败等bug
2018-07-30 21:27:55 -05:00
ibuler
aefc18d73b
Merge branch 'org' into tmp_org
2018-07-27 19:02:26 +08:00
ibuler
23815f87c5
[Update] 升级url
2018-07-27 18:56:40 +08:00
ibuler
206e037cf2
[Update] 优化datatable 和显示组织优化
2018-07-27 18:55:07 +08:00
ibuler
492fd98882
[Update] 修改url 为django 2.0 path
2018-07-27 17:43:18 +08:00
ibuler
d92d462dab
[Update] 暂时修改一些url
2018-07-27 16:54:40 +08:00
ibuler
8afd5ef90a
[Merge] 修改一下bug
2018-07-27 16:21:55 +08:00
ibuler
d3dca5d077
[Update] Merge with org
2018-07-27 16:19:19 +08:00
ibuler
9166a26f80
Merge branch 'org' into tmp_org
2018-07-27 16:16:29 +08:00
ibuler
3039284666
[Bugfix] 修复校验失败api
2018-07-27 16:15:04 +08:00
老广
2f395794ef
Merge pull request #1602 from jumpserver/bai_org
...
[Bugfix] 修复org下用户查看我的资产不显示已授权节点/资产的bug
2018-07-27 03:13:59 -05:00
ibuler
c6d50802db
[Bugfix] Fix perm name unique
2018-07-27 15:35:12 +08:00
BaiJiangJie
a10e47f72c
Merge branch 'org' into michael_org
2018-07-27 15:24:52 +08:00
BaiJiangJie
3dc214d1fa
[Bugfix] 修复org下用户查看我的资产不显示已授权节点/资产的bug
2018-07-27 15:24:09 +08:00
ibuler
f7fb36a176
[Update] 修改api
2018-07-27 15:21:14 +08:00
ibuler
0d7295b60e
[Update] 恢复原来的api地址
2018-07-27 15:10:48 +08:00
BaiJiangJie
8f654c37a9
[Update] Node get_all_assets 过滤游离资产,条件nodes_key=None -> nodes=None
2018-07-27 13:01:41 +08:00
ibuler
b29a541aa6
[Update] Add init
2018-07-27 12:55:59 +08:00
ibuler
9fd52f6665
[Bugfix] 修复merge引起的bug
2018-07-27 12:14:13 +08:00
ibuler
f4c86718dc
[Update] Merge dev
2018-07-27 12:12:32 +08:00
老广
4ff7a1f066
Merge pull request #1600 from jumpserver/bai_org
...
[Bugfix] 修复org下普通用户打开web终端看不到已被授权的资产和节点bug
2018-07-26 23:08:55 -05:00
ibuler
eca245fdd5
[Bugfix] 修复节点前面有个空目录
2018-07-27 11:59:39 +08:00
ibuler
7e3cf908a1
[Update] 修改get_all_assets
2018-07-27 11:09:37 +08:00
老广
dded4e10fb
Merge pull request #1599 from jumpserver/dev
...
Dev
2018-07-26 21:45:32 -05:00
BaiJiangJie
45a354f848
[Bugfix] 修复org下普通用户打开web终端看不到已被授权的资产和节点bug
2018-07-27 10:42:32 +08:00
ibuler
8386f107c6
Merge remote-tracking branch 'github/dev' into dev
2018-07-26 19:32:23 +08:00
ibuler
5ce3dd4079
[Update] 添加unblock user脚本
2018-07-26 19:30:37 +08:00
老广
a48fb9de8d
Tmp org ( #1596 )
...
* [Update] 修改index view
* [Update] 修改nav
* [Update] 修改profile
2018-07-26 05:27:09 -05:00
BaiJiangJie
04e7f54c69
[Update] org admin显示资产详情右侧选项卡;修复资产授权添加用户,会显示其他org用户的bug ( #1594 )
...
* [Bugfix] 修复资产授权添加用户,显示其他org的用户bug
* [Update] org admin 显示资产详情右侧选项卡
2018-07-26 05:25:44 -05:00
BaiJiangJie
d649aacfd6
[Update] asset platform 取消*required ( #1595 )
2018-07-26 05:25:14 -05:00
ibuler
7e65e44a3c
[Update] 兼容guacamole手动模式上传system user是uuid
2018-07-26 18:12:25 +08:00
ibuler
74c3f12275
[Update] 添加脚本,将windows协议改为rdp
2018-07-26 14:37:10 +08:00
ibuler
8c12c382a5
[Bugfix] 修复merge带来的问题
2018-07-25 18:21:37 +08:00
ibuler
2ecfecb06f
[Update] Merge with dev
2018-07-25 18:18:18 +08:00
BaiJiangJie
ac238aa36e
[Update] 修改用户登录失败限制次数,3->7 ( #1586 )
...
* [Update] 修改用户登录失败限制次数,3->7
* [Update] 修改用户登录失败限制次数,3->7 - 续
2018-07-25 04:51:09 -05:00
ibuler
2abb9efe96
[Update] Org功能修改
2018-07-25 17:21:13 +08:00
BaiJiangJie
f17727deb9
[Update] 在线/历史/命令model添加org;修复命令记录保存org失败bug ( #1584 )
...
* [Update] 修复创建授权规则,显示org_name不是有效UUID的bug
* [Update] 更新org之间隔离授权规则,解决QuerySet与Manager问题;修复创建用户,显示org_name不是有效UUID之bug;
* [Update] 在线/历史/命令model添加org
* [Bugfix] 修复命令记录,保存org不成功bug
2018-07-25 02:13:53 -05:00
老广
36f1165d1b
Tmp org ( #1583 )
...
* [Update] 修改一些内容
* [Update] 修改datatable 支持process
* [Bugfix] 修复asset queryset 没有valid方法的bug
2018-07-25 02:05:28 -05:00
BaiJiangJie
e7c530d8e6
[Update] 添加授权规则org ( #1580 )
...
* [Update] 修复创建授权规则,显示org_name不是有效UUID的bug
* [Update] 更新org之间隔离授权规则,解决QuerySet与Manager问题;修复创建用户,显示org_name不是有效UUID之bug;
2018-07-24 22:28:20 -05:00
老广
b156f4ad16
Tmp org ( #1579 )
...
* [Update] 添加org api, 升级到django 2.0
* [Update] fix some bug
* [Update] 修改一些bug
2018-07-24 22:21:12 -05:00
老广
16b23a37fe
增加命令导出 ( #1566 )
...
* [Update] gunicorn不使用eventlet
* [Update] 添加eventlet
* 替换淘宝IP查询接口
* [Feature] 添加命令记录下载功能 (#1559 )
* [Feature] 添加命令记录下载功能
* [Update] 文案修改,导出记录、提交,取消全部命令导出
* [Update] 命令导出,修复时间问题
* [Update] paramiko => 2.4.1
* [Update] 修改settings
* [Update] 修改权限判断
2018-07-24 22:09:58 -05:00
ibuler
e41add6126
Merge remote-tracking branch 'github/dev' into dev
2018-07-25 10:23:18 +08:00
ibuler
f4c31d8e86
[Update] 修改权限判断
2018-07-25 10:22:32 +08:00
ibuler
28e8f204ec
Merge remote-tracking branch 'github/dev' into dev
2018-07-24 16:41:17 +08:00
ibuler
80f147cf13
[Update] 修改settings
2018-07-24 16:40:41 +08:00
老广
c816875f28
[Update] 修改permission ( #1574 )
2018-07-22 23:55:13 -05:00
ibuler
1c56ba5a11
[Update] paramiko => 2.4.1
2018-07-20 18:48:57 +08:00
老广
2208d6d51e
[Bugfix] 解决Node.root() 死循环,移动AdminRequired到permission中 ( #1571 )
2018-07-20 05:42:01 -05:00
ibuler
e3aa18ff2d
[Update] 修改get_current_org 为 proxy对象 current_org
2018-07-20 17:49:47 +08:00
ibuler
b5f6f80ae6
[Update] 修改Node
2018-07-20 13:25:50 +08:00
ibuler
bbe4080008
[Update] 删掉Premiddleware
2018-07-20 12:15:45 +08:00
ibuler
cd797b18fb
Merge remote-tracking branch 'github/dev' into dev
2018-07-20 11:10:51 +08:00
ibuler
b6523da603
[Update] 修改外键为org_id
2018-07-20 10:54:16 +08:00
ibuler
c24f1a0517
[Update] 修改约束
2018-07-19 19:24:29 +08:00
BaiJiangJie
83f220d7de
[Feature] 添加命令记录下载功能 ( #1559 )
...
* [Feature] 添加命令记录下载功能
* [Update] 文案修改,导出记录、提交,取消全部命令导出
* [Update] 命令导出,修复时间问题
2018-07-19 05:36:52 -05:00
老广
8e42a65736
Merge pull request #1560 from wojiushixiaobai/dev
...
[Update]替换淘宝IP查询接口
2018-07-19 05:03:59 -05:00
wojiushixiaobai
e1fff18ce3
替换淘宝IP查询接口
2018-07-19 14:14:58 +08:00
ibuler
3052744203
[Update] 添加eventlet
2018-07-18 19:17:20 +08:00
ibuler
7924b094f8
[Update] gunicorn不使用eventlet
2018-07-18 16:15:35 +08:00
老广
3d34b06203
Merge pull request #1551 from jumpserver/dev
...
[Bugfix] 修复转义引起的中文乱码问题
2018-07-18 02:33:33 -05:00
ibuler
c94d018d7e
[Bugfix] 修复转义引起的中文乱码问题
2018-07-18 15:31:14 +08:00
老广
53086a8977
Merge pull request #1550 from jumpserver/dev
...
Dev
2018-07-18 02:28:13 -05:00
ibuler
ce1fc0f3e2
[Bugfix] 修复授权列表引起的分页bug
2018-07-18 15:26:58 +08:00
ibuler
c215278978
[Bugfix] 修复授权列表引起的分页bug
2018-07-18 15:24:58 +08:00
老广
061963a316
Merge pull request #1549 from jumpserver/revert-1515-master
...
Revert "授权页面分页问题"
2018-07-18 01:56:18 -05:00
老广
97b240cfdd
Revert "授权页面分页问题"
2018-07-18 14:55:16 +08:00
ibuler
fd5f562cbf
[Update] stash it
2018-07-18 12:57:08 +08:00
老广
722bf786f1
Merge pull request #1542 from jumpserver/dev
...
Dev to master
2018-07-17 04:26:37 -05:00
老广
2cb5876d1a
Merge branch 'master' into dev
2018-07-17 04:25:37 -05:00
ibuler
8883e0090f
[Update] 更改版本号
2018-07-17 17:12:28 +08:00
ibuler
790652ff4d
[Update] 修改协议小问题
2018-07-17 17:09:36 +08:00
ibuler
ff3f74abe6
[Update] 修改api
2018-07-17 12:06:47 +08:00
老广
1a49cf4d9c
Merge pull request #1532 from wojiushixiaobai/dev
...
[Update]修改url地址
2018-07-16 22:24:09 -05:00
ibuler
4d1da56872
[Update] 修改asset api
2018-07-16 14:47:06 +08:00
老广
ff9e109a2c
Merge pull request #1533 from jumpserver/update_unblockuser
...
[Update] 取消系统用户-清除认证信息,取消-网关rdp协议认证信息,添加解除用户登录限制功能
2018-07-16 01:42:30 -05:00
BaiJiangJie
09e636495e
[Update] 模版删除unblock的id属性
2018-07-16 12:22:32 +08:00
BaiJiangJie
14076d8fe1
Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
2018-07-16 12:13:59 +08:00
BaiJiangJie
812078331e
[Update] 添加解除用户登录限制功能
2018-07-16 12:13:13 +08:00
wojiushixiaobai
696589a3cf
修改url
2018-07-16 12:13:06 +08:00
wojiushixiaobai
7eba46b303
Merge branch 'dev' of https://github.com/jumpserver/jumpserver into dev
2018-07-16 11:01:49 +08:00
wojiushixiaobai
5d63d2369f
合并冲突解决
2018-07-16 11:01:06 +08:00
ibuler
3e17e94245
[Update] 修改资产
2018-07-15 18:39:11 +08:00
ibuler
5648dcd7e7
[Update] 修改用户view
2018-07-15 00:55:05 +08:00
ibuler
28e47f33c1
[Update] 修改一些逻辑
2018-07-14 00:47:21 +08:00
老广
91b3b7ce69
Merge pull request #1515 from wstart/master
...
授权页面分页问题
2018-07-13 08:22:34 -05:00
老广
8c587a1376
Merge pull request #1523 from wojiushixiaobai/dev
...
[Update]修改url地址
2018-07-13 08:19:40 -05:00
BaiJiangJie
1182313c1a
[Update] 取消系统用户-清除认证信息,取消-网关rdp协议认证信息,添加用户unblock功能
2018-07-13 19:30:48 +08:00
ibuler
7412bdcba7
[Update] 完成基本框架
2018-07-13 15:05:46 +08:00
ibuler
d6ec92d82d
[Update] 修改url
2018-07-13 00:31:50 +08:00
ibuler
ad3214641d
[Update] 添加org
2018-07-13 00:00:35 +08:00
wojiushixiaobai
9004351ad1
修正字符串
2018-07-12 16:47:35 +08:00
wojiushixiaobai
d3e22a2a90
修改url地址
2018-07-12 10:53:39 +08:00
wstart
fd3df81a64
Update api.py
2018-07-10 17:03:31 +08:00
ycfuck
72517a2c72
授权页面分页
...
授权页面分页
2018-07-10 16:33:28 +08:00
ibuler
01185a2d07
[Update] 添加gateway api
2018-07-10 16:03:05 +08:00
ibuler
8bfd2be21f
[Update] 清除系统用户认证信息时提示
2018-07-10 15:50:15 +08:00
老广
b03ac46df9
Merge pull request #1456 from wojiushixiaobai/dev
...
[Update]修改提示文字
2018-07-10 02:35:26 -05:00
老广
76be054fcb
Merge pull request #1502 from Nevss/patch-1
...
update docker-guacamole version to latest
2018-07-10 02:32:06 -05:00
老广
df95c93bb1
Merge pull request #1503 from jumpserver/update_loginlog
...
[Update] 记录用户登录失败日志,限制用户登录失败次数
2018-07-10 02:31:39 -05:00
ycfuck
eaefb5c669
Revert "资产授权页面增加分页"
...
This reverts commit 0ddb9476ba .
2018-07-09 16:00:02 +08:00
林峰任1049851
0ddb9476ba
资产授权页面增加分页
...
资产授权页面增加分页
2018-07-09 15:55:07 +08:00
ibuler
75a9deebdd
Merge remote-tracking branch 'github/dev' into dev
2018-07-08 13:03:43 +08:00
ibuler
b6cd4a20c5
[Bugfix] Data table xss attack
2018-07-08 13:02:43 +08:00
BaiJiangJie
435acafccd
[Update] 在线会话,历史会话显示登录来源 Web/SSH Terminal
2018-07-06 13:22:20 +08:00
BaiJiangJie
86e4bc5e9a
Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
2018-07-06 10:57:42 +08:00
ibuler
315609bc45
Merge remote-tracking branch 'github/dev' into dev
2018-07-06 10:35:31 +08:00
ibuler
814e6a7df8
[Update] 修改sshpass 引号引入密码,特殊字符处理
2018-07-06 10:34:16 +08:00
Nevss
7a7c6d40df
update docker-guacamole version to latest
...
update docker-guacamole version to latest
2018-07-05 19:08:35 +08:00
BaiJiangJie
5d800fa629
[Update] 修改coco端登录限制次数逻辑
2018-07-05 17:07:03 +08:00
BaiJiangJie
bd14266abd
[Update] 修改登录日志模型类的MFA字段默认状态为-
2018-07-05 16:45:05 +08:00
BaiJiangJie
88f36c6f02
Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
2018-07-05 16:23:48 +08:00
BaiJiangJie
512fc8f8f0
[Update] 优化登录失败次数限制的逻辑,并添加系统安全设置选项
2018-07-05 16:23:33 +08:00
ibuler
37bb344166
[Bugfix] 修复网关端口不对的问题
2018-07-05 10:58:52 +08:00
ibuler
f8c2a445f7
[Bugfix] 修改gateway port
2018-07-05 10:26:16 +08:00
BaiJiangJie
ff9b1a887f
[Update] 添加用户登录失败次数限制
2018-07-04 16:55:11 +08:00
BaiJiangJie
43370c547a
[Update] 登录日志逻辑修改变量名
2018-07-04 10:57:37 +08:00
BaiJiangJie
2eda58eadd
Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
2018-07-03 17:48:22 +08:00
BaiJiangJie
e1be867913
[Update] 更新用户登录日志,记录登录失败日志并添加MFA启用状态信息
2018-07-03 17:47:12 +08:00
ibuler
01afcf701c
Merge remote-tracking branch 'origin/dev' into dev
2018-07-03 13:24:07 +08:00
ibuler
4002289974
[Bugfix] 修复详情中删除时的bug
2018-07-03 13:23:21 +08:00
ibuler
ef9e03c7ed
Merge remote-tracking branch 'github/dev' into dev
2018-07-02 12:11:45 +08:00
老广
442d4e727a
Merge pull request #1492 from jumpserver/feature_telnet
...
[Feature] 添加功能,支持 telnet server.
2018-07-01 22:23:20 -05:00
BaiJiangJie
3993797527
Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
2018-06-29 15:00:15 +08:00
BaiJiangJie
f1f06491d6
[Feature] 添加功能, 支持 telnet server.
2018-06-29 14:59:43 +08:00
ibuler
eb95a0a912
[Bugfix] 修改下载录像没有目录的bug
2018-06-27 10:34:16 +08:00
ibuler
401a7f88a8
[Update] 更新依赖storage的版本
2018-06-26 22:27:16 +08:00
ibuler
0a2ff83ca1
Merge remote-tracking branch 'origin/dev' into dev
2018-06-26 22:14:21 +08:00
ibuler
7276bd0b2a
[Update] 更新获取session log的方法,以后统一到media/replay中
2018-06-26 22:13:39 +08:00
wojiushixiaobai
2950613b69
修改提示文字
2018-06-20 15:58:01 +08:00
老广
6fa0562d7a
Merge pull request #1441 from chnliyong/master
...
python-gssapi libkrb5-dev for gssapi/gssapi.h
2018-06-18 21:25:15 -05:00
老广
ef22d33afa
Merge pull request #1161 from Nidhoggur1993/dev
...
更新make_migrations.sh的migration逻辑
2018-06-13 21:53:23 -05:00
老广
86404db6c7
Merge pull request #1414 from leostudio/dev
...
[fixed #1404 ]新增Redis DB配置
2018-06-13 21:51:53 -05:00
老广
fdf2807d9b
Merge pull request #1419 from jumpserver/feature_login_mode
...
[Update] 添加功能,系统用户选择登录模式(自动/手动登录)
2018-06-13 21:25:00 -05:00
BaiJiangJie
2e6d238c76
[Bugfix] 修复系统用户选择手动登录,ssh命令行连接获取不到login_mode字段值
2018-06-11 19:09:24 +08:00
BaiJiangJie
f5a4370b80
[Update] 系统用户选择手动登录,取消自动推送
2018-06-11 17:56:20 +08:00
BaiJiangJie
db2273ef27
Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
2018-06-11 16:28:10 +08:00
BaiJiangJie
dd07fa678f
[Update] 添加功能,系统用户选择登录模式(自动/手动登录)
2018-06-11 16:27:40 +08:00
老广
e7a731fae9
Merge pull request #1417 from jumpserver/dev
...
Dev
2018-06-10 22:33:57 -05:00
ibuler
73f9f54620
[Update] 修改版本号
2018-06-11 11:23:32 +08:00
梁志艳
a2f23e9681
新增Redis DB配置
2018-06-09 00:19:57 +08:00
ibuler
dbc471c195
[Bugfix] 修复小错误
2018-06-08 18:40:31 +08:00
ibuler
4c8eb4a94b
Merge remote-tracking branch 'github/dev' into dev
2018-06-08 18:34:03 +08:00
老广
9946c4612f
Merge pull request #1409 from jokimina/dev_for_pr2
...
[Update]删除示例配置中未使用的BROKER_URL配置
2018-06-08 05:32:38 -05:00
老广
8a5e1b8223
Merge pull request #1407 from jokimina/dev_for_pr
...
[Bugfix] 更新用户信息时不填密码也会触发密码规则验证,导致无法更新
2018-06-08 05:31:05 -05:00
老广
06ce098e00
Merge pull request #1408 from jumpserver/bugfix_user_date_expired
...
[Bugfix] 修复用户失效日期截止后还可登录问题
2018-06-08 05:29:12 -05:00
ibuler
5579d3f0de
[Update] 修复测试网关连接known_host问题
2018-06-08 18:28:15 +08:00
xiaodong
1ef582e9ac
[Update]删除示例配置中未使用的BROKER_URL配置
2018-06-08 16:39:16 +08:00
BaiJiangJie
221fae5875
[Bugfix] 修复用户失效日期截止后还可登录问题
2018-06-08 16:34:15 +08:00
xiaodong
f4084c800a
[Bugfix] 更新用户信息时不填密码也会触发密码规则验证,导致无法更新
2018-06-08 16:20:28 +08:00
老广
5464ac8167
Merge pull request #1397 from jumpserver/feature_security_setting
...
[Feature] 增加功能,安全设置(全局MFA设置,密码强度校验)
2018-06-06 23:57:48 -05:00
BaiJiangJie
c6a8967376
[Update] 删除多余代码
2018-06-07 12:52:40 +08:00
BaiJiangJie
5f2c31e42c
[Update] 重置公钥,添加成功信息(user-pubkey-update)/自动跳转下一步(first-login)
2018-06-07 12:29:55 +08:00
BaiJiangJie
64db02c3f8
[Update] 添加用户来源 db/ldap
2018-06-06 16:59:32 +08:00
BaiJiangJie
842841128f
Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
2018-06-06 15:35:40 +08:00
BaiJiangJie
b026e86741
[Update] 修改判断MFA是否全局启用的逻辑,放到User.otp_force_enabled中
2018-06-06 15:35:26 +08:00
老广
283b1c1d64
Merge pull request #1403 from jumpserver/dev
...
[Update] 修改清理用户组脚本
2018-06-06 02:25:10 -05:00
ibuler
c8c0479ce5
[Update] 修改清理用户组脚本
2018-06-06 15:18:23 +08:00
老广
2a30204c4e
Merge pull request #1401 from jumpserver/dev
...
Dev
2018-06-06 01:57:41 -05:00
ibuler
30afcecf59
Merge remote-tracking branch 'github/dev' into dev
2018-06-06 14:43:11 +08:00
ibuler
80d11bbaab
[Update] 删除user group继承的抽象类
2018-06-06 14:42:06 +08:00
ibuler
58e36b5f63
[Bugfix] 暂时还不能删除Tree这个类
2018-06-06 11:13:13 +08:00
ibuler
2c413e8d51
[Bugfix] 修复权限查看引起的bug
2018-06-06 10:49:16 +08:00
老广
17de014ee9
Merge pull request #1400 from jokimina/dev_for_pr
...
remove useless image
2018-06-05 21:19:08 -05:00
xiaodong
6b2a38c78d
remove useless image
2018-06-06 08:17:45 +08:00
BaiJiangJie
fcd17460d7
[Update] 增加密码校验规则中密码最小长度限制6位
2018-06-05 17:56:58 +08:00
BaiJiangJie
4c4430661b
[Merge] Merge branch dev of github.com:jumpserver/jumpserver into github_dev
2018-06-05 17:31:55 +08:00
BaiJiangJie
ee35ca3643
[Feature] 增加功能,安全设置(全局MFA设置,密码强度校验)
2018-06-05 17:26:31 +08:00
老广
99c4875dd7
Merge pull request #1395 from jumpserver/dev
...
Dev
2018-06-04 22:06:58 -05:00
ibuler
482d1bb27f
[Update] 修改permisstion util
2018-06-01 16:22:52 +08:00
ibuler
e7c7c3a7a8
Merge branch 'dev' into perm_tree
2018-06-01 15:41:50 +08:00
ibuler
54efc88799
Merge remote-tracking branch 'github/dev' into dev
2018-06-01 15:39:43 +08:00
ibuler
a9d1538135
[Update] 修改一些方法
2018-06-01 15:34:08 +08:00
ibuler
f8ff223f90
[Update] 更新api和model方法
2018-05-31 19:47:57 +08:00
老广
a3f1622a50
Merge pull request #1371 from jumpserver/fix_asset_count
...
[Update] 修改资产树节点(数量)总显示此节点以及子孙节点下的所有资产总数
2018-05-31 12:31:44 +08:00
老广
0021f2e5e1
Merge pull request #1377 from wojiushixiaobai/dev
...
[Update]更新自动升级脚本
2018-05-31 12:29:21 +08:00
wojiushixiaobai
dbcad47214
更新升级文档
2018-05-30 11:23:54 +08:00
wojiushixiaobai
6c384b49fe
修改脚本
2018-05-30 11:19:37 +08:00
BaiJiangJie
526943a041
Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
2018-05-29 19:26:19 +08:00
BaiJiangJie
e9d0104a69
Merge branch 'dev' of github.com:jumpserver/jumpserver into fix_asset_count_dev
2018-05-29 19:20:03 +08:00
BaiJiangJie
7c694c6885
[Update] 合并Node的parent.setter方法,修改node_fake的parent逻辑
2018-05-29 19:19:35 +08:00
ibuler
69e5ab438a
[Bugfix] 解决发送邮件重启的问题
2018-05-29 18:58:56 +08:00
ibuler
757a31a52f
[Update] 优化asset api, 获取时增加prefetch
2018-05-29 13:19:58 +08:00
BaiJiangJie
5b53cfb4dd
[Update] 修改资产树节点(数量)总显示此节点下的资产总数
2018-05-29 11:50:09 +08:00
ibuler
b0710c42b0
Merge remote-tracking branch 'github/dev' into dev
2018-05-29 11:27:56 +08:00
老广
d9d82cea5e
Merge pull request #1370 from jumpserver/fix_asset_count
...
[Update] 修改资产树和资产列表数量显示(游离资产)
2018-05-29 11:26:23 +08:00
老广
4f521e5a94
Merge pull request #1369 from gengkeye/master
...
录像回放API BUG: SessionReplayViewSet
2018-05-29 11:20:23 +08:00
BaiJiangJie
3a2973023c
[Update] 修改资产树和资产列表数量显示(游离资产)
2018-05-29 11:17:09 +08:00
oldseven
4f28f85410
#1368
2018-05-29 09:51:55 +08:00
oldseven
a1905ecfdb
Merge branch 'master' of https://github.com/jumpserver/jumpserver
...
Conflicts:
apps/terminal/api.py
2018-05-29 09:39:30 +08:00
ibuler
47397d2308
[Bugfix] 修复网关测试连接需要ssh信任key的问题
2018-05-28 16:44:00 +08:00
ibuler
7b57d24dc9
[Update] 优化代码
2018-05-28 15:00:06 +08:00
老广
f2216274c5
Merge pull request #1366 from jumpserver/dev
...
Dev
2018-05-28 13:26:04 +08:00
ibuler
ffabef0040
Merge branch 'large' into dev
2018-05-28 13:20:58 +08:00
ibuler
0b4df78393
[Update] 修改permistion utils优化返回的属性
2018-05-28 13:20:26 +08:00
BaiJiangJie
2fab69ca61
Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
2018-05-28 11:15:48 +08:00
老广
7987056b12
Merge pull request #1365 from jumpserver/dev
...
Dev修复
2018-05-28 11:05:11 +08:00
BaiJiangJie
f9ab0abc37
Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
2018-05-28 10:58:47 +08:00
ibuler
0bc86543b5
[Update] 修改用户组详情显示授权资产的bug
2018-05-26 21:53:50 +08:00
ibuler
fc2a44621b
[Bugfix] 修复右击位置不对的bug
2018-05-25 19:17:57 +08:00
ibuler
9b4b9e6900
[Update] 发送邮件增加用户名显示
2018-05-25 18:13:48 +08:00
老广
62c114d9c4
Merge pull request #1362 from jumpserver/dev
...
修改树形结构
2018-05-25 17:53:40 +08:00
ibuler
22a84d57ca
[Update] 修改树形结构
2018-05-25 17:32:10 +08:00
ibuler
3f4b5ad465
[Update] Merge
2018-05-25 17:28:53 +08:00
ibuler
a96bda8ca9
[Update] 修改树形结构
2018-05-25 17:26:57 +08:00
ibuler
bff3868b8f
[Update] 统一requirements版本
2018-05-25 15:23:52 +08:00
老广
8470dce805
Merge pull request #1357 from jumpserver/dev
...
Dev
2018-05-24 18:58:47 +08:00
ibuler
b9d0d89f66
[Update] 更改版本好
2018-05-24 13:32:20 +08:00
ibuler
5a7192e035
[Update] 修改心跳bug
2018-05-24 13:30:15 +08:00
BaiJiangJie
de2416b173
Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
2018-05-24 12:42:06 +08:00
BaiJiangJie
486793ddcd
[Bugfix] 修复取消LDAP认证不成功bug
2018-05-24 12:41:48 +08:00
老广
c40c5ac543
Merge pull request #1355 from jumpserver/dev
...
调整Luna树形结构修复一些bug
2018-05-24 11:39:01 +08:00
ibuler
c529061ee0
[Bugfix] 修复授权uitls的错误
2018-05-24 11:18:20 +08:00
ibuler
fe52c57a11
[Bugfix] 修复授权uitls的错误
2018-05-24 11:13:22 +08:00
ibuler
f8384973a1
[Update] 调整Luna的树形结构
2018-05-23 15:15:27 +08:00
ibuler
dc1d228e07
[Update] 更新requirements
2018-05-22 19:44:13 +08:00
ibuler
092b33d4d1
[Update] 更新requirements
2018-05-22 19:30:15 +08:00
ibuler
d615eb80b5
[Update] 优化使用storage sdk
2018-05-22 18:22:06 +08:00
ibuler
46520287d9
[Update] 添加清理重复用户组脚本
2018-05-17 15:26:22 +08:00
ibuler
4b7af1457d
[Update] 系统用户新增清除认证的操作
2018-05-17 11:39:04 +08:00
BaiJiangJie
c1db33713f
[Bugfix] 修复资产授权树root节点bug
2018-05-16 16:12:27 +08:00
老广
c3101dba29
Merge pull request #1334 from jumpserver/dev
...
Dev
2018-05-16 12:43:54 +08:00
老广
e66cfc2e13
Merge pull request #1333 from jumpserver/update_rdp
...
[Update] 去掉windows相关无用配置,修复资产树节点移动等问题
2018-05-16 12:42:01 +08:00
BaiJiangJie
ac67c231fc
[Update] 修改前端rdp相关配置的选择逻辑
2018-05-16 12:31:13 +08:00
BaiJiangJie
599431f402
[Update] 去掉添加windows相关配置时的一些无用功能,网域网关/会话列表
2018-05-15 17:32:20 +08:00
ibuler
ed18cb317f
[Bugfix] 修复创建node api的bug
2018-05-15 15:05:49 +08:00
ibuler
cb4afabc91
[Bugfix] 修复创建node节点的问题,修复windows session的问题
2018-05-15 14:44:02 +08:00
BaiJiangJie
718715cc6d
[Update] 创建系统用户选择rdp协议,去掉相关配置的一些无用功能
2018-05-15 12:52:53 +08:00
BaiJiangjie
38f8c5bb72
[Bugfix] 修复资产树节点移动,资产授权树节点下的资产显示问题
2018-05-14 14:21:32 +08:00
ibuler
ebc1b4975a
[Update] 自动生成秘钥去掉密码
2018-05-11 18:38:26 +08:00
ibuler
2da87151ed
Merge remote-tracking branch 'github/dev' into dev
2018-05-11 12:01:54 +08:00
老广
ab9d457ce0
Merge pull request #1312 from jumpserver/bugfix_asset_tree_node
...
修复:资产树节点,取消model value unique,并添加唯一性校验,serializers/api中;修改新增节点计数器规则;
2018-05-11 12:01:13 +08:00
BaiJiangjie
cbc4a0a97b
[Bugfix] 资产树节点Node Value值校验修改异常抛出为400
2018-05-11 11:27:48 +08:00
ibuler
0031d025aa
[Bugfix] 修复上次提交引起的bug
2018-05-11 09:28:20 +08:00
BaiJiangjie
4c53eebdbe
Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
2018-05-10 21:15:49 +08:00
BaiJiangjie
2583c0b26c
[Bugfix] 资产树节点,取消model value unique,并添加唯一性校验,修改新增节点计数器规则
2018-05-10 20:48:16 +08:00
ibuler
ebef4f254a
Merge remote-tracking branch 'github/dev' into dev
2018-05-10 12:29:09 +08:00
老广
84d3fa6db0
Merge pull request #1303 from jumpserver/update_asset_tree
...
[Update] 添加功能:资产树显示全部/只显示当前节点下的资产;修复资产树节点主机数与列表显示不一致
2018-05-10 12:28:34 +08:00
ibuler
e2fa492987
Merge remote-tracking branch 'github/dev' into dev
2018-05-10 12:25:10 +08:00
ibuler
116a04da68
Merge branch 'term_js' into dev
2018-05-10 12:24:09 +08:00
ibuler
7de6af89ad
[Update] 使用xterm.js替换原来的term.js
2018-05-10 12:19:37 +08:00
ibuler
8e74a04282
[Update] 修改一些bug
2018-05-09 17:35:46 +08:00
BaiJiangjie
3af01d6a31
[Update] 添加功能:资产树显示全部/只显示当前节点下的资产;修复资产树节点主机数与列表显示不一致
2018-05-08 18:02:19 +08:00
老广
5bfc34a9ea
Merge pull request #1301 from jumpserver/dev
...
Dev
2018-05-08 11:00:26 +08:00
老广
869a84964d
Merge branch 'master' into dev
2018-05-08 10:59:59 +08:00
老广
2a8358b1aa
Bugfix ldap option ( #1300 )
...
* [Update] 修改replay api
* [Bugfix] 修复ldap参数改错引起的bug
2018-05-08 10:48:52 +08:00
ibuler
0a9af98729
[Bugfix] 修复ldap参数改错引起的bug
2018-05-08 10:13:33 +08:00
老广
dfd98f8aea
Dev ( #1299 )
...
* [Update] 修改版本号
* [Update] 默认关闭定时任务
* [Update] 修改授权列表创建api,返回id
* [Update] 修改用户名校验规则
* Perms return (#1293 )
* [Update] 修改版本号
* [Update] 默认关闭定时任务
* [Update] 修改授权列表创建api,返回id
* [Update] 修改用户名校验规则
* [Update] 添加ldap auth timeout时间
* [Update] 修改replay api (#1298 )
2018-05-08 09:06:33 +08:00
老广
e9b86ca668
[Update] 修改replay api ( #1298 )
2018-05-08 09:05:10 +08:00
ibuler
d2b0aba620
[Update] 修改replay api
2018-05-07 19:28:01 +08:00
ibuler
7f670ab709
Merge remote-tracking branch 'github/dev' into dev
2018-05-07 13:13:08 +08:00
ibuler
941e55bdec
[Update] 添加ldap auth timeout时间
2018-05-07 13:11:02 +08:00
老广
e630321e55
Perms return ( #1293 ) ( #1294 )
...
* [Update] 修改版本号
* [Update] 默认关闭定时任务
* [Update] 修改授权列表创建api,返回id
* [Update] 修改用户名校验规则
2018-05-04 15:04:39 +08:00
老广
01d136cf1e
Perms return ( #1293 )
...
* [Update] 修改版本号
* [Update] 默认关闭定时任务
* [Update] 修改授权列表创建api,返回id
* [Update] 修改用户名校验规则
2018-05-04 15:01:49 +08:00
ibuler
4ed9e11090
[Update] 修改用户名校验规则
2018-05-04 14:58:52 +08:00
ibuler
cde2e7adb0
[Update] 修改授权列表创建api,返回id
2018-05-04 14:54:58 +08:00
zhangbohan
7a27021d3d
图片调小一些
2018-05-03 23:02:12 +08:00
zhangbohan
966123e4c6
README功能说明修改
2018-05-03 22:48:24 +08:00
ibuler
e291ca9057
[Update] 默认关闭定时任务
2018-05-02 18:15:48 +08:00
老广
84003b777c
Merge pull request #1283 from jumpserver/dev
...
更改版本号
2018-05-02 10:54:38 +08:00
老广
1edfb1cec4
[Update] 修改版本号 ( #1282 )
2018-05-02 10:52:57 +08:00
ibuler
0b89ff17fd
[Update] 修改版本号
2018-05-02 10:48:39 +08:00
老广
9fa6b3e387
[Update] 暂时隐藏rdp的session,等待windows录像播放 ( #1276 ) ( #1278 )
2018-04-27 21:23:18 +08:00
老广
c0bbda9769
[Update] 暂时隐藏rdp的session,等待windows录像播放 ( #1276 )
2018-04-27 15:38:13 +08:00
oldseven
0d8a600277
#1258 bug fix: 阿里云OSS录像无法回放问题
2018-04-27 15:17:32 +08:00
老广
d7a32120ba
Merge pull request #1274 from jumpserver/dev
...
Merge with dev
2018-04-27 12:44:00 +08:00
老广
55096f9ad5
Bugfix perm asset not active ( #1273 )
...
* [Bugfix] 修复资产禁用了还可以登录的bug
2018-04-27 11:41:47 +08:00
老广
494cd760d7
Trans change ( #1272 )
...
* [Update] 更新授权规则生效日期文案
2018-04-27 11:33:28 +08:00
老广
6f494ef09c
校验用户名长度和特殊字符 ( #1271 )
...
* [Bugfix] 修复系统用户用户名校验问题
* [Update] 增加长度限制
2018-04-27 11:27:16 +08:00
wojiushixiaobai
e476cab2a1
更新自动升级脚本 ( #1250 )
2018-04-27 11:01:52 +08:00
老广
cc67fcb53b
Merge pull request #1269 from jumpserver/dev
...
Dev
2018-04-26 21:02:00 +08:00
老广
b074bd8fbd
Merge pull request #1267 from jumpserver/bugfix_user
...
[Bugfix] 修复首次登录条款问题及引导页面MFA配置问题
2018-04-26 21:00:20 +08:00
老广
627582233b
Merge pull request #1268 from jumpserver/bufix_for_perm_tree
...
[Bugfix] 解决上次引入的bug
2018-04-26 20:59:05 +08:00
ibuler
5103dab72e
[Bugfix] 解决上次引入的bug
2018-04-26 20:48:32 +08:00
老广
43c13355f2
Merge pull request #1266 from jumpserver/dev
...
Dev
2018-04-26 19:54:42 +08:00
老广
59eb1f8e3e
Merge pull request #1265 from jumpserver/bufix_for_perm_tree
...
[Bugfix] 修复授权树列表和资产树列表不同的bug
2018-04-26 19:53:39 +08:00
ibuler
16aa42a861
[Bugfix] 修复授权树列表和资产树列表不同的bug
2018-04-26 19:51:32 +08:00
BaiJiangjie
0962a16b22
[Bugfix] 修复首次登录条款问题及引导页面MFA配置问题
2018-04-26 19:49:09 +08:00
wojiushixiaobai
7c35e75586
更新自动升级脚本
2018-04-25 19:49:22 +08:00
老广
787be3ff7a
Merge pull request #1248 from jumpserver/dev
...
Bugfix 修复搜索命令的bug
2018-04-25 17:55:39 +08:00
ibuler
d5debc375e
[Bugfix] 修复命令搜索异常bug
2018-04-25 17:48:44 +08:00
ibuler
40a0c4597b
Merge remote-tracking branch 'github/dev' into dev
2018-04-25 15:15:36 +08:00
老广
5c17b1a7f7
Merge pull request #1240 from jumpserver/dev
...
首次登陆免验证码,首次登录信息变更
2018-04-25 10:00:56 +08:00
BaiJiangjie
ea2863a51b
[Update] 创建用户、资产成功的提示信息可关闭
2018-04-24 22:10:52 +08:00
BaiJiangjie
102e1ca97c
[Bugfix] 创建资产,资产系统置上,RDP:3389
2018-04-24 18:29:14 +08:00
BaiJiangjie
2823d02763
[Bugfix] 修复资产列表导入,资产id问题
2018-04-24 16:15:04 +08:00
BaiJiangjie
c37414045b
[Bugfix] 修改用户列表导出,默认导出全部用户
2018-04-24 15:16:05 +08:00
BaiJiangjie
784bec42ff
[Update] 修改用户登录,首次登录不需要验证码,登录失败时需要验证码校验
2018-04-24 13:00:36 +08:00
ibuler
9a3d0732bc
[Update] 更新授权代码
2018-04-24 11:07:09 +08:00
ibuler
20a7247b16
Merge remote-tracking branch 'github/dev' into dev
2018-04-24 10:52:31 +08:00
ibuler
df60981eb4
Merge branch 'dev' of bitbucket.org:jumpserver/core into dev
2018-04-24 10:51:30 +08:00
老广
7aa2bb06e8
Merge pull request #1228 from wojiushixiaobai/dev
...
添加升级脚本
2018-04-24 10:41:23 +08:00
liuzheng712
536be1175a
feat: replay api update
...
make a v2 session replay api, get the json response
2018-04-24 08:53:30 +08:00
BaiJiangjie
b5fc76d6a5
[Update] 修改用户首次登录页
2018-04-23 21:04:46 +08:00
ibuler
941dd627e3
[Update] 更新session列表
2018-04-23 11:44:09 +08:00
ibuler
8389c85054
[Update] 更改sesion表结构
2018-04-23 11:40:30 +08:00
ibuler
02ca8c3139
[Update] 更新session api
2018-04-23 11:32:46 +08:00
wojiushixiaobai
abd20f31b8
更新升级脚本
2018-04-22 22:37:51 +08:00
wojiushixiaobai
5c7acae018
更改版本号
2018-04-22 20:18:10 +08:00
wojiushixiaobai
1c623f71e0
添加升级脚本
2018-04-22 19:22:55 +08:00
BaiJiangjie
5b52b907c0
[Update] 创建用户,更新用户,添加MFA设置选项
2018-04-20 16:15:45 +08:00
BaiJiangjie
8447c6f487
[Update] 修改coco文案OTP改为MFA
2018-04-20 11:51:32 +08:00
老广
e865484a56
Merge pull request #1224 from jumpserver/dev
...
Dev
2018-04-20 11:36:16 +08:00
BaiJiangjie
ad6e22cd42
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2018-04-20 11:24:21 +08:00
BaiJiangjie
7a219e1710
[Update] OTP文案修改为MFA
2018-04-20 11:23:31 +08:00
老广
a0a8419c5e
Merge pull request #1221 from jumpserver/dev
...
[Bugfix] 修复用户错误storage的bug
2018-04-19 18:27:49 +08:00
ibuler
0c24310510
[Bugfix] 修复用户错误storage的bug
2018-04-19 18:26:59 +08:00
老广
967491fba5
Merge pull request #1220 from jumpserver/dev
...
[Update] 修改用户详情,自己更改自己otp,提示小写
2018-04-19 17:56:41 +08:00
ibuler
9ac7f26c74
[Update] 修改用户详情,自己更改自己otp,提示小写
2018-04-19 17:55:40 +08:00
老广
910f3cdddc
Merge pull request #1219 from jumpserver/dev
...
[Bugfix] 修复用户登录缓存设置问题
2018-04-19 17:22:04 +08:00
BaiJiangjie
f73fe1f315
[Bugfix] 修复用户登录缓存设置问题
2018-04-19 17:20:53 +08:00
老广
28acc6cc63
Merge pull request #1217 from jumpserver/dev
...
[Bugfix] 修复解密None的bug
2018-04-19 16:39:27 +08:00
ibuler
763cf0d981
[Bugfix] 修复解密None的bug
2018-04-19 16:35:38 +08:00
老广
611289a5ec
Merge pull request #1214 from jumpserver/dev
...
支持二次认证
2018-04-19 12:16:25 +08:00
ibuler
95a8bf0988
Merge remote-tracking branch 'github/dev' into dev
2018-04-19 11:46:07 +08:00
ibuler
947f7d206a
[Bugfix] 修复生成system user的问题
2018-04-19 11:16:52 +08:00
BaiJiangjie
12c8cf6b76
[Update] 添加OTP认证功能
2018-04-19 11:13:11 +08:00
BaiJiangjie
33bc73aba7
[Update] 添加OTP认证功能
2018-04-19 10:49:47 +08:00
老广
53c532a6ad
Merge pull request #1213 from jumpserver/dev
...
更新资产选择
2018-04-19 10:49:01 +08:00
ibuler
035dd16b36
[Bugfix] 修复授权详情中选择用户或资产的bug
2018-04-19 10:34:17 +08:00
BaiJiangjie
f450accbf8
[Merge] with dev
2018-04-18 12:49:17 +08:00
BaiJiangjie
0bbfc7433d
[Feature] 支持otp
2018-04-18 12:48:07 +08:00
ibuler
48e8785725
[Update] 修改users otp secret key
2018-04-18 12:46:25 +08:00
ibuler
b90d3306c5
[Bugfix] 去掉gateway name连接
2018-04-17 12:01:00 +08:00
ibuler
7f7d634c38
Merge remote-tracking branch 'github/master' into dev
2018-04-16 17:08:01 +08:00
老广
45b13abed3
Merge pull request #1204 from jumpserver/bugfix_user_assets
...
[Bugfix] 修复用户看不到我的资产的bug
2018-04-16 17:04:29 +08:00
ibuler
72cd7a3be2
[Bugfix] 修复用户看不到我的资产的bug
2018-04-16 17:01:25 +08:00
ibuler
3ccd54680e
[Bugfix] 修改授权详情快速Node更改失效的bug
2018-04-14 12:18:15 +08:00
ibuler
071d14c639
[Update] 修改资产获取select
2018-04-13 21:26:10 +08:00
ibuler
823e879432
[Update] 更新节点移动交互
2018-04-13 15:48:10 +08:00
ibuler
739932b005
[Update] 更新资产导入
2018-04-12 18:50:43 +08:00
ibuler
24f144fdc3
[Bugfix] 修复导入资产时url地址问题
2018-04-12 18:17:42 +08:00
ibuler
967800391e
[Update] 更新api
2018-04-12 17:31:37 +08:00
老广
3ccb6637d7
Merge pull request #1197 from jumpserver/dev
...
[Update] 更新迁移脚本
2018-04-12 17:03:39 +08:00
ibuler
8dfdefd428
[Update] 更新迁移脚本
2018-04-12 17:02:04 +08:00
老广
ab2c58b626
Merge pull request #1194 from jumpserver/dev
...
[Bugfix] 修复资产重复的bug
2018-04-12 11:08:14 +08:00
ibuler
ee4f5a8194
[Bugfix] 修复资产重复的bug
2018-04-12 11:07:40 +08:00
老广
084a76b215
Merge pull request #1193 from jumpserver/dev
...
更改表结构
2018-04-12 10:17:53 +08:00
ibuler
2398e9acbd
更改表截稿
2018-04-12 10:16:38 +08:00
老广
5ad8b3cc70
Merge pull request #1191 from jumpserver/dev
...
[Update] 更改版本号
2018-04-12 09:51:54 +08:00
ibuler
7d14e1f248
[Update] 更改版本号
2018-04-12 09:49:44 +08:00
老广
819f8f469d
Merge pull request #1187 from jumpserver/dev
...
[Bugfix] 修复一个脚本的bug
2018-04-11 17:02:02 +08:00
ibuler
a31b7a8800
[Update]
2018-04-11 16:59:07 +08:00
老广
24bdaecab4
Merge pull request #1185 from jumpserver/dev
...
授权规则优化,支持细颗粒授权
2018-04-11 15:25:02 +08:00
ibuler
8b3b517bab
[Update] 修改授权规则详情列表页面
2018-04-11 15:24:12 +08:00
ibuler
7fc2ef00ee
[Update] 修改资产api获取的bug
2018-04-11 12:45:04 +08:00
ibuler
cbd6c3ee69
[Update] 添加迁移脚本
2018-04-11 12:23:35 +08:00
ibuler
3835adafb8
[Update] 修改bug
2018-04-11 12:13:49 +08:00
ibuler
bbaa35c773
[Update] 修改Perms
2018-04-11 11:34:15 +08:00
ibuler
0fa8287811
Merge branch 'dev' into perms
2018-04-11 10:25:18 +08:00
ibuler
78f4e5a89a
[Update] 修改用户Opt
2018-04-10 21:04:56 +08:00
ibuler
3193c5549d
Merge remote-tracking branch 'github/dev' into dev
2018-04-10 21:02:36 +08:00
ibuler
ed71e7d2d9
[Update] 修改用户Opt
2018-04-10 21:02:07 +08:00
ibuler
33c299566a
[Update] 修复bug
2018-04-10 20:45:01 +08:00
ibuler
84634eb8c0
[Update] 修改Permr认证
2018-04-10 20:29:06 +08:00
ibuler
a4ff2181c5
[Update] 修改用户view的api
2018-04-10 09:41:06 +08:00
ibuler
fffa0def9e
[Update] 修改api和view
2018-04-08 20:02:40 +08:00
ibuler
d0ede246e7
[Update] 修改授权
2018-04-08 00:16:37 +08:00
BaiJiangJie
b8b78ffeb2
Merge pull request #1162 from BaiJiangJie/dev
...
创建用户发送邮件
2018-04-06 15:50:50 +08:00
老广
d2d10b59ac
Merge pull request #1175 from jumpserver/dev
...
支持sftp
2018-04-06 13:30:05 +08:00
ibuler
cb8e59edf2
[Update] 修改文案
2018-04-06 13:23:15 +08:00
ibuler
1c0d783eec
[update] 添加Migrations
2018-04-06 11:36:47 +08:00
ibuler
4fa72400be
Merge remote-tracking branch 'github/dev' into dev
2018-04-06 11:35:33 +08:00
ibuler
37c0062fae
[Update] 添加审计模块
2018-04-06 11:27:52 +08:00
BaiJiangjie
8504c3d2fd
修复资产列表导出问题
2018-04-04 19:38:32 +08:00
老广
2d10e13057
Merge pull request #1171 from jumpserver/dev
...
Dev
2018-04-04 14:05:16 +08:00
ibuler
1d7ba3e204
[Bugfix] 修复小bug
2018-04-04 13:03:36 +08:00
ibuler
d966e22cf9
[Update] 修改小bug
2018-04-04 13:01:57 +08:00
ibuler
6a88fd2d60
[Update] 修改api权限
2018-04-04 08:47:02 +08:00
BaiJiangjie
b63999f385
创建用户发送邮件
2018-04-03 16:28:58 +08:00
Nidhoggur1993
4fd83bd5be
Update make_migrations.sh
...
增加自动合并而不是在弹出warning结束
2018-04-03 16:02:51 +08:00
老广
82d06351e7
Merge pull request #1158 from jumpserver/dev
...
bugfix for celery log path
2018-04-03 14:50:49 +08:00
ibuler
aa8bece724
Merge branch 'ansible' into dev
2018-04-03 14:49:58 +08:00
老广
241bdff7c8
Merge pull request #1156 from jumpserver/dev
...
Dev
2018-04-03 12:18:41 +08:00
ibuler
168335a381
[Update] 更新内容
2018-04-03 12:14:58 +08:00
ibuler
121726b731
Merge remote-tracking branch 'github/dev' into dev
2018-04-03 10:44:35 +08:00
ibuler
0b812a03c6
[Bugfix] 修复 ApiUpdateAttr的bug
2018-04-03 10:36:11 +08:00
ibuler
79ae6efafb
[Bugfix] 修复没有Log path引起的bug
2018-04-02 19:14:42 +08:00
老广
d2f108eeec
Merge pull request #1154 from BaiJiangJie/master
...
终端管理用户显示,资产导入IP字段空格,资产导入domain字段保存
2018-04-02 19:03:51 +08:00
BaiJiangJie
c48beb10af
Merge pull request #1 from BaiJiangJie/dev
...
终端管理用户,资产列表IP字段,domain保存对象
2018-04-02 18:52:52 +08:00
老广
ea9264ec49
Merge pull request #1153 from BaiJiangJie/dev
...
修复导入资产列表IP字段前后有空格问题,导入资产列表时domain保存为对象
2018-04-02 18:43:33 +08:00
BaiJiangjie
5b65ed8a19
修复导入资产列表IP字段前后有空格问题,导入资产列表时doamin保存为对象
2018-04-02 18:32:24 +08:00
ibuler
951ac252fe
[Merge] 更新ansible功能
2018-04-02 17:45:17 +08:00
ibuler
24c4e1df50
[Update] 资产,系统用户,管理用户等支持查看日志
2018-04-02 16:55:39 +08:00
ibuler
d247e49b70
[Update] 修改celery位置
2018-04-02 15:54:49 +08:00
ibuler
a4c843ff13
[Update] 迁移celery到ops
2018-04-02 13:19:31 +08:00
BaiJiangjie
ec6103448e
使终端管理的应用用户不显示在用户组里
2018-04-02 12:02:06 +08:00
老广
0ca14463cd
Merge pull request #1147 from jumpserver/dev
...
支持网域功能
2018-04-02 10:59:55 +08:00
ibuler
df80e8047a
[Update] 修改日志
2018-04-01 23:45:37 +08:00
ibuler
09fc2776df
[Update] Support history view
2018-03-30 22:03:43 +08:00
ibuler
e4c2affb5f
Merge branch 'rev' into dev
2018-03-29 15:07:49 +08:00
ibuler
6fae4d5dee
[Bugfix] for some commit
2018-03-29 15:06:35 +08:00
ibuler
0c80e3e815
[rev] for api commit
2018-03-29 15:02:09 +08:00
ibuler
d32f070b5c
[Update] 修改Inverntoy,增加更多属性
2018-03-28 19:37:29 +08:00
ibuler
b959f1f68b
Merge branch 'bugfix_ip_lookup' into dev
2018-03-28 16:47:44 +08:00
ibuler
e1cab35db0
[Bugfix] 修改获取城市
2018-03-28 16:47:36 +08:00
ibuler
8014cc48b6
[Update] 修改settings和缩进
2018-03-28 15:47:20 +08:00
ibuler
829f57e2d7
[Bugfix] 修复小bug
2018-03-28 14:35:27 +08:00
ibuler
5f0b4a4b63
[Update] 修改一些翻译
2018-03-28 11:28:40 +08:00
ibuler
c5af4d47eb
Merge branch 'some_auth_api' into dev
2018-03-27 18:37:04 +08:00
ibuler
c37bfb682a
[Update] 添加设置认证api和创建用户时可以不选择组
2018-03-27 18:34:41 +08:00
ibuler
3aaea6cc31
Merge branch 'bugfix_useradd' into dev
2018-03-27 17:48:35 +08:00
ibuler
f85e5b6f75
[Bugfix] 修改添加用户的bug
2018-03-27 17:47:53 +08:00
ibuler
d598571dc1
[Update] 添加一个log
2018-03-27 16:51:27 +08:00
ibuler
e873be95d5
[Update] 导入到当前node
2018-03-26 16:16:18 +08:00
ibuler
dbaa4ab502
[Update] 修改资产导入的事务问题
2018-03-26 15:55:31 +08:00
ibuler
ac1e319cd9
[Merge] merge with vpc
2018-03-26 09:56:25 +08:00
ibuler
a39424ac09
[Update] 更新jms脚本
2018-03-25 21:48:41 +08:00
ibuler
75319b99ae
[Update] 更新ap请求
2018-03-25 21:47:29 +08:00
ibuler
7f4f67aa8d
[Update] 支持网域
2018-03-23 19:46:46 +08:00
ibuler
fe1862120f
[Update] 删掉集群等等
2018-03-21 18:13:16 +08:00
ibuler
759760e7d9
[Update] 服务器可以生成用户密钥
2018-03-21 15:22:10 +08:00
老广
15b74da57c
Merge pull request #1100 from jumpserver/dev
...
Dev
2018-03-21 11:59:05 +08:00
ibuler
6f29cf5ddd
[Update] 修改quickstart
2018-03-21 09:26:14 +08:00
ibuler
0bba840e4d
Merge branch 'pubkey' into dev
2018-03-19 16:24:59 +08:00
ibuler
2156e0f51a
[Update] 修改jms
2018-03-19 16:24:50 +08:00
ibuler
2fc9c04228
[Bugfix] 修复更新系统用户后关联节点丢失的问题
2018-03-19 15:32:02 +08:00
ibuler
d8e614c54d
[Update] 管理脚本
2018-03-19 11:26:51 +08:00
ibuler
2ab26e25cc
[Update] 改为supervisor启动
2018-03-16 10:43:21 +08:00
ibuler
f195b309d4
[Bugfix] 全选后编辑checkbox问题
2018-03-16 10:42:53 +08:00
ibuler
5e41c5cadc
[Update] 删掉没用的脚本
2018-03-15 18:14:43 +08:00
ibuler
d92d09bd80
[Update] 更新说明
2018-03-15 09:34:19 +08:00
liuzheng
227804b7ab
Update step_by_step.rst
2018-03-15 07:33:56 +08:00
liuzheng
eeae989c06
Update step_by_step.rst
2018-03-15 07:30:32 +08:00
liuzheng
c67a9eb845
Update quickstart.rst
2018-03-15 07:27:30 +08:00
老广
35ed881139
Merge pull request #1070 from jumpserver/dev
...
[Update] 升级版本号
2018-03-14 20:03:02 +08:00
ibuler
a58db9826e
[Update] 升级版本号
2018-03-14 19:57:35 +08:00
老广
5250a223c3
Merge pull request #1069 from jumpserver/dev
...
Dev to master
2018-03-14 19:56:04 +08:00
ibuler
15427fb743
[Update] 还原ldap配置
2018-03-14 19:37:36 +08:00
ibuler
7874a1539c
[Update] 修改配置,默认先从数据库认证
2018-03-14 19:33:48 +08:00
老广
9f23520712
Merge pull request #1068 from jumpserver/dev
...
merge dev to master
2018-03-14 18:39:31 +08:00
ibuler
63f1ec839c
[Update] merge with master
2018-03-14 18:38:54 +08:00
ibuler
7e087ad5c6
Merge remote-tracking branch 'github/dev' into dev
2018-03-14 18:36:22 +08:00
ibuler
93895b6b92
[Update] 修改一些文案说明和翻译
2018-03-14 18:14:37 +08:00
q4speed
4d7fbcc49b
修复文字过长bug
2018-03-14 18:01:37 +08:00
ibuler
3822d51888
Merge branch 'docs' into dev
2018-03-14 16:21:53 +08:00
ibuler
aa5187dc39
Merge remote-tracking branch 'github/dev' into dev
2018-03-14 16:21:35 +08:00
ibuler
e9be4f51e5
[Update] 删除资产详情中的windows等测试连接
2018-03-14 16:19:59 +08:00
ibuler
496403bde0
[Update] 修改docs
2018-03-14 16:08:27 +08:00
ibuler
4f522c1cd1
[Update] docs
2018-03-14 16:06:05 +08:00
ibuler
5c3846a886
[Update] 添加Faq
2018-03-14 15:54:27 +08:00
ibuler
42f297e6c4
[Update] 更新一些文案
2018-03-14 13:13:32 +08:00
fit2cloud-fengyi
5d88c7b779
add git install
2018-03-14 13:09:51 +08:00
ibuler
74047d19d0
Merge branch 'dev' of bitbucket.org:jumpserver/core into dev
2018-03-14 12:18:17 +08:00
ibuler
8b63961d4d
[Update] 默认开启定时检测,运行失败默认log为warn
2018-03-14 12:17:48 +08:00
liuzheng712
9c2470b67c
feat: update the sdk
2018-03-13 19:05:16 +08:00
liuzheng
240faee2b4
Update upgrade.rst
2018-03-13 14:53:23 +08:00
liuzheng
3d3d9b565a
Update upgrade.rst
2018-03-13 14:51:22 +08:00
ibuler
2e8f5919a8
[Update] 默认关闭自动定时推送功能
2018-03-13 09:57:38 +08:00
ibuler
faf6a7b623
[Update] 删掉token api调用次数限制
2018-03-12 20:29:27 +08:00
ibuler
8e4ab9f3a9
[Update] 支持获取token的用户
2018-03-12 19:39:27 +08:00
ibuler
e4823a21e3
[Update] 优化部分代码
2018-03-12 18:29:06 +08:00
ibuler
634af19945
Merge branch 'dev' of bitbucket.org:jumpserver/core into dev
2018-03-12 18:24:14 +08:00
liuzheng712
b2ae0e8f44
fix: download update
2018-03-12 17:53:22 +08:00
ibuler
4a3e5e9b22
Merge branch 'dev' of bitbucket.org:jumpserver/core into dev
2018-03-12 16:44:10 +08:00
ibuler
43b4b7c55e
[Feature] 资产节点增加批量测试可连接性和更新硬件信息
2018-03-12 11:41:12 +08:00
fit2cloud-fengyi
b19a0e1cdf
删除faq和久的intro
2018-03-12 10:33:55 +08:00
liuzheng
b92ccdd05e
fix: update the jms-storage==0.0.11
2018-03-12 10:30:49 +08:00
fit2cloud-fengyi
34cc6abec5
Merge remote-tracking branch 'origin/docs' into docs
2018-03-12 10:28:54 +08:00
ibuler
f59f03adfd
[Update] 支持使用环境变量关闭定时任务
2018-03-12 10:20:23 +08:00
老广
0f2b0b146d
Update README.md
2018-03-12 09:17:34 +08:00
老广
e085fee101
Update README.md
2018-03-12 09:16:54 +08:00
ibuler
fe03011177
[Update] 不允许添加应用程序类型的用户
2018-03-11 19:46:40 +08:00
chnliyong
6035d1f130
python-gssapi libkrb5-dev for gssapi/gssapi.h
2018-03-10 10:46:28 +08:00
ibuler
9ffb079c8f
[Update] 增加修改system user auth 的api
2018-03-09 12:53:08 +08:00
ibuler
050b6e6d88
[Update] 修改一些docs
2018-03-09 12:12:10 +08:00
fit2cloud-fengyi
422990a992
添加 venv 到 ignore 文件
2018-03-09 10:33:57 +08:00
老广
06ff7f75ce
Merge pull request #1061 from toryzen/master
...
Update step_by_step.rst
2018-03-09 10:07:38 +08:00
toryzen
0b82b97c66
Update step_by_step.rst
...
删除多余的3.2章节
2018-03-09 10:04:59 +08:00
ibuler
fcbe94de37
[Update] 更新持久化
2018-03-08 12:28:45 +08:00
老广
ce35a8e2ac
Merge pull request #1059 from jumpserver/dev
...
Dev
2018-03-08 12:11:50 +08:00
老广
bebd71895c
Merge pull request #1058 from jumpserver/docs
...
Docs
2018-03-08 12:11:04 +08:00
ibuler
ea18727bdb
Merge remote-tracking branch 'github/docs' into docs
2018-03-08 12:08:45 +08:00
fit2cloud-fengyi
b90c5d1e43
英文格式
2018-03-08 12:00:14 +08:00
liuzheng
0be31a8078
Merge pull request #1056 from jumpserver/dev
...
revert: add the old apps/users/migrations/0002_auto_20171225_1157.py
2018-03-08 09:18:25 +08:00
liuzheng712
9162f4a226
revert: add the old apps/users/migrations/0002_auto_20171225_1157.py
2018-03-08 09:13:40 +08:00
老广
3bf7d061c9
Merge pull request #1055 from jumpserver/dev
...
Dev
2018-03-07 23:31:31 +08:00
ibuler
51e15b583f
Merge remote-tracking branch 'origin/dev' into dev
2018-03-07 23:29:17 +08:00
ibuler
60427b9908
[Update] README.md
2018-03-07 23:28:30 +08:00
老广
60bc42f630
Dev ( #1054 )
...
* [Update] 修改 success message, 添加资产组时可以添加资产
* [Update] system user form add label
* [Update] set default cluster
* [Update] 修改一些翻译
* [Bugfix] 修复重置密码bug
* [Bugfix] 默认default cluster
* [Bugfix] 用户添加报错
* 修改tab样式
* [Bugfix] 修复了一些显示上的bug
* 修复全选按钮在搜索后仍然选择全部的问题
* [Bugfix] 修复以下bug
1. 查看执行历史异常
2. 用户授权资产页显示message
* [Update] api 返回platform, 并增加web terminal nav
* [Feature] 添加setting页面
* [Feature] 添加basic settings
* [Update] 修改翻译
* [Update] 修改config
* [Update] 启动加载common setting
* [Bugfix] 修复cluster创建的bug
* [Bugfix] 修复title显示Jumpserver
* [Bugfix] setting tables not found
* [Bugfix] settings add option
* [Feature] 添加后端paging
* [Bugfix] 资产列表选择别的页会报错
* [Update] check all 只选择当前页面
* [Bugfix] user login ip
* [Bugfix] for login ip
* [Bugfix] 修复资产列表显示bug
* [Remove] labels
* [Bugfix] task运行失败,因为tasks没有设置
* [Feature] 增加标签
* [Bugfix] 读取不到prefix
* For storage
* [Change] 修改部分翻译
* [Update] 启用ldap移动位置
* [Update] 修改翻译
* [Feature] 支持es存储命令
* Update README.md
* [Feature] 添加es支持
* [update] 修改用户创建时 姓名和用户名的位置
* [Update] 修改install.md
* [Update] remote default PAGE_SIZE stting
* [Feature] terminal config load
* [Feature] es support
* [Update] 修改requirement
* [Update] 修改requirements
* [Update] 修改dictfiled
* [Fix] 修改Logger
* [Bugfix] 倒序显示
* [Update] 修改默认头像和logo
* [Update] 修改django-celery-beat的版本
* [Feature] 添加修改用户密码api
* add logo test
* [Bugfix] 修复一些bug
* [Update] 修改copyrite
* [Update] 修改copyright
* Update ISSUE_TEMPLATE.md
* [Update] 修改禁止排序的颜色
* [Feature] 标签管理功能
* [Bugfix] git status
* [Model] 修改create_by字段
* [Update] 修改位置
* [Update] 修改签名md5算法
* [Feature] 资产列表标签搜索
* [Feature] 添加资产详情标签
* [Bugfix] 修复资产搜索bug
* [Update] ansible disk bug
* [Update] ansible disk bug
* [Bugfix] 修复获取kvmcpu的bug
* [Bugfix] 修复bsd获取cpu数量bug
* [Bugfix] 修改翻译
* [Bugfix] 资产model 太长
* [Bugfix] 修改项目结构描述
修正"项目多语言目录"
* Update project_structure.md
* [Update] add debug log
* refactor: rename folder i18n
* [Feature] 添加链接token
* [Feature] Label 删除修改
* [Update] 修改部分翻译
* [Update] 修改小bug
* [Update] 修复获取资产信息异常bug
* [Bugfix] 修复系统用户上传秘钥的bug
* [Update] 修改获取资产信息产生的异常
* [Update] 删除部分资产属性
* [Bugfix] 资产批量便捷
* [Update] 修改认证
* [Feature] 支持popover
* [Feature] tree
* [Feature] 添加资产树
* [Feature] 使用ztree
* [Feature] tree增删功能
* [Bugfix] 修复组详情bug
* [Bugfix] 修复组详情bug
* [Bugfix] 修改创建label时报错的bug
* [Bugfix] 修改label api bug
* [Update] 去掉资产组添加
* [Update] 修改ztrr
* Update README.md
* [Update] 修改资产创建
* [Bugfix] 修复ldap认证bug
* [Update] 修改一处翻译
* [Update] 更改授权规则前commit
* [Abandon] ...
* Update README.md
* Update README.md
* Update README.md
* [Feature] 完成资产授权和资产添加
* [Update] 修改授权
* [Bugfix] 修改创建系统用户的bug
* feat: rdp support
* [Update] 拆分asset api module
* [Update] 资产列表选中和移除资产
* [Feature] 更改perms api
* [Update] 使用资产树,去掉集群和资产组
* [Update] 修改系统用户推送,拆分assets的部分模块
* [Update] 完成树形改造
* [Update] 完成资产书
* [Update] 修改资产model
* ubuntu16.04 deb_requirements.txt update (#1007 )
* Update run server.py (#915 )
Fix for not callable error when config.py not exists
* [Update]一些修改
* [Update] 修改初始
* feat: replay setting page and api
* 增加隐藏树功能
* [Update] 修改翻译
* 对齐菜单文字。修改英文
* feat: update app setting
* fix: app get replay storage
* [Update] 修改文案
* [Docs] 初始化doc
* [Bugfix] 用户csv导入编码问题
* [Update] 修改设置的一些require
* [Bugfix] 修复管理用户无法查看的bug
* [Update] 修改授权api, windows资产只有rdp协议,linux只有ssh协议
* [Update] terminal可以更改名称
* [Update] 统一copyright
* [Update] 修改文档
* [Bugfix] 修复资产禁用还可以登录
* [Update] 修改文案
* [Update] 支持拖拽更新
* [Bugfix] 修复bug,修改celery beat版本依赖
* [Update] 修改一些小问题
* 添加普通用户使用内容
* [Update] 修改一些文案
* Update README.md
* Update README.md
* Update README.md
* 用户列表
* [Update] 修改一些bug和文案
* [Delete] 删除build 页面
* 用户管理模块更新
* 用户管理模块更新
* [Update] 修改conf
* [Update] bugfix
* [Update] 更新文档地址
* 用户管理模块更新
* [Update] 修改部分翻译和文档
* 管理用户
* 权限管理文档
* 权限管理文档命名修改
* 作业中心文档
* 细节改动
* 添加贡献者
* 截图
* [Update] 修改一些bug
* add ignore
* [Update] 修改文档
* fix bug
* add ignore
* [Igore] force
* [Update] 修改链接
* [Update] 修改版本
* 标签管理
* 会话管理,权限管理,作业中心文档
* [Update] 增加批量终端session api
* [Update] 修改Node value唯一
* 系统设置
* 快速启动修改
* [Bugfix] 修复首页无法显示数据的bug
* feat: s3 replay file get
* feat: update
* [Update] 修改bug
* [Update] 修改Model
* [Update] 修改文档地址
* [Update] 修改gua的安装
* [Update] 修改推送任务
* [Update] 修改安装分支
* feat: update the requirements
* [Update] 更新README
* fix: remove gssapi==1.2.4
* [Update] 修改readme
* fix(config = settings.TERMINAL_REPLAY_STORAGE.items()):
* fix: AttributeError: 'SessionReplayViewSet' object has no attribute 'ACCESS_KEY'
* [Update] 修改readme
* [Update] index
* [Update] 修改Linux截图
2018-03-07 23:26:50 +08:00
ibuler
63924a2ef4
Merge branch 'master' of github.com:jumpserver/jumpserver into dev
2018-03-07 23:26:25 +08:00
ibuler
2842153e21
[Update] 修改Linux截图
2018-03-07 23:21:29 +08:00
老广
3643ee1f89
Dev ( #1053 )
...
* [Update] 修改 success message, 添加资产组时可以添加资产
* [Update] system user form add label
* [Update] set default cluster
* [Update] 修改一些翻译
* [Bugfix] 修复重置密码bug
* [Bugfix] 默认default cluster
* [Bugfix] 用户添加报错
* 修改tab样式
* [Bugfix] 修复了一些显示上的bug
* 修复全选按钮在搜索后仍然选择全部的问题
* [Bugfix] 修复以下bug
1. 查看执行历史异常
2. 用户授权资产页显示message
* [Update] api 返回platform, 并增加web terminal nav
* [Feature] 添加setting页面
* [Feature] 添加basic settings
* [Update] 修改翻译
* [Update] 修改config
* [Update] 启动加载common setting
* [Bugfix] 修复cluster创建的bug
* [Bugfix] 修复title显示Jumpserver
* [Bugfix] setting tables not found
* [Bugfix] settings add option
* [Feature] 添加后端paging
* [Bugfix] 资产列表选择别的页会报错
* [Update] check all 只选择当前页面
* [Bugfix] user login ip
* [Bugfix] for login ip
* [Bugfix] 修复资产列表显示bug
* [Remove] labels
* [Bugfix] task运行失败,因为tasks没有设置
* [Feature] 增加标签
* [Bugfix] 读取不到prefix
* For storage
* [Change] 修改部分翻译
* [Update] 启用ldap移动位置
* [Update] 修改翻译
* [Feature] 支持es存储命令
* Update README.md
* [Feature] 添加es支持
* [update] 修改用户创建时 姓名和用户名的位置
* [Update] 修改install.md
* [Update] remote default PAGE_SIZE stting
* [Feature] terminal config load
* [Feature] es support
* [Update] 修改requirement
* [Update] 修改requirements
* [Update] 修改dictfiled
* [Fix] 修改Logger
* [Bugfix] 倒序显示
* [Update] 修改默认头像和logo
* [Update] 修改django-celery-beat的版本
* [Feature] 添加修改用户密码api
* add logo test
* [Bugfix] 修复一些bug
* [Update] 修改copyrite
* [Update] 修改copyright
* Update ISSUE_TEMPLATE.md
* [Update] 修改禁止排序的颜色
* [Feature] 标签管理功能
* [Bugfix] git status
* [Model] 修改create_by字段
* [Update] 修改位置
* [Update] 修改签名md5算法
* [Feature] 资产列表标签搜索
* [Feature] 添加资产详情标签
* [Bugfix] 修复资产搜索bug
* [Update] ansible disk bug
* [Update] ansible disk bug
* [Bugfix] 修复获取kvmcpu的bug
* [Bugfix] 修复bsd获取cpu数量bug
* [Bugfix] 修改翻译
* [Bugfix] 资产model 太长
* [Bugfix] 修改项目结构描述
修正"项目多语言目录"
* Update project_structure.md
* [Update] add debug log
* refactor: rename folder i18n
* [Feature] 添加链接token
* [Feature] Label 删除修改
* [Update] 修改部分翻译
* [Update] 修改小bug
* [Update] 修复获取资产信息异常bug
* [Bugfix] 修复系统用户上传秘钥的bug
* [Update] 修改获取资产信息产生的异常
* [Update] 删除部分资产属性
* [Bugfix] 资产批量便捷
* [Update] 修改认证
* [Feature] 支持popover
* [Feature] tree
* [Feature] 添加资产树
* [Feature] 使用ztree
* [Feature] tree增删功能
* [Bugfix] 修复组详情bug
* [Bugfix] 修复组详情bug
* [Bugfix] 修改创建label时报错的bug
* [Bugfix] 修改label api bug
* [Update] 去掉资产组添加
* [Update] 修改ztrr
* Update README.md
* [Update] 修改资产创建
* [Bugfix] 修复ldap认证bug
* [Update] 修改一处翻译
* [Update] 更改授权规则前commit
* [Abandon] ...
* Update README.md
* Update README.md
* Update README.md
* [Feature] 完成资产授权和资产添加
* [Update] 修改授权
* [Bugfix] 修改创建系统用户的bug
* feat: rdp support
* [Update] 拆分asset api module
* [Update] 资产列表选中和移除资产
* [Feature] 更改perms api
* [Update] 使用资产树,去掉集群和资产组
* [Update] 修改系统用户推送,拆分assets的部分模块
* [Update] 完成树形改造
* [Update] 完成资产书
* [Update] 修改资产model
* ubuntu16.04 deb_requirements.txt update (#1007 )
* Update run server.py (#915 )
Fix for not callable error when config.py not exists
* [Update]一些修改
* [Update] 修改初始
* feat: replay setting page and api
* 增加隐藏树功能
* [Update] 修改翻译
* 对齐菜单文字。修改英文
* feat: update app setting
* fix: app get replay storage
* [Update] 修改文案
* [Docs] 初始化doc
* [Bugfix] 用户csv导入编码问题
* [Update] 修改设置的一些require
* [Bugfix] 修复管理用户无法查看的bug
* [Update] 修改授权api, windows资产只有rdp协议,linux只有ssh协议
* [Update] terminal可以更改名称
* [Update] 统一copyright
* [Update] 修改文档
* [Bugfix] 修复资产禁用还可以登录
* [Update] 修改文案
* [Update] 支持拖拽更新
* [Bugfix] 修复bug,修改celery beat版本依赖
* [Update] 修改一些小问题
* 添加普通用户使用内容
* [Update] 修改一些文案
* Update README.md
* Update README.md
* Update README.md
* 用户列表
* [Update] 修改一些bug和文案
* [Delete] 删除build 页面
* 用户管理模块更新
* 用户管理模块更新
* [Update] 修改conf
* [Update] bugfix
* [Update] 更新文档地址
* 用户管理模块更新
* [Update] 修改部分翻译和文档
* 管理用户
* 权限管理文档
* 权限管理文档命名修改
* 作业中心文档
* 细节改动
* 添加贡献者
* 截图
* [Update] 修改一些bug
* add ignore
* [Update] 修改文档
* fix bug
* add ignore
* [Igore] force
* [Update] 修改链接
* [Update] 修改版本
* 标签管理
* 会话管理,权限管理,作业中心文档
* [Update] 增加批量终端session api
* [Update] 修改Node value唯一
* 系统设置
* 快速启动修改
* [Bugfix] 修复首页无法显示数据的bug
* feat: s3 replay file get
* feat: update
* [Update] 修改bug
* [Update] 修改Model
* [Update] 修改文档地址
* [Update] 修改gua的安装
* [Update] 修改推送任务
* [Update] 修改安装分支
* feat: update the requirements
* [Update] 更新README
* fix: remove gssapi==1.2.4
* [Update] 修改readme
* fix(config = settings.TERMINAL_REPLAY_STORAGE.items()):
* fix: AttributeError: 'SessionReplayViewSet' object has no attribute 'ACCESS_KEY'
* [Update] 修改readme
* [Update] index
2018-03-07 23:18:34 +08:00
ibuler
14510b08a4
Merge branch 'github_master' into github_dev
2018-03-07 23:13:17 +08:00
ibuler
f2251bbb32
[Update] index
2018-03-07 22:38:37 +08:00
liuzheng712
580f1f2a82
Merge branch 'dev' of bitbucket.org:jumpserver/core into dev
2018-03-07 22:15:41 +08:00
liuzheng712
3c6c05f83e
fix: update
2018-03-07 22:15:17 +08:00
ibuler
4e0f81e447
Merge remote-tracking branch 'origin/dev' into dev
2018-03-07 22:15:06 +08:00
ibuler
629ff39026
[Update] 修改readme
2018-03-07 22:10:30 +08:00
liuzheng712
51d7e51119
fix: AttributeError: 'SessionReplayViewSet' object has no attribute 'ACCESS_KEY'
2018-03-07 22:05:50 +08:00
liuzheng712
3c32048aa8
Merge branch 'dev' of bitbucket.org:jumpserver/core into dev
2018-03-07 21:55:33 +08:00
liuzheng712
166a3fff5c
fix(config = settings.TERMINAL_REPLAY_STORAGE.items()):
2018-03-07 21:54:58 +08:00
ibuler
476a00d270
Merge branch 'docs' into dev
2018-03-07 21:41:08 +08:00
ibuler
2e51a28deb
Merge remote-tracking branch 'origin/dev' into dev
2018-03-07 21:39:04 +08:00
ibuler
0bd33ec823
[Update] 修改readme
2018-03-07 21:38:34 +08:00
liuzheng712
813e10ed11
fix: remove gssapi==1.2.4
2018-03-07 21:35:18 +08:00
ibuler
8b4d7c0dd7
Merge remote-tracking branch 'origin/dev' into dev
2018-03-07 21:33:26 +08:00
ibuler
395dc2e505
[Update] 更新README
2018-03-07 21:32:49 +08:00
liuzheng712
2406a7590b
feat: update the requirements
2018-03-07 21:28:06 +08:00
ibuler
f86322fa15
[Update] 修改安装分支
2018-03-07 21:26:19 +08:00
ibuler
88c10e851b
[Update] 修改推送任务
2018-03-07 21:24:13 +08:00
老广
c2abd58dcb
Merge to dev ( #1051 )
...
* [Update] 修改 success message, 添加资产组时可以添加资产
* [Update] system user form add label
* [Update] set default cluster
* [Update] 修改一些翻译
* [Bugfix] 修复重置密码bug
* [Bugfix] 默认default cluster
* [Bugfix] 用户添加报错
* 修改tab样式
* [Bugfix] 修复了一些显示上的bug
* 修复全选按钮在搜索后仍然选择全部的问题
* [Bugfix] 修复以下bug
1. 查看执行历史异常
2. 用户授权资产页显示message
* [Update] api 返回platform, 并增加web terminal nav
* [Feature] 添加setting页面
* [Feature] 添加basic settings
* [Update] 修改翻译
* [Update] 修改config
* [Update] 启动加载common setting
* [Bugfix] 修复cluster创建的bug
* [Bugfix] 修复title显示Jumpserver
* [Bugfix] setting tables not found
* [Bugfix] settings add option
* [Feature] 添加后端paging
* [Bugfix] 资产列表选择别的页会报错
* [Update] check all 只选择当前页面
* [Bugfix] user login ip
* [Bugfix] for login ip
* [Bugfix] 修复资产列表显示bug
* [Remove] labels
* [Bugfix] task运行失败,因为tasks没有设置
* [Feature] 增加标签
* [Bugfix] 读取不到prefix
* For storage
* [Change] 修改部分翻译
* [Update] 启用ldap移动位置
* [Update] 修改翻译
* [Feature] 支持es存储命令
* Update README.md
* [Feature] 添加es支持
* [update] 修改用户创建时 姓名和用户名的位置
* [Update] 修改install.md
* [Update] remote default PAGE_SIZE stting
* [Feature] terminal config load
* [Feature] es support
* [Update] 修改requirement
* [Update] 修改requirements
* [Update] 修改dictfiled
* [Fix] 修改Logger
* [Bugfix] 倒序显示
* [Update] 修改默认头像和logo
* [Update] 修改django-celery-beat的版本
* [Feature] 添加修改用户密码api
* add logo test
* [Bugfix] 修复一些bug
* [Update] 修改copyrite
* [Update] 修改copyright
* Update ISSUE_TEMPLATE.md
* [Update] 修改禁止排序的颜色
* [Feature] 标签管理功能
* [Bugfix] git status
* [Model] 修改create_by字段
* [Update] 修改位置
* [Update] 修改签名md5算法
* [Feature] 资产列表标签搜索
* [Feature] 添加资产详情标签
* [Bugfix] 修复资产搜索bug
* [Update] ansible disk bug
* [Update] ansible disk bug
* [Bugfix] 修复获取kvmcpu的bug
* [Bugfix] 修复bsd获取cpu数量bug
* [Bugfix] 修改翻译
* [Bugfix] 资产model 太长
* [Bugfix] 修改项目结构描述
修正"项目多语言目录"
* Update project_structure.md
* [Update] add debug log
* refactor: rename folder i18n
* [Feature] 添加链接token
* [Feature] Label 删除修改
* [Update] 修改部分翻译
* [Update] 修改小bug
* [Update] 修复获取资产信息异常bug
* [Bugfix] 修复系统用户上传秘钥的bug
* [Update] 修改获取资产信息产生的异常
* [Update] 删除部分资产属性
* [Bugfix] 资产批量便捷
* [Update] 修改认证
* [Feature] 支持popover
* [Feature] tree
* [Feature] 添加资产树
* [Feature] 使用ztree
* [Feature] tree增删功能
* [Bugfix] 修复组详情bug
* [Bugfix] 修复组详情bug
* [Bugfix] 修改创建label时报错的bug
* [Bugfix] 修改label api bug
* [Update] 去掉资产组添加
* [Update] 修改ztrr
* Update README.md
* [Update] 修改资产创建
* [Bugfix] 修复ldap认证bug
* [Update] 修改一处翻译
* [Update] 更改授权规则前commit
* [Abandon] ...
* Update README.md
* Update README.md
* Update README.md
* [Feature] 完成资产授权和资产添加
* [Update] 修改授权
* [Bugfix] 修改创建系统用户的bug
* feat: rdp support
* [Update] 拆分asset api module
* [Update] 资产列表选中和移除资产
* [Feature] 更改perms api
* [Update] 使用资产树,去掉集群和资产组
* [Update] 修改系统用户推送,拆分assets的部分模块
* [Update] 完成树形改造
* [Update] 完成资产书
* [Update] 修改资产model
* ubuntu16.04 deb_requirements.txt update (#1007 )
* Update run server.py (#915 )
Fix for not callable error when config.py not exists
* [Update]一些修改
* [Update] 修改初始
* feat: replay setting page and api
* 增加隐藏树功能
* [Update] 修改翻译
* 对齐菜单文字。修改英文
* feat: update app setting
* fix: app get replay storage
* [Update] 修改文案
* [Docs] 初始化doc
* [Bugfix] 用户csv导入编码问题
* [Update] 修改设置的一些require
* [Bugfix] 修复管理用户无法查看的bug
* [Update] 修改授权api, windows资产只有rdp协议,linux只有ssh协议
* [Update] terminal可以更改名称
* [Update] 统一copyright
* [Update] 修改文档
* [Bugfix] 修复资产禁用还可以登录
* [Update] 修改文案
* [Update] 支持拖拽更新
* [Bugfix] 修复bug,修改celery beat版本依赖
* [Update] 修改一些小问题
* 添加普通用户使用内容
* [Update] 修改一些文案
* Update README.md
* Update README.md
* Update README.md
* 用户列表
* [Update] 修改一些bug和文案
* [Delete] 删除build 页面
* [Update] 修改conf
* [Update] bugfix
* [Update] 更新文档地址
* [Update] 修改部分翻译和文档
* [Update] 修改一些bug
* [Update] 修改链接
* [Update] 增加批量终端session api
* [Update] 修改Node value唯一
* [Bugfix] 修复首页无法显示数据的bug
* feat: s3 replay file get
* feat: update
* [Update] 修改bug
2018-03-07 21:21:56 +08:00
ibuler
1fa3e98eb0
Merge remote-tracking branch 'github/docs' into docs
2018-03-07 19:13:54 +08:00
ibuler
42af939501
[Update] 修改gua的安装
2018-03-07 19:12:44 +08:00
ibuler
2def25cae6
[Update] 修改文档地址
2018-03-07 19:08:42 +08:00
ibuler
d3fa3d63e7
[Update] 修改Model
2018-03-07 19:05:43 +08:00
ibuler
5cc43f6907
Merge remote-tracking branch 'github/dev' into dev
2018-03-07 18:10:33 +08:00
ibuler
d852f0182b
[Update] 修改bug
2018-03-07 17:48:19 +08:00
liuzheng712
9aed73d644
feat: update
2018-03-07 17:18:56 +08:00
liuzheng712
d1a2fe145d
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2018-03-07 17:18:06 +08:00
liuzheng712
83f83d9b07
feat: s3 replay file get
2018-03-07 17:17:31 +08:00
ibuler
c4afd04cbc
Merge remote-tracking branch 'github/dev' into dev
2018-03-07 16:13:52 +08:00
ibuler
40d2934de0
[Bugfix] 修复首页无法显示数据的bug
2018-03-07 16:04:13 +08:00
fit2cloud-fengyi
e734fa3b0d
快速启动修改
2018-03-07 14:47:14 +08:00
fit2cloud-fengyi
50b0e024e5
系统设置
2018-03-07 13:07:18 +08:00
fit2cloud-fengyi
f7d1a8b35f
系统设置
2018-03-07 13:03:07 +08:00
ibuler
cd9000e7e9
[Update] 修改Node value唯一
2018-03-07 12:13:03 +08:00
ibuler
af2db2d870
[Update] 增加批量终端session api
2018-03-07 11:28:42 +08:00
shenchenyang
2559899b97
会话管理,权限管理,作业中心文档
2018-03-07 11:17:55 +08:00
fit2cloud-fengyi
86cf7bd6b5
标签管理
2018-03-07 10:35:58 +08:00
ibuler
150855183a
[Update] 修改版本
2018-03-06 21:12:51 +08:00
ibuler
0aa4755565
[Update] 修改链接
2018-03-06 21:09:40 +08:00
ibuler
7488d8834e
[Igore] force
2018-03-06 18:54:58 +08:00
ibuler
022f6625b1
Merge remote-tracking branch 'github/docs' into docs
2018-03-06 18:54:03 +08:00
fit2cloud-fengyi
115c7c4d50
add ignore
2018-03-06 18:52:09 +08:00
fit2cloud-fengyi
094e862abf
fix bug
2018-03-06 18:49:36 +08:00
ibuler
55436ddff1
Merge remote-tracking branch 'github/docs' into docs
2018-03-06 18:41:57 +08:00
ibuler
df1c85494b
[Update] 修改文档
2018-03-06 18:41:31 +08:00
fit2cloud-fengyi
8e09151a02
Merge branch 'docs' of https://github.com/jumpserver/jumpserver into docs
2018-03-06 18:30:42 +08:00
fit2cloud-fengyi
18841d6c21
add ignore
2018-03-06 18:29:24 +08:00
ibuler
3fe5dadebc
[Update] 修改介绍
2018-03-06 18:27:28 +08:00
ibuler
d3e77b09ef
[Merge] with doc
2018-03-06 18:04:03 +08:00
ibuler
25ebb5c442
[Update] 修改一些bug
2018-03-06 17:05:36 +08:00
fit2cloud-fengyi
84c4e69062
截图
2018-03-06 16:54:00 +08:00
fit2cloud-fengyi
ed7f7392db
添加贡献者
2018-03-06 15:42:46 +08:00
fit2cloud-fengyi
457886cb6c
Merge branch 'docs' of https://github.com/jumpserver/jumpserver into docs
2018-03-06 15:16:57 +08:00
fit2cloud-fengyi
f724f46e00
细节改动
2018-03-06 15:16:42 +08:00
shenchenyang
6a8d75f00e
作业中心文档
2018-03-06 12:18:08 +08:00
shenchenyang
65619fabc5
权限管理文档命名修改
2018-03-06 11:54:50 +08:00
shenchenyang
370534e28f
Merge branch 'docs' of https://github.com/jumpserver/jumpserver into docs
2018-03-06 11:50:20 +08:00
shenchenyang
cefdcb242c
权限管理文档
2018-03-06 11:49:42 +08:00
fit2cloud-fengyi
31ba73e2fa
管理用户
2018-03-06 11:00:19 +08:00
ibuler
86c0a2d28b
[Update] 修改部分翻译和文档
2018-03-05 17:14:42 +08:00
fit2cloud-fengyi
4778ac1392
用户管理模块更新
2018-03-05 17:12:02 +08:00
fit2cloud-fengyi
58189df280
用户管理模块更新
2018-03-05 17:09:53 +08:00
ibuler
bc230e0ea5
[Update] 更新文档地址
2018-03-05 15:25:49 +08:00
ibuler
21328382fc
[Update] bugfix
2018-03-05 15:05:48 +08:00
ibuler
eca5966257
[Update] 修改conf
2018-03-05 15:04:11 +08:00
fit2cloud-fengyi
42cb54dd2a
用户管理模块更新
2018-03-05 13:10:51 +08:00
fit2cloud-fengyi
d07b427037
用户管理模块更新
2018-03-05 13:10:02 +08:00
ibuler
efcf31b2a9
[Delete] 删除build 页面
2018-03-05 13:09:00 +08:00
ibuler
e123599735
[Update] 修改一些bug和文案
2018-03-05 12:59:14 +08:00
fit2cloud-fengyi
1c204675e5
用户列表
2018-03-05 12:20:40 +08:00
老广
e449a07a3f
Update README.md
2018-03-05 10:11:13 +08:00
老广
d4f61b9e69
Update README.md
2018-03-05 10:08:04 +08:00
老广
4451d68d62
Update README.md
2018-03-05 10:07:34 +08:00
ibuler
bd4f96134f
[Update] 修改一些文案
2018-03-04 13:01:33 +08:00
fit2cloud-fengyi
767d94875c
添加普通用户使用内容
2018-03-04 09:57:11 +08:00
ibuler
d284c2175d
[Update] 修改一些小问题
2018-03-02 15:39:01 +08:00
ibuler
f7ab13952e
[Bugfix] 修复bug,修改celery beat版本依赖
2018-03-02 09:36:17 +08:00
ibuler
5dcdeddf22
Merge remote-tracking branch 'github/dev' into dev
2018-03-01 13:39:52 +08:00
ibuler
1018deda96
[Update] 支持拖拽更新
2018-03-01 12:40:41 +08:00
ibuler
5a0068d86a
[Update] 修改文案
2018-03-01 10:45:51 +08:00
ibuler
31629fc975
[Bugfix] 修复资产禁用还可以登录
2018-03-01 10:44:55 +08:00
ibuler
634b36c74b
[Update] 修改文档
2018-03-01 00:13:53 +08:00
ibuler
521a5c57a2
[Update] 统一copyright
2018-02-28 11:23:04 +08:00
ibuler
1e5b9fb3ef
[Update] terminal可以更改名称
2018-02-28 10:39:38 +08:00
ibuler
f886e7c2f5
[Update] 修改授权api, windows资产只有rdp协议,linux只有ssh协议
2018-02-27 19:39:27 +08:00
ibuler
91863107d7
[Bugfix] 修复管理用户无法查看的bug
2018-02-27 15:32:30 +08:00
ibuler
870b863136
[Update] 修改设置的一些require
2018-02-27 15:04:05 +08:00
ibuler
9292e48554
[Bugfix] 用户csv导入编码问题
2018-02-27 12:18:36 +08:00
ibuler
13abd4c751
[Docs] 初始化doc
2018-02-27 10:27:28 +08:00
ibuler
8e2891d7d7
[Update] 修改文案
2018-02-27 10:27:08 +08:00
ibuler
315159e4b6
Merge branch 'dev' of bitbucket.org:jumpserver/core into dev
2018-02-26 18:12:20 +08:00
liuzheng712
fc61dea9b5
fix: app get replay storage
2018-02-26 18:11:46 +08:00
ibuler
08ccac3f66
Merge branch 'dev' of bitbucket.org:jumpserver/core into dev
2018-02-26 18:06:09 +08:00
liuzheng712
ea27d05c58
feat: update app setting
2018-02-26 18:05:41 +08:00
q4speed
05255f850f
Merge remote-tracking branch 'origin/dev' into dev
2018-02-26 17:28:18 +08:00
q4speed
c96a107e0a
对齐菜单文字。修改英文
2018-02-26 17:28:03 +08:00
ibuler
e2cb128794
[Update] 修改翻译
2018-02-26 16:57:34 +08:00
ibuler
24fdff0120
Merge remote-tracking branch 'github/dev' into dev
2018-02-26 16:32:40 +08:00
ibuler
8999458a72
Merge branch 'dev' of bitbucket.org:jumpserver/core into dev
2018-02-26 16:32:20 +08:00
q4speed
66b8e8bcf8
增加隐藏树功能
2018-02-26 16:31:51 +08:00
liuzheng
459d0668a8
feat: replay setting page and api
2018-02-26 16:19:29 +08:00
ibuler
c68da5898a
[Update] 修改初始
2018-02-26 12:31:33 +08:00
ibuler
1f3b11a223
Merge remote-tracking branch 'github/dev' into dev
2018-02-26 11:38:20 +08:00
ibuler
f1c386714d
[Update]一些修改
2018-02-25 22:36:42 +08:00
calmzhu
5193ba2e39
Update run server.py ( #915 )
...
Fix for not callable error when config.py not exists
2018-02-25 20:09:15 +08:00
bagechashu
eb18648a66
ubuntu16.04 deb_requirements.txt update ( #1007 )
2018-02-25 20:07:26 +08:00
ibuler
f0dd7d54c8
[Update] 修改资产model
2018-02-25 18:40:15 +08:00
ibuler
08edda35e1
[Update] 完成资产书
2018-02-25 18:08:00 +08:00
ibuler
c8728cace4
[Update] 完成树形改造
2018-02-09 15:24:44 +08:00
ibuler
c7296c2498
[Update] 修改系统用户推送,拆分assets的部分模块
2018-02-09 11:12:40 +08:00
ibuler
f82d939d15
[Update] 使用资产树,去掉集群和资产组
2018-02-08 11:34:21 +08:00
ibuler
3bb6e08985
[Feature] 更改perms api
2018-02-07 23:25:15 +08:00
ibuler
6104acae8f
[Update] 资产列表选中和移除资产
2018-02-07 13:39:45 +08:00
ibuler
bd4768c147
[Update] 拆分asset api module
2018-02-06 18:32:02 +08:00
ibuler
d047ff3b3a
Merge branch 'dev' into tree
2018-02-06 13:02:30 +08:00
liuzheng712
6edd3f6cf8
feat: rdp support
2018-02-05 21:54:57 +08:00
ibuler
bdf506a555
Merge remote-tracking branch 'github/dev' into dev
2018-02-02 19:04:36 +08:00
ibuler
114289edaf
[Bugfix] 修改创建系统用户的bug
2018-02-02 19:04:09 +08:00
ibuler
274cb74097
[Update] 修改授权
2018-02-02 18:52:09 +08:00
ibuler
2d3967872b
[Feature] 完成资产授权和资产添加
2018-02-02 17:06:08 +08:00
老广
64da400281
Update README.md
2018-02-01 17:57:50 +08:00
老广
9ffe1b5ab5
Update README.md
2018-02-01 17:56:04 +08:00
老广
83ad72e04b
Update README.md
2018-02-01 17:54:26 +08:00
ibuler
653c328e84
[Abandon] ...
2018-02-01 17:14:15 +08:00
ibuler
2bc5e882fd
[Update] 更改授权规则前commit
2018-02-01 15:06:44 +08:00
ibuler
45f6a62989
[Update] 修改一处翻译
2018-02-01 12:37:45 +08:00
ibuler
21a7202587
[Bugfix] 修复ldap认证bug
2018-02-01 12:33:05 +08:00
ibuler
02cd3b1a18
Merge remote-tracking branch 'github/dev' into dev
2018-02-01 10:23:32 +08:00
ibuler
a10ff5930f
[Update] 修改资产创建
2018-02-01 10:22:20 +08:00
老广
2b4880c784
Update README.md
2018-02-01 10:20:33 +08:00
ibuler
017c3ae36a
[Update] 修改ztrr
2018-02-01 01:03:31 +08:00
ibuler
c4b52cb2a3
[Update] 去掉资产组添加
2018-02-01 00:33:00 +08:00
ibuler
5f2ca58d62
[Bugfix] 修改label api bug
2018-01-31 18:59:43 +08:00
ibuler
1c7212014b
[Bugfix] 修改创建label时报错的bug
2018-01-31 18:48:07 +08:00
ibuler
97dd411ab8
[Bugfix] 修复组详情bug
2018-01-31 17:06:04 +08:00
ibuler
d2ad10af9a
[Bugfix] 修复组详情bug
2018-01-31 17:04:15 +08:00
ibuler
2f06a2b1d3
[Feature] tree增删功能
2018-01-31 17:01:21 +08:00
ibuler
1ac30ed09c
[Feature] 使用ztree
2018-01-31 12:46:33 +08:00
ibuler
3603b33a42
[Feature] 添加资产树
2018-01-31 10:46:26 +08:00
ibuler
460fa8e8a9
[Feature] tree
2018-01-30 19:57:47 +08:00
ibuler
9e09a962af
[Feature] 支持popover
2018-01-30 18:07:51 +08:00
ibuler
3e62a7f5b7
[Update] 修改认证
2018-01-30 16:12:33 +08:00
ibuler
b4f833740e
[Bugfix] 资产批量便捷
2018-01-30 14:54:27 +08:00
ibuler
1fbf4ac08c
[Update] 删除部分资产属性
2018-01-30 14:46:02 +08:00
ibuler
da4c5f48a1
[Update] 修改获取资产信息产生的异常
2018-01-30 12:09:33 +08:00
ibuler
1192e8cdad
[Bugfix] 修复系统用户上传秘钥的bug
2018-01-30 11:56:41 +08:00
ibuler
bad397e2e6
[Update] 修复获取资产信息异常bug
2018-01-30 10:38:40 +08:00
ibuler
0f15a94b08
Merge remote-tracking branch 'origin/dev' into dev
2018-01-29 17:04:09 +08:00
ibuler
012614562f
[Update] 修改小bug
2018-01-29 16:57:50 +08:00
ibuler
8b626ea9d4
[Update] 修改部分翻译
2018-01-29 16:27:21 +08:00
ibuler
58d22b72ec
[Feature] Label 删除修改
2018-01-29 16:25:30 +08:00
ibuler
6d552f4680
[Feature] 添加链接token
2018-01-29 16:18:30 +08:00
liuzheng
e821d2995d
refactor: rename folder i18n
2018-01-29 11:54:38 +08:00
ibuler
cc4eca2563
[Update] add debug log
2018-01-29 11:53:49 +08:00
liuzheng
04c344e2a0
Update project_structure.md
2018-01-29 11:50:41 +08:00
liuzheng
7f777a4472
Merge pull request #968 from chenchen1750/patch-1
...
[Bugfix] 修改项目结构描述
2018-01-29 11:49:06 +08:00
chenchen1750
1f792a9e3c
[Bugfix] 修改项目结构描述
...
修正"项目多语言目录"
2018-01-29 11:07:01 +08:00
ibuler
6d4e9c7d30
[Bugfix] 资产model 太长
2018-01-26 17:17:37 +08:00
ibuler
9433d6177a
[Bugfix] 修改翻译
2018-01-26 16:50:59 +08:00
ibuler
723805d395
[Bugfix] 修复bsd获取cpu数量bug
2018-01-26 16:28:40 +08:00
ibuler
c553872f90
Merge remote-tracking branch 'github/dev' into dev
2018-01-26 16:22:06 +08:00
ibuler
41756b06e1
[Bugfix] 修复获取kvmcpu的bug
2018-01-26 16:21:14 +08:00
ibuler
9e36a2cbb1
[Update] ansible disk bug
2018-01-26 16:06:36 +08:00
ibuler
f0b9a11482
[Update] ansible disk bug
2018-01-26 16:06:23 +08:00
ibuler
f6d21585ab
[Bugfix] 修复资产搜索bug
2018-01-26 15:53:43 +08:00
ibuler
b0fab2453a
[Merge] 合并标签功能
2018-01-26 15:49:09 +08:00
ibuler
b2d6645f46
[Feature] 添加资产详情标签
2018-01-26 15:32:23 +08:00
ibuler
cb902362b5
[Feature] 资产列表标签搜索
2018-01-26 14:47:10 +08:00
ibuler
0a2b6494cc
[Update] 修改签名md5算法
2018-01-25 16:38:40 +08:00
ibuler
0c935e8922
Merge branch 'dev' of bitbucket.org:jumpserver/core into dev
2018-01-25 16:15:54 +08:00
ibuler
17f91f7f53
[Update] 修改位置
2018-01-25 15:43:52 +08:00
ibuler
d74c2e8466
[Model] 修改create_by字段
2018-01-25 12:17:26 +08:00
ibuler
070c3d73cc
[Bugfix] git status
2018-01-25 12:16:26 +08:00
ibuler
7433327d75
[Feature] 标签管理功能
2018-01-23 19:37:22 +08:00
ibuler
a976475617
[Update] 修改禁止排序的颜色
2018-01-23 17:11:26 +08:00
ibuler
f37b331630
Merge with dev
2018-01-23 15:13:24 +08:00
老广
4b0ea63e0a
Update ISSUE_TEMPLATE.md
2018-01-23 15:02:34 +08:00
ibuler
9dbf498322
[Update] 修改copyright
2018-01-23 12:40:22 +08:00
ibuler
8e6efac6db
[Update] 修改copyrite
2018-01-23 12:39:19 +08:00
ibuler
579e74dd5d
[Bugfix] 修复一些bug
2018-01-23 12:22:25 +08:00
ibuler
cad07434ff
add logo test
2018-01-23 11:11:20 +08:00
ibuler
f40fbaf602
[Feature] 添加修改用户密码api
2018-01-23 10:36:20 +08:00
ibuler
a43d29d446
[Update] 修改django-celery-beat的版本
2018-01-22 23:57:08 +08:00
ibuler
2f136800c7
[Update] 修改默认头像和logo
2018-01-22 23:47:41 +08:00
ibuler
dd6e9444e1
[Bugfix] 倒序显示
2018-01-22 18:48:16 +08:00
ibuler
7670f521a2
[Fix] 修改Logger
2018-01-22 18:37:28 +08:00
ibuler
cafb0e02a3
[Update] 修改dictfiled
2018-01-22 17:21:03 +08:00
ibuler
9d399c475c
[Update] 修改requirements
2018-01-22 12:49:55 +08:00
ibuler
8766a936f3
[Update] 修改requirement
2018-01-22 12:01:32 +08:00
ibuler
968b395bce
Merge branch 'es' into dev
2018-01-22 11:51:37 +08:00
ibuler
0a931bbf77
[Feature] es support
2018-01-22 11:38:40 +08:00
ibuler
17181db8a5
[Feature] 支持es存储
2018-01-21 17:27:27 +08:00
ibuler
41f1c3f7f7
[Feature] terminal config load
2018-01-21 15:12:59 +08:00
liuzheng712
c4406c2a33
Merge branch 'master' of github.com:jumpserver/jumpserver into dev
2018-01-21 11:33:44 +08:00
ibuler
7f18821990
[Update] remote default PAGE_SIZE stting
2018-01-20 23:02:17 +08:00
ibuler
8fe3caf2ea
[Update] 修改install.md
2018-01-20 22:54:15 +08:00
ibuler
15119bec3c
Merge remote-tracking branch 'github/dev' into dev
2018-01-20 22:26:41 +08:00
ibuler
57e508f331
[update] 修改用户创建时 姓名和用户名的位置
2018-01-20 22:26:21 +08:00
ibuler
b936d54a48
[Feature] 添加es支持
2018-01-20 22:22:09 +08:00
老广
5c8dd5676c
Merge to master ( #944 )
...
* [Update] 修改 success message, 添加资产组时可以添加资产
* [Update] system user form add label
* [Update] set default cluster
* [Update] 修改一些翻译
* [Bugfix] 修复重置密码bug
* [Bugfix] 默认default cluster
* [Bugfix] 用户添加报错
* 修改tab样式
* [Bugfix] 修复了一些显示上的bug
* 修复全选按钮在搜索后仍然选择全部的问题
* [Bugfix] 修复以下bug
1. 查看执行历史异常
2. 用户授权资产页显示message
* [Update] api 返回platform, 并增加web terminal nav
* [Feature] 添加setting页面
* [Feature] 添加basic settings
* [Update] 修改翻译
* [Update] 修改config
* [Update] 启动加载common setting
* [Bugfix] 修复cluster创建的bug
* [Bugfix] 修复title显示Jumpserver
* [Bugfix] setting tables not found
* [Bugfix] settings add option
* [Feature] 添加后端paging
* [Bugfix] 资产列表选择别的页会报错
* [Update] check all 只选择当前页面
* [Bugfix] user login ip
* [Bugfix] for login ip
* [Bugfix] 修复资产列表显示bug
* [Remove] labels
* [Bugfix] task运行失败,因为tasks没有设置
* [Bugfix] 读取不到prefix
* [Change] 修改部分翻译
* [Update] 启用ldap移动位置
* [Update] 修改翻译
* Update README.md
2018-01-20 21:01:55 +08:00
老广
689558b8c7
Update README.md
2018-01-18 18:12:39 +08:00
ibuler
67001dd99f
[Feature] 支持es存储命令
2018-01-18 09:56:13 +08:00
ibuler
3c3e9a4113
[Update] 修改翻译
2018-01-17 17:26:25 +08:00
ibuler
d08a1c3ddb
[Update] 启用ldap移动位置
2018-01-17 17:22:04 +08:00
ibuler
a77acb7dfb
[Change] 修改部分翻译
2018-01-17 17:18:13 +08:00
ibuler
ba5ab21b37
For storage
2018-01-17 17:17:18 +08:00
ibuler
ce9ff67b24
[Bugfix] 读取不到prefix
2018-01-17 16:18:33 +08:00
ibuler
5bbad01909
[Feature] 增加标签
2018-01-16 16:32:06 +08:00
ibuler
01895bafc0
[Bugfix] task运行失败,因为tasks没有设置
2018-01-16 11:40:18 +08:00
ibuler
f1ec53d1bc
[Remove] labels
2018-01-16 11:26:30 +08:00
ibuler
d3109a03b2
[Bugfix] 修复资产列表显示bug
2018-01-16 11:20:26 +08:00
ibuler
681ddb5af2
[Bugfix] for login ip
2018-01-16 11:08:05 +08:00
ibuler
29061aa088
[Bugfix] user login ip
2018-01-16 09:58:33 +08:00
ibuler
dad21cadb3
[Update] check all 只选择当前页面
2018-01-15 18:32:07 +08:00
ibuler
7e2d627d3f
[Bugfix] 资产列表选择别的页会报错
2018-01-15 18:14:58 +08:00
ibuler
cc18ad9a7f
Merge branch 'paging' into dev
2018-01-15 17:41:57 +08:00
ibuler
b2f97a263d
[Feature] 添加后端paging
2018-01-15 17:41:49 +08:00
ibuler
8b9e45ad31
[Bugfix] settings add option
2018-01-15 16:00:26 +08:00
ibuler
89e013e2e2
[Bugfix] setting tables not found
2018-01-15 14:17:56 +08:00
ibuler
59a69f0253
[Bugfix] 修复title显示Jumpserver
2018-01-15 13:54:19 +08:00
ibuler
39fff235d1
[Bugfix] 修复cluster创建的bug
2018-01-14 18:02:11 +08:00
ibuler
7316661eb5
[Update] 启动加载common setting
2018-01-12 16:37:55 +08:00
ibuler
f6056426dc
[Update] 修改config
2018-01-12 15:57:24 +08:00
ibuler
d48f8dceb5
[Update] 修改翻译
2018-01-12 15:55:08 +08:00
ibuler
abb1a40a4f
[Feature] 添加basic settings
2018-01-12 15:43:26 +08:00
ibuler
121f56f44b
[Feature] 添加setting页面
2018-01-11 20:10:27 +08:00
ibuler
b49e3b8f84
[Update] api 返回platform, 并增加web terminal nav
2018-01-10 19:39:22 +08:00
ibuler
9bf6b12904
Merge remote-tracking branch 'github/dev' into dev
2018-01-10 18:11:23 +08:00
ibuler
6aaa106aff
[Bugfix] 修复以下bug
...
1. 查看执行历史异常
2. 用户授权资产页显示message
2018-01-10 18:08:27 +08:00
q4speed
576ddbf673
修复全选按钮在搜索后仍然选择全部的问题
2018-01-10 17:56:50 +08:00
ibuler
d415e81add
Merge remote-tracking branch 'github/dev' into dev
2018-01-10 17:41:57 +08:00
ibuler
3223d3b74d
[Bugfix] 修复了一些显示上的bug
2018-01-10 17:38:10 +08:00
q4speed
7f3d32a876
Merge remote-tracking branch 'origin/dev' into dev
2018-01-10 16:42:57 +08:00
q4speed
6d7b596854
修改tab样式
2018-01-10 16:42:30 +08:00
ibuler
b2b123b41e
[Bugfix] 用户添加报错
2018-01-10 15:15:29 +08:00
ibuler
99cd685194
[Bugfix] 默认default cluster
2018-01-10 12:03:35 +08:00
ibuler
7e23d2c234
[Bugfix] 修复重置密码bug
2018-01-10 11:31:25 +08:00
ibuler
b4080be5be
[Update] 修改一些翻译
2018-01-10 00:38:21 +08:00
ibuler
22af44211d
[Update] set default cluster
2018-01-09 23:33:14 +08:00
ibuler
a4d02adb22
[Update] system user form add label
2018-01-09 23:14:25 +08:00
ibuler
72a82c41ee
[Update] 修改 success message, 添加资产组时可以添加资产
2018-01-09 23:07:53 +08:00
ibuler
450a9495ec
[Bug&Update] 以下bug和功能
...
- 修复新建资产不选管理用户和集群异常bug
- profile下拉增加icon
- 授权api增加os和platform
2018-01-09 13:10:28 +08:00
ibuler
c0829194dc
[Update] 修改一些bug, 增加执行task的按钮
2018-01-08 19:16:28 +08:00
ibuler
dfaf029a68
[Bugfix] 资产导入bugfix
2018-01-08 15:51:08 +08:00
ibuler
3f1863151a
[Bugfix] 修复session搜索bug
2018-01-08 15:15:21 +08:00
ibuler
676d640e70
[Bugfix] 修复导出csv和更新资产环境变量冲突
2018-01-08 14:58:07 +08:00
ibuler
c7d1ba1944
[Update] Middleware 写法升级到新版本, Task login require
2018-01-08 14:18:02 +08:00
ibuler
07a70311df
[Bugfix] 修复以下bug
...
- 删除用户报错,上次更新带来的
- 管理员用户页面会看到所有主机的,而不是授权给自己的
- 授权详情页面 资产显示无效
2018-01-08 11:22:19 +08:00
ibuler
c16471d54f
[Bugfix] 资产导入中下载模板异常
2018-01-05 19:09:42 +08:00
ibuler
9a6bc9fec5
[Update] session添加登陆ip
2018-01-05 18:37:36 +08:00
ibuler
1888c698f1
[Bugfix] 修复一些bug
2018-01-05 17:57:02 +08:00
ibuler
6518ae8fa3
Merge remote-tracking branch 'origin/dev' into dev
2018-01-05 14:57:53 +08:00
ibuler
afce4c81a8
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2018-01-05 14:56:50 +08:00
ibuler
28223421b1
[Bugfix] 修复一下bug
...
1. 添加管理用户时同名的异常
2. 添加授权规则的检查
2018-01-05 14:36:49 +08:00
ibuler
56fd18241d
[Update] 修改一些翻译
2018-01-04 09:29:54 +08:00
i317280
7648207ae4
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2018-01-03 17:09:35 +08:00
q4speed
9a2fbba956
修改访问官网链接
2018-01-03 15:07:46 +08:00
ibuler
a327c46229
Merge remote-tracking branch 'github/dev' into dev
2018-01-02 19:37:56 +08:00
ibuler
720dc9ab05
[Bugfix] 修复以下bug
...
- session时区
- 切换管理和用户页面cookie问题
- 创建权限时验证
- 一些翻译
2018-01-02 19:36:13 +08:00
q4speed
25fa392dda
修复图片高度和大小
2018-01-02 17:51:25 +08:00
q4speed
ad3297ff2f
显示个人头像
2018-01-02 17:40:49 +08:00
q4speed
ab27d1c193
修改菜单折叠起来时Logo
2018-01-02 17:31:20 +08:00
q4speed
8160425672
修改Logo
2018-01-02 17:07:00 +08:00
ibuler
68ccec6b9c
[UPdate] 修改cookie设置
2018-01-02 17:02:03 +08:00
q4speed
bf34c2e320
Merge remote-tracking branch 'origin/dev' into dev
2018-01-02 16:50:57 +08:00
q4speed
54bcb33a0e
修改Logo
2018-01-02 16:43:47 +08:00
ibuler
6d15f60c5c
更改默认使用Dev配置文件
2018-01-02 15:23:06 +08:00
ibuler
239a829c20
[Bugfix] support xvdx disk
2018-01-02 14:49:52 +08:00
ibuler
4dbf332a56
[Bugfix] 修复刷新硬件的bug
2018-01-02 14:29:37 +08:00
ibuler
539bf7bec8
Update doc
2018-01-02 10:47:32 +08:00
ibuler
c6eaf894a4
Update doc
2018-01-02 10:46:20 +08:00
ibuler
5eef584c7d
[Bugfix] 解决打印print失败问题,原因在于运行docker没有tty,也可以添加PYTHONIOENCODING环境变量解决
2018-01-01 23:45:27 +08:00
ibuler
f4a39aba00
[Debug] 无法print中文
2018-01-01 22:00:08 +08:00
ibuler
3300d20c1c
[Update] 修改beat 启动,判断pid文件是否存在
2018-01-01 21:04:43 +08:00
ibuler
edcafa7275
[Update] 修改运行 beat方式
2018-01-01 20:54:48 +08:00
ibuler
e8a72c8c7d
[Update] 修改一些翻译
2018-01-01 19:55:37 +08:00
ibuler
73a99de55c
[Update] 修改terminal翻译
2018-01-01 15:39:35 +08:00
ibuler
3b6403b2f2
[Update] 修改一些翻译
2018-01-01 15:08:33 +08:00
ibuler
c48531c586
[Update] 添加和修改部分翻译
2018-01-01 00:45:12 +08:00
ibuler
0916757eb8
[Bugfix] 修复一些bug
2017-12-31 21:51:25 +08:00
ibuler
0b299344a7
[Update] 修改database 表现
2017-12-31 12:20:08 +08:00
ibuler
13b610c140
[Change] 仅点击checkbox选中
2017-12-31 11:14:02 +08:00
ibuler
7558c2b3e4
[Debug] debug print error
2017-12-30 23:02:10 +08:00
ibuler
ddd18e10e0
[Debug] debug print error
2017-12-30 22:53:59 +08:00
ibuler
a755882100
[Bugfix] 修复打印中文报错异常
2017-12-30 22:26:05 +08:00
ibuler
6586bef84c
[Modify] Add access log
2017-12-30 20:45:54 +08:00
ibuler
e0a3fafbd5
[Bugfix] 详见trello
2017-12-30 02:29:29 +08:00
ibuler
3804ab532d
[Update] 修改信号
2017-12-29 23:53:45 +08:00
ibuler
158678c2db
[Bugfix] 修改bug,显示cluster
2017-12-28 18:01:15 +08:00
ibuler
2cceb281c2
Merge remote-tracking branch 'github/new_api' into dev
2017-12-28 17:44:59 +08:00
liuzheng712
14de3ba5de
Merge branch 'new_api' of github.com:jumpserver/jumpserver into new_api
2017-12-28 17:41:00 +08:00
liuzheng712
ac3ee4c317
feat: luna window
2017-12-28 17:39:24 +08:00
ibuler
69f723c8f5
[Bugfix] requirements 添加openssh-cleints
2017-12-28 16:06:07 +08:00
ibuler
b6b0d6a9be
[bugfix] Beat start failed, rm pidfile
2017-12-28 14:34:17 +08:00
ibuler
f992347fc5
[Update] 修改become信息
2017-12-28 14:25:56 +08:00
ibuler
e20444983d
[Bugfix] 修改html bug
2017-12-28 12:25:43 +08:00
ibuler
827246ed4c
Update ansible remote tmp
2017-12-28 12:03:02 +08:00
ibuler
f58c45f7be
[Update] 修改run celery
2017-12-28 11:39:12 +08:00
ibuler
84fa7b5f17
[Bugfix] 修改启动脚本,celery beat可能不存在
2017-12-28 10:52:40 +08:00
ibuler
8e9ad7d645
[Update] 修改runserver运行
2017-12-28 01:18:50 +08:00
ibuler
825edadc13
[Update] Add build no
2017-12-28 01:08:39 +08:00
ibuler
1c20f519a9
[Bugfix] 修改小的bug
2017-12-27 11:22:44 +08:00
ibuler
0848893f1e
[Bugfix] 修复时间日期搜索的bug,select2模块自适应长度
2017-12-27 01:29:23 +08:00
ibuler
3d705dbeaa
[Bugfix] 修复一些bug
2017-12-27 00:14:46 +08:00
ibuler
22b7b84a45
[Update] 修改创建默认集群,组等名称为Default
2017-12-26 22:14:37 +08:00
ibuler
6a6d0cf279
[Update] Change user model
2017-12-26 02:01:19 +08:00
ibuler
a39e0a1db9
[Docker] For docker update
2017-12-26 01:54:10 +08:00
ibuler
f4beccddae
[Update] 修改注册流程
2017-12-25 12:22:49 +08:00
ibuler
8b081cd6b0
[Update] 修改 运行脚本
2017-12-25 00:36:14 +08:00
ibuler
209200dc4f
[Update] 修改migrations
2017-12-24 23:23:05 +08:00
ibuler
d0ef1e715e
[Add] Add initial migrations
2017-12-24 23:21:05 +08:00
ibuler
bf9bb1b973
[Update] 修改ops task运行
2017-12-24 18:53:07 +08:00
ibuler
30efec1b09
[Update] 修改 task 运行机制
2017-12-22 21:42:12 +08:00
ibuler
4893c4664d
[Update] 修改task定时运行机制
2017-12-22 02:08:29 +08:00
ibuler
47040a61c8
[Bugfix] User first login
2017-12-21 19:33:16 +08:00
ibuler
da113b99af
[Update] Remove IDE python version file
2017-12-21 19:30:18 +08:00
ibuler
146ddc3ee0
[Update] Remove docker file
2017-12-21 19:26:51 +08:00
ibuler
d33ae9d9d9
[Update] login add cookie test
2017-12-21 19:15:12 +08:00
ibuler
d51b3eff6a
[Update] 修改settings和配置文件
2017-12-21 18:54:29 +08:00
ibuler
ec45c56868
[Change] 修改media地址
2017-12-21 16:04:24 +08:00
ibuler
e1b23a7cb4
[Bugfix] 修复无法记录日志的bug
2017-12-21 15:28:21 +08:00
ibuler
76df1de634
[Bugfix] 修复一些明显的bug
2017-12-21 11:31:13 +08:00
ibuler
5a92972120
[Bugfix] 修复ops一些功能的bug
2017-12-20 11:30:15 +08:00
ibuler
3f89701b84
[Bugfix] 修复授权和资产的一部分bug
2017-12-19 19:38:09 +08:00
ibuler
b0eace6ad8
[Bugfix] 基本完成assets模块
2017-12-19 12:41:00 +08:00
ibuler
b4e1ac1953
[Bugfix] 修复资产模块中一些bug
2017-12-18 22:48:19 +08:00
ibuler
a308000d2e
[Bugfix] 修改users模块一些bug
2017-12-18 18:38:30 +08:00
ibuler
e1163895e2
[Update] 系统用户api允许app user获取
2017-12-16 17:21:30 +08:00
ibuler
2f638f5938
[Merge]
2017-12-16 17:18:16 +08:00
ibuler
1b6fd4d13a
[Bugfix] 修改普通用户获取资产详情的bug
2017-12-16 17:16:40 +08:00
i317280
fb6a187639
feat: find a bug
2017-12-16 16:58:10 +08:00
ibuler
0f64d39cc5
Merge branch 'new_api' of github.com:jumpserver/jumpserver into new_api
2017-12-15 18:56:21 +08:00
ibuler
5e1eff19b7
[Change] Add terminal migrations force
2017-12-15 18:55:36 +08:00
ibuler
8da8c14ace
[Update] 修改requirements
2017-12-15 18:53:21 +08:00
ibuler
6cee62696c
[Feature] 翻译,并增加设置导航
2017-12-15 17:38:46 +08:00
ibuler
11fa3e08e9
[Bugfix] 修改ts_to_date bug
2017-12-15 17:08:22 +08:00
ibuler
2d0be8f996
[git status
2017-12-15 17:07:52 +08:00
ibuler
b97d5b0960
[Feature] assets task 修改
2017-12-15 15:50:15 +08:00
ibuler
08e1788426
[Feature] 打算拆分下载和上传为独立模块,时间有限暂时放弃
2017-12-14 21:27:14 +08:00
ibuler
160b01ec12
Merge branch 'new_api' into ops
2017-12-13 18:10:41 +08:00
ibuler
17ddb3bbbd
[Feture] 使用信号解耦
2017-12-13 17:21:08 +08:00
liuzheng712
ef1bbc29b5
fix: update the terminal app
2017-12-13 00:34:04 +08:00
ibuler
ffa7e58025
[Bugfix] Terminal status报异常
2017-12-12 16:05:21 +08:00
ibuler
18fbfb449d
[Feature] 修改url pattern 精确匹配uuid
2017-12-12 15:45:01 +08:00
ibuler
cb57002682
[Change] 去掉前端html中的hardcode 99991937
2017-12-12 14:38:51 +08:00
ibuler
722863428d
[Feature] 添加context_processor
2017-12-12 14:28:12 +08:00
ibuler
99b4c66b5e
[Feature] 添加signals 解耦代码
2017-12-12 12:19:45 +08:00
ibuler
cbc000696e
[Feature] 修改adminuser systemuser cluster及他们的关系
2017-12-11 17:08:43 +08:00
ibuler
0c9e24dc59
[Feture] 添加ops 页面
2017-12-11 00:29:25 +08:00
ibuler
18fd04d63c
[Stash] Test case 通不过,import error
2017-12-08 10:15:27 +08:00
ibuler
27a1849b1d
[Change] 修改idc => cluster
2017-12-07 16:25:50 +08:00
ibuler
32fd9bb42f
Merge branch 'new_api' into ops
2017-12-07 13:28:29 +08:00
ibuler
15f6d5c9c0
[Bugfix] terminal tasks main()运行时,可能数据库还不存在
2017-12-07 13:28:11 +08:00
ibuler
2b3551f1fc
[Feature] 修改ansible和ops
2017-12-07 13:01:33 +08:00
ibuler
e57121a780
[Feature] 优化Ops ansible api
2017-12-06 18:31:51 +08:00
ibuler
ec8106e43d
[Feature] 完成登陆日志
2017-12-05 12:24:31 +08:00
ibuler
a5f9735906
[Update] 更新index view
2017-12-04 20:15:47 +08:00
ibuler
71a3079221
[Feature] 离线session完成
2017-12-04 16:41:00 +08:00
ibuler
9b6696bb6e
[Feture] session detail页面,包含命令列表
2017-12-04 00:21:26 +08:00
ibuler
01558c985a
[Feture] 添加session 列表,并支持kill session
2017-12-03 20:42:36 +08:00
ibuler
bf8fa95597
[Update] 修改session
2017-12-01 21:22:32 +08:00
ibuler
94462bddb3
[Bugfix] 修改api view name
2017-12-01 17:55:19 +08:00
ibuler
1920a0f03d
[Bugfix] 修改nav小bug
2017-12-01 17:37:46 +08:00
ibuler
f74422e4bb
[Bugfix] 更改application models后导致 terminalstatus报错
2017-12-01 17:35:28 +08:00
ibuler
3120cef335
[Change] 修改导航列表
2017-12-01 17:29:57 +08:00
ibuler
61a8d95f46
[Change] Rename applications -> terminal
2017-12-01 17:28:47 +08:00
ibuler
19051d36dc
[Update] 修改一些bug
2017-12-01 17:00:55 +08:00
ibuler
7910292e0f
[Feature] 修改命令上传api
2017-11-29 19:27:04 +08:00
ibuler
26607bc327
[Copyright] 修改copyrite
2017-11-23 14:35:16 +08:00
ibuler
e7f38ec894
[Change] 全部使用uuid作为主键
2017-11-23 14:08:01 +08:00
ibuler
d80cbe270a
[Update] 修改用户获取自己授权资产的api,和查询用户授权资产组等api的Url和结构
2017-11-23 11:26:17 +08:00
ibuler
818ead85ca
[Feature] 增加上传replay log的api
2017-11-22 10:54:59 +08:00
ibuler
7f9ce57318
修改 terminal上报接口和api
2017-11-14 09:44:16 +08:00
ibuler
3639b190e3
Update perm api
2017-11-01 23:23:11 +08:00
ibuler
034f0a02b1
Update terminal api
2017-10-31 11:34:20 +08:00
ibuler
30c4fc9514
App user get user perms
2017-10-22 17:53:46 +08:00
ibuler
91601cce9e
[Feature] Support multiple ou search
2017-10-12 14:29:00 +08:00
ibuler
a4fa15a7de
Update logging
2017-10-10 15:46:14 +08:00
ibuler
d4ed6a97a5
[Bugfix] Update jumpserver settings
2017-10-10 14:28:32 +08:00
ibuler
0db8482873
Update ldap auth
2017-10-10 14:18:08 +08:00
ibuler
8bccaa6ee2
Update issue template
2017-10-08 19:43:55 +08:00
ibuler
2ae3bec335
[Bugfix] Change user public key length to 5000, fixed #631
2017-09-28 21:37:36 +08:00
ibuler
da5b9be5ca
[Bugfix] Update some translation and set warning, partial fix #646
2017-09-28 20:52:33 +08:00
ibuler
d1fbbd3213
[Bugfix] Push system user have not result may be error, fixed #701
2017-09-28 07:23:46 +08:00
ibuler
688a836bbe
[Copywriting] Copywriting change fixes #733
2017-09-28 07:15:36 +08:00
ibuler
83c49ae78f
Update readme icon
2017-09-27 13:29:58 +08:00
ibuler
e1a8f4910f
Update readme
2017-09-27 13:26:57 +08:00
ibuler
5ddcc994de
Add issue template
2017-09-27 07:38:07 +08:00
ibuler
5446196471
[Bugfix] #695 Asset detail add or delete system user or group mixed
2017-09-27 07:20:16 +08:00
ibuler
0f9ae9efbb
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2017-09-25 22:15:42 +08:00
ibuler
4aef5b8229
[Bugfix] export asset pof error when none of assets
2017-09-25 22:15:22 +08:00
ibuler
6903e05af1
[Bugfix] Remove pdfmake js 404
2017-09-25 21:55:48 +08:00
Caijun
43a0c4fe51
Fix importing csv bugs ( #717 )
...
* Fix exporting csv bugs
1. auto detect the encoding of csv
2. if id in csv is empty, let it equal 0
3. if hostname exists, give up this asset
* Add chardet to requirements.txt
2017-09-24 09:16:47 +08:00
老广
8342ba68c0
Update requirements.txt
2017-09-24 08:57:20 +08:00
crisewng
48ef5c421b
更新Mac安装ldap失败解决方法 ( #613 )
2017-09-24 08:41:42 +08:00
管宜尧
290872dcad
bugfix: 解决用户失效时间为空时,无法使用密码进行ssh登录跳板机的问题 ( #659 )
...
* bugfix: 解决用户失效时间为空时,无法使用密码进行ssh登录跳板机的问题
bugfix: 解决用户失效时间为空时,无法使用密码进行ssh登录跳板机的问题。
```
AttributeError at /api/users/v1/auth/
'NoneType' object has no attribute 'strftime'
Request Method: POST
Request URL: http://127.0.0.1:8080/api/users/v1/auth/
Django Version: 1.11.4
Python Executable: /opt/py3/bin/python
Python Version: 3.6.1
Python Path: ['/data/deployment/jumpserver/apps', '/usr/local/lib/python36.zip', '/usr/local/lib/python3.6', '/usr/local/lib/python3.6/lib-dynload', '/opt/py3/lib/python3.6/site-packages', '/data/deployment/jumpserver', '/data/deployment/jumpserver/apps']
Server time: Wed, 30 Aug 2017 23:18:47 +0800
Installed Applications:
['users.apps.UsersConfig',
'assets.apps.AssetsConfig',
'perms.apps.PermsConfig',
'ops.apps.OpsConfig',
'audits.apps.AuditsConfig',
'common.apps.CommonConfig',
'applications.apps.ApplicationsConfig',
'rest_framework',
'rest_framework_swagger',
'django_filters',
'bootstrap3',
'captcha',
'django.contrib.auth',
'django.contrib.contenttypes',
'django.contrib.sessions',
'django.contrib.messages',
'django.contrib.staticfiles']
Installed Middleware:
['django.middleware.security.SecurityMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.locale.LocaleMiddleware',
'django.middleware.common.CommonMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware',
'jumpserver.middleware.TimezoneMiddleware',
'jumpserver.middleware.DemoMiddleware']
Traceback:
File "/opt/py3/lib/python3.6/site-packages/django/core/handlers/exception.py" in inner
41. response = get_response(request)
File "/opt/py3/lib/python3.6/site-packages/django/core/handlers/base.py" in _get_response
187. response = self.process_exception_by_middleware(e, request)
File "/opt/py3/lib/python3.6/site-packages/django/core/handlers/base.py" in _get_response
185. response = wrapped_callback(request, *callback_args, **callback_kwargs)
File "/usr/local/lib/python3.6/contextlib.py" in inner
53. return func(*args, **kwds)
File "/opt/py3/lib/python3.6/site-packages/django/views/decorators/csrf.py" in wrapped_view
58. return view_func(*args, **kwargs)
File "/opt/py3/lib/python3.6/site-packages/django/views/generic/base.py" in view
68. return self.dispatch(request, *args, **kwargs)
File "/opt/py3/lib/python3.6/site-packages/rest_framework/views.py" in dispatch
489. response = self.handle_exception(exc)
File "/opt/py3/lib/python3.6/site-packages/rest_framework/views.py" in handle_exception
449. self.raise_uncaught_exception(exc)
File "/opt/py3/lib/python3.6/site-packages/rest_framework/views.py" in dispatch
486. response = handler(request, *args, **kwargs)
File "/data/deployment/jumpserver/apps/users/api.py" in post
166. return Response({'token': token, 'user': user.to_json()})
File "/data/deployment/jumpserver/apps/users/models/user.py" in to_json
207. 'date_expired': self.date_expired.strftime('%Y-%m-%d %H:%M:%S')
Exception Type: AttributeError at /api/users/v1/auth/
Exception Value: 'NoneType' object has no attribute 'strftime'
Request information:
USER: AnonymousUser
GET: No GET data
POST: No POST data
FILES: No FILES data
COOKIES: No cookie data
```
* bugfix: 个人信息页面个人信息pannel错位
bugfix: 个人信息页面个人信息pannel错位
2017-09-24 08:40:59 +08:00
老广
d4fa082e17
Update Dockerfile
2017-09-14 09:49:42 +08:00
ibuler
e6537699fd
[Bugfix] Update asset create template bug
2017-09-13 10:09:17 +08:00
老广
1d950c4f49
Update settings.py
2017-09-12 17:58:09 +08:00
老广
5e197fb0db
Update README.md
2017-09-08 07:18:26 +08:00
ibuler
594ad0e14f
Update db index more than 767
2017-08-31 16:54:45 +08:00
ibuler
d73d6e943b
update user model charfield max length more than 767 bug
2017-08-31 16:04:57 +08:00
老广
eb8b02d88b
Update README.md
2017-08-03 18:16:32 +08:00
老广
c8728e52d8
Update README.md
2017-08-03 18:14:36 +08:00
本杰明
8537e3e135
Update settings ( #595 )
...
修改redis有密码无法连接bug
2017-08-03 15:24:16 +08:00
ibuler
cd1d690fd3
[Bugfix] 修复一些bug
2017-07-28 21:52:43 +08:00
中国娃
67e953902b
Update utils.py ( #579 )
2017-07-28 20:42:16 +08:00
ibuler
5ffd1f99fd
[Bugfix] 修复更新bug
2017-07-24 22:42:01 +08:00
ibuler
cc1a339142
[bugfix] system user update bug
2017-07-24 21:59:55 +08:00
ibuler
1c78526f86
Fix bug
2017-07-20 07:58:16 +08:00
ibuler
b0a5289a42
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2017-07-20 07:55:45 +08:00
ibuler
477d23ea37
fix some bug
2017-07-20 07:55:24 +08:00
tonygatescxp
72c2290300
Update settings.py ( #515 )
...
修正Redis连接字符串
2017-07-17 17:18:14 +08:00
ibuler
61014c747e
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2017-07-15 13:51:15 +08:00
ibuler
b2ba1f3ca5
update requirements
2017-07-15 13:50:56 +08:00
Eli
7c154abf70
fix bug: variable i should be the host name ( #538 )
...
fix bug: variable i is not the host name, because summary['failed'] is something like [("hostname1", "error message 1"),("hostname1", "error message 1")]
2017-07-13 14:00:17 +08:00
ibuler
d012880a90
[Bugfix] 修复bug
2017-07-13 11:46:56 +08:00
ibuler
3ce07cf969
Update README
2017-07-12 20:45:21 +08:00
ibuler
24dd7b6347
update docker config
2017-07-10 15:11:28 +08:00
ibuler
9237c9dcee
Add requirements
2017-07-10 11:31:33 +08:00
ibuler
143cabe5fc
update settings
2017-07-10 11:02:51 +08:00
Eli
370cdc275a
添加一个资产,然后推送系统用户时出现(Asset实例无法序列化) ( #477 )
...
* error while push systemuser. error while create assets with adminuser(ssh key)
* fix errors in case of config.py dose not exist.
* change sign_t return from bytes to str. (#480 )
* fix id_dsa check error (#458 )
* fix id_dsa check error
* fix 邮件修改密码 token错误
* fix 3c8aec9 add )
* Dockerfile 优化 (#453 )
2017-07-10 11:01:20 +08:00
老广
235cbe12ee
Update README.md
2017-07-10 10:57:41 +08:00
Fengxu Lin
26a169d938
fix bug in pagination_range function ( #511 )
...
start and end may be float when current_num >= 3 and display % 2 == 1
2017-07-10 10:39:18 +08:00
ibuler
4e67749eef
[Docs] 添加api dockers
2017-07-10 10:26:17 +08:00
ibuler
e120fd56a6
Update readme
2017-06-19 23:48:36 +08:00
ibuler
51b9e3732f
Update readme
2017-06-19 23:41:45 +08:00
ibuler
f3a50610af
[Update] update docker-compose
2017-06-19 23:15:09 +08:00
ibuler
4141ae517f
update docker-compose
2017-06-19 18:13:44 +08:00
ibuler
29095a869c
[Demo] update demo mode code
2017-06-19 17:59:13 +08:00
ibuler
cda22a6f0d
add demo mode middleware
2017-06-15 22:35:03 +08:00
Caijun
8f4d8b1c02
Compile messages ( #495 )
2017-06-13 17:51:12 +08:00
Caijun
b502b06e82
Support i18n for asset platform field ( #494 )
2017-06-13 16:38:33 +08:00
谢义学
7d541ee916
Dockerfile 优化 ( #453 )
2017-06-06 11:25:14 +08:00
njqaaa
9b14244363
fix id_dsa check error ( #458 )
...
* fix id_dsa check error
* fix 邮件修改密码 token错误
* fix 3c8aec9 add )
2017-06-06 11:23:39 +08:00
bdlzhx
b680a42425
change sign_t return from bytes to str. ( #480 )
2017-06-06 11:22:29 +08:00
Caijun
cf07a6ebb7
Fix judging request.user valid on UserToken API ( #476 )
2017-06-02 17:15:59 +08:00
njqaaa
dd6c82b168
fix left's users logout ( #446 )
...
* fix left's users logout
* fix issues 445
2017-05-25 14:12:16 +08:00
crisewng
18169251fa
[Bugfix] 修复管理用户上传私钥兼容问题 ( #451 )
2017-05-25 11:14:21 +08:00
ibuler
8ee1e468b8
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2017-05-24 20:13:01 +08:00
ibuler
1719eee264
[Bugfix] 修复py3 bytes bug
2017-05-24 20:12:50 +08:00
老广
ae94948246
Update README.md
2017-05-24 09:49:02 +08:00
老广
f19bcc48f6
Update python_style_guide.md
2017-05-22 23:28:35 +08:00
ibuler
41633be1aa
[Bugfix] 修复无法删除资产组
2017-05-22 20:30:31 +08:00
ibuler
d2620a655c
[Bugfix] 修复模板bug, 修复getattr bug
2017-05-22 20:18:13 +08:00
ibuler
24c1a931a5
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2017-05-22 19:56:39 +08:00
ibuler
31025b8c52
[bugfix] 修复重置密码bug
2017-05-22 19:51:54 +08:00
ibuler
25f3d5bf02
[Bugfix] 修复翻译一处bug
2017-05-22 19:48:15 +08:00
老广
e21bea6ec0
Update README.md
2017-05-22 12:31:37 +08:00
老广
0399074fcb
Update README.md
2017-05-22 11:27:30 +08:00
ibuler
edc631ad60
[Docker] 添加Docker compose
2017-05-20 00:19:10 +08:00
GuangHongwei
ff374b7141
[Docker] Build a docker
2017-05-17 09:42:32 +08:00
GuangHongwei
458989328e
[Bugfix] 修改bug,使用py3编程
2017-05-15 23:39:54 +08:00
GuangHongwei
3c8d6fbe1b
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2017-05-11 19:42:58 +08:00
GuangHongwei
a052ac8117
[Bugfix] 注释掉配置,影响登陆
2017-05-11 19:41:13 +08:00
老广
94a022e76b
Update install.md
2017-05-11 09:54:00 +08:00
GuangHongwei
831ac60e25
[Update] 更新文档说明,使用python3
2017-05-11 09:43:59 +08:00
GuangHongwei
56e648e924
Update requirements
2017-05-11 09:19:37 +08:00
GuangHongwei
61c5eede94
Merge branch 'dev' of github.com:jumpserver/jumpserver
2017-05-10 10:00:48 +08:00
ibuler
2ec0ab871a
Fix form bug
2017-04-12 18:06:32 +08:00
ibuler
695e4da85e
[Fixture] 完成批量更新
2017-04-12 11:50:15 +08:00
ibuler
2aa9aafdf6
[Change] Bulk update asset
2017-04-11 17:29:53 +08:00
ibuler
071d1922d0
stash it
2017-04-10 22:55:15 +08:00
ibuler
95e64d7809
[Change] 修改导出和更新逻辑
2017-04-09 17:59:14 +08:00
ibuler
5418d0b44c
[Change] Using csv replace xlsx
2017-04-09 00:45:28 +08:00
ibuler
bcc065eb8f
[Compat] compat py3 change bootstrap form to bootstrap3
2017-04-07 23:52:46 +08:00
ibuler
a320b9e05e
[Bugfix] 兼容py3
2017-04-07 19:11:27 +08:00
ibuler
b913bce398
[Bugfix] 修改翻译bug
2017-04-07 17:09:25 +08:00
ibuler
c11374ae39
[Bugfix] 修改翻译
2017-04-07 16:59:09 +08:00
假想控
eebd54a4e8
Update install.md
2017-04-06 18:46:00 +08:00
ibuler
92ebe85a3f
[Fixture] 详情页添加system user 推送
2017-04-05 19:09:51 +08:00
ibuler
25b8108af0
Merge branch 'audits'
2017-04-04 21:52:29 +08:00
ibuler
8a2b008fbf
Merge branch 'a'
2017-04-04 21:52:23 +08:00
ibuler
753440faff
Merge branch 'dev' of github.com:jumpserver/jumpserver into audits
2017-04-04 21:52:04 +08:00
ibuler
be09db059d
Update some bug
2017-04-04 21:47:58 +08:00
假想控
cbb14d140e
Update install.md
2017-04-04 20:46:03 +08:00
假想控
f06cf887e1
Update install.md
2017-04-04 20:16:40 +08:00
假想控
194a698372
Update install.md
2017-04-04 20:15:30 +08:00
ibuler
5a5d5bdd51
[Fixture] 添加更新硬件信息api
2017-04-04 19:16:34 +08:00
ibuler
992af0f1cb
[Fixture] 拆分asset view
2017-04-04 11:37:52 +08:00
ibuler
ac3553babb
[Fixture] 修改asset detail
2017-04-04 11:14:59 +08:00
ibuler
97fb2a4fe6
[Fixture] 修改index页面
2017-04-03 00:27:18 +08:00
ibuler
709552f14c
[Fixture] 添加首页
2017-04-02 18:09:40 +08:00
老广
365750565d
Update requirements.txt
2017-04-01 13:53:34 +08:00
ibuler
66a2262ee9
[Fixture] 增加 asset groups assets api
2017-04-01 00:41:16 +08:00
ibuler
067426d5e0
[Fixture] 完成用户向导页
2017-03-31 23:46:00 +08:00
ibuler
87eb1914fb
Merge branch 'dev' of github.com:jumpserver/jumpserver
2017-03-31 18:50:34 +08:00
ibuler
135899608e
Merge branch 'master' of code.jumpserver.org:Jumpserver/jumpserver
2017-03-31 18:48:11 +08:00
ibuler
7720e9f3fd
[Change] 修改图片
2017-03-31 18:47:50 +08:00
ibuler
61a481f427
[Fixture] 添加用户连接终端
2017-03-31 11:25:25 +08:00
ibuler
3fa5ce5404
[Fixture] 添加用户信息更改
2017-03-30 16:28:00 +08:00
ibuler
0983f294b7
[Fixture] 添加用户profile
2017-03-30 00:51:36 +08:00
ibuler
4e7b665ea8
[Change] 添加翻译,并添加用户登陆页面
2017-03-29 15:26:32 +08:00
右书僮
b34c5dde40
Merge branch 'master' of code.jumpserver.org:Jumpserver/jumpserver
...
# Conflicts:
# apps/assets/templates/assets/asset_list.html
2017-03-27 08:03:23 +08:00
右书僮
9de2ff2052
修复idc_list删除时重新加载table
2017-03-27 07:58:35 +08:00
ibuler
a4ad9b49b9
Merge branch 'audits'
2017-03-26 19:41:17 +08:00
ibuler
90055f7680
[Bugfix] 添加翻译
2017-03-26 19:41:10 +08:00
假想控
2e31cf51f3
Update install.md
2017-03-26 14:56:17 +08:00
假想控
4714d5d42f
Update install.md
2017-03-26 13:55:01 +08:00
假想控
5984b0b579
Update install.md
2017-03-26 13:54:11 +08:00
假想控
d700c448c6
Update install.md
2017-03-26 13:50:10 +08:00
假想控
ef8599b836
Update install.md
2017-03-26 13:46:26 +08:00
假想控
dd5b1097f2
Update install.md
2017-03-26 13:40:27 +08:00
假想控
f7c35fde2d
Update install.md
2017-03-26 13:38:48 +08:00
假想控
4fbb4dfb55
Update install.md
2017-03-26 13:35:26 +08:00
假想控
84af0405d9
Update install.md
2017-03-26 13:32:38 +08:00
假想控
c0e5e5f896
Update install.md
2017-03-26 13:31:38 +08:00
老广
12bc63fbc9
Update install.md
2017-03-26 13:06:34 +08:00
老广
7bbb1d24ac
Update install.md
2017-03-26 13:05:33 +08:00
ibuler
49f6ed524d
Merge with master
2017-03-26 11:54:46 +08:00
ibuler
7ddfa2d25e
[Doc] 添加doc
2017-03-26 11:50:09 +08:00
ibuler
d3cdfc1b9d
Update ignore
2017-03-24 23:14:10 +08:00
ibuler
1f9dbb6bdc
[Change] 修复验证码模糊度
2017-03-24 23:13:17 +08:00
ibuler
10eb13920b
[Delete] 删除资产tag
2017-03-24 14:48:18 +08:00
ibuler
a57dac0706
[Fixture] 拆分proxy log 为在线和离线
2017-03-24 14:23:51 +08:00
右书僮
e0179ea332
删除资产HTML页面中SystemUser相关内容(视图中的相关API暂时未动)
2017-03-24 11:13:40 +08:00
右书僮
c931d3179b
修复资产组更新中 用户己选择的资产项不全问题
2017-03-24 11:02:55 +08:00
右书僮
c5666f1357
fix some files
2017-03-24 10:37:05 +08:00
ibuler
b60e5a7ee3
[Change] 修改一些view
2017-03-24 00:27:33 +08:00
ibuler
c940a4c0fb
[Fixture] 增加 task list 删除按钮
2017-03-23 00:15:25 +08:00
ibuler
3f72ce4b1f
[Update] 更新生成fake数据脚本
2017-03-22 23:36:43 +08:00
ibuler
5613dbb28b
[Update] 更新生成fake数据脚本
2017-03-22 23:36:30 +08:00
ibuler
2ae57a7970
[Delete] 删除 system user一些属性
2017-03-22 22:15:15 +08:00
ibuler
610c9c5149
Pull it
2017-03-22 22:05:24 +08:00
ibuler
caec9709ef
[Fixture] 添加task list 搜索,重试
2017-03-22 21:57:05 +08:00
ibuler
a4504dc0c7
[Change] 拆分tasks
2017-03-16 00:43:43 +08:00
ibuler
0fbd9843bd
[Change] 修改runner, inventory位置
2017-03-16 00:19:47 +08:00
ibuler
240c7db416
[Fixture] 添加 rerun function
2017-03-14 14:15:13 +08:00
ibuler
915873135e
[Fixture] 添加runner run record
2017-03-14 00:58:25 +08:00
ibuler
a822f667af
[Fixture] 完成用户推送task
2017-03-09 14:55:33 +08:00
ibuler
c234b5b2d5
Update AdHocRunner
2017-03-06 23:34:54 +08:00
xiaokong1937@gmail.com
694899799b
trivial changes
2017-03-06 21:05:00 +08:00
ibuler
eb5a9dd20f
Remote ansible_api file
2017-03-05 23:30:14 +08:00
ibuler
6015f2423b
[Fixture] 添加PlaybookRunner
2017-03-05 20:53:24 +08:00
ibuler
01e50d592e
完成AdHoc JMSHost JMSInventory
2017-03-05 11:38:02 +08:00
老广
0524e8dddf
Update README.md
2017-03-04 16:41:36 +08:00
ibuler
ab62bfca7e
[Bugfix] 修改一些bug
2017-03-04 16:38:26 +08:00
ibuler
7833fc8c80
Merge remote-tracking branch 'new_git/dev' into dev
2017-03-03 15:19:55 +08:00
ibuler
9c2c38c74a
[Bugfix] 修复导入自定义过滤器问题
2017-03-03 15:15:10 +08:00
ibuler
78700cd2f5
merge with version 0.4.0
2017-03-03 10:28:45 +08:00
ibuler
695dc96ce8
Merge branch 'audits'
2017-03-03 10:24:34 +08:00
ibuler
f1d4cae20b
Delete 0.3.1 version code
2017-03-03 10:13:58 +08:00
ibuler
9518672ad2
Add
2017-03-02 18:29:29 +08:00
ibuler
b055144908
Merge with audits
2017-03-01 15:35:11 +08:00
ibuler
7825c107ab
[Bugfix] model FieldError
2017-03-01 15:30:19 +08:00
右书僮
dd5dd9d7e1
fixed html files
2017-02-25 23:20:20 +08:00
Webb
63fd3cfff2
fixed asset_group delete html
2017-02-25 20:18:13 +08:00
Webb
a6825ac91e
fixed asset_list html and asset_update
2017-02-25 17:25:27 +08:00
Webb
8ee9d02ffc
fixed html
2017-02-24 21:29:11 +08:00
ibuler
008be6a8e3
[Fixtrue] 完成terminal detail 和批量结束会话
2017-02-12 16:51:32 +08:00
ibuler
1f544b98ab
[Stash] 删除结束会话之前
2017-02-11 19:49:15 +08:00
ibuler
42e4c64d06
[Bugfix] 修复一些bug
2017-02-11 12:13:02 +08:00
xiaokong1937@gmail.com
548d7ef99a
fix #13;fix user context conflict problem in user-detail page
2017-02-09 21:19:49 +08:00
ibuler
9c7bd7d285
[Fixture] 添加record log
2017-02-07 21:51:44 +08:00
ibuler
a79c3dd156
[Fixture] 添加command log backends, 未来支持es
2017-02-06 23:13:27 +08:00
xiaokong1937@gmail.com
fe01f92545
user profile: update ssh pk
2017-02-03 13:37:05 +08:00
xiaokong1937@gmail.com
8a5d0b2d92
remove unused templatetags: users_tags and common_tags
2017-01-26 20:24:50 +08:00
xiaokong1937@gmail.com
f3647ea46d
user-profile page
2017-01-25 21:19:16 +08:00
xiaokong1937@gmail.com
31bded8953
CAPTCHA_TEST_MODE settings and small fix
2017-01-23 12:29:36 +08:00
xiaokong1937@gmail.com
3f7cb4a458
ignore windows bat files
2017-01-23 10:52:59 +08:00
ibuler
0869931e67
[Bugfix] 修改了一些issue上的bug
2017-01-20 20:13:22 +08:00
ibuler
948214cacb
Merge branch 'audits'
2017-01-20 14:00:11 +08:00
ibuler
df94d11f53
[Fix] 修改一些api bug
2017-01-20 13:59:53 +08:00
ibuler
ffed28c9c7
[Change] 修改perm的代码, 强制79个字符内
2017-01-17 17:11:01 +08:00
ibuler
25cb47d2f5
[Change] 拆分user view为多个view
2017-01-17 16:34:47 +08:00
wangfeng7399
0979480103
update dockerfile
2017-01-13 15:43:51 +08:00
王胜辉
dc4c37afb6
Update README.md
2017-01-13 07:30:23 +00:00
ibuler
87bbb6afde
[Bugfix] 修改添加系统用户view
2017-01-10 23:41:14 +08:00
ibuler
8916221bba
[Bugfix] 紧急修复url解析失败错误
2017-01-10 18:03:00 +08:00
ibuler
8658675f67
[Bugfix] 重命名applications导致api请求content_type不对
2017-01-09 23:12:32 +08:00
ibuler
be3f94d86c
[BugFix] 修改requirements添加新的库
2017-01-09 01:58:23 +08:00
ibuler
17657deb0e
[Bugfix] 和Master分支合并后,修复冲突,DRF 新版本要求 fields和exclude
2017-01-08 13:35:59 +08:00
ibuler
49861b6a84
Merge with master
2017-01-07 22:34:12 +08:00
ibuler
3da33a57e2
[Bugfix] 修改tab -> space, 删除system user的 as default
2017-01-07 20:17:22 +08:00
ibuler
9c6c6d6b4c
[Feature] 添加Dockerfile
2017-01-07 20:07:33 +08:00
右书僮
dbdb8a58fe
资产相关API及Web
2017-01-06 20:34:24 +08:00
ibuler
b670259ab6
Modify terminal reqject templatte
2017-01-03 00:11:44 +08:00
ibuler
0907f5021e
Finish form ajax submmit
2016-12-30 22:21:50 +08:00
ibuler
301e02bcd8
Update some api
2016-12-30 00:19:47 +08:00
ibuler
70da177ed7
Update api
2016-12-29 19:17:00 +08:00
ibuler
92d854b971
Update api
2016-12-29 00:29:59 +08:00
ibuler
d80fec6e60
Update some api
2016-12-28 00:28:52 +08:00
广宏伟
4c06257070
Update README.md
2016-12-27 23:44:05 +08:00
ibuler
d56f030dc4
Finish terminal accept
2016-12-27 00:59:52 +08:00
ibuler
775cd523eb
Update app terminal name to applications
2016-12-25 23:10:53 +08:00
ibuler
a8fa4d2f0c
update terminal regist
2016-12-25 17:44:39 +08:00
ibuler
2707012325
Finish access key auth
2016-12-25 13:15:28 +08:00
ibuler
c5ab49c515
Finish access key auth
2016-12-25 13:15:19 +08:00
ibuler
fe17bec752
Add access key auth
2016-12-22 01:07:05 +08:00
ibuler
5b4ce709af
Add private token and change user group
2016-12-22 00:36:31 +08:00
ibuler
875aaa0029
update user model for create application user
2016-12-21 01:17:36 +08:00
ibuler
589b6d7cfe
update
2016-12-21 01:03:52 +08:00
ibuler
649509dec1
Change models dir
2016-12-21 00:43:52 +08:00
ibuler
4d96978b4f
Merge branch 'master' into audits
2016-12-20 23:08:09 +08:00
ibuler
81ec121918
Merge branch 'master' of code.jumpserver.org:jumpserver/jumpserver
2016-12-20 23:07:57 +08:00
ibuler
a448fd02e2
merged
2016-12-20 23:07:33 +08:00
ibuler
96d32f2e3e
prepare merge ops
2016-12-20 23:06:27 +08:00
ibuler
4d71c2d1ff
修改token获取,拆分认证文件和权限文件
2016-12-20 01:19:50 +08:00
广宏伟
6ef33eb0c3
Merge branch 'ops_dev' into 'master'
...
Ops dev
See merge request !1
2016-12-19 23:58:49 +08:00
yumaojun03
046c7e21e9
Merge remote-tracking branch 'origin/master' into ops_dev
...
# Conflicts:
# requirements.txt
2016-12-19 23:55:54 +08:00
yumaojun03
47d87e38a6
补充task需要的一些接口
2016-12-19 23:46:03 +08:00
ibuler
2ab8e92bf4
Add black line
2016-12-19 23:10:16 +08:00
yumaojun03
150e1030c3
ansible Task接口更上层抽象的基本实现
2016-12-19 14:07:21 +08:00
yumaojun03
86c5f0d3d3
完成cron和sudo的list和detail基础,ansible Task接口更上层抽象中
2016-12-19 00:24:51 +08:00
ibuler
d964221689
Update api
2016-12-16 19:32:05 +08:00
wangjun5
87eed2e59b
add asset tool
2016-12-15 19:55:15 +08:00
广宏伟
a737564a6c
Add new file
2016-12-14 19:58:20 +08:00
广宏伟
6374a9772c
Add new file
2016-12-14 19:57:47 +08:00
yumaojun03
b348f7f1ce
添加了部分cron的list页面
2016-12-14 09:54:16 +08:00
yumaojun03
a0c9e3d117
添加了部分sudo的页面
2016-12-14 00:06:16 +08:00
yumaojun03
3eb8a702c8
为模型生成fake数据
2016-12-12 11:08:10 +08:00
yumaojun03
806d38bbb2
模拟数据测试
2016-12-11 20:50:26 +08:00
yumaojun03
84613e51d8
为了防止循环导入,采用__all__导出模块变量
2016-12-11 12:05:11 +08:00
ibuler
0e4804b59f
Merge branch 'audits'
2016-12-06 10:43:05 +08:00
ibuler
69767e978d
Add fake
2016-12-06 10:40:17 +08:00
yumaojun03
baba65ad43
修改url模块, 匹配整体架构风格.
2016-12-05 23:02:08 +08:00
yumaojun03
d0460d8691
修改url模块, 匹配整体架构风格.
2016-12-05 22:54:38 +08:00
ibuler
a7476222a9
Update import
2016-11-27 23:36:35 +08:00
Administrator
61ac9129b0
url少加了下划线
2016-11-27 22:45:53 +08:00
ibuler
3aea994101
asset import
2016-11-27 14:37:50 +08:00
Administrator
8e0afb2cc4
调整模型
2016-11-27 11:30:23 +08:00
ibuler
c1c9c7b68a
update asset
2016-11-25 22:45:47 +08:00
ibuler
6e843533cb
Base finish user
2016-11-25 11:00:51 +08:00
ibuler
d8a229c09b
to Commpany
2016-11-25 08:39:24 +08:00
Administrator
2494fa5846
修改url
2016-11-24 22:34:55 +08:00
Administrator
984391e2b2
同步Master分支上的代码, 解决部分冲突问题
2016-11-24 22:10:04 +08:00
ibuler
72ad4b44ce
update bug
2016-11-24 19:36:49 +08:00
Administrator
1bc88e5b11
Merge branch 'ansible_api' into ops_dev
...
# Conflicts:
# apps/jumpserver/urls.py
# apps/locale/zh/LC_MESSAGES/django.po
# apps/templates/_nav.html
# requirements.txt
# run_server.py
2016-11-24 18:22:36 +08:00
Administrator
c289d6a4c5
Merge branch 'ansible_api' into ops_dev
...
# Conflicts:
# apps/jumpserver/urls.py
# apps/locale/zh/LC_MESSAGES/django.po
# apps/templates/_nav.html
# requirements.txt
# run_server.py
2016-11-24 17:57:50 +08:00
Administrator
7c4aefd959
兼容py3测试
2016-11-24 17:10:43 +08:00
ibuler
c1a74aebc5
[BugFix] update some user import bug
2016-11-24 17:08:20 +08:00
ibuler
eae580e51f
Update user import and export
2016-11-24 15:45:08 +08:00
ibuler
e28f7a3bec
Add export and import
2016-11-24 00:48:57 +08:00
ibuler
be99eb82e8
udpate some bug
2016-11-23 19:37:47 +08:00
ibuler
5af97c969b
export csv
2016-11-23 19:09:11 +08:00
ibuler
7dfde3a3c5
Update
2016-11-23 16:17:23 +08:00
Administrator
cd22c39078
[future] 将Task移到一个包内管理
2016-11-23 11:45:50 +08:00
Administrator
32a5aec34e
[future] 调整app架构
2016-11-22 23:02:12 +08:00
Administrator
fea76178ee
添加作业中心i18n
2016-11-22 21:40:05 +08:00
Administrator
3abe2196dd
[future] 添加作业中心 i18n相关
2016-11-22 21:38:38 +08:00
Administrator
18e0fee1a7
[future] 添加作业中心基础框架
2016-11-22 21:08:45 +08:00
Administrator
954814da65
[future] 添加Cron相关的基础API框架
2016-11-22 10:41:18 +08:00
ibuler
180af7e0bd
Update csv
2016-11-22 00:59:49 +08:00
Administrator
79971d677d
[future] 使用mixin去掉重复多余代码
2016-11-20 18:12:18 +08:00
Administrator
1e835d2fa9
[future] 增加503和501的自定义异常
2016-11-20 16:23:45 +08:00
Administrator
76f72dfb58
[future] 添加路由, 增加api认证, 测试所有添加的api
2016-11-20 16:22:41 +08:00
Administrator
5ae2711c6e
sudo privilege删除走api
2016-11-20 14:48:18 +08:00
Administrator
39ae4a3a10
[future] url 调整
2016-11-20 12:22:56 +08:00
Administrator
961ecb3ee8
[future] 添加sudo相关的api方法
2016-11-20 12:18:44 +08:00
ibuler
205c11dfba
Finish list paganation
2016-11-18 12:00:23 +08:00
广宏伟
c743715459
Update README.md
2016-11-18 10:22:35 +08:00
广宏伟
b4bd923304
Update README.md
2016-11-18 10:14:46 +08:00
ibuler
e89d3b3807
Update asset
2016-11-17 19:28:45 +08:00
ibuler
6e69c018b4
Merge branch 'audits'
2016-11-16 18:12:40 +08:00
ibuler
aff37092bf
Rename urls
2016-11-16 18:12:14 +08:00
ibuler
5745c8cc4a
Finish url namespace change
2016-11-16 17:45:46 +08:00
ibuler
a5e487441f
prepare change api name
2016-11-16 17:38:03 +08:00
Administrator
c588436d55
初始化模板和api模块
2016-11-16 15:00:46 +08:00
Administrator
82412831d5
initial sudo views
2016-11-16 14:20:44 +08:00
ibuler
aa08f0aa48
Merge branch 'audits' of code.jumpserver.org:Jumpserver/jumpserver into audits
2016-11-16 12:34:01 +08:00
ibuler
32d12b7f78
Update user group asset permission
2016-11-16 12:33:54 +08:00
ibuler
3b30eb3278
Weiteng
2016-11-15 23:09:36 +08:00
ibuler
99c36f2a2c
Fix bug
2016-11-15 19:44:08 +08:00
ibuler
db8b0022fc
Update usergroup detail
2016-11-15 19:33:04 +08:00
ibuler
bd882c8bef
User group detail
2016-11-15 00:48:48 +08:00
ibuler
8d358a7a68
UPdate some
2016-11-14 19:28:21 +08:00
广宏伟
8731e0816d
Update README.md
2016-11-14 19:25:17 +08:00
广宏伟
074cc2f26e
Update README.md
2016-11-14 19:24:27 +08:00
广宏伟
6eaaddd8ed
Update README.md
2016-11-14 19:21:46 +08:00
ibuler
419876b575
Update heatbeat
2016-11-13 22:34:38 +08:00
ibuler
2635217421
Update celery
2016-11-11 09:48:47 +08:00
ibuler
c6fc3dfe91
Update terminal interval
2016-11-11 02:13:13 +08:00
ibuler
10aa8c40a7
Add login log
2016-11-10 23:54:21 +08:00
ibuler
f70abec5ef
Finish user detail
2016-11-10 22:06:23 +08:00
ibuler
69f2bf664b
Finish user permission revoke
2016-11-10 16:59:50 +08:00
ibuler
dde9ffb2ae
Update perm api
2016-11-10 00:18:57 +08:00
ibuler
47090eb0f7
update some user api
2016-11-09 23:49:10 +08:00
ibuler
c5d625e261
Merge branch 'audits' of code.jumpserver.org:Jumpserver/jumpserver into audits
2016-11-09 19:29:26 +08:00
ibuler
8d7759d22f
change user api
2016-11-09 19:29:15 +08:00
ibuler
0d4d64c274
Update api
2016-11-09 00:36:23 +08:00
ibuler
ea3f8af161
Fix pubkey auth bug
2016-11-07 16:59:52 +08:00
ibuler
a75e1db970
Add form validate
2016-11-07 00:39:26 +08:00
ibuler
072da114db
Finish system user list
2016-11-06 22:45:26 +08:00
ibuler
968b1b4cb6
Stash
2016-11-06 21:29:04 +08:00
ibuler
afb923737c
Merge with audits
2016-11-06 11:52:25 +08:00
ibuler
79c8f2275c
Update perm api
2016-11-05 23:34:45 +08:00
Administrator
d9278c2c24
[future] 添加sudo相关的表,以及实现生成sudo内容的方法
2016-11-05 13:10:44 +08:00
ibuler
5b0f897118
Update proxy log and command log view
2016-11-05 12:45:59 +08:00
ibuler
41337d28c3
add proxy log search
2016-11-05 01:15:25 +08:00
ibuler
1d29c52a43
Update datatable
2016-11-04 19:25:10 +08:00
ibuler
53e97dac40
stash it
2016-11-04 18:33:16 +08:00
Administrator
8716d9c725
[future] 添加用于记录sudo相关的表
2016-11-04 18:12:10 +08:00
ibuler
f278b735cc
Modify settings
2016-11-04 00:41:21 +08:00
ibuler
2a65e81316
detail page add update
2016-11-03 23:16:16 +08:00
ibuler
f437d3f883
update
2016-11-03 19:42:47 +08:00
Administrator
1fd0f8fdde
[future] 添加sudo的配置模板
2016-11-03 18:26:10 +08:00
ibuler
61eadf6891
Modify asset detail
2016-11-03 00:09:38 +08:00
ibuler
3448f3eb0a
Modify init data
2016-11-02 23:00:47 +08:00
ibuler
05a5e9cc69
Finish some bug
2016-11-02 19:44:11 +08:00
ibuler
34a0a37b63
Add token
2016-11-01 19:31:35 +08:00
ibuler
1159d9494c
Update signer
2016-11-01 17:21:16 +08:00
Administrator
92f396761c
[future] 完成获取硬件和链接测试的第一版v1
...
1. 完成数据结果的封装, 添加数据结构样列
2. 完成硬件和链接测试接口v1版
2016-11-01 10:37:03 +08:00
ibuler
f1dfba6a93
Update some asset issues
2016-10-31 19:31:56 +08:00
ibuler
b36d70987d
Finish token access api
2016-10-31 18:58:30 +08:00
ibuler
315af35296
Finish token access api
2016-10-31 18:58:23 +08:00
Administrator
97b8bcd5ca
[future]
...
1. settings 添加ops 的logger, 关于Ansible的log单独记录
2. models 增加Tasker模型, 添加AnsibleHostReuslt 对于数据处理的方法
3. ansible_api, callback 类,增加保存Tasker的逻辑,i其他兼容
4. taskers, 实现获取硬件信息和ping的 tasker接口。
2016-10-31 17:41:26 +08:00
江世峰
6b6fdcd5fd
asset:add assets_bulk_update
2016-10-28 21:24:01 +08:00
江世峰
3d4f79ca59
asset:add assets_bulk_update
2016-10-28 21:19:37 +08:00
Administrator
ccf3851d81
[future] 初步添加测试链接的接口
2016-10-28 17:43:56 +08:00
Administrator
97d7e6cb9b
[future] 修改celery 使用eventlet 作为concurrent pool, 添加获取资产硬件信息的 初步接口
2016-10-28 17:28:32 +08:00
Administrator
fd945513ac
[fix] 修改模型的显示, 因为字段默认会加上Class的Name
2016-10-28 15:47:37 +08:00
ibuler
92251f2a45
Merge with master
2016-10-28 15:09:38 +08:00
Administrator
51c530c123
[future] ansible运行结果存入数据库
2016-10-28 14:58:09 +08:00
Administrator
96bc1cd8f1
[future]ansible运行结果存入数据库中...
2016-10-28 13:41:11 +08:00
ibuler
374dfbdac2
Force merge
2016-10-28 11:36:37 +08:00
ibuler
534321d1aa
Merge with master
2016-10-28 11:34:07 +08:00
ibuler
69c6f81c31
Add fake to
2016-10-28 00:21:11 +08:00
ibuler
9e3d740b43
Add fake to
2016-10-28 00:17:10 +08:00
ibuler
5cdc80ec11
Add init data
2016-10-27 23:59:54 +08:00
ibuler
217586b536
Add fake
2016-10-27 23:55:19 +08:00
ibuler
2abec15691
Rm ws4redis
2016-10-27 23:50:44 +08:00
ibuler
688bfa556c
Merge with audits
2016-10-27 23:04:02 +08:00
ibuler
589d0d0fac
Finish command log list
2016-10-27 22:58:19 +08:00
ibuler
3c00c578c3
Update some vie
2016-10-27 19:35:02 +08:00
Administrator
eb5f0fcf68
[future] 在主机层面支持多种sudo, 以及回调结果的分类
2016-10-27 15:20:16 +08:00
ibuler
c0de35a683
Add layer and layer open command log
2016-10-27 00:52:44 +08:00
ibuler
d19b47a427
add command log modal
2016-10-27 00:03:05 +08:00
ibuler
573b3a8743
Update log_command modal
2016-10-26 19:31:54 +08:00
ibuler
5d3f9b4a03
Add command list
2016-10-26 19:10:14 +08:00
ibuler
c2aab50c7b
Add proxy log list
2016-10-25 23:23:01 +08:00
Administrator
13f34a8bdd
ops: [future]完成ansible2.0 API 的基本封装.
2016-10-25 18:15:02 +08:00
江世峰
f88c149076
asset:add assets_bulk
2016-10-25 02:16:20 +08:00
ibuler
6a510dad6c
Update some bug
2016-10-24 19:32:53 +08:00
江世峰
cdb1602e06
asset:add assets_bulk
2016-10-22 20:21:36 +08:00
江世峰
80baecc8be
Merge branch 'master' of code.jumpserver.org:Jumpserver/jumpserver
...
Merge
2016-10-21 21:15:04 +08:00
江世峰
73f0199dc0
asset:add assets_bulk
2016-10-21 21:14:49 +08:00
ibuler
6b161d5971
Update import
2016-10-20 19:01:57 +08:00
ibuler
67ecc108bd
Command parser
2016-10-20 00:26:53 +08:00
ibuler
df380c343e
Update api
2016-10-19 19:30:55 +08:00
ibuler
6164896793
Update some thing
2016-10-19 18:33:14 +08:00
ibuler
45dcb26123
Merge branch 'audits'
2016-10-19 15:14:07 +08:00
ibuler
bb9a067293
Finish command log
2016-10-19 01:05:28 +08:00
ibuler
961abad14b
Add heatbeat
2016-10-18 23:49:04 +08:00
ibuler
17ade287ab
Add proxy log api
2016-10-18 19:28:36 +08:00
ibuler
7513474366
Finish terminal app
2016-10-17 17:28:07 +08:00
ibuler
303659cb0e
Change app name apps => terrminal
2016-10-17 15:24:41 +08:00
江世峰
4e1f9c97a5
asset:update assets_list by tag
2016-10-16 22:35:25 +08:00
ibuler
4531157c72
may be some wrong
2016-10-16 22:12:13 +08:00
ibuler
26a8bce2c3
Change auto_now to auto_now_add
2016-10-15 23:34:02 +08:00
ibuler
3383b2b535
Add terminal mode
2016-10-15 18:28:49 +08:00
ibuler
9960a6cd21
Plan create a new app: terminal
2016-10-15 17:14:56 +08:00
ibuler
0446f449e9
Add auth and permission backends
2016-10-15 16:04:54 +08:00
ibuler
a62a2178d0
Add user backend
2016-10-15 00:49:59 +08:00
ibuler
f038423ce2
Add isdangerous
2016-10-14 20:18:34 +08:00
江世峰
a3683f184e
Merge branch 'master' of code.jumpserver.org:Jumpserver/jumpserver
...
Merge
2016-10-14 19:29:15 +08:00
江世峰
abe09e2a85
asset:update assets_list by tag
2016-10-14 19:28:58 +08:00
ibuler
3efad338eb
Merge branch 'connect'
2016-10-13 14:49:04 +08:00
ibuler
29b3ef70ef
Merge branch 'master' of code.jumpserver.org:Jumpserver/jumpserver
2016-10-12 19:43:43 +08:00
江世峰
73f5891f87
asset:update assets_list by tag
2016-10-12 18:57:51 +08:00
ibuler
081af2f953
Add proxy log api for create or update
2016-10-10 00:39:24 +08:00
ibuler
0c8922e30f
Modify some bug
2016-10-09 19:27:49 +08:00
广宏伟
82610163cb
Update README.md
2016-10-09 18:14:19 +08:00
ibuler
ba82c395f2
Move terminal to a new project
2016-10-09 15:14:41 +08:00
ibuler
0954f6d7e8
Add audits api
2016-10-09 00:12:18 +08:00
江世峰
b99b88a30f
asset:update tag
2016-10-08 18:33:00 +08:00
ibuler
59727656c3
Update table desgin doc and audit log
2016-10-07 23:54:29 +08:00
江世峰
0c611b6429
Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
...
merage
2016-10-07 23:04:48 +08:00
江世峰
2829445f4f
assets:add tag
2016-10-07 23:04:37 +08:00
ibuler
0cda4e0905
Record command history
2016-10-07 08:53:28 +08:00
ibuler
aa02c211fe
Modify inital data
2016-10-02 22:16:15 +08:00
ibuler
6b6105491c
Add migrations
2016-10-02 22:13:08 +08:00
ibuler
45df58114c
Merge branch 'connect'
2016-10-02 21:45:44 +08:00
ibuler
a04d772501
Merge with master
2016-10-02 21:45:26 +08:00
ibuler
820d608b18
Rm teminal app
2016-10-02 21:43:22 +08:00
ibuler
b54c973d82
Update requirement
2016-10-02 21:38:27 +08:00
ibuler
0234ff0252
Pripare web terminal server
2016-10-02 17:09:27 +08:00
xiaokong1937@gmail.com
6856fad0c0
integrate the user-group list page with its api;
2016-10-02 11:09:27 +08:00
xiaokong1937@gmail.com
d40aa49d8c
user bulk import through Excel and close #20
2016-10-01 20:26:43 +08:00
xiaokong1937@gmail.com
05e961f29f
user-group detail: fix #15
2016-09-30 20:50:40 +08:00
江世峰
474f7e0f68
Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
...
merge
2016-09-30 18:26:02 +08:00
江世峰
fd52a85dbb
fix #25
2016-09-30 18:25:50 +08:00
ibuler
d9866e1f38
Debug to find command
2016-09-30 00:07:55 +08:00
ibuler
0d25a8f5b7
Use thread replace process
2016-09-29 23:52:07 +08:00
ibuler
b4c6499139
Try to fix ssh server close client bug
2016-09-29 21:36:15 +08:00
xiaokong1937@gmail.com
d8143a67cd
user-group-detail: user-adding frontend integration
2016-09-29 21:14:55 +08:00
ibuler
e3c620e138
Debug some bug for auth failed and exit
2016-09-29 18:35:52 +08:00
ibuler
acf51238d0
Modify ssh server bug for using public key
2016-09-29 18:01:26 +08:00
xiaoyu
e7fddf80ae
user-group-detail: add users support
2016-09-29 16:41:55 +08:00
xiaokong1937@gmail.com
f9b49605e4
user-group detail page: users op
2016-09-28 21:11:43 +08:00
江世峰
0dec647116
Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
...
rollback user_list.html
2016-09-28 13:45:03 +08:00
江世峰
3201853cdf
rollback user_list.html
2016-09-28 13:44:51 +08:00
江世峰
e83ecb1254
assets_group_forbug
2016-09-28 12:05:34 +08:00
xiaokong1937@gmail.com
2522f0d80f
trivial changes: refactor the jumpserver DataTable api
2016-09-27 21:28:02 +08:00
xiaokong1937@gmail.com
70a6ddc897
fix #27
2016-09-27 20:16:46 +08:00
ibuler
b17a12662c
modify change windows size
2016-09-27 00:10:14 +08:00
ibuler
be1a374b14
Modify log
2016-09-26 22:16:21 +08:00
xiaokong1937@gmail.com
49f007601f
add user-list-delete support for user-group detail page
2016-09-26 21:22:48 +08:00
xiaokong1937@gmail.com
74cdd2d0f3
user list groups bulk update
2016-09-26 19:39:43 +08:00
xiaoyu
15dcc760b4
user list bulk update modal
2016-09-26 16:33:10 +08:00
xiaoyu
d2197d99c2
fix #26
2016-09-26 11:30:43 +08:00
ibuler
badd319bb4
Modify some bug and add some logging
2016-09-26 00:05:23 +08:00
ibuler
e627b14e55
finish ssh server use more class
2016-09-25 23:38:42 +08:00
ibuler
4b7419559c
Update ssh_server to some class
2016-09-25 23:11:09 +08:00
ibuler
2c64b78487
Update terminal
2016-09-25 21:21:25 +08:00
ibuler
5e33c2dc6b
Update ssh config
2016-09-25 20:41:56 +08:00
ibuler
ebb30424fa
Use process except thread
2016-09-25 19:53:55 +08:00
ibuler
216163f436
stash
2016-09-25 11:30:02 +08:00
ibuler
d3e9c8c9c0
Replace ssh server dir
2016-09-25 00:21:32 +08:00
ibuler
cfef374454
Update ssh server
2016-09-25 00:11:31 +08:00
ibuler
0d4ca9717e
Merge branch 'master' into connect
2016-09-24 22:18:07 +08:00
ibuler
7ab47916f2
add __init__.py
2016-09-24 22:12:49 +08:00
ibuler
283c53fddf
Update gitignore
2016-09-24 22:11:53 +08:00
ibuler
c5c11864e0
update
2016-09-24 22:10:17 +08:00
ibuler
da56310db9
update .gitignore
2016-09-24 22:09:20 +08:00
ibuler
7935c00338
update .gitignore
2016-09-24 22:02:44 +08:00
ibuler
1620f6a311
Update ignore
2016-09-24 22:01:19 +08:00
ibuler
4925f3227a
update .gitignore
2016-09-24 21:57:24 +08:00
ibuler
c158edb574
Modify ignore
2016-09-24 21:54:58 +08:00
ibuler
ab18fe466b
stash
2016-09-24 21:47:10 +08:00
ibuler
88bb620af2
Modify ignore
2016-09-24 11:50:25 +08:00
ibuler
a65d5269fe
Modify git ignore
2016-09-24 11:46:11 +08:00
ibuler
1f3d763490
Add requirement
2016-09-24 11:44:59 +08:00
江世峰
184ac728db
Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
...
update:add_assets-group
2016-09-23 20:23:02 +08:00
江世峰
5bf414ffb5
update add_assets-group
2016-09-23 20:22:45 +08:00
xiaoyu
22163173fe
user bulk delete view
2016-09-23 16:30:59 +08:00
ibuler
de0f8c24f7
finish example
2016-09-22 23:56:27 +08:00
ibuler
f946a4bfb3
finish example
2016-09-22 23:26:44 +08:00
江世峰
18341717a1
Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
...
"assets-group"
2016-09-22 18:31:15 +08:00
江世峰
d2e989403f
update assets-group
2016-09-22 18:31:04 +08:00
xiaoyu
af713672fb
user list page bulk action
2016-09-22 16:06:46 +08:00
ibuler
db2d00f828
implement a some server
2016-09-22 00:37:13 +08:00
xiaoyu
515406c05d
temp: deactive test
2016-09-21 16:43:41 +08:00
xiaoyu
61d1d9ec90
temp
2016-09-21 15:48:21 +08:00
ibuler
e020aaa368
ssh server
2016-09-21 00:43:19 +08:00
ibuler
771cf39944
ssh server
2016-09-21 00:38:17 +08:00
ibuler
c7f3aaa654
Change appname webterminal to terminal
2016-09-20 23:34:37 +08:00
ibuler
220892824c
Finish some bug
2016-09-20 01:13:50 +08:00
ibuler
ce5950ca73
Merge with asset
2016-09-20 00:43:30 +08:00
ibuler
24e31a69cb
finish asset
2016-09-20 00:39:33 +08:00
xiaokong1937@gmail.com
65461a09a7
user-group edit implement
2016-09-19 21:08:08 +08:00
江世峰
6c7e51041f
update assets_group
2016-09-19 18:01:13 +08:00
江世峰
98757aa428
update assets_group
2016-09-19 17:25:41 +08:00
xiaoyu
9a81057d95
fix a typo
2016-09-19 15:51:28 +08:00
xiaoyu
f00da20764
user-group delete implement
2016-09-19 15:47:58 +08:00
ibuler
d323c9df88
Modify asset create
2016-09-19 00:07:52 +08:00
xiaokong1937@gmail.com
4e2a41f4cf
user-group draft
2016-09-18 21:00:07 +08:00
xiaoyu
8a5a4f3362
fix #14
2016-09-18 14:28:34 +08:00
xiaoyu
8cdc4674d7
update toastr js and close #8
2016-09-18 10:32:23 +08:00
ibuler
acfe8950b8
MOdify asset create
2016-09-18 00:10:08 +08:00
ibuler
502c7e756b
Modify asset
2016-09-17 23:43:41 +08:00
ibuler
7fd224e690
Merge with user-perm
2016-09-17 19:15:14 +08:00
ibuler
dc4d388d9a
Merge with master
2016-09-17 18:53:11 +08:00
ibuler
df281defd8
Finish user detail asset grant ..
2016-09-17 18:51:19 +08:00
ibuler
7d3474aeea
Add user permission user list
2016-09-17 15:20:33 +08:00
wangyong
343f139904
alter asset add and detail
2016-09-17 14:52:14 +08:00
wangyong
b95c1deee1
alter asset add and detail
2016-09-17 14:50:14 +08:00
ibuler
b5abb17568
Jiu zhe yang ba
2016-09-17 13:04:26 +08:00
ibuler
ab2eeb0da3
Finish user asset form
2016-09-17 01:04:52 +08:00
ibuler
e232962649
Update some template
2016-09-16 20:53:10 +08:00
wangyong
42012d7bfe
merge master
2016-09-16 17:32:35 +08:00
ibuler
06b2c623cb
Modify some bug
2016-09-16 17:23:47 +08:00
wangyong
792908eb35
asset add
2016-09-16 17:23:23 +08:00
ibuler
a091036744
Add user permission select
2016-09-16 16:09:11 +08:00
ibuler
d9812e2bdb
Remove action from asset permission
2016-09-16 09:55:26 +08:00
ibuler
74b8ee8c10
Pre delete action
2016-09-16 09:38:07 +08:00
xiaokong1937@gmail.com
db5d04c37f
fix #13
2016-09-16 08:45:29 +08:00
xiaokong1937@gmail.com
7984806b38
change user ssh reset type from private key to public key
2016-09-15 16:54:00 +08:00
ibuler
766bd3b76d
Move js to jumpserver.js
2016-09-15 13:09:24 +08:00
ibuler
b2444c2aca
Add fake data to init.json
2016-09-15 12:21:34 +08:00
ibuler
bb8852d57e
Modify some style
2016-09-15 12:20:53 +08:00
ibuler
037d9323a4
Modify and code review
2016-09-15 11:19:36 +08:00
ibuler
f253d2ea69
Merge with master
2016-09-14 23:31:22 +08:00
ibuler
a4dc27f073
Finish permissin detail asset list and user list
2016-09-14 23:29:39 +08:00
ibuler
812df7b07b
Restore settings.py
2016-09-14 16:52:09 +08:00
unknown
c237f82e51
restore settings
2016-09-14 16:10:15 +08:00
unknown
e7c20f0707
add assets manage Sweet Alert"
2016-09-14 15:51:09 +08:00
unknown
0f9bdab108
Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
2016-09-14 15:40:47 +08:00
unknown
1005fbabbd
add assets manage
...
Sweet Alert
2016-09-14 15:38:54 +08:00
unknown
8490583d73
add assets manage
...
Sweet Alert
2016-09-14 15:19:27 +08:00
ibuler
5bca783e12
permission user search
2016-09-14 01:08:26 +08:00
xiaokong1937@gmail.com
6751c5a63a
reset user password and ssh pk implement
2016-09-13 21:45:10 +08:00
xiaoyu
00502ce33d
trivial js style changes; bugfix for patch method
2016-09-13 16:38:43 +08:00
ibuler
4c4f598552
Finish asset permission detail and add user or user group list
2016-09-13 00:37:24 +08:00
unknown
7cff5cbf61
Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
2016-09-12 15:36:13 +08:00
unknown
12831a7d21
text
2016-09-12 15:35:50 +08:00
ibuler
7b99a33a2f
permission update and delete finished
2016-09-11 23:20:14 +08:00
ibuler
6d736d7309
Finish permission create and list
2016-09-11 22:45:24 +08:00
ibuler
f558ded5bb
Plan delete some view
2016-09-11 20:13:56 +08:00
ibuler
324bb68667
user-pserm
2016-09-11 16:59:19 +08:00
ibuler
70cae93a4b
Add user perm model and form
2016-09-11 09:50:42 +08:00
ibuler
627a5825f4
Add user perm
2016-09-10 21:08:10 +08:00
xiaokong1937@gmail.com
899233338d
#8 user first login view
2016-09-10 13:20:34 +08:00
xiaokong1937@gmail.com
a7e3f9c465
#8 user first login view
2016-09-10 13:16:58 +08:00
ibuler
6069b8946b
Start asset extend
2016-09-10 00:29:57 +08:00
ibuler
c58725dbc0
Finish system user view
2016-09-09 23:19:39 +08:00
ibuler
292179d41d
system-user
2016-09-09 21:48:44 +08:00
ibuler
a89ae94d85
Update system user create template script
2016-09-09 00:34:23 +08:00
ibuler
4fc9274e00
Add asset system user
2016-09-09 00:09:49 +08:00
ibuler
5259dd8054
Asset form: Add some comment
2016-09-08 22:54:05 +08:00
xiaokong1937@gmail.com
d8fe59debb
temp save for issue 8
2016-09-08 21:51:44 +08:00
ibuler
409fac3ef1
Merge branch 'admin-user'
2016-09-08 20:39:25 +08:00
ibuler
239dd0567f
Finish admin user view
2016-09-08 20:39:06 +08:00
xiaokong1937@gmail.com
62cac20ba7
fix #9
2016-09-08 19:30:22 +08:00
ibuler
ff30435eb4
Finish adin user add
2016-09-08 18:12:53 +08:00
ibuler
5a0b119410
Stash it
2016-09-08 00:59:00 +08:00
ibuler
ccfe9b9d08
Merge branch 'admin-user'
2016-09-08 00:41:22 +08:00
ibuler
6f4a832389
Add admin user list view
2016-09-08 00:40:59 +08:00
xiaokong1937@gmail.com
8acbcb2ed2
Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
2016-09-07 21:53:33 +08:00
xiaokong1937@gmail.com
04151b9957
user group quickedit frontend and rest API
2016-09-07 21:53:27 +08:00
ibuler
dfc628a397
modify idc
2016-09-07 21:03:18 +08:00
ibuler
4db352f55b
Add idc
2016-09-07 20:51:33 +08:00
ibuler
d8e6433404
Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
2016-09-07 20:06:01 +08:00
ibuler
d0ba17374e
Finish asset group create
2016-09-07 20:05:42 +08:00
xiaokong1937@gmail.com
7f09b486d9
user-group edit serializer and url implement
2016-09-06 21:44:23 +08:00
ibuler
30fd51c268
Asset group detail
2016-09-06 21:39:21 +08:00
xiaokong1937@gmail.com
556fb4e09f
refactor is_active trigger view and enable_otp trigger view in UserDetail page;trivial changes
2016-09-06 21:03:51 +08:00
xiaokong1937@gmail.com
a3096689b5
Merge branch 'xiaoyu'
2016-09-06 19:14:16 +08:00
wangyong
bc232c4f77
merge cmdb
2016-09-06 18:45:40 +08:00
wangyong
342e4bdee8
change some html
2016-09-06 18:43:13 +08:00
ibuler
dc01833a5b
Forget to forgot
2016-09-06 16:55:57 +08:00
ibuler
170b49428c
change date_added -> date_created
2016-09-06 16:50:19 +08:00
xiaoyu
c6f875c517
temp commit
2016-09-06 16:40:44 +08:00
ibuler
07dd6d1192
Reslove conflict
2016-09-06 15:56:03 +08:00
ibuler
25d9dbe93c
Merge with cmdb
2016-09-06 15:09:00 +08:00
xiaoyu
8cc09f0e5a
move login and logout view back to CBV
2016-09-06 15:03:37 +08:00
ibuler
02b5483d81
Update add->create edit->update and assetgrou->asset-grou etc format
2016-09-06 14:38:19 +08:00
ibuler
b8c10a0350
Add assetgroup form save action
2016-09-06 01:09:03 +08:00
ibuler
126d7fd62c
Add asset group add Form m2m
2016-09-06 00:49:42 +08:00
ibuler
3c6f50b788
Modify some bug
2016-09-05 23:42:10 +08:00
ibuler
2cb6b15bc3
set textarea rows
2016-09-05 23:12:01 +08:00
ibuler
2f5b7ad654
Modify asset model
2016-09-05 22:57:43 +08:00
xiaokong1937@gmail.com
6aedfb5219
fix small template erros
2016-09-05 22:20:50 +08:00
xiaokong1937@gmail.com
397da7d676
Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
2016-09-05 21:38:37 +08:00
xiaokong1937@gmail.com
e75d33439a
fix captcha not valid bug of login view; use django's default login and logout view to enhance robustness
2016-09-05 21:38:21 +08:00
ibuler
7241f7509f
Update nav
2016-09-05 20:27:44 +08:00
ibuler
8827fd2d74
Modify translation
2016-09-05 20:17:45 +08:00
ibuler
6fc3bbb97d
Update initial data: fixtures dir
2016-09-05 19:41:34 +08:00
ibuler
508bda37f5
Modify form datetime valid error, because form format
2016-09-05 19:37:37 +08:00
ibuler
a0ef3cfc34
Update locale dir name to zh
2016-09-05 19:17:18 +08:00
ibuler
1b9c9c48b6
Merge branch 'cmdb'
2016-09-04 21:54:17 +08:00
ibuler
22e20d29f5
Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
2016-09-04 21:50:39 +08:00
ibuler
0604f76f56
Merge branch 'cmdb' of code.simcu.com:jumpserver/jumpserver into cmdb
2016-09-04 21:47:20 +08:00
ibuler
4855e86a3f
Add asset group view
2016-09-04 21:47:10 +08:00
wangyong
69349368bf
cmdb merge model and url
2016-09-04 19:15:31 +08:00
wangyong
b531d9eeb2
asset add html
2016-09-04 19:12:31 +08:00
ibuler
246fcb8efa
Modify run_server.py
2016-09-04 19:10:28 +08:00
ibuler
3972bd3ff3
Add asset traslation
2016-09-04 19:05:47 +08:00
ibuler
d1c96cd4b2
Merge branch 'cmdb' of code.simcu.com:jumpserver/jumpserver into cmdb
2016-09-04 18:07:19 +08:00
ibuler
154783a974
Modify some and pull from server
2016-09-04 18:07:15 +08:00
wangyong
fa07f4ee8a
fix null
2016-09-04 18:06:14 +08:00
wangyong
0e8e88fac0
add admin|sys user model
2016-09-04 17:50:30 +08:00
wangyong
426c3c4062
add asset amdin|sys user model
2016-09-04 17:43:03 +08:00
ibuler
8d0334e003
Add translation
2016-09-04 17:34:48 +08:00
ibuler
0ab015abfd
Asset add traslation
2016-09-04 17:15:26 +08:00
ibuler
7350e150c8
Merge branch 'master' into cmdb
2016-09-04 16:39:27 +08:00
ibuler
61f0205529
Modify users url to singular
2016-09-04 16:05:58 +08:00
ibuler
11d06b5e2b
Add asset group view and url
2016-09-04 16:02:51 +08:00
ibuler
a9b5762fbc
Modify api style guide info
2016-09-04 15:31:10 +08:00
广宏伟
724b1c6fd4
Add new directory logs
2016-09-04 12:37:42 +08:00
ibuler
acd98365c1
Fix translation
2016-09-04 12:31:20 +08:00
liuzheng712
32c49c080c
update
2016-09-04 07:04:15 +08:00
liuzheng712
d371c0c5ae
mkdirp
2016-09-04 06:55:12 +08:00
ibuler
47171174b5
Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
2016-09-04 00:52:04 +08:00
ibuler
f274684473
Add translation for support i18n
2016-09-04 00:51:36 +08:00
wangyong
d96ac56460
merge master
2016-09-03 23:01:36 +08:00
wangyong
77f3a1f146
add asset add
2016-09-03 19:05:50 +08:00
ibuler
ba3f46fbd6
i18n
2016-09-03 19:02:18 +08:00
ibuler
0b406b6988
Add captch login using
2016-09-03 14:37:01 +08:00
ibuler
6f0cfd23c1
Rm logout.html
2016-09-03 00:39:52 +08:00
ibuler
10d51ada37
Update login error message
2016-09-03 00:39:06 +08:00
lijiejie
9fa70f6cb8
create a restframework api for cmdb models
2016-09-02 22:52:30 +08:00
lijiejie
cec5a7f2c6
create the restframework url
2016-09-02 22:51:10 +08:00
lijiejie
829df26b0f
create the api
2016-09-02 22:49:51 +08:00
ibuler
b8bebc9b64
Merge branch 'api' of code.simcu.com:jumpserver/jumpserver into api
2016-09-02 22:24:05 +08:00
ibuler
90ca5a8bb7
start capcha support
2016-09-02 22:23:15 +08:00
ibuler
2c11255828
Add capacha support
2016-09-02 22:21:26 +08:00
ibuler
9803dd9547
Add ico, Modify forget_password
2016-09-02 18:10:26 +08:00
ibuler
dcff84958f
Add run development server script: run_server.py
2016-09-01 23:10:28 +08:00
ibuler
3a9cf6c360
Add forget password and reset password
2016-09-01 23:09:58 +08:00
ibuler
8ff872f41d
Add ls config
2016-09-01 16:05:14 +08:00
ibuler
5940cec0e6
Add user and send mail
2016-09-01 01:12:02 +08:00
ibuler
5359da3ce2
Finish user login
2016-08-31 23:42:06 +08:00
ibuler
c9369db578
Add new login page
2016-08-31 20:39:25 +08:00
ibuler
d70deaf1ac
Modify config-example
2016-08-31 19:48:37 +08:00
ibuler
b31f8d5867
Add user generate reset password token
2016-08-31 19:28:06 +08:00
ibuler
5350f83275
Add celery usage more
2016-08-31 16:48:12 +08:00
广宏伟
dd80b94b43
Update README.md
2016-08-31 16:43:44 +08:00
广宏伟
4cbadbd941
Update README.rst
2016-08-31 16:43:18 +08:00
广宏伟
e61341df79
Update README.md to README.rst
2016-08-31 16:33:05 +08:00
ibuler
f7ab26a5da
Add celery broker
2016-08-31 15:54:04 +08:00
ibuler
0d3bde1191
User add confirmed
2016-08-31 12:14:25 +08:00
ibuler
c143735393
Add ssh-key-gen function
2016-08-31 01:00:20 +08:00
ibuler
43af5383e3
Add model user method: get_token set_token
2016-08-30 20:30:47 +08:00
ibuler
ffed46175d
update .gitignore
2016-08-30 17:26:33 +08:00
ibuler
31a39be9ea
Resolve conflicts
2016-08-30 17:22:06 +08:00
ibuler
2022ca8e10
Add test code
2016-08-30 17:20:39 +08:00
wangyong
d0d433db1a
add asset_list
2016-08-30 13:50:30 +08:00
yumaojun03
e8d8f7c406
ops: ansible_api add ansible api 2.0 adhoc runner
2016-08-30 13:00:06 +08:00
yumaojun03
f6b2abb1fb
add ansible 2.0
2016-08-30 01:16:14 +08:00
ibuler
011c125564
Modify user active api And Add Token authorization
2016-08-30 00:10:27 +08:00
ibuler
1a9f90a08e
Modify api
2016-08-29 21:09:32 +08:00
ibuler
3eb4897bd3
Merge branch 'api' of code.simcu.com:jumpserver/jumpserver into api
2016-08-29 19:27:23 +08:00
ibuler
3c9dbaf860
Fix some bug
2016-08-28 23:58:22 +08:00
ibuler
d918d5b466
Add Logger setting .
2016-08-26 16:56:50 +08:00
ibuler
d95ffdfbf7
Test permmision
2016-08-26 00:51:05 +08:00
yumaojun03
363ddb70e2
add celery support (not use django-celery)
2016-08-25 19:52:03 +08:00
ibuler
bb76f6c652
Add api authentication
2016-08-25 19:29:59 +08:00
ibuler
641e998504
Update context name path1, path2 => app, action
2016-08-25 13:56:49 +08:00
ibuler
0a9e4a5e85
Modify urls.conf: Merge to single
2016-08-25 13:28:02 +08:00
ibuler
8aa92bb688
Add api: UserApi And UserGroupApi
2016-08-24 19:42:16 +08:00
ibuler
1d5faa3101
Delete Model: Role
2016-08-24 17:14:21 +08:00
ibuler
b97b34961c
Modify api: complete some setting
2016-08-24 12:29:19 +08:00
liuzheng712
be92ac58ae
merge
2016-08-24 06:48:50 +08:00
liuzheng712
1df0def9ea
pip freeze
2016-08-24 06:47:14 +08:00
ibuler
a43ac90b21
Modify CRLF to LF
2016-08-24 00:13:58 +08:00
ibuler
bbecbc8578
Merge with webternimal
2016-08-24 00:12:46 +08:00
ibuler
6458231946
Add api file
2016-08-24 00:11:13 +08:00
yumaojun03
97a2e8bb50
test add celery
2016-08-23 23:51:39 +08:00
liuzheng712
400d744938
add api redirect
2016-08-23 23:29:33 +08:00
ibuler
9a6d20b6ec
Modify requirement: add some module
2016-08-23 23:00:55 +08:00
liuzheng712
7cebc4efe8
Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
2016-08-23 22:35:00 +08:00
liuzheng712
91f0800e26
add webterminal
2016-08-23 22:34:52 +08:00
ibuler
a99a6b6946
Split tests file in tests module
2016-08-23 22:19:39 +08:00
ibuler
c37dea2079
Add user add view Test Case
2016-08-23 19:36:15 +08:00
ibuler
b55b516fc3
Update foot_js.html add active
2016-08-23 17:34:52 +08:00
ibuler
1f3c0d004f
Change update batch, add _list_base.html
2016-08-23 17:14:08 +08:00
ibuler
3c3fda8064
Change chosen To select2 lib
2016-08-23 14:44:06 +08:00
ibuler
ae9bbb40fd
Add flash message template
2016-08-23 12:18:19 +08:00
ibuler
8e5e788bcd
Test case added
2016-08-23 00:39:07 +08:00
liuzheng712
c50cdd2976
add webterminal
2016-08-22 23:53:14 +08:00
ibuler
f45690b34f
Add test case
2016-08-22 19:53:01 +08:00
ibuler
f0b0e41d33
Update user edit
2016-08-21 22:37:55 +08:00
ibuler
308aa2eca2
Modify README.md
2016-08-21 22:26:50 +08:00
wangyong
3771b2ff70
add asset detail and list
2016-08-21 22:12:17 +08:00
ibuler
8b0f31c43a
modify list, edit url error
2016-08-21 21:32:20 +08:00
ibuler
8ba7b078fd
Finish expaire date
2016-08-21 21:31:25 +08:00
ibuler
57f0b04387
Modify project statucure guide and init data
2016-08-21 20:59:39 +08:00
ibuler
24d7cb3d5d
add init data dir fixture
2016-08-21 15:03:57 +08:00
ibuler
85cf2169d4
Modify readme
2016-08-21 13:59:44 +08:00
ibuler
0427d406b9
Add init data file
2016-08-21 01:16:30 +08:00
ibuler
96dd2f5c85
add config
2016-08-20 20:35:58 +08:00
ibuler
e355c7b8ef
Modify pagination and Role model
2016-08-20 18:33:18 +08:00
xRain
7789c8d13d
增加了缺失的必需组件
2016-08-20 09:44:40 +08:00
ibuler
6e46a17d98
Useradd group change
2016-08-20 00:42:50 +08:00
ibuler
e48f36397e
Modify url
2016-08-20 00:18:44 +08:00
ibuler
cf15b7eaff
Add UserGroup some View
2016-08-19 01:39:08 +08:00
ibuler
651e89994e
modify list and sort
2016-08-18 22:29:35 +08:00
ibuler
342298ad3e
reslove conflict
2016-08-18 14:43:10 +08:00
ibuler
a76191ffdc
Change view detail template
2016-08-18 10:20:37 +08:00
ibuler
279987925a
Modify user detail of usergroup
2016-08-18 00:47:34 +08:00
ibuler
824b1c7f6f
update user update view
2016-08-17 22:17:16 +08:00
ibuler
bcae7beae6
upload avatar
2016-08-17 00:36:54 +08:00
ibuler
9353022627
add context
2016-08-17 00:23:52 +08:00
ibuler
35abf16f7d
Modify panel color
2016-08-17 00:22:33 +08:00
ibuler
c14eb42186
reslove conflict add user detail template
2016-08-17 00:14:56 +08:00
ibuler
98d6043f2d
merged
2016-08-16 23:25:30 +08:00
ibuler
7a8d4a3a59
Add delete view
2016-08-16 22:13:06 +08:00
ibuler
3bf0d4aabb
Add common app
...
common app used as write public api or templatetags
modify user list view and user edit view
2016-08-16 00:09:48 +08:00
ibuler
edd60cad11
Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
2016-08-15 22:54:56 +08:00
广宏伟
e3223f745a
app users
...
Modify user list view
Modify user add view
2016-08-15 21:10:30 +08:00
wangyong
fcd39370ed
add asset some cbv
2016-08-14 22:10:10 +08:00
广宏伟
86ffcc973c
Add user template
2016-08-14 19:18:41 +08:00
ibuler
9493fb07cb
Add user list view
2016-08-14 17:21:04 +08:00
ibuler
9303415b89
modify some issues
2016-08-14 00:40:21 +08:00
ibuler
8b8e391feb
Modify project structure design
2016-08-13 22:02:05 +08:00
ibuler
234684c875
Rename dir name dashboard to apps
...
It's may be well
2016-08-13 21:59:08 +08:00
ibuler
25f1c9ccf3
Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
2016-08-13 16:17:42 +08:00
ibuler
1dd17b1814
Add django CBV interitance
2016-08-13 16:17:30 +08:00
广宏伟
089b54986a
Update README.md
2016-08-13 01:16:52 +08:00
ibuler
224797e5e7
Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
2016-08-13 01:11:58 +08:00
ibuler
346fbcc286
add logs,install dir, modify table_design
2016-08-13 01:11:46 +08:00
广宏伟
1ee53c6877
Update README.md
2016-08-13 01:09:33 +08:00
广宏伟
7f4d737503
Update README.md
2016-08-13 01:03:51 +08:00
ibuler
551d3df892
Finish table design
2016-08-13 00:18:34 +08:00
ibuler
b2bfdb097b
Modify table design
2016-08-12 19:34:26 +08:00
ibuler
40572cdc00
Modify table design
2016-08-11 15:49:24 +08:00
ibuler
46f0d17da7
update table_design.xml
2016-08-10 23:54:31 +08:00
ibuler
bc474c6c06
Add table design
2016-08-10 23:03:01 +08:00
ibuler
31a41000bf
添加 user 表结构,简单思考
2016-08-10 01:30:19 +08:00
ibuler
a5621a4178
修改README.md, 采用绝对地址
2016-08-09 19:43:20 +08:00
ibuler
17869dc5d8
修改README.md, 采用相对地址
2016-08-09 19:41:58 +08:00
ibuler
69c1639e46
修改 README.md 采用相对路径
2016-08-09 19:39:18 +08:00
ibuler
ffcd669898
修改readme显示,采用相对路径
2016-08-09 19:37:55 +08:00
ibuler
8121e48825
添加 api设计风格文档
...
详细描述了设计原则和遵守风格, 还不够完善,会随着开发进程逐渐完善它
2016-08-09 19:29:52 +08:00
ibuler
aed18698a3
修改python编码风格指导
...
添加api风格约定, python风格添加了详细说明,更改project的骨架说明
2016-08-09 18:36:13 +08:00
ibuler
e1d5cbd06e
添加 utils和api样例文件
2016-08-09 17:27:37 +08:00
ibuler
964247b1f2
修改 nav导航显示
2016-08-09 16:12:11 +08:00
ibuler
ef604615ec
修改项目骨架,添加前端框架 base.html
2016-08-09 14:42:21 +08:00
ibuler
bd3735e755
Change some word
2016-08-09 01:10:23 +08:00
ibuler
7bb6890370
Change content of README.md
2016-08-09 01:05:57 +08:00
ibuler
734f6564fa
Change project_structure content to a new file
2016-08-09 00:57:31 +08:00
ibuler
b5c159c967
Init project structure
2016-08-09 00:43:11 +08:00
ibuler
ba215335bf
Add .gitignore
2016-08-09 00:42:33 +08:00
ibuler
da4bd937a8
Merge branch 'dev'
2016-07-26 18:43:26 +08:00
ibuler
b5b14373d0
Merge branch 'master' of github.com:jumpserver/jumpserver
2016-07-26 18:42:40 +08:00
老广
270499a4fd
修改删除系统用户的交互 ( #276 )
...
* fix(api) 修改建立目录的bug
使用bash代替python完成建立777目录的功能
* fix passwd input
* fix(mkdir) 修改mkdirs策略
修改原来导致的bug
* fix passwd input (#232 )
修复记录敏感密码bug
* fix passwd input
* fix passwd input
* fix passwd input
* fix(connect) 输入role id时,输入了role名称异常
抓取后并处理
* Update perm_role_edit.html
* fix role delete
2016-07-26 18:41:58 +08:00
ibuler
26ad623d0e
fix role delete
2016-07-26 11:59:04 +08:00
ibuler
f8eedc8650
Merge branch 'dev'
2016-07-26 10:20:39 +08:00
ibuler
89e32b327d
Merge branch 'master' of github.com:jumpserver/jumpserver
2016-07-26 10:20:20 +08:00
假想控
27223a1883
Update next.py
...
修改安装成功访问web提示信息
2016-07-23 18:14:26 +08:00
老广
e0ae7eeee7
Update user_api.py
2016-07-12 17:08:26 +08:00
老广
b5fefb4687
Update user_api.py
2016-07-12 17:00:20 +08:00
chnliyong
ecfb2f3d40
fix reset password bug ( #274 )
...
感谢PR
2016-07-08 03:22:38 -05:00
老广
1614dd5a4d
Update README.md
2016-06-20 10:01:35 +08:00
liuzheng
cf3e89c374
Update run_server.py
...
because if someone need run jumpserver at 127.0.0.1 need this fix
2016-06-15 22:06:26 +08:00
老广
0f0908d3f3
Update jumpserver.conf
2016-06-14 17:32:28 +08:00
ibuler
31c3def1a8
Update group_add.html
2016-06-07 17:34:08 +08:00
ibuler
f75003461a
Update settings.py
2016-06-07 16:39:35 +08:00
ibuler
49504e46ee
Update docker-compose.yaml
2016-06-07 16:37:06 +08:00
ibuler
699bdd1348
Update config_tmpl.conf
2016-06-07 16:35:48 +08:00
ibuler
e608fbaad5
Update settings.py
2016-06-07 16:17:10 +08:00
ibuler
6a7d105484
Update jumpserver.conf
2016-06-07 16:12:38 +08:00
xRain
6acda5fcd1
add docker support and update the locally
2016-06-07 11:51:16 +08:00
xRain
57ba8ed2fb
add docker support
2016-06-07 11:49:59 +08:00
kikiyou
d6c4017a2e
使示例可以正确运行 ( #237 )
...
为了安全pattern=空,后示例代码无法使用,运行示例时加上pattern='*',使示例可以返回正确的结果
2016-06-06 21:55:54 -05:00
lrqrun
b7be5d14e0
User object is not the user, must update at the user ( #254 )
...
修改信息保存后数据不是最新的而是之前的数据,因为在object的惰性查询不会获取到最新的数据,因此需要在缓存的对象基础上修改save后commit到数据库。
2016-06-06 21:55:28 -05:00
lrqrun
f130a78f0a
users_selected keep new ( #255 )
...
用户组保存后数据显示的问题,在已选用户处显示选择的数据
2016-06-06 21:54:11 -05:00
__YoYO
a077053b68
Dev ( #250 )
...
* Update perm_role_edit.html
2016-06-06 21:52:41 -05:00
Kallen Ding
c93c8de7fe
Replace os.makedirs to mkdir. ( #251 )
...
解决Tty Logs 日志跨天后目录权限不对的问题
2016-06-06 21:50:38 -05:00
ibuler
3176156639
Update connect.py
2016-06-03 10:03:12 +08:00
ibuler
7072d16f00
Update install.py
2016-05-31 19:25:10 +08:00
ibuler
f2dda35f28
Update footer.html
2016-05-19 17:47:50 +08:00
zheng
0cc04ee20d
Group edit ( #241 )
...
* 修复主机组编辑时回车导致主机丢失问题
在主机组编辑页面,如果直接执行回车会导致主机组中主机信息丢失。
本修复方法是关闭回车提交
* 编辑主机组在移除过滤保存时数据会丢失
现象:在反向移除选择的主机时,用过滤框搜索移除主机此时保存的数据是当前过滤显示的数据
后果:会造成原有主机组数据丢失
修复:在保存之前触发一次空值搜索
2016-05-18 05:14:18 -05:00
ibuler
7531a3ada7
修复编辑系统用户,用户名jsbug ( #240 )
...
* Update perm_role_edit.html
2016-05-18 04:08:12 -05:00
ibuler
08717d196f
Update perm_role_edit.html
2016-05-18 17:00:35 +08:00
ibuler
a1859676e4
fix(connect) 输入role id时,输入了role名称异常
...
抓取后并处理
2016-05-11 19:13:38 +08:00
ibuler
e4a54ddbf8
Merge branch 'master' into dev
2016-05-11 19:10:59 +08:00
ibuler
5b9a9779c8
Merge branch 'master' of github.com:jumpserver/jumpserver
2016-05-11 19:10:45 +08:00
ibuler
32ab8a1646
完美修复vim等交互式命令记录 ( #236 )
...
* fix(api) 修改建立目录的bug
使用bash代替python完成建立777目录的功能
* fix passwd input
* fix(mkdir) 修改mkdirs策略
修改原来导致的bug
* fix passwd input (#232 )
修复记录敏感密码bug
* fix passwd input
* fix passwd input
* fix passwd input
2016-05-11 18:48:38 +08:00
kelianchun
f0e943ebcc
Merge pull request #235 from jumpserver/fix_passwd_input
...
fix passwd input
2016-05-11 18:29:21 +08:00
kelianchun_miller
c0e91896df
fix passwd input
2016-05-11 18:27:26 +08:00
ibuler
d60562a034
修复交互式记录密码bug,merge to master ( #234 )
...
* fix(api) 修改建立目录的bug
使用bash代替python完成建立777目录的功能
* fix passwd input
* fix(mkdir) 修改mkdirs策略
修改原来导致的bug
* fix passwd input (#232 )
修复记录敏感密码bug
* fix passwd input
* fix passwd input
2016-05-11 17:44:22 +08:00
ibuler
93e08a6e29
修复创建tty日志文件失败, 请修改目录 bug ( #231 )
...
* fix(api) 修改建立目录的bug
使用bash代替python完成建立777目录的功能
* fix passwd input
* fix(mkdir) 修改mkdirs策略
修改原来导致的bug
* fix passwd input (#232 )
修复记录敏感密码bug
* fix passwd input
* fix passwd input
2016-05-11 17:41:46 +08:00
ibuler
0f09172ed0
conflict reslove
2016-05-11 17:38:38 +08:00
ibuler
948763443e
Merge branch 'fix_passwd_input' of github.com:jumpserver/jumpserver into fix_passwd_input
2016-05-11 17:21:41 +08:00
kelianchun_miller
3ef3b452e2
fix passwd input
2016-05-11 17:21:15 +08:00
ibuler
39ebdb2f61
Merge branch 'fix_passwd_input' of github.com:jumpserver/jumpserver into fix_passwd_input
2016-05-11 17:20:47 +08:00
kelianchun_miller
dff50305de
fix passwd input
2016-05-11 17:18:40 +08:00
ibuler
f71c8551e8
fix passwd input ( #232 )
...
修复记录敏感密码bug
2016-05-11 11:31:53 +08:00
ibuler
d63d4eb019
Merge branch 'dev' into fix_passwd_input
2016-05-11 11:25:43 +08:00
zheng
d66ba9d6c6
修复主机组编辑时回车导致主机丢失问题 ( #230 )
...
在主机组编辑页面,如果直接执行回车会导致主机组中主机信息丢失。
本修复方法是关闭回车提交
2016-05-11 11:22:08 +08:00
ibuler
8526437c88
fix(mkdir) 修改mkdirs策略
...
修改原来导致的bug
2016-05-11 11:19:32 +08:00
kelianchun_miller
987b1c2c36
fix passwd input
2016-05-11 11:10:48 +08:00
ibuler
18e159350b
fix(api) 修改建立目录的bug
...
使用bash代替python完成建立777目录的功能
2016-05-11 11:10:02 +08:00
ibuler
1338d25b4e
fix bug
2016-05-10 13:55:06 +08:00
ibuler
f994c4d1da
fix(connect.py) 修复max引起的异常
...
已经修复
2016-05-10 13:48:55 +08:00
ibuler
5fab276c26
fix(jperm) fix jperm role detail list.
...
* 1. Add a window to list pushed error asset
* 2. Fix old bug for pagninator
2016-05-10 12:19:54 +08:00
ibuler
9f171da570
修复cli 端资产列表显示 ( #226 )
...
* modify(jperm) 授权列表模糊搜索
修改授权规则搜索为模糊搜索
* fix(cli nav align) Max Hostname length 30, else will be truncate.
2016-05-10 10:11:32 +08:00
ibuler
fed00d04a6
fix(cli nav align) Max Hostname length 30, else will be truncate.
2016-05-09 20:19:01 +08:00
ibuler
ecfaf9f02d
modify(jperm) 授权列表模糊搜索 ( #225 )
...
修改授权规则搜索为模糊搜索
2016-05-09 18:54:33 +08:00
ibuler
d05e9d0b45
modify(jperm) 授权列表模糊搜索
...
修改授权规则搜索为模糊搜索
2016-05-09 18:53:04 +08:00
ibuler
d4385c7e43
Merge branch 'master' into dev
2016-04-28 15:56:22 +08:00
ibuler
04fc9962ff
Merge branch 'dev'
2016-04-28 15:55:08 +08:00
ibuler
2fd68845ce
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2016-04-28 15:54:33 +08:00
yumaojun03
bd69339e22
Bug fix hostname ( #216 )
...
* fix (jasset): 修复资产hostname过长和密码过长引起的bug
1. 修改password字段的长度,对称加密过后的字符串会变长,所有设置得比较大(256)
2. 添加check hostname 和 password的 长度校验
* fix (jumpserver/jasset): 修复setting时,秘密过长问题。
1. 修改password字段的长度,对称加密过后的字符串会变长,所有设置得比较大(256)
2. 后端修复views秘密超过30位不保存
3.前段使用js限制秘密长多不能超过30位
* fix (jumpserver/jasset): setting and asset hostname password too long.
1. 添加setting password字段长度验证
2. 添加资产主机名和密码长度验证
* fix (jumpserver/jasset): setting and asset hostname password too long.
1. 修正setting时的 输入密码的提示错误.
2016-04-28 15:44:48 +08:00
liuzheng
c6404f7ed6
Static bug ( #208 )
...
* 紧急修复下载文件后静态文件404问题
* 紧急修复监控白屏问题
* 紧急修复下载文件后静态文件404问题
* 紧急修复下载文件后静态文件404问题
* 修复zip包为空问题
2016-04-24 20:42:02 +08:00
huangguozhen
6ce948366d
Update base.html ( #213 )
...
fix(frontend): use webkit default in multi kernel browsers
2016-04-23 10:35:28 +08:00
ibuler
9e78fd3651
Merge master to dev ( #212 )
...
* Update install.py
修改centos7支持
* Update install.py
* Support resize web terminal size
Support resize web terminal size.
Change new windows to a new tab.
May be more hommization
* Static bug (#204 )
* 紧急修复下载文件后静态文件404问题
* 紧急修复监控白屏问题
* bugfix(upload web) When download file, static file will unreachable.
Didn't change dir
fixed
* bugfix(upload web) When download file, static file will unreachable. (#206 ) (#207 )
* Update install.py
修改centos7支持
* Update install.py
* Support resize web terminal size
Support resize web terminal size.
Change new windows to a new tab.
May be more hommization
* Static bug (#204 )
* 紧急修复下载文件后静态文件404问题
* 紧急修复监控白屏问题
* bugfix(upload web) When download file, static file will unreachable.
Didn't change dir
fixed
* fix bug index out of range (#210 )
2016-04-22 11:51:36 +08:00
kelianchun
5afd135967
fix bug index out of range ( #210 )
2016-04-22 11:49:50 +08:00
ibuler
d5aa9324fa
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2016-04-21 18:12:58 +08:00
ibuler
9096a6e5b8
bugfix(upload web) When download file, static file will unreachable. ( #206 ) ( #207 )
...
* Update install.py
修改centos7支持
* Update install.py
* Support resize web terminal size
Support resize web terminal size.
Change new windows to a new tab.
May be more hommization
* Static bug (#204 )
* 紧急修复下载文件后静态文件404问题
* 紧急修复监控白屏问题
* bugfix(upload web) When download file, static file will unreachable.
Didn't change dir
fixed
2016-04-20 15:21:55 +08:00
ibuler
cb58012a82
bugfix(upload web) When download file, static file will unreachable. ( #206 )
...
* Update install.py
修改centos7支持
* Update install.py
* Support resize web terminal size
Support resize web terminal size.
Change new windows to a new tab.
May be more hommization
* Static bug (#204 )
* 紧急修复下载文件后静态文件404问题
* 紧急修复监控白屏问题
* bugfix(upload web) When download file, static file will unreachable.
Didn't change dir
fixed
2016-04-20 15:20:11 +08:00
ibuler
58bb3cc84f
Merge branch 'dev'
...
fix download error
static file lost
2016-04-20 15:17:04 +08:00
ibuler
c2ff05201a
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2016-04-20 14:44:06 +08:00
yumaojun03
9be13cf08f
fix (jperm): 修复密码添加和更新 role时 密码过长引起的bug ( #202 )
...
1. 修改password字段的长度,对称加密过后的字符串会变长,所有设置得比较大(512)
2. 修改后端检查密码长度,并触发异常。
2016-04-20 14:31:52 +08:00
ibuler
eb4ec47f7a
bugfix(upload web) When download file, static file will unreachable.
...
Didn't change dir
fixed
2016-04-20 14:29:11 +08:00
liuzheng
e2eb9b72f8
Static bug ( #204 )
...
* 紧急修复下载文件后静态文件404问题
* 紧急修复监控白屏问题
2016-04-20 13:08:26 +08:00
ibuler
c9ff235089
fix(connect) input exact ip for connect
...
modify search strategy
if some ip match pass
2016-04-16 16:27:15 +08:00
ibuler
9af809a4f0
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2016-04-12 11:12:32 +08:00
Astraeux
288a42663a
TTY nav sort by ip / hostname / none ( #198 )
...
* TTY nav sort by ip / hostname / none
* add newline at end of file
2016-04-12 11:11:19 +08:00
liuzheng
cca15d4211
Support resize web terminal size
...
Support resize web terminal size.
Change new windows to a new tab.
May be more hommization
2016-04-07 15:45:48 +08:00
jiaxiangkong
fe2081b407
Update install.py
2016-04-07 15:07:03 +08:00
ibuler
fa323d4987
Update install.py
...
修改centos7支持
2016-04-07 11:56:00 +08:00
ibuler
eeef4a2f95
Merge branch 'windowResize' of github.com:jumpserver/jumpserver into windowResize
2016-04-06 13:04:47 +08:00
liuzheng712
2e49f51093
update
2016-04-06 12:58:00 +08:00
ibuler
0481e83ec4
Merge branch 'dev' into windowResize
2016-04-06 12:57:54 +08:00
liuzheng712
ff8b5bd6c0
默认terminal100x35
2016-04-06 10:26:30 +08:00
liuzheng712
aabab653d3
默认terminal大小100x35
2016-04-06 10:24:18 +08:00
ibuler
efe0b3acc0
Fix nav info and delete user key when delete a user
...
Fix nav info and delete user key when delete a user
reviewd by ibuler <ibuler@qq.com >
2016-04-05 23:47:27 +08:00
ibuler
35cc966132
change(info) Modify some nav info
...
May be clearly.
2016-04-05 23:44:01 +08:00
ibuler
777997202b
patch again with 1f09a40c77
...
print => debug
2016-04-05 22:37:55 +08:00
ibuler
1f09a40c77
fix(user manage and connect first login)
...
When delete a user, but didn't delete the user sysuser key. When create
a user with same username, error occur.
When user login tty, and type a num first, it will search a host, but
login the asset with the id.
fixed
2016-04-05 22:34:37 +08:00
ibuler
d20fecadac
Merge branch 'dev'
2016-04-05 16:53:06 +08:00
ibuler
fa430bf104
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2016-04-05 16:52:44 +08:00
ibuler
8bb66ac254
fix(install.py) delete old pycrypto module
...
fixed
2016-04-05 16:51:58 +08:00
liuzheng712
6518aa3670
bugfix
2016-04-05 13:05:07 +08:00
liuzheng712
c76d9ebd88
bugfix
2016-04-05 12:56:37 +08:00
liuzheng712
7f4d3ffdbc
bug_fix
2016-04-05 12:54:37 +08:00
liuzheng712
b908fdafc6
udpate
2016-04-05 12:50:09 +08:00
liuzheng712
ef59cff44b
bug_fix
2016-04-05 12:42:44 +08:00
ibuler
f511802db5
fix asset group judge
...
reviewed by: ibuler <ibuler@qq.com >
2016-04-05 11:22:31 +08:00
ibuler
30c74b8427
Merge pull request #192 from jumpserver/group_judge
...
new feature (connect) Ignore case in searching
2016-04-05 11:19:55 +08:00
ibuler
2dd16b91ec
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2016-04-05 11:18:54 +08:00
liuzheng712
bb7a3ea053
Merge branch 'master' of github.com:jumpserver/jumpserver
2016-04-05 10:53:47 +08:00
liuzheng712
0499a7265a
手动修改窗口大小问题
2016-04-05 10:53:35 +08:00
ibuler
1959c685b9
new feature (connect) Ignore case in searching
...
finshed
2016-04-01 17:52:47 +08:00
ibuler
cd80fbcdbb
Merge pull request #190 from jumpserver/dev
...
Dev
2016-04-01 17:24:45 +08:00
ibuler
5814b833ed
Merge pull request #189 from jumpserver/webexec_log
...
Webexec log
2016-04-01 16:44:35 +08:00
ibuler
cda0b9c90a
fix(web exec) Web execute command log didn't get the real ip if behind the lb proxy.
...
fixed
2016-04-01 16:42:01 +08:00
ibuler
609bba569e
fix(web exec) Web execute command log didn't get the real ip if behind the lb proxy.
...
fixed
2016-04-01 16:40:53 +08:00
ibuler
77c7f8fb54
fix(web exec) Web execute command log didn't get the real ip if behind the lb proxy.
...
fixed
2016-04-01 16:38:37 +08:00
ibuler
f65290ef38
Merge pull request #188 from jumpserver/dev
...
新增功能
2016-04-01 13:49:28 +08:00
ibuler
de594aebd5
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2016-04-01 12:12:34 +08:00
ibuler
2be81c0322
fix(connect) delete debug
...
fixed
2016-04-01 12:11:31 +08:00
ibuler
e902fccd39
Merge pull request #187 from jumpserver/search_sort
...
feat (sort search) 对搜索结果排序
2016-04-01 11:54:28 +08:00
ibuler
61d162312f
Merge pull request #185 from Astraeux/support_amazon_linux
...
支持 Amazon Linux
2016-04-01 11:53:55 +08:00
ibuler
30a3cd2911
feat (sort search) 对搜索结果排序
...
tty登陆连接,搜索时对结果进行排序
finished
2016-04-01 11:50:35 +08:00
ibuler
2dfe9337a2
Merge pull request #186 from jumpserver/conn_search
...
fix(connect) 增加模糊搜索
2016-03-31 23:50:37 +08:00
ibuler
c188696328
fix(connect) 增加模糊搜索
...
之前只是输入id登陆,增加了模糊搜索登陆
如果搜索唯一则登陆
2016-03-31 23:45:01 +08:00
Astraeux
f8fac06e1b
支持 Amazon Linux
2016-03-31 15:14:41 +08:00
ibuler
edad26e05b
Merge pull request #183 from jumpserver/connect_slow
...
fix(connect) 修复paramiko连接速度特么慢问题
2016-03-31 00:16:18 +08:00
ibuler
6c8117045f
fix(connect) 修复paramiko连接速度特么慢问题
...
导致的原因是 pycrypto库有问题
fixed
2016-03-31 00:14:46 +08:00
ibuler
b573170d69
Merge pull request #182 from jumpserver/web_width
...
fix(web terminal) 修改web terminal初始窗口大小
2016-03-30 22:25:35 +08:00
ibuler
1d14f08541
fix(web terminal) 修改web terminal初始窗口大小
...
代码缺陷,没有复用
2016-03-30 22:22:43 +08:00
ibuler
489d796d7b
Merge pull request #180 from jumpserver/bugfix
...
修复日志回放问题
2016-03-29 23:52:19 +08:00
liuzheng712
1efede4de8
bugfix
2016-03-29 21:37:56 +08:00
liuzheng712
a1187757bc
bugfix
2016-03-29 21:22:18 +08:00
liuzheng712
263ff1ee08
bugfix
2016-03-29 21:18:04 +08:00
liuzheng712
2f2289a863
bugfix
2016-03-29 21:16:30 +08:00
liuzheng712
e07305ef46
bugfix
2016-03-29 21:06:46 +08:00
liuzheng712
1c61ed6a8b
bugfix
2016-03-29 21:05:29 +08:00
liuzheng712
cf1da2a420
bugfix
2016-03-29 20:56:19 +08:00
liuzheng712
7de03c0fc7
Merge branch 'master' of github.com:jumpserver/jumpserver
2016-03-29 20:44:45 +08:00
liuzheng712
9c38f39e5b
紧急修复监控白屏问题
2016-03-29 17:20:05 +08:00
ibuler
0937e64c2e
Merge pull request #178 from jumpserver/dev
...
Fix a bug for get_log function
hot fix
2016-03-29 17:18:46 +08:00
ibuler
5a6e0283dd
Merge branch 'master' into dev
2016-03-29 17:17:54 +08:00
ibuler
5489797900
Merge branch 'dev'
2016-03-29 17:17:03 +08:00
liuzheng712
6e48fe6357
紧急修复监控白屏问题
2016-03-29 17:16:26 +08:00
ibuler
485b45675d
Merge pull request #177 from jumpserver/fixed_log
...
fix(log) fix load_full_log function bug
2016-03-29 17:14:15 +08:00
ibuler
d31f882f1a
fix(log) fix load_full_log function bug
...
fixed
2016-03-29 17:11:56 +08:00
ibuler
209c078614
Merge pull request #176 from jumpserver/merge_master
...
Merge with master
2016-03-29 15:39:46 +08:00
ibuler
d2b4594bc2
Merge branch 'master' into dev
2016-03-29 15:38:28 +08:00
ibuler
6fcfb385cd
Update README.md
2016-03-29 14:07:44 +08:00
ibuler
b12b83cbb5
Update requirements.txt
2016-03-29 14:07:14 +08:00
ibuler
26804b4093
Merge pull request #174 from jumpserver/dev
...
Release 0.3.1 version, Fix most bugs
2016-03-29 11:33:05 +08:00
ibuler
8ebcd47599
Merge pull request #173 from jumpserver/version_num
...
change(version num) change jumpserver version
2016-03-28 23:38:42 +08:00
ibuler
d810a082c5
change(version num) change jumpserver version
...
from 0.3.0 -> 0.3.1
2016-03-28 23:37:32 +08:00
ibuler
2f9255a46f
Merge pull request #172 from jumpserver/web_log
...
fix(web terminal and log kill) fix close web terminal when not init finished
2016-03-28 23:09:37 +08:00
ibuler
5d0171d5b7
fix(web terminal and log kill) fix close web terminal when not init finished
...
when web terminal not init complete, you close the window, online log you will see the log and cann't kill it
catch a except fix it
2016-03-28 23:04:30 +08:00
ibuler
c5382c88a2
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2016-03-28 22:59:35 +08:00
ibuler
98f9e632ac
Merge pull request #170 from jumpserver/TermLogRecorder
...
Term log recorder, 需要数据库增加filename字段
2016-03-28 22:59:06 +08:00
ibuler
f912869de6
fix(web monitor) 修改监控特殊编码卡住
...
编码字符,强制utf-8
2016-03-28 22:00:48 +08:00
liuzheng712
8cd6d23ff2
update
2016-03-28 20:24:02 +08:00
liuzheng712
f3d863ea45
filename
2016-03-28 20:19:49 +08:00
liuzheng712
958909551d
bug_fix
2016-03-28 20:09:51 +08:00
liuzheng712
b132a0c0b5
use_old_way
2016-03-28 20:06:05 +08:00
ibuler
6e7e4d4742
Merge pull request #169 from jumpserver/new-line-
...
New line
2016-03-28 19:16:48 +08:00
ibuler
c95c76d0e0
change(web terminal) 修复web terminal遇到-换行
...
添加css
white-space: nowrap;
display: inline-block;
之前通过修改字体解决
2016-03-28 19:14:45 +08:00
ibuler
8735af4cbb
fix(monitor) 修复监控-换行
...
修复实时监控-导致的换行,添加css
.terminal {
white-space: nowrap;
display: inline-block;
}
2016-03-28 19:11:56 +08:00
liuzheng712
edfef5822f
bug fix
2016-03-27 22:58:59 +08:00
liuzheng712
ebef54ca44
Merge branch 'TermLogRecorder' of github.com:jumpserver/jumpserver into TermLogRecorder
2016-03-27 22:30:04 +08:00
liuzheng712
c937abe098
bugfix
2016-03-27 22:29:39 +08:00
liuzheng712
587c9b2c3f
bugfix
2016-03-27 22:20:20 +08:00
kelianchun
74ac1dc06b
Merge pull request #167 from kelianchun/TermLogRecorder
...
connect.py use TermLog
2016-03-27 22:00:59 +08:00
kelianchun_miller
0707b68796
connect.py use TermLog
2016-03-27 22:00:00 +08:00
liuzheng712
445a83f78a
remove this log in loglist
2016-03-27 12:17:02 +08:00
liuzheng712
bc1d89da89
here I didn't use int to record the dict , changed
2016-03-27 11:13:15 +08:00
liuzheng712
dc5751951e
disuse pyinotify, use TermLogRecord to record the log and monitor
2016-03-27 11:11:50 +08:00
ibuler
3ca6629175
Merge pull request #166 from jumpserver/font_size
...
change(font) 修改使用websocket的页面字体,增加监控size
2016-03-26 11:42:12 +08:00
ibuler
1e1aa67b3e
change(font) 修改使用websocket的页面字体,增加监控size
...
增加 "Microsoft Yahei"
2016-03-26 11:39:49 +08:00
kelianchun
3dfd9cd512
Merge pull request #165 from kelianchun/dev
...
pull issue #120 remove ps1
2016-03-26 08:50:21 +08:00
kelianchun_miller
6a51bd1a1c
pull issue #120 remove ps1
2016-03-26 00:01:48 +08:00
liuzheng712
5e329f51a4
Merge branch 'dev' of github.com:jumpserver/jumpserver into TermLogRecorder
2016-03-25 23:58:04 +08:00
kelianchun
d86cebf99a
Merge pull request #164 from kelianchun/dev
...
pull issue #120 remove ps1
2016-03-25 23:55:26 +08:00
liuzheng712
9b43c6c238
update
2016-03-25 23:52:48 +08:00
liuzheng712
1084be4712
update
2016-03-25 22:28:49 +08:00
liuzheng712
44b2bcb759
修改日志数据库部分
2016-03-25 22:24:56 +08:00
liuzheng712
2d1e001ddf
日志回放ok
2016-03-25 22:20:50 +08:00
liuzheng712
8e8d8c9d6a
日志回放OK
2016-03-25 22:19:31 +08:00
liuzheng712
a1862d912a
Merge branch 'dev' of github.com:jumpserver/jumpserver into TermLogRecorder
2016-03-25 21:08:55 +08:00
kelianchun_miller
fd713e0e5c
pull issue #120 remove ps1
2016-03-25 21:08:52 +08:00
ibuler
d7442b4879
Update views.py
2016-03-25 17:36:12 +08:00
ibuler
4f79e909e5
Merge pull request #161 from jumpserver/user_edit
...
fix(user edit) 修改用户导致密码问题
2016-03-25 17:20:21 +08:00
ibuler
69061791ed
fix(user edit) 修改用户导致密码问题
...
简单修改,更改结构和变量名
close #160
2016-03-25 17:18:41 +08:00
ibuler
38f15c976f
Merge pull request #159 from jumpserver/terminal_font
...
fix(web terminal) Windows 浏览器使用chrome -换行
2016-03-24 19:07:55 +08:00
ibuler
b745ebdda1
fix(web terminal) Windows 浏览器使用chrome -换行
...
经测试由于字体原因,可以安装Monaco字体解决,然而不太方便
添加第二字体为 微软雅黑,经测试解决
fixed
close #158
2016-03-24 19:03:20 +08:00
ibuler
ae58fd548f
Merge pull request #157 from jumpserver/force_del_user
...
fix(userdel) 修复无法删除在线用户bug
2016-03-24 18:07:28 +08:00
ibuler
fbc3078c07
fix(userdel) 修复无法删除在线用户bug
...
当用户已经登录到jumpserver时,web上删除用户时失败,也没有提示
修改方法: userdel -r -f 强制删除
close #156
2016-03-24 18:04:04 +08:00
liuzheng712
860c7f1508
Merge branch 'dev' of github.com:jumpserver/jumpserver into TermLogRecorder
2016-03-24 17:29:59 +08:00
liuzheng712
3fcd9589a4
update
2016-03-24 17:29:50 +08:00
liuzheng712
ba5e90abc3
update
2016-03-24 17:17:47 +08:00
kelianchun
5587ff59b0
Merge pull request #155 from kelianchun/dev
...
Dev
2016-03-24 13:35:46 +08:00
kelianchun
6d329b130a
remove ps1 search
...
remove ps1 search
2016-03-24 13:02:02 +08:00
liuzheng712
357aea1693
update jumpserver.conf only for myself
2016-03-24 12:49:39 +08:00
liuzheng712
3ab0c94496
update settings for myself, use sqlite
2016-03-24 12:49:06 +08:00
liuzheng712
b3f83c3362
update
2016-03-23 22:38:02 +08:00
liuzheng712
17a7470a2a
update_TermLogRecorder
2016-03-23 18:26:23 +08:00
liuzheng712
365a5ccd46
update_TermLogRecorder
2016-03-23 18:25:18 +08:00
liuzheng712
742a2b1b85
Merge branch 'dev' of github.com:jumpserver/jumpserver into TermLogRecorder
2016-03-23 17:08:33 +08:00
liuzheng712
388ebe3bee
update
2016-03-23 17:07:57 +08:00
ibuler
6d302eb25a
Merge pull request #154 from jumpserver/term_log_bug
...
fix: command recoder bug fix
2016-03-23 17:07:28 +08:00
liuzheng712
fa1f2404d9
日志记录
2016-03-23 17:05:35 +08:00
liuzheng712
52d8825d95
修复tmux等会重复出现命令的bug
2016-03-23 17:05:02 +08:00
liuzheng712
e743ae3dbe
model
2016-03-23 16:36:55 +08:00
kelianchun
db72048c31
Update run_server.py
2016-03-23 15:47:08 +08:00
liuzheng712
f1ff52eb6b
fix: command recoder bug fix
2016-03-23 15:46:42 +08:00
ibuler
0b05899818
Merge pull request #152 from jumpserver/pyte
...
change(install.py) 增加pyte库
2016-03-23 15:12:07 +08:00
ibuler
bd59b6316e
change(install.py) 增加pyte库
...
增加pyte库来分析命令
2016-03-23 15:10:28 +08:00
jiaxiangkong
2c74c8a8df
Update README.md
2016-03-23 14:42:26 +08:00
kelianchun
dc2ea0d6bf
Merge pull request #149 from kelianchun/dev
...
Dev
2016-03-23 12:40:06 +08:00
kelianchun
73382cbcfb
Update run_server.py
2016-03-23 12:37:55 +08:00
kelianchun
e6254ddc2c
deal command data
...
deal command data
2016-03-23 12:36:29 +08:00
kelianchun
30607730f2
Merge pull request #148 from kelianchun/dev
...
no command data
2016-03-23 12:29:38 +08:00
kelianchun
b92c5188d1
no command data
...
no command data
2016-03-23 12:28:32 +08:00
ibuler
524cd1d990
Merge pull request #147 from jumpserver/bug_asset_upload_01
...
fix asset upload bug
2016-03-23 12:09:20 +08:00
wangyong
231f961945
fix asset upload bug
2016-03-23 11:56:32 +08:00
ibuler
267c1cd696
Merge pull request #142 from jumpserver/bug_asset_upload
...
fix asset upload bug
2016-03-22 18:03:00 +08:00
wangyong
a1e947ae1e
fix asset upload bug
2016-03-22 17:32:43 +08:00
ibuler
300e106143
Merge pull request #140 from Astraeux/smtp_ssl_fix
...
SMTP发邮件支持SSL
2016-03-22 16:32:51 +08:00
ibuler
57e85affde
Merge pull request #141 from jumpserver/termShake
...
fix: when moniter the terminal, fix the shake
2016-03-22 10:22:42 +08:00
liuzheng712
34b74b9e4e
fix: when moniter the terminal, fix the shake
2016-03-21 22:51:28 +08:00
Astraeux
c218949556
SMTP发邮件支持SSL
2016-03-21 21:55:03 +08:00
Astraeux
4b90cd9b82
Merge pull request #3 from jumpserver/dev
...
update from origin
2016-03-21 20:08:34 +08:00
ibuler
fcb3fd7186
Merge pull request #139 from jumpserver/issue_52_bugfix
...
Issue 52 bugfix: 修复录像播放,web terminal hang住bug
2016-03-21 11:11:21 +08:00
ibuler
4dbc6803fb
Update README.md
2016-03-21 11:00:31 +08:00
ibuler
b6af8368b6
Merge pull request #138 from jumpserver/role_pass_long_bug
...
修复系统用户role密码过长引起的异常
2016-03-21 10:40:59 +08:00
ibuler
6e4b291808
fix(perm_role_edit) 修复编辑系统用户密码过长bug
...
1. 添加前端验证
close #173
2016-03-21 10:32:08 +08:00
ibuler
4c88ea3c05
fix(perm_role_add) 修复添加系统用户密码过长导致的异常bug
...
1. 修改表结构password长度
2. 修改template添加js验证
2016-03-21 10:30:29 +08:00
ibuler
0e5fd68e6c
Merge pull request #129 from jumpserver/bug_fix_100_and_127
...
fix (jperm): 统一调整系统用户 仅使用秘钥进行通信, 已存在的用户不会修改密码
2016-03-19 13:18:06 +08:00
liuzheng712
1103ee8f52
len(vim_data)
2016-03-18 23:55:06 +08:00
liuzheng712
9efa9e979c
len(vim_data)
2016-03-18 23:51:25 +08:00
liuzheng712
f331b4471f
Merge branch 'dev' of github.com:jumpserver/jumpserver into issue_52_bugfix
2016-03-18 23:41:19 +08:00
kelianchun
f11016f57c
Merge pull request #136 from kelianchun/dev
...
pull issue #120
2016-03-18 23:38:26 +08:00
Astraeux
4b53bae57b
Merge pull request #1 from jumpserver/dev
...
update from origin
2016-03-18 23:37:22 +08:00
kelianchun_miller
b2ccbc3f9e
pull issue #120
2016-03-18 23:36:31 +08:00
kelianchun_miller
7dcf050dc4
pull issue #120
2016-03-18 22:06:40 +08:00
kelianchun_miller
717869fd30
Merge remote-tracking branch 'remotes/origin/master' into dev
2016-03-18 22:04:12 +08:00
kelianchun_miller
598d6cffa4
pull issue #120
2016-03-18 20:43:25 +08:00
liuzheng712
c022c81100
Merge branch 'dev' of github.com:jumpserver/jumpserver into issue_52_bugfix
2016-03-18 17:32:46 +08:00
liuzheng712
5af9dd655e
delete_require_chardet
2016-03-18 17:08:15 +08:00
ibuler
abdf9c72ca
Merge pull request #122 from jumpserver/bug_fix_80
...
fix (jasset): 修复连接超时,以及freebsd无法更新硬件信息
2016-03-18 17:00:09 +08:00
ibuler
3778724b73
Merge pull request #134 from kelianchun/dev
...
修复命令截取bug
2016-03-18 16:46:02 +08:00
kelianchun
d76865c1ed
pull issue #120
...
修复了命令处理的bug
2016-03-18 15:38:31 +08:00
liuzheng712
3ccf7adac1
终于修复了乱码啦啦啦
2016-03-18 15:01:07 +08:00
yumaojun
c0e8ff8620
fix (jperm): 统一调整系统用户 仅使用秘钥进行通信, 已存在的用户不会修改密码
...
1. perm_role_add 同上 保留 密码选项
2. perm_role_edit 同上 保留 密码选项
3. 仅保持入数据,不设计远程操作
close #100
close #127
2016-03-16 23:03:43 +08:00
yumaojun
ca75484eb8
fix (jperm): 统一调整系统用户 仅使用秘钥进行通信, 已存在的用户不会修改密码
...
1. perm_role_push 模板取消密码选项,但是为了 那么留下秘钥推送可勾选,允许空推送
2. perm_role_add 同上 取消 密码选项
3. perm_role_edit 同上 取消 密码选项
4. views 调整role push add edit 相关视图
5. perm_api,调整 gen_resource,仅支持秘钥认证(是否需要支持密码认证,我觉得没必要,如果需要请提出)
close #100
close #127
2016-03-16 22:30:39 +08:00
liuzheng712
8adf1c5d71
requirement
2016-03-15 15:11:33 +08:00
liuzheng712
5f35b740df
test
2016-03-15 15:06:37 +08:00
liuzheng712
b0d1dd9485
test
2016-03-15 15:04:15 +08:00
liuzheng712
ade8fb927c
test
2016-03-15 15:02:16 +08:00
liuzheng712
31708c0d24
udpate
2016-03-15 14:53:30 +08:00
liuzheng712
9b3a51469e
install_chardet
2016-03-15 14:46:25 +08:00
yumaojun
cdd31227b7
fix (jasset): 修复连接超时,以及freebsd无法更新硬件信息
...
1. 超时原因应该是sshd 的配置引起的,当前bsd的更新 相对于其他发行版 慢,这个原因估计的bsd自身有关
2. ansible 的setup模块对于b sd获取的字段 越有偏差,而且无法获取硬盘信息,这个后期可以 提交patch 给ansible的setup模块。
close #80
2016-03-14 22:47:33 +08:00
jiaxiangkong
b02a45ee6c
Update README.md
2016-03-10 17:43:37 +08:00
jiaxiangkong
f796e8f673
Update README.md
2016-03-10 17:42:45 +08:00
jiaxiangkong
930c57398a
Update README.md
2016-03-10 17:40:54 +08:00
ibuler
6b39c9946b
Merge pull request #116 from jumpserver/bug_fix_guang
...
fix(bug) 修复首页点击头像404问题
2016-03-06 09:51:31 +08:00
ibuler
3a71d7f1a8
fix(bug) 修复首页点击头像404问题
...
处理结果,直接干掉连接
2016-03-06 09:50:01 +08:00
liuzheng712
d48020a919
test
2016-03-04 23:59:18 +08:00
liuzheng712
210b3c8588
test
2016-03-04 23:57:39 +08:00
liuzheng712
bdf6d97478
test
2016-03-04 23:50:19 +08:00
liuzheng712
1ac9bebb8d
fix: delete monkey patch
2016-03-04 23:17:19 +08:00
liuzheng712
ef3156e6f7
fix(test): monkey patch
2016-03-04 23:15:39 +08:00
liuzheng712
95a7557acf
fix:
2016-03-04 20:42:08 +08:00
liuzheng712
8e30ffb840
fix(run_server.py): test if it invoke_shell bug
2016-03-04 20:40:37 +08:00
liuzheng712
20b5facc38
fix(webterminal): data
2016-03-04 20:30:58 +08:00
liuzheng712
f7eda41a54
fix(webterminal): data.data.data
2016-03-04 20:29:54 +08:00
liuzheng712
6a0edb63f0
fix(webterminal): data.data
2016-03-04 20:28:52 +08:00
liuzheng712
e7976e4235
fix(webterminal.js): }) bug
2016-03-04 20:22:46 +08:00
liuzheng712
2bd3fdb4e7
fix(webterminal): url bug
2016-03-04 20:21:20 +08:00
liuzheng712
94a4d68be2
fix(webterminal.js): send bug
2016-03-04 20:12:09 +08:00
liuzheng712
b879e724e2
fix(webterminal.js): forget rowHeight and colWidth
2016-03-04 20:09:05 +08:00
liuzheng712
234f79857c
fix(webterminal): change it to HTML5 websocket
2016-03-04 20:07:05 +08:00
liuzheng712
f73d34b9cc
fix(monitor): change monitor url
2016-03-04 19:48:52 +08:00
liuzheng712
936faad1b9
fix(base.jinja2): change script with term.js
2016-03-04 19:35:53 +08:00
ibuler
649783d2c3
Merge pull request #114 from jumpserver/bug_fix_guang
...
change(with pre fix) 修改安装和jumpserver.conf
2016-03-03 18:18:36 +08:00
ibuler
c0bacb7c7c
change(with pre fix) 修改安装和jumpserver.conf
...
上次修改已可以自动获取 ws地址,去掉无用设置和配置文件指定
去掉install.py中的设置
2016-03-03 18:16:11 +08:00
ibuler
6436fab837
Merge pull request #113 from jumpserver/bug_fix_guang
...
fix(ws protocal): 修复所有ws自动获取
2016-03-03 18:09:26 +08:00
ibuler
e38620a2a2
Merge pull request #111 from jumpserver/install_bug_fix
...
修复一些install.py 中的小问题
2016-03-03 18:08:04 +08:00
ibuler
702b1bd3b7
fix(ws protocal): 修复所有ws自动获取
...
自动获取websocket无需再手动指定
2016-03-03 18:05:10 +08:00
ibuler
c2c833f279
Merge pull request #112 from jumpserver/issue_110_bugfix
...
修复webterminal vim后命令double
2016-03-03 17:21:42 +08:00
liuzheng712
a816a7b149
fix(webterminal): bug fix test
2016-03-03 17:03:47 +08:00
liuzheng712
32519f8eae
fix:
2016-03-03 16:50:49 +08:00
liuzheng712
dbb4904513
fix(webterminal): test
2016-03-03 16:41:41 +08:00
liuzheng712
0e7a8c1a62
fix(webterminal): test
2016-03-03 16:39:14 +08:00
yumaojun
68582ca466
fix (install.py): 修复lockfile 创建失败问题
2016-03-03 16:37:12 +08:00
liuzheng712
b1f0297e82
fix(web terminal): test
2016-03-03 16:35:48 +08:00
liuzheng712
eeff2ab215
fix(webterminal): test
2016-03-03 16:34:22 +08:00
yumaojun
62fb6429f9
fix (install.py): 更新install.py 和 service.sh
...
1. 添加软件安装失败后的用户提醒
2. service.sh脚本添加对lockfile 目录缺失的处理。
2016-03-03 15:53:46 +08:00
ibuler
90c3ed96e3
Merge pull request #109 from jumpserver/bug_fix_guang
...
fix(web teminal): 修改动态改变窗口大小bug
2016-03-02 11:40:28 +08:00
ibuler
c79e625000
fix(web teminal): 修改动态改变窗口大小bug
...
变量名写错引起的不明显bug
2016-03-02 11:38:38 +08:00
Huang Chengwei
bce3def4c6
Update run_server.py
...
fix signal call in auth
2016-03-01 17:09:27 +08:00
ibuler
1437140f87
Merge pull request #108 from jumpserver/bug_fix_guang
...
fix(run_server.py) 修改一个常规错误,函数参数个数
2016-03-01 17:03:33 +08:00
ibuler
fd19bb6299
fix(run_server.py) 修改一个常规错误,函数参数个数
...
已fix
2016-03-01 17:01:11 +08:00
ibuler
a401440004
Merge pull request #105 from jumpserver/hot_fix_log
...
hot_fix(kill invalid connection) 紧急修复超时异常连接
修改日志参数
修改处理间隔,每10分钟处理一次
修改处理策略 ssh: 1小时不操作,就kill掉 web: 超过1天,就设置完成
2016-02-29 18:18:57 +08:00
ibuler
06aef8fb1a
Merge pull request #106 from jumpserver/issue_57_bug_fix
...
1. 修复tonrado数据库连接bug
2. 修改定期处理长时间连接
3. 添加nginx文档
ref #57
2016-02-29 18:18:10 +08:00
ibuler
c418f142ba
Merge remote-tracking branch 'origin/issue_57_bug_fix' into dev
2016-02-29 18:15:31 +08:00
ibuler
88d21caa19
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2016-02-29 18:14:50 +08:00
ibuler
f6c58054a6
Merge branch 'hot_fix_log' into dev
2016-02-29 17:59:25 +08:00
ibuler
b4d74bc589
hot_fix(kill invalid connection) 紧急修复超时异常连接
...
1. 修改日志参数
2. 修改处理间隔,每10分钟处理一次
3. 修改处理策略
ssh: 1小时不操作,就kill掉
web: 超过1天,就设置完成
2016-02-29 17:53:15 +08:00
ibuler
d7bb4c1005
fix(kill invalid connection) 紧急处理超时连接
...
1. 紧急修复异常bug
2. 修改处理策略
3. 每10分钟处理一次
ssh连接:超过1小时没有操作就干掉
web:超过1天的就设置完成
2016-02-29 17:48:14 +08:00
ibuler
3c610668b5
fix(invalid connection again) 定期处理长时间连接
...
1. 减少了处理时间间隔
2. 处理策略更改为 超过 1小时没有动的连接就干掉
2016-02-29 17:07:53 +08:00
ibuler
5d28a6e402
fix(invalid connection) 定期处理长时间连接
...
1. 减少了处理时间间隔
2. 处理策略更改为 超过 1小时没有动的连接就干掉
2016-02-29 16:35:09 +08:00
黄成维
e886b55727
fix signal send
2016-02-29 16:09:01 +08:00
黄成维
8c552ccc45
fix signal send
2016-02-29 16:06:20 +08:00
黄成维
054edeefb6
try fix tornado connection timeout
2016-02-29 15:03:48 +08:00
ibuler
6c599e0127
Merge pull request #101 from jumpserver/bug_fix_yu
...
install.py安装兼容多个平台
2016-02-29 12:21:41 +08:00
ibuler
4f97987061
Merge pull request #97 from jumpserver/bug_fix_guang
...
fix 启动脚本,配置文件,批量命令异常等
2016-02-29 12:17:31 +08:00
yumaojun
50e82c5b99
fix (install.py): 更新wiki地址
2016-02-29 11:08:48 +08:00
yumaojun
1f9337feca
fix (install.py): compatible fedora
...
1. mysql-python编译不过, 添加rpm-build 依赖
2016-02-29 10:58:31 +08:00
ibuler
cba53bba55
modify(jumpserver.conf) 修改jumpserver.conf默认配置
...
django和tornado统一入口后,配置默认启动端口80
websocket和web都使用该端口
2016-02-29 10:25:59 +08:00
yumaojun
427fda1015
fix (install.py): compatible fedora
...
1. compatible fedora (test fedora22)
2016-02-29 10:09:05 +08:00
yumaojun
a95e1bb835
fix (install.py): compatible fedora
...
1. compatible fedora (test fedora22)
2016-02-29 09:52:10 +08:00
Tad Wang
5ab882ae66
update configuration doc
...
typo of KEYWORD of SSL configuration
2016-02-29 01:37:20 +08:00
Tad Wang
e5ce5766be
add document for nginx ssl setting #88
...
add document for nginx ssl configuration. #88
2016-02-29 01:27:51 +08:00
ibuler
725405e4fd
change(install) 修改提示,更改变化的文件名 run_server.py
...
websocket -> websocket_url
2016-02-28 16:41:44 +08:00
ibuler
cad7a193b3
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2016-02-28 16:32:33 +08:00
ibuler
69ac8ae147
Merge pull request #99 from jumpserver/misunderstand_4_default_DB_user
...
安装脚本默认数据库用户名
2016-02-28 16:09:31 +08:00
yumaojun
247e5e7f24
fix (install.py): little update to contain liuzheng pr.
...
1. 请输入数据库服务器用户 [root] , 修改成 [jumpserver]
2016-02-28 15:55:21 +08:00
yumaojun
04821a00f8
fix (install.py): compatable centos7
...
1. use systemctl stop firewalld
2. add dependence: readline-devel and lrzsz
3. use mariadb as mysql server
2016-02-28 15:47:39 +08:00
yumaojun
ad3178fe94
fix (install.py): compatable centos7
...
1. use systemctl stop firewalld
2. add dependence: readline-devel and lrzsz
2016-02-28 15:23:14 +08:00
yumaojun
ccd1a10892
fix (install.py): compatable centos7
...
1. use systemctl stop firewalld
2. add dependence: readline-devel and lrzsz
2016-02-28 15:01:55 +08:00
yumaojun
b80ad40f54
fix (install.py): compatable centos7
...
1. use systemctl stop firewalld
2. add dependence: readline-devel and lrzsz
2016-02-28 14:40:17 +08:00
liuzheng712
7cf190e3f9
refactor(install/install.py): default database user should be jumpserver
2016-02-27 21:25:09 +08:00
yumaojun
cac94245ea
fix (install.py): ubuntu auto install mysql-server
...
1. set ansible_api connector as paramiko
2. set ubuntu apt-get --force-yes when install packages
2016-02-27 18:35:00 +08:00
yumaojun
a729e54425
fix (install.py): ubuntu auto install mysql-server
...
1. auto install mysql server
2016-02-27 13:24:19 +08:00
yumaojun
d4b57fc1b0
fix (install.py): ubuntu auto install mysql-server
...
1. auto install mysql server
2016-02-27 12:43:59 +08:00
yumaojun
d63b5772e4
fix (install.py): check platform
...
1. check platform , support CentOS, ReaHat, Fedora, Ubuntu, debian
2016-02-27 12:05:34 +08:00
yumaojun
37e0f80fb8
fix (install.py): fix install.py add user failed and service failed
...
1. use shlex.os.system replace subprocess.call
2. next.py use bash service start
2016-02-27 12:01:44 +08:00
ibuler
532fbbd4f1
change(service.sh, run_websocket) 修改启动脚本, rename run_websocket.py
...
1. 修改启动脚本,支持放到 init.d
2. rename run_websocket.py -> run_server.py 交互式启动
2016-02-27 01:26:36 +08:00
ibuler
16f5906979
Merge pull request #96 from jumpserver/ip_port_config
...
jumpserver.conf添加字段,tornado根据需求监听端口
2016-02-27 00:24:15 +08:00
ibuler
bf3fb24c3a
Merge pull request #95 from jumpserver/IP_get_bug
...
修复使用反向代理还不使用反向代理获取 remote_ip异常wen问题
2016-02-27 00:23:00 +08:00
ibuler
a8eb9f3e79
fix(jlog, websocket url) 修复ws使用 ws协议还是wss协议
...
1. 不再需要浏览器判断什么协议,需要在jumpserver.conf注明
ref #63
2016-02-27 00:19:04 +08:00
ibuler
a88d8ca410
fix(upload, download, exec, gn) 修复上传下载文件名,上传目录层次,执行命令回车报错,g+不存在id报错
...
1. 上传下载文件名 改为 时间+随机4位字母数字
2. 命令回车判断,为空返回
3. g+1判断,不过不存在该组,则返回
close #52
close #93
ref https://github.com/jumpserver/jumpserver/issues/53
ref https://github.com/jumpserver/jumpserver/issues/93
2016-02-26 23:51:21 +08:00
liuzheng712
ba8d808cd9
fix(service.sh): annotate django runserver
2016-02-26 23:09:19 +08:00
liuzheng712
d67aab573d
fix: ip and port use jumpserver.conf to configure
2016-02-26 22:59:17 +08:00
liuzheng712
5098b1c696
fix(run_websocket.py): remote IP get bug
...
when use nginx self.request.headers.get(X-Real-IP) will get real remote IP,
self.request.remote_ip will get 127.0.0.1 ; if not it will git null, so need to use
self.request.remote_ip for get the ip
2016-02-26 22:48:07 +08:00
yumaojun
0b9b94bc0b
Merge branch 'bug_fix_yu' into dev
...
# Conflicts:
# service.sh
2016-02-26 15:36:42 +08:00
yumaojun
8aec0c1ac7
fix (install jumpserver): install jumpserver compatible with ubuntu
...
1. install.py add platform judge, fix get_ip_addr function
2. next.py little adjust
3. service.sh little adjust
2016-02-26 14:13:21 +08:00
liuzheng712
77f69fbc5e
fix(service.sh): annotate django runserver
2016-02-26 11:52:53 +08:00
liuzheng712
14a0c1871f
Merge branch 'issue_59_bug_fix' into dev
2016-02-26 10:53:29 +08:00
liuzheng712
49e7796df9
Merge branch 'feat_Only_run_one' into dev
2016-02-26 10:45:40 +08:00
liuzheng712
318a053dbf
real ip
2016-02-26 10:38:04 +08:00
ibuler
29953eb7c7
Merge pull request #87 from liuzheng712/feat_run_one
...
整合Tornado和Django,修复web阻断功能
2016-02-26 10:12:23 +08:00
liuzheng712
1816723f16
fix(run_websocket.py): get real ip from headers
2016-02-25 22:43:52 +08:00
liuzheng712
5fb5c1bb40
merge
2016-02-25 21:16:09 +08:00
liuzheng712
4d5d56fe79
fix(jlog/views.py): kill bug, because cross domain
2016-02-25 21:07:18 +08:00
liuzheng712
7213c5c637
fix(log_online.html): log kill bug
...
change $.ajax to $.get
2016-02-25 21:04:27 +08:00
liuzheng712
eb161b978a
test kill
2016-02-25 21:00:48 +08:00
liuzheng712
23d4c926b7
web log_kill
2016-02-25 20:45:48 +08:00
liuzheng712
c354b64679
web log_kill
2016-02-25 20:44:13 +08:00
liuzheng712
9c93d5a8d2
add /ws/
2016-02-25 20:42:35 +08:00
liuzheng712
4f75f76db8
fix: web socket url update
2016-02-25 20:05:20 +08:00
ibuler
4dfef99216
Merge pull request #85 from jumpserver/bug_fix_issue_83
...
修复用户禁用后仍可ssh登陆跳板机
2016-02-25 18:42:59 +08:00
ibuler
47ce09393c
fix(connect.py) 用户禁用后仍可ssh登陆jumpserver
...
修改connect.py添加判断
资产禁用还没有考虑,改动太大,留后续版本更改
ref https://github.com/jumpserver/jumpserver/issues/83
2016-02-25 18:34:46 +08:00
liuzheng712
92e9f988f3
feat(run_websocket.py): add main function, it need only run run_websocket.py
...
I want to run one program at once, open two terminal is ridiculous
2016-02-25 16:51:41 +08:00
liuzheng712
037a88f0f5
fix(term.js): my mistake
...
use yoshiokatsuneo term.js
2016-02-25 13:58:31 +08:00
yumaojun
e8db8addd7
fix (service.sh): ubuntu service.sh 脚本不可用
...
由于service.sh 脚本依赖外部的函数库 /etc/init.d/functions, 而ubuntu 和其他一起系统并没有这个文件,所以直接把 这个文件copy 到了当前目录下
不在依赖外部环境。
2016-02-25 13:26:18 +08:00
ibuler
d0ba0503e5
Merge pull request #81 from jumpserver/v3.0_beta_issue_62
...
V3.0 beta issue 62 用户下载key后,就删除,为了安全
2016-02-25 13:15:13 +08:00
liuzheng712
27be35ae77
fix(user_list.html & juser/views.py): only for user delete sshkey when downloaded, add generate butt
...
https://github.com/jumpserver/jumpserver/issues/62
2016-02-25 13:04:09 +08:00
yumaojun
835706f780
fix (jperm.view): 修复回收主机时, 未修改sudoers文件的bug
...
1. 恢复ansible 使用的 连接器配置未 smart
2. 修改perm_role_recycle 删除, 添加回收sudo配置.
2016-02-25 11:59:29 +08:00
ibuler
f79675b265
Merge pull request #78 from jumpserver/bug_fix_guang
...
#78 统一资产添加文案,修改添加用户流程,修复添加系统用户使用key推送,不生成密码
2016-02-24 15:06:20 +08:00
ibuler
0a35f757e9
modify(function arg) only for writing style
...
修改函数使用kwarg
2016-02-24 14:46:28 +08:00
liuzheng712
856852592d
fix(term.js): CJK support, Copy and Paste support
...
Use yoshiokatsuneo's code, fix this bug. His idea is append a textarea and bind all click event on
it. That works for us
https://github.com/jumpserver/jumpserver/issues/59 https://github.com/chjj/term.js/pull/97
2016-02-24 13:39:00 +08:00
ibuler
f60a896926
modify(jasset) 统一管理用户文案
...
所有用得到管理用户文案的地,都进行了统一
更改了 管理用户使用默认的对齐
去掉了分隔线
2016-02-24 12:32:41 +08:00
ibuler
b6fc8b777f
change(juse) 修改用户添加流程
...
1. 添加新用户,不在为该用户设置密码
2. 强制用户使用key登陆跳板机,为了安全性
3. 更改邮件文案和不发送邮件提示文案
2016-02-24 12:29:47 +08:00
ibuler
caefbdc917
fix(juser) 推送系统用户,选择密钥时不为用户生成密码
...
当推送系统用户时,选择系统用户使用密钥时没有必要为系统用户生成密码,
以免造成安全上的问题,在代码上也属于冗余.
2016-02-24 11:34:33 +08:00
yumaojun
c6823be302
修复sudo 命令 小写all 引起的推送失败(map)
2016-02-23 23:29:15 +08:00
yumaojun
7bfb1d19fe
修复sudo 命令 小写all 引起的推送失败
2016-02-23 23:04:46 +08:00
yumaojun
f24b34758c
修复sudo 命令 小写all 引起的推送失败
2016-02-23 21:14:54 +08:00
ibuler
d4b1bdef8e
modify(with 0e9a962506) 变更启动脚本
...
1. 启动时添加 django crontab
2. 关闭时删除 django crontab
2016-02-23 18:46:00 +08:00
ibuler
dee1d31fc0
change(with 6be7003) 联动改变安装脚本
...
1. 为init.sh添加执行权限
2. 统一函数功能 修改其他需要改变权限的脚本或目录
2016-02-23 18:29:23 +08:00
ibuler
363bce82d8
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2016-02-23 17:49:59 +08:00
ibuler
6be7003ac2
bugfix(登录初始化) 避免登录时ctrl+c进入系统内部
...
此bug信息见 #72
1. 修改思路 重命名zzjumpserver.sh,并移动到外层
2. 服务器添加用户时指定shell为 some_dir/jumpserver/init.sh
升级修复方案:
1. 删除/etc/profile.d/zzjumpserver.sh
2. git pull 更新
3. vim编辑 /etc/passwd,把之前建的用户的sh改为 some_dir/jumpserver/init.sh
终
Closes #72
closes #31
2016-02-23 17:40:33 +08:00
ibuler
586e43c8d0
Merge pull request #71 from jumpserver/dev
...
fix(bsd推送系统用户bug)
2016-02-23 15:50:59 +08:00
ibuler
18e66f52dd
Merge remote-tracking branch 'origin/dev' into dev
2016-02-23 15:45:32 +08:00
yumaojun
09e86f0a6b
Merge branch 'dev' of https://github.com/jumpserver/jumpserver into dev
2016-02-23 15:22:15 +08:00
yumaojun
3b5daf19c3
1. 修复freebsd 推送带sudo规则的用户时 , sudo 路径引发的问题。
2016-02-23 15:21:27 +08:00
liuzheng712
a037108cf3
refactor: double meaning
2016-02-23 14:23:07 +08:00
liuzheng712
b8a8c3ebf3
feat(juser/views.py;func:down_key): delete the private key when user download it
...
issue:62
2016-02-23 14:15:55 +08:00
ibuler
9fa7f8762e
Merge branch 'master' into dev
2016-02-23 13:35:36 +08:00
ibuler
9ec457bf5f
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2016-02-23 13:35:28 +08:00
ibuler
2691cc0b6d
Merge branch 'master' into dev
2016-02-23 13:33:32 +08:00
yumaojun
4645029a27
1. 配置ansible 使用paramiko进行链接(ssh 有卡死问题, 等待反馈.)
...
2. 修复freebsd 推送带sudo规则的用户时 由于 sed 引起的问题。
2016-02-23 11:48:09 +08:00
ibuler
b1768565c1
修复
...
1. 推送时 验证改为 /usr/sbin/visudo -c
2. 添加系统用户的key 认证更改 支持 RSA|DSA
3. web terminal 行数 -1
2016-02-22 16:31:33 +08:00
ibuler
7323b72c4b
修复
...
1. 推送时 验证改为 /usr/sbin/visudo -c
2. 添加系统用户的key 认证更改 支持 RSA|DSA
3. web terminal 行数 -1
2016-02-22 16:29:36 +08:00
ibuler
2e5c01a4da
Merge pull request #47 from iambocai/master
...
当用户未被授予任何角色/主机权限时,提示用户
根据用户实际安装路径,替换启动脚本中connect.py的路径
修正几处拼写错误
2016-02-20 22:53:27 +08:00
ibuler
19dd1af4dc
Merge pull request #49 from wangjunj/master
...
添加本地mysqld自启动服务
2016-02-20 22:51:15 +08:00
ibuler
0e9a962506
具体体现在 日志监控页,定期回收过期的在线log
...
需要运行python manage.py crontab add来添加
运行 python manage.py crontab remove 来去掉
crontab -l
2016-02-20 16:02:31 +08:00
iambocai bob.chen.cs@gmail.com
fa195c3808
update for pull#47
2016-02-17 15:16:36 +08:00
wangjunj
cd6cfc6ae9
Update install.py
2016-01-28 23:08:12 +08:00
wangjunj
02e9ba54f9
添加本地mysqld自启动服务
...
添加数据库自启动服务。修复服务器重启后./server.sh start 会提示错误——“Starting jumpsever
service:run_websocket.py not running”
2016-01-28 14:50:57 +08:00
ibuler
b79056295b
Merge branch 'dev'
2016-01-26 15:37:27 +08:00
ibuler
8653630d83
Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev
2016-01-26 15:37:19 +08:00
ibuler
99f09709ec
修改默认端口获取
2016-01-26 15:37:12 +08:00
wangyong
bcb914485d
fix asset edit port not save
2016-01-26 15:35:47 +08:00
iambocai bob.chen.cs@gmail.com
0b79f754f9
1. 当用户未被授予任何角色/主机权限时,提示用户
...
2. 根据用户实际安装路径,替换启动脚本中connect.py的路径
3. 修正几处拼写错误
2016-01-25 18:21:07 +08:00
ibuler
fe87e32e2b
roll back
2016-01-21 19:37:20 +08:00
ibuler
9c9390878e
Merge branch 'master' of github.com:ibuler/jumpserver
2016-01-21 18:17:29 +08:00
ibuler
1c2cba64ec
修改推送默认端口bug
2016-01-21 18:17:18 +08:00
ibuler
b69853a608
Merge pull request #46 from wptad/master
...
监控支持 ssl
2016-01-21 13:21:59 +08:00
Tad Wang
852de35e3e
fix term.js input error problem
...
handler is undefined.
2016-01-21 13:02:23 +08:00
Tad Wang
6fbb387488
fix wss support for web_monitor_uri
...
Https support
2016-01-21 11:53:56 +08:00
ibuler
36bfb50aad
系统用户支持.
2016-01-18 12:01:39 +08:00
ibuler
28e0ea3e81
支持用户名带小数点,上传文件大小最大2G
2016-01-15 15:54:49 +08:00
ibuler
6ba9191b30
update LANG setting
2016-01-14 11:58:53 +08:00
ibuler
b6f82ca020
修复vim修改窗口大小中断bug
2016-01-14 11:10:07 +08:00
ibuler
81a6f4841f
修复用户组编辑导致该用户组都丢失问题
2016-01-14 11:01:19 +08:00
ibuler
f2487a22cd
修复 su - 无法获取 Env的bug
2016-01-13 17:57:32 +08:00
ibuler
4d0331e105
Update connect.py
2016-01-13 15:51:29 +08:00
ibuler
66e53c2701
Update zzjumpserver.sh
2016-01-13 14:06:36 +08:00
ibuler
2e6f3d3579
Merge pull request #42 from hhding/master
...
Get SSH client IP address from environment
2016-01-13 13:20:28 +08:00
ibuler
80fde52dc5
Merge pull request #38 from wptad/master
...
fix wss issue when using https #37 支持 wss 和 https
2016-01-13 12:32:16 +08:00
ibuler
82a88e0b0a
fix 硬盘超过6块数据库溢出
2016-01-12 22:39:44 +08:00
wangyong
d3f9fc7a21
disk length 128 to 1024
2016-01-12 22:17:02 +08:00
ibuler
9d7c30336e
修复中文字符报错
2016-01-11 18:12:30 +08:00
ibuler
ff5b339ce8
Update asset_cu_list.html
2016-01-09 21:51:07 +08:00
ibuler
70c86d2a44
修改windows下 web terminal窗口高度
2016-01-09 21:50:22 +08:00
ibuler
0924484bc4
Update install.py
2016-01-09 21:42:44 +08:00
Honghui Ding
dd36857cf8
Get SSH client IP address
2016-01-09 07:37:28 +00:00
ibuler
2f54c369f7
Update README.md
2016-01-08 17:16:06 +08:00
ibuler
9e5402e2c3
Merge branch 'master' of github.com:ibuler/jumpserver
2016-01-08 11:49:33 +08:00
ibuler
097d77755a
Merge branch 'dev'
2016-01-08 11:48:57 +08:00
wangyong
4fbeb5c172
fix cpu bug
2016-01-07 19:19:05 +08:00
ibuler
23b04fbbd7
Merge pull request #36 from chnliyong/master
...
Ubuntu的passwd命令不支持--stdin选项,使用chpasswd替代,在CentOS上已经验证有效
2016-01-07 19:06:12 +08:00
Tad Wang
d9455e3f9b
fix wss issue when using https #37
2016-01-07 15:59:57 +08:00
yumaojun
beeb2442ad
回收sudo用户, 添加sudo别名添加规则检查
2016-01-07 15:21:39 +08:00
yumaojun
f6a228008b
回收sudo用户, 添加sudo别名添加规则检查
2016-01-07 15:15:44 +08:00
LI Yong
73522dc4c1
Ubuntu's passwd command doesn't support --stdin option, use chpasswd which is also available in CentOS
2016-01-07 14:09:11 +08:00
ibuler
d9b4f5504c
Merge branch 'dev'
2016-01-05 19:29:56 +08:00
yumaojun
01511c0d5a
Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev
2016-01-05 17:22:44 +08:00
yumaojun
01cf2d4e7b
删除role时提醒那些 主机上的系统用户会被删除, (需求: http://bbs.jumpserver.org/read/325.html)
2016-01-05 17:22:25 +08:00
ibuler
e9212d5ce6
fix普通用户大小修改
2016-01-04 17:15:33 +08:00
ibuler
bc2345ba14
Merge branch 'master' of github.com:ibuler/jumpserver
2016-01-04 16:38:20 +08:00
wangyong
c2818870d3
fix aliyun disk bug
2016-01-04 16:37:02 +08:00
ibuler
38b0f2f5f9
Merge pull request #34 from t57root/forget_password_vul
...
当有用户uuid 或账号姓名电邮地址信息时,可以修改任意账号的密码
2016-01-04 15:05:31 +08:00
ParInshOvGotQuep
79300b752b
修复找回密码及静态key问题
2016-01-04 13:56:47 +08:00
yumaojun
ed6559bbe9
修改前端禁止root的正则表达式,做精确匹配
2016-01-04 13:17:58 +08:00
yumaojun
0821e7cf41
Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev
2016-01-04 13:13:35 +08:00
yumaojun
38f72a85e4
修改前端禁止root的正则表达式,做精确匹配
2016-01-04 13:13:13 +08:00
ibuler
ccc2bcf066
Merge branch 'dev'
2016-01-04 12:08:14 +08:00
ibuler
d9d009ab1f
Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev
2016-01-04 12:08:02 +08:00
ibuler
f268af945f
修复web执行命令没有结果
2016-01-04 12:01:47 +08:00
yumaojun
34e8b32180
添加系统用户删除 提醒
2016-01-04 11:47:50 +08:00
yumaojun
c6626e83f2
禁止添加root用户作为系统用户
2016-01-04 11:43:17 +08:00
ibuler
4e5c501041
Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev
2016-01-03 22:03:26 +08:00
yumaojun
0832ea97b1
去除sudo 添加和修改是 空格会被识别为 分隔符的问题
2016-01-03 21:11:55 +08:00
ibuler
7bef517518
支持修改窗口大小
2016-01-01 22:38:50 +08:00
ibuler
ea973bbb52
修复交换机小bug
2015-12-31 22:37:01 +08:00
ibuler
b673fec532
添加失败点击提示
2015-12-31 19:12:17 +08:00
ibuler
7e185197aa
Merge branch 'sh'
2015-12-31 16:42:21 +08:00
ibuler
5e86b06db8
添加调试
2015-12-31 16:41:52 +08:00
ibuler
2e2b065c42
Merge pull request #31 from t57root/modify-default-shell
...
修改普通用户默认shell为connect.py,修复jailbreak
2015-12-31 16:41:22 +08:00
ibuler
91e006cfb0
Merge branch 'sh1' into sh
2015-12-31 16:35:33 +08:00
ibuler
b1a36bbb11
fix
2015-12-31 16:35:17 +08:00
ParInshOvGotQuep
ac40098ac5
修改硬编码的shell路径
2015-12-31 16:24:46 +08:00
ibuler
6ff030847e
Merge branch 'sh1' into sh
2015-12-31 16:18:50 +08:00
ibuler
a12e401f15
fix comment
2015-12-31 12:54:15 +08:00
ibuler
49f2f92a9c
fix输入换行
2015-12-31 11:20:41 +08:00
ibuler
d1ac7ca647
Merge branch 'master' into dev
2015-12-31 10:20:08 +08:00
wangyong
f6c26a201e
修改硬盘不显示问题
2015-12-30 22:35:32 +08:00
ParInshOvGotQuep
90b875adae
修改普通用户默认shell为connect.py,修复jailbreak
2015-12-30 19:15:33 +08:00
ibuler
7be7772af6
修复授权修改显示ip
2015-12-30 15:38:28 +08:00
ibuler
2fa1d7a95b
fix connect.py 字符报错
2015-12-30 12:36:34 +08:00
ibuler
6e747fa299
Merge branch 'master' of github.com:ibuler/jumpserver
2015-12-30 12:12:00 +08:00
ibuler
86cc963673
更换alert我layer
2015-12-30 12:11:39 +08:00
ibuler
e776c3c5f9
Update README.md
2015-12-29 22:54:55 +08:00
wangyong
33da9fd143
fix hostname unicode
2015-12-29 14:20:47 +08:00
ibuler
09416286bf
fix install port bug
2015-12-29 13:09:05 +08:00
ibuler
c5f9db450d
添加查看quickstart提示
2015-12-29 11:37:52 +08:00
ibuler
1e93b13b4c
Merge branch 'master' of github.com:ibuler/jumpserver
2015-12-29 11:13:04 +08:00
ibuler
48cf64cd3a
port int
2015-12-29 11:12:41 +08:00
ibuler
ff3666c6af
Update README.md
2015-12-28 11:08:23 +08:00
ibuler
3918025ffd
Update README.md
2015-12-28 10:53:00 +08:00
ibuler
1b7ee3b575
返回上个版本
2015-12-26 11:09:48 +08:00
ibuler
b370f01551
Merge branch 'master' into dev
2015-12-26 10:53:01 +08:00
ibuler
18da6f69a2
Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev
2015-12-26 10:52:57 +08:00
yumaojun
d040e2719f
修复Role 删除时 秘钥问题等异常引起的Bug
2015-12-26 10:12:00 +08:00
ibuler
9eb64466bc
fix user perm group perm
2015-12-25 20:26:31 +08:00
ibuler
9fc0c9da06
Merge branch 'master' of github.com:ibuler/jumpserver
2015-12-24 11:31:31 +08:00
ibuler
f63b75c01b
fix 随机密码默认长度
2015-12-24 11:31:05 +08:00
ibuler
aa1dea1b08
Merge pull request #26 from wcc526/master
...
fix remote ip bug
2015-12-23 15:24:19 +08:00
chi-chi weng
71116bc525
fix remote ip bug
...
fix remote ip bug
2015-12-23 15:17:14 +08:00
ibuler
8f1e8af2e1
Merge branch 'dev'
2015-12-22 23:12:08 +08:00
ibuler
c691759af8
Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev
2015-12-22 23:12:02 +08:00
yumaojun
d604639b96
修复添加role 时 因私钥格式不对而引起的bug(2)
2015-12-22 23:05:38 +08:00
ibuler
cde3185a20
Merge branch 'dev'
2015-12-22 22:50:17 +08:00
ibuler
40ae57d7ea
Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev
2015-12-22 22:50:08 +08:00
ibuler
9efd42d4ed
添加team照片
2015-12-22 22:49:59 +08:00
yumaojun
3248ee1a3d
修复添加role 时 因私钥格式不对而引起的bug
2015-12-22 22:39:59 +08:00
ibuler
13d325e259
捕捉smtp异常
2015-12-22 17:18:53 +08:00
ibuler
79994e13c7
添加交流群
2015-12-22 15:57:16 +08:00
ibuler
3f9a9157f4
添加交流群
2015-12-22 15:56:39 +08:00
ibuler
7adcb11f1d
comment newline
2015-12-21 16:58:30 +08:00
ibuler
42f6392cc4
fix install script bug
2015-12-21 16:10:07 +08:00
ibuler
835e32b1cc
service.sh 脚本修改
2015-12-21 14:28:12 +08:00
ibuler
a7e2592fa8
fix install bug
2015-12-21 12:18:36 +08:00
ibuler
f17001e86c
fix comment
2015-12-21 11:12:52 +08:00
ibuler
7113852cd6
update README
2015-12-21 10:25:51 +08:00
ibuler
7d85c0393f
fix readme
2015-12-20 21:20:08 +08:00
ibuler
48af55adab
添加readline
2015-12-20 19:30:42 +08:00
ibuler
c36267dc17
rebase version
2015-12-20 19:09:18 +08:00
ibuler
b7eb95f85f
修复安装bug
2015-12-20 17:45:57 +08:00
ibuler
08cbaa1622
fix sudo bug
2015-12-20 00:30:31 +08:00
ibuler
a73fa7811c
Merge branch 'dev'
2015-12-19 22:52:16 +08:00
wangyong
0d5fa418af
Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev
2015-12-19 22:49:46 +08:00
wangyong
cf59ebf1aa
fix asset add batch bug
2015-12-19 22:49:39 +08:00
ibuler
52566cb562
modify service.sh
2015-12-19 22:08:56 +08:00
ibuler
75b307105b
fix
2015-12-19 22:00:54 +08:00
ibuler
998281d86d
Merge branch 'dev' of git.coding.net:jumpserver/jumpserver
2015-12-19 21:57:15 +08:00
ibuler
8494989715
修改install
2015-12-19 21:56:42 +08:00
jumpserver
b73527fb33
update jumpserver.conf
2015-12-19 21:39:56 +08:00
ibuler
f18c68b8ba
Update jumpserver.conf
2015-12-19 21:38:23 +08:00
ibuler
c8c0366b39
Merge with dev
2015-12-19 21:14:16 +08:00
ibuler
22c90eecfc
修改安装脚本
2015-12-19 21:12:47 +08:00
ibuler
3695989866
fix install bug
2015-12-19 20:31:06 +08:00
ibuler
80c5acef81
Merge branch 'dev'
2015-12-19 17:57:51 +08:00
ibuler
2cb6a1aac0
merge with github master
2015-12-19 17:46:30 +08:00
ibuler
39b7a7290f
merge with dev
2015-12-19 17:30:21 +08:00
ibuler
7b792907d3
merge with dev
2015-12-19 17:27:12 +08:00
ibuler
c103738302
merge with dev
2015-12-19 17:26:34 +08:00
ibuler
89901fa7fb
fix url error
2015-12-19 17:13:37 +08:00
ibuler
3176608eaa
Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev
2015-12-19 17:09:55 +08:00
ibuler
94d0f7ebea
添加作者
2015-12-19 17:09:43 +08:00
wangyong
04eb4484da
Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev
2015-12-19 17:01:23 +08:00
wangyong
9ffc887adf
fix common user asset list search bug
2015-12-19 17:01:13 +08:00
ibuler
f5b97c57f8
fix readme pic width
2015-12-19 16:11:43 +08:00
ibuler
46c17b055e
fix readme pic width
2015-12-19 16:10:08 +08:00
ibuler
b5bbbf7eb3
fix
2015-12-19 15:26:25 +08:00
ibuler
87f5a531bb
fix
2015-12-19 15:24:50 +08:00
ibuler
3afeda8b19
fix
2015-12-19 15:20:49 +08:00
ibuler
832dc0b0e1
修改readme
2015-12-18 23:45:12 +08:00
ibuler
13cecd9b91
修改readme
2015-12-18 23:42:17 +08:00
ibuler
cba7195670
chmod +x script
2015-12-18 23:03:48 +08:00
ibuler
446a51122f
添加doc
2015-12-18 18:55:42 +08:00
ibuler
e3c0757166
添加doc
2015-12-18 18:52:32 +08:00
ibuler
0715e11c05
fix install bug
2015-12-18 18:35:07 +08:00
ibuler
1fc86733ba
fix install bug
2015-12-18 18:27:12 +08:00
ibuler
4c002afde1
fix install bug
2015-12-18 18:14:12 +08:00
ibuler
caa0e29564
fix install bug
2015-12-18 18:02:46 +08:00
ibuler
0896c9ab3f
fix install bug
2015-12-18 17:59:05 +08:00
ibuler
c56c44f8c0
fix install bug
2015-12-18 17:56:00 +08:00
ibuler
655bfc855e
fix install bug
2015-12-18 17:49:59 +08:00
ibuler
439efa1c83
fix install bug
2015-12-18 17:42:25 +08:00
ibuler
59591c2a13
fix install bug
2015-12-18 17:39:22 +08:00
ibuler
e452c6d70a
fix install bug
2015-12-18 16:52:50 +08:00
ibuler
12967bb6f9
fix install bug
2015-12-18 16:52:36 +08:00
广宏伟
6798dd8686
添加安装脚本
2015-12-18 16:26:17 +08:00
ibuler
d72a8ac5a9
修改 readme
2015-12-17 18:56:10 +08:00
ibuler
f38f809337
修改目录结构
2015-12-17 17:37:26 +08:00
ibuler
c78ab8edf7
fix 日志记录名称
2015-12-17 17:35:57 +08:00
ibuler
e24003df97
Update connect.py
...
修复 remote ip抓取问题
2015-12-17 17:12:26 +08:00
ibuler
f8213a1a2a
user update password null
2015-12-17 11:05:43 +08:00
ibuler
da7cc102a3
fix null bug
2015-12-17 10:52:48 +08:00
ibuler
ea29305f8b
Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev
2015-12-17 10:08:49 +08:00
ibuler
9fb71ade71
remove install wizzrd
2015-12-17 10:08:38 +08:00
ibuler
5740dec7b4
add install wizzrd
2015-12-17 10:04:19 +08:00
wangyong
7c742bf061
fix del idc failed
2015-12-16 22:24:29 +08:00
yumaojun
a30ec0c75e
修复 sudo 规则删除bug
2015-12-16 18:34:19 +08:00
yumaojun
b8abedc5b9
Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev
2015-12-15 22:16:15 +08:00
ibuler
ef7f42cf6d
reset password fix
2015-12-15 19:36:33 +08:00
ibuler
e817715da3
fix asset update bug
2015-12-15 17:35:02 +08:00
ibuler
9c0825ce70
fix more role open exec window width bug
2015-12-15 16:46:14 +08:00
ibuler
2e81f0cf95
fix nav active bug
2015-12-15 14:48:37 +08:00
ibuler
c4b099d2a5
Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev
2015-12-15 14:45:41 +08:00
ibuler
f3606dfd96
add install wizzird
2015-12-15 14:45:37 +08:00
yumaojun
05f80f743b
Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev
2015-12-14 20:28:39 +08:00
wangyong
f249509817
Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev
2015-12-14 18:42:27 +08:00
wangyong
c6e0b2007d
alert idc|group length
2015-12-14 18:42:17 +08:00
ibuler
2496f1c654
asset udpate url bug
2015-12-14 18:28:53 +08:00
ibuler
1a32fb5da1
fix del role url bug
2015-12-14 17:13:07 +08:00
ibuler
be2f0b2172
fix log kill and asset detail bug
2015-12-14 16:54:49 +08:00
ibuler
5e5aab7962
fix asset upload bug
2015-12-14 16:26:12 +08:00
ibuler
a8bdc37780
fix group list bug
2015-12-14 15:57:46 +08:00
广宏伟
3260584f90
修改jumpserver.conf注释
2015-12-14 14:52:35 +08:00
ibuler
b58ff14ed1
role fix to sys user
2015-12-14 14:36:42 +08:00
ibuler
db13b7a3e9
主机组列表编辑连接修改
2015-12-12 23:47:28 +08:00
ibuler
3150461d12
bug fix
2015-12-12 23:37:28 +08:00
ibuler
97bfbe24b8
bug fix
2015-12-12 23:09:58 +08:00
ibuler
30b5f74c51
bug fix
2015-12-12 23:01:59 +08:00
ibuler
69aba4643e
bug fix
2015-12-12 22:57:42 +08:00
ibuler
f849ffef3e
url modify
2015-12-12 19:30:39 +08:00
ibuler
6d5513c69e
open in current window
2015-12-11 17:40:52 +08:00
ibuler
b27e2075ff
bug fix
2015-12-11 17:28:01 +08:00
ibuler
9979fdf6de
bugfix
2015-12-11 15:32:06 +08:00
yumaojun
b655b064df
Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev
2015-12-11 14:38:24 +08:00
yumaojun
974619d1ce
fixed rule and role detail page not id bug
2015-12-11 14:38:10 +08:00
ibuler
280560f286
Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev
2015-12-11 14:03:12 +08:00
wangyong
7ce12af146
fix none bug
2015-12-11 14:02:41 +08:00
ibuler
b7bf6b4cc0
Merge pull request #23 from hailwind/master
...
add choose group to execute commands. 增加组执行命令功能
2015-12-11 12:05:15 +08:00
ibuler
ba955df493
Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev
2015-12-11 11:45:25 +08:00
ibuler
34cbb13b8a
bug fix
2015-12-11 11:45:19 +08:00
yumaojun
aa262d0430
fixed perm page
2015-12-10 22:58:04 +08:00
yumaojun
4294ecaf26
修复了rule 和 role 的detail 页面
2015-12-10 22:56:24 +08:00
ibuler
014d0935ba
bug fix
2015-12-10 21:55:21 +08:00
ibuler
e65cad5074
Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev
2015-12-10 17:51:23 +08:00
yumaojun
b0f2b346f9
修复了rule 和 role 的detail 页面
2015-12-10 17:44:45 +08:00
ibuler
affd9aadb5
Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev
2015-12-10 14:42:03 +08:00
ibuler
23051a4a05
bug fix
2015-12-10 14:42:01 +08:00
yumaojun
e9fe871af3
Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev
2015-12-10 14:40:45 +08:00
yumaojun
80b1bda51c
update...
2015-12-10 14:40:29 +08:00
ibuler
e117cd003f
Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev
2015-12-10 14:10:56 +08:00
ibuler
e03b4722b0
defend attack
2015-12-10 14:10:47 +08:00
yumaojun
b5a3fb44c3
Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev
2015-12-10 01:15:46 +08:00
yumaojun
4903a17104
Merge branch 'map_perm' into dev
...
# Conflicts:
# jperm/ansible_api.py
# jperm/views.py
2015-12-10 01:15:25 +08:00
yumaojun
a068498561
Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev
...
# Conflicts:
# jperm/ansible_api.py
2015-12-10 00:17:01 +08:00
halcyon
1a3541e575
fix bugs
2015-12-10 00:13:50 +08:00
yumaojun
49267b57e4
1. 角色添加和角色修改, Server 端 输入验证
...
2. 日志打印
2015-12-10 00:10:39 +08:00
ibuler
d337b929ef
perm edit fix
2015-12-09 17:27:13 +08:00
ibuler
f74b15c1bf
perm edit fix
2015-12-09 16:42:48 +08:00
ibuler
d3fd9e05ca
ansible api fix
2015-12-09 14:50:48 +08:00
ibuler
16b94c1089
bug fix
2015-12-09 11:49:30 +08:00
ibuler
d6b4c7c485
Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev
2015-12-08 23:19:42 +08:00
ibuler
0309213ccc
bug fix
2015-12-08 23:19:39 +08:00
ibuler
e408414631
bug fix
2015-12-08 19:25:11 +08:00
kelianchun_miller
80ffb9d762
update connect.py
2015-12-08 11:44:42 +08:00
ibuler
bd2a3e6119
bugfix
2015-12-08 11:32:27 +08:00
ibuler
95e8115045
bug fix
2015-12-07 23:29:19 +08:00
ibuler
b7cfac4d1f
bug fix
2015-12-07 23:21:10 +08:00
ibuler
5be2633795
bug fix
2015-12-07 18:06:07 +08:00
ibuler
cb12b83e47
bug fix
2015-12-07 17:41:29 +08:00
ibuler
cd798daf0a
bug fix
2015-12-07 17:30:57 +08:00
wangyong
7f6f46b662
Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev
2015-12-06 23:48:46 +08:00
wangyong
e78d7b0219
cu asset page and sth
2015-12-06 23:48:39 +08:00
yumaojun
58082179fe
1. 用户的批量回收, 角色删除会回收推送的角色
2015-12-06 23:44:13 +08:00
ibuler
622611498c
fix bug
2015-12-06 23:33:23 +08:00
ibuler
b346e1c480
Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev
2015-12-06 22:00:55 +08:00
ibuler
bf23d6d7aa
fix some bug
2015-12-06 22:00:44 +08:00
kelianchun_miller
3d0b8917fa
update connect.py
2015-12-06 20:56:28 +08:00
yumaojun
8723d673d7
1. 计算该角色有哪些主机没推送时,使用交集计算(原来是差集)
...
2. 修改rule detail页面 不计算,经返回rule 记录的信息
3. 修改role detail页面 不计算,经返回rule 记录的信息
4. 添加了 推送主机上的用户回收功能
5. TODO: 页面的美观展示,与 实现 用户的批量回收。
2015-12-06 18:07:57 +08:00
ibuler
35c818f4a0
用户详情
2015-12-06 00:28:43 +08:00
ibuler
532646a431
Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev
2015-12-05 17:55:49 +08:00
ibuler
0fd7b980de
fix some bug
2015-12-05 17:55:45 +08:00
wangyong
2f0e91a538
fix bug
2015-12-05 16:57:47 +08:00
wangyong
0f6f3bdb9a
Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev
2015-12-05 16:15:33 +08:00
wangyong
2c3e681942
fix bugs
2015-12-05 16:15:19 +08:00
ibuler
34ccaeb10f
fix push role bug
2015-12-05 12:03:18 +08:00
wangyong
8f985ade97
Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev
2015-12-05 11:09:41 +08:00
wangyong
9b7ef1139e
fix bugs
2015-12-05 11:09:34 +08:00
ibuler
2829a7ad31
fix asset admin count
2015-12-04 18:49:17 +08:00
ibuler
b5325fd0ac
bug fix for rule add check
2015-12-04 18:24:20 +08:00
ibuler
69bbdab450
完成上传下载
2015-12-04 13:42:05 +08:00
ibuler
6975acfc8a
文件上传日志
2015-12-03 23:24:34 +08:00
ibuler
9233fef63f
exec log
2015-12-03 19:10:37 +08:00
ibuler
33663783cc
恢复错误修复
2015-12-03 18:49:04 +08:00
ibuler
6f4fd18c47
add
2015-12-03 18:38:06 +08:00
ibuler
7decfdc37f
col-lg -> col-sm to
2015-12-03 18:37:18 +08:00
ibuler
267bb02417
修改exec 和 MyRUnner
2015-12-03 16:53:39 +08:00
ibuler
255e3a043a
修改支持选中执行
2015-12-03 10:38:10 +08:00
ibuler
6080a861db
Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev
2015-12-02 23:50:31 +08:00
ibuler
4959073a33
web 批量执行命令
2015-12-02 23:50:20 +08:00
halcyon
f6dbec1436
day update
2015-12-02 23:39:17 +08:00
ibuler
88fbcabcbb
exec-cmd tempalate
2015-12-02 19:17:12 +08:00
ibuler
1f26e49fb8
完成web批量命令执行
2015-12-02 19:16:05 +08:00
ibuler
104ee779e7
Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev
2015-12-02 15:42:24 +08:00
ibuler
77da01d1ee
完成上传下载
2015-12-02 15:41:39 +08:00
ibuler
0e6fd89f0b
批量上传下载
2015-12-02 13:35:06 +08:00
halcyon
dd912e8958
asset list and add system_arch
2015-12-01 23:39:49 +08:00
ibuler
e95c47ff6a
upload
2015-12-01 19:23:35 +08:00
ibuler
6b7937c639
普通用户页面
2015-12-01 13:21:42 +08:00
ibuler
f72c5753c9
添加推送
2015-12-01 11:58:11 +08:00
yumaojun
bf98aa5464
sudo push
2015-12-01 11:20:43 +08:00
yumaojun
f3102e3b5b
erge laoguang.
2015-11-30 23:10:31 +08:00
yumaojun
e0aaba2cf5
no change...
2015-11-30 23:08:30 +08:00
ibuler
4b36fc540d
role推送基本完成
2015-11-30 23:04:02 +08:00
yumaojun
7cafbde5b1
update sudo
2015-11-30 22:55:40 +08:00
ibuler
7106e915ef
modify sudo
2015-11-30 19:51:34 +08:00
ibuler
f7c8ad6f38
修改推送用户
2015-11-30 19:06:25 +08:00
Alex Wang
3f451158f0
add choose group to execute commands.
2015-11-30 15:15:05 +08:00
ibuler
8dd4a9fce1
push role 更改
2015-11-29 19:02:13 +08:00
ibuler
52c4395b68
去掉runas
2015-11-29 16:56:39 +08:00
ibuler
49fbae4fad
Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev
2015-11-29 16:38:48 +08:00
ibuler
2d91f1ab38
校验推送
2015-11-29 16:38:40 +08:00
yumaojun
4d844548c2
fixed merge...
2015-11-29 15:50:36 +08:00
ibuler
29e1090d2c
sudo添加runas
2015-11-29 15:18:05 +08:00
ibuler
98f0655da4
fix rule and role bug
2015-11-29 11:33:19 +08:00
yumaojun
b241d6d148
Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev
2015-11-28 23:00:40 +08:00
yumaojun
b7d9e41b43
1. 修复角色推送 step3 失败
2015-11-28 22:54:59 +08:00
ibuler
3f000b9d54
修改role添加显示
2015-11-28 22:53:27 +08:00
ibuler
4672884255
修改role添加显示
2015-11-28 22:45:40 +08:00
ibuler
a0ae7ff139
修改getresource
2015-11-28 22:08:47 +08:00
ibuler
8ac369b925
Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev
2015-11-28 21:23:01 +08:00
ibuler
117f01e71f
中文播放bug fix
2015-11-28 21:13:44 +08:00
yumaojun
38416fbebb
merge perm
2015-11-28 21:02:23 +08:00
yumaojun
39a0350e08
1. 完成Sudo 规则的 角色授权
...
2. 角色详情里面 新增 推送详情
3. 角色推送 支持计算与叠加
2015-11-28 19:33:21 +08:00
ibuler
a099d2a25a
中文播放bug
2015-11-27 18:51:15 +08:00
ibuler
bd885da179
recoard 特殊字符去掉
2015-11-27 17:53:11 +08:00
ibuler
35db337f79
Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev
2015-11-27 16:16:47 +08:00
ibuler
c3f1e0e06e
批量执行命令记录日志 bug fix
2015-11-27 16:16:38 +08:00
ibuler
b64ab276fb
修改批量执行命令2
2015-11-27 13:24:57 +08:00
ibuler
66610fb3e7
修改批量执行命令
2015-11-27 12:20:08 +08:00
halcyon
09dcdfa318
fix some bugs and hehe
2015-11-26 23:42:58 +08:00
ibuler
c574bbcb96
fix date change bug
2015-11-26 23:26:11 +08:00
ibuler
61deed70ad
merge with connect
2015-11-26 21:47:37 +08:00
ibuler
601747ac49
fix
2015-11-26 21:01:39 +08:00
ibuler
2afce31e95
删掉添加导航
2015-11-26 20:19:54 +08:00
ibuler
ba08602e20
添加登陆方式
2015-11-26 19:49:23 +08:00
ibuler
19dcf171e6
弹窗title修改
2015-11-26 19:06:17 +08:00
kelianchun_miller
1bbd685a23
update connect.py
2015-11-26 18:19:36 +08:00
ibuler
02c3bc75f3
connect.py 回滚
2015-11-26 17:42:03 +08:00
yumaojun
951467f8ca
1. 新增 PermPush表, 用于记录角色的推送记录
...
2. 角色权限 以来 sudo 完成。
2015-11-26 17:23:16 +08:00
ibuler
cdfea145d9
Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev
2015-11-26 17:18:47 +08:00
kelianchun_miller
431ad2940b
update connect.py
2015-11-26 17:17:37 +08:00
ibuler
72b8ac2a50
Merge branch 'bug' into dev
2015-11-26 17:10:25 +08:00
ibuler
d3153e9bb4
Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev
2015-11-26 17:10:18 +08:00
ibuler
5045d66c1c
fix
2015-11-26 17:10:09 +08:00
kelianchun_miller
e71bbd4122
update connect.py
2015-11-26 14:26:58 +08:00
kelianchun_miller
c4160e1d50
Accept Pull Request #2 : (kelianchun_miller:dev -> jumpserver:dev)
...
Pull Request: 提交transport和命令解析
Created By: @kelianchun_miller
Accepted By: @kelianchun_miller
URL: https://coding.net/u/jumpserver/p/jumpserver/git/pull/2
2015-11-26 14:25:07 +08:00
ibuler
46245ab4aa
fix record bug
2015-11-26 13:21:05 +08:00
kelianchun_miller
8880b5ff4f
update connect.py
...
增加transport连接方式,同时增加了替换符号的命令处理
2015-11-25 19:02:51 +08:00
ibuler
2c0d42e0da
fix some bug
2015-11-25 18:59:12 +08:00
kelianchun_miller
1d70a23859
update connect.py
2015-11-25 18:52:18 +08:00
ibuler
0335bc26ca
fix rule js bug
2015-11-25 16:37:17 +08:00
ibuler
60166ac008
Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev
2015-11-25 16:06:30 +08:00
ibuler
f760df1e34
角色key问题修复
2015-11-25 16:01:07 +08:00
ibuler
6fe6342ca4
角色key问题修复
2015-11-25 14:59:57 +08:00
liuzheng712
175f2702d1
Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into NormalUserPageLZ
2015-11-25 14:52:30 +08:00
ibuler
a7db713b1e
Merge branch 'exec_cmd' into dev
2015-11-25 10:01:06 +08:00
yumaojun
1a0c9cd4e6
1. 新增 PermSudo表, 用于记录 sudo别名
...
2. 实现Sudo表对应的 添加,显示,更新,删除页面
3. 添加角色时,需要选择对应的 sudo别名
2015-11-24 22:03:58 +08:00
wangyong
742e56fc5f
Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev
2015-11-24 19:04:28 +08:00
wangyong
0262d94dd3
fix disk detail bug
2015-11-24 19:04:16 +08:00
ibuler
32d036c2b0
修改setting字段
2015-11-24 17:38:27 +08:00
ibuler
1a63d32fe3
fix bug
2015-11-24 16:31:06 +08:00
ibuler
ec9b00e255
fix bug
2015-11-24 13:37:36 +08:00
ibuler
d7cb549eac
Merge branch 'exec_cmd' into dev
2015-11-24 13:31:55 +08:00
ibuler
168157bfe1
fix
2015-11-24 13:31:48 +08:00
ibuler
7cbb7718eb
fix bug
2015-11-24 12:03:38 +08:00
ibuler
2d65265fc6
Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev
2015-11-24 12:01:02 +08:00
ibuler
30fe9f5236
fix websocket授权
2015-11-24 11:58:42 +08:00
wangyong
49821062fb
Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev
2015-11-24 11:22:01 +08:00
wangyong
99439be04f
add update all button
2015-11-24 11:20:01 +08:00
ibuler
17ccac92ee
fix 加密bug
2015-11-24 11:01:54 +08:00
wangyong
dd4c243d7c
Merge branch 'cmdb' of https://git.coding.net/jumpserver/jumpserver into cmdb
2015-11-24 09:53:50 +08:00
halcyon
34031bfd6b
fix bugs
2015-11-23 23:55:19 +08:00
ibuler
a7a030fedd
fix bug
2015-11-23 23:07:58 +08:00
ibuler
4c50551249
fix some bug
2015-11-23 19:15:52 +08:00
ibuler
483ca9677c
资产列表添加连接
2015-11-23 18:39:38 +08:00
ibuler
f00a2e003d
Merge branch 'dev' into exec_cmd
2015-11-23 15:36:24 +08:00
ibuler
0b878216ed
Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev
2015-11-23 15:34:34 +08:00
ibuler
f49a92e742
webscoket授权
2015-11-23 15:34:28 +08:00
kelianchun_miller
ee218a5fed
update connect.py
2015-11-23 12:47:02 +08:00
wangyong
a9196ef149
merge cmdb | add asset update batch and crontab
2015-11-23 11:12:14 +08:00
wangyong
04bf37b52a
Merge branch 'cmdb' into dev
2015-11-23 11:06:41 +08:00
wangyong
5a3c11f619
asset update batch and crontab
2015-11-22 23:53:25 +08:00
liuzheng712
c89d43d269
update, now Mac to develop will be all egg pain
2015-11-22 22:20:55 +08:00
ibuler
12f33176bf
Merge branch 'dev' into exec_cmd
2015-11-22 21:59:18 +08:00
ibuler
eb779e5bf6
修改run_websocket
2015-11-22 21:59:07 +08:00
ibuler
47ace5d654
Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev
2015-11-22 20:47:45 +08:00
ibuler
70db8c69d2
global SSH_FLAG to self.ssh_flag
2015-11-22 20:45:48 +08:00
liuzheng712
962d16172c
Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into NormalUserPageLZ
2015-11-22 20:35:03 +08:00
kelianchun_miller
5f9e675d00
update connect.py
2015-11-22 20:29:35 +08:00
ibuler
4cdc7f33ce
添加注释
2015-11-22 20:20:32 +08:00
kelianchun_miller
c359d1e264
update connect.py
2015-11-22 20:20:04 +08:00
kelianchun_miller
0c42d039ff
update connect.py
2015-11-22 20:18:33 +08:00
kelianchun_miller
55503c89e9
update connect.py
2015-11-22 19:15:58 +08:00
wangyong
b8cb6f4246
Merge branch 'dev' into cmdb
2015-11-22 18:58:31 +08:00
wangyong
d25e23623a
fix bugs
2015-11-22 18:57:47 +08:00
ibuler
a143797ac9
修改gen_resource api
2015-11-22 17:56:38 +08:00
liuzheng712
09de12c02a
index show assets, need discussion
2015-11-22 13:04:11 +08:00
liuzheng712
246e8770ac
http://localhost:8000/juser/user_detail/?id=5001 fix
2015-11-21 22:40:28 +08:00
liuzheng712
ea059790a9
Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into NormalUserPageLZ
2015-11-21 21:24:17 +08:00
liuzheng712
6ae4907520
update
2015-11-21 21:24:01 +08:00
ibuler
5f768444ac
Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev
2015-11-21 21:07:39 +08:00
ibuler
93481a98db
完成登陆,批量执行命令流
2015-11-21 19:20:11 +08:00
wangyong
0ebb7c4f9a
merge cmdb
2015-11-21 18:37:40 +08:00
wangyong
652ea98a2b
alert ip -> hostname
2015-11-21 18:28:25 +08:00
ibuler
877383679c
添加api注释
2015-11-21 14:45:20 +08:00
ibuler
e041a49ad7
添加资产权限查询,添加生成resource文件api
2015-11-21 14:42:53 +08:00
ibuler
dc06426ada
完成授权查询api
2015-11-21 12:41:17 +08:00
ibuler
1478ac18fa
用户和组查询api完成
2015-11-21 11:53:36 +08:00
ibuler
558309599c
添加授权查询api
2015-11-21 00:42:54 +08:00
ibuler
40d1eb37dc
Merge branch 'exec_cmd' into dev
2015-11-20 23:12:48 +08:00
ibuler
b8d6c5d007
删除遗留的model SysUser PermLog
2015-11-20 23:12:33 +08:00
ibuler
85a9da0e8a
bug fix
2015-11-20 21:59:09 +08:00
ibuler
faa0275700
Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev
2015-11-20 21:48:58 +08:00
ibuler
eea56ea0e5
定义通用模块执行
2015-11-20 21:30:57 +08:00
ibuler
ab313aacd8
定义Command前
2015-11-20 18:42:44 +08:00
yumaojun
a88ee0725d
1. 在授权规则添加页面 通过js 给予用户输入提醒
2015-11-20 14:07:17 +08:00
yumaojun
e57c6a9d2e
1. 在授权规则添加页面 通过js 给予用户输入提醒
2015-11-20 14:03:05 +08:00
liuzheng712
f863f4b7ae
登陆web的密码(如不修改请留空)
2015-11-20 11:26:07 +08:00
liuzheng712
4bbae38150
confirm alert
2015-11-20 11:16:47 +08:00
liuzheng712
31807b674b
Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into NormalUserPageLZ
2015-11-20 11:12:10 +08:00
liuzheng712
75fbd9e615
annotation the Asset
2015-11-20 11:08:39 +08:00
liuzheng712
42ec624a91
group add and remove fixed
2015-11-20 11:04:22 +08:00
halcyon
b4c13069c0
batch asset alert
2015-11-20 00:03:36 +08:00
ibuler
6b1b33481c
一些js, setting的KEY_DIR, 下载秘钥鉴定
2015-11-19 23:11:00 +08:00
halcyon
1471e0a247
merge cmdb and hehe
2015-11-19 22:06:12 +08:00
halcyon
a04bb100bf
Merge branch 'cmdb' into dev
2015-11-19 22:01:38 +08:00
halcyon
f9b1d3059a
fix bugs
2015-11-19 21:58:44 +08:00
ibuler
bddb689e86
merge with exec_cmd
2015-11-19 21:57:17 +08:00
yumaojun
757f7beeaf
update merge conflict.
2015-11-19 13:20:27 +08:00
yumaojun
6582ee1624
1. 更新 和 添加 (role 和 rule )操作 以 msg 的方式 刷新页面
2015-11-18 22:32:21 +08:00
yumaojun
04e7073aca
1. fixed ansible api auto load local host file (/etc/ansible/hosts) bug with null list
2015-11-18 19:03:13 +08:00
yumaojun
2ccd072416
1. delete role filed : is_screty_key
...
2. rule edit page add selected mark
3. role add page consider user use_default_auth attribute
4. role password use jumpserver api CRYPTO to crypt
5. fixed ansible api auto load local host file (/etc/ansible/hosts) bug
6. ansible api command and task interface add pattern default argument( pattern='*')
2015-11-18 17:16:29 +08:00
ibuler
79ecbc83ae
bug fix
2015-11-18 15:23:56 +08:00
ibuler
2a6051ae35
merge with dev
2015-11-18 15:22:26 +08:00
ibuler
cf8e366ae1
修改connect方法
2015-11-18 15:15:08 +08:00
halcyon
d42197db3a
fix tower bugs
2015-11-17 23:34:13 +08:00
ibuler
8017b1b479
解决jperm key dir 和 ansible api问题
2015-11-17 23:32:24 +08:00
yumaojun
375a243131
Merge remote-tracking branch 'origin/map_perm' into dev
2015-11-17 22:18:17 +08:00
yumaojun
70e6904eb7
Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev
2015-11-17 22:17:18 +08:00
ibuler
42745c52df
Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev
2015-11-17 21:41:31 +08:00
ibuler
8479989ea8
更换nav ico, 修复需要登陆,登陆后跳转到登陆前页面
2015-11-17 21:41:03 +08:00
liuzheng712
ee7675f7ae
fix when ./keys/user/ didn't exist bug
2015-11-17 21:06:38 +08:00
liuzheng712
37b91c40b6
url
2015-11-17 20:27:38 +08:00
liuzheng712
4027a87e7f
user delete with alert confirm
2015-11-17 20:25:15 +08:00
liuzheng712
84992746de
juser/change_info/ fix password can be ignore
2015-11-17 20:06:25 +08:00
liuzheng712
4397819b44
user.update bug fix
2015-11-17 19:55:38 +08:00
liuzheng712
ee443361b9
bug of user.update
2015-11-17 19:51:16 +08:00
ibuler
c00a55619c
Update connect.py
...
去掉compress
2015-11-17 16:43:33 +08:00
yumaojun
e5c1071073
Merge branch 'dev' into map_perm
2015-11-17 14:10:46 +08:00
yumaojun
8d941dc028
update role edit and rule edit
2015-11-17 13:55:13 +08:00
yumaojun
11f6939b85
1. update role and update rule complete.
2015-11-17 13:48:19 +08:00
liuzheng712
1c3b66c1a8
user.update
2015-11-17 11:13:52 +08:00
liuzheng712
a99f024dfc
user.update
2015-11-17 11:07:40 +08:00
ibuler
d58ba82388
添加ignore
2015-11-17 10:48:18 +08:00
liuzheng712
738c6353ef
user.update
2015-11-17 10:44:34 +08:00
ibuler
dc547de592
修正文件目录
2015-11-17 10:27:41 +08:00
liuzheng712
adf20f188e
user.update
2015-11-17 10:16:51 +08:00
liuzheng712
b9b965753b
Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into NormalUserPageLZ
2015-11-17 09:53:48 +08:00
liuzheng712
036873e129
merge_dev
2015-11-17 09:53:43 +08:00
yumaojun
9d36dc9e39
1. push role bug , because the password push is mandatory, so just the push key is option.
2015-11-16 23:44:53 +08:00
ibuler
ce02d430ba
deal_command添加到静态方法中
2015-11-16 23:33:44 +08:00
ibuler
4abf2b06d8
添加jumpserver.conf
2015-11-16 23:11:37 +08:00
ibuler
2d27e3fee0
恢复修改前
2015-11-16 22:46:36 +08:00
ibuler
67771105ae
key目录变化
2015-11-16 22:45:41 +08:00
liuzheng712
de9ce6dd19
select all
2015-11-16 22:28:02 +08:00
ibuler
71ef4b079a
Merge branch 'dev' of git.coding.net:jumpserver/Jumpserver into dev
2015-11-16 18:35:31 +08:00
ibuler
f0d901e136
修复分页bug
2015-11-16 18:34:51 +08:00
liuzheng712
d3dd9d94d3
update
2015-11-16 14:59:26 +08:00
liuzheng712
2938f7e506
update
2015-11-16 14:30:10 +08:00
liuzheng712
1f5fa9a9bd
merge
2015-11-16 14:21:21 +08:00
liuzheng712
96ac65b346
udpate
2015-11-16 14:09:02 +08:00
yumaojun
c00e4c24a3
app jperm role and rule bug fixed...
2015-11-16 13:49:39 +08:00
yumaojun
844fe2c250
add asset ok ,pull
2015-11-15 23:43:19 +08:00
yumaojun
6da97c5403
merge dev ...
2015-11-15 23:30:37 +08:00
wangyong
1e41b79611
fix merge bug
2015-11-15 23:29:31 +08:00
ibuler
5d33493233
asset js
2015-11-15 23:21:59 +08:00
ibuler
38c65dbea8
暂时去掉普通用户的get.asset
2015-11-15 23:19:50 +08:00
yumaojun
218ba0d189
merge ...
2015-11-15 22:20:19 +08:00
yumaojun
a36294a529
new map
2015-11-15 22:12:28 +08:00
广宏伟
333ee713d4
解决分页bug,和random_pass
2015-11-15 18:20:34 +08:00
广宏伟
b8ae0ed565
some bug fix
2015-11-15 17:01:02 +08:00
ibuler
3b07198b8a
merge with cmdb
2015-11-15 19:57:25 +08:00
yumaojun
8b94833ea0
1. role push function use password and public key completed
2015-11-15 12:38:57 +08:00
yumaojun
0862ffef98
merge map
2015-11-15 08:39:43 +08:00
yumaojun
95dc12a71b
update models
2015-11-14 23:17:05 +08:00
wangyong
0f29745bfa
asset add batch
2015-11-14 23:09:13 +08:00
yumaojun
012950cb68
merge update...
2015-11-14 23:07:08 +08:00
ibuler
f9c06c22ae
修改变量命名
2015-11-14 22:57:34 +08:00
yumaojun
83c2704d53
1. update role push
2015-11-14 22:54:29 +08:00
yumaojun
74b6b4dea2
1. rule push page completed
2015-11-14 21:52:09 +08:00
yumaojun
f6bc03324f
1. rule operations list add delete edit info page compeleted
...
2. rule operations list add delete edit info page compeleted
2015-11-14 21:13:02 +08:00
kelianchun_miller
3d4443e1b0
update connect.py
...
命令处理进一步处理
2015-11-14 11:45:56 +08:00
kelianchun_miller
366a5d5737
update connect.py
2015-11-14 11:24:31 +08:00
yumaojun
6d5d279f61
1. 增加授权规则的添加,删除,编辑,详情页面。
...
2. 修改nav.html中关于授权部分页面。
3. 修改Jasset APP 下的 view,使得数据库中存储的密码是明文。
2015-11-14 10:16:48 +08:00
ibuler
20970db404
修复环境变量大小写,修改terminal类
2015-11-13 21:15:41 +08:00
yumaojun
1eff4ab4ff
add edit, detail page
2015-11-13 17:17:22 +08:00
yumaojun
1aed3b4d91
modify add rule html
2015-11-13 13:21:57 +08:00
yumaojun
9379bc1f6e
merge failed, update....
2015-11-13 13:06:17 +08:00
yumaojun
9ec2b9ff1d
merge filed, update files...
2015-11-13 12:50:21 +08:00
yumaojun
4bfe326868
ansible api add get_host_info in Class Tasks
2015-11-13 00:34:32 +08:00
yumaojun
6074bb033d
ansible api add get_host_info in Class Tasks
2015-11-13 00:31:27 +08:00
halcyon
ec7b543bf2
Merge branch 'cmdb' of https://git.coding.net/jumpserver/jumpserver into cmdb
2015-11-13 00:06:15 +08:00
halcyon
b7c3cc5532
add idc
2015-11-13 00:03:51 +08:00
Zi Chuanxiu
1c3d642be2
fixed ansible command variables bug.
2015-11-10 19:55:12 +08:00
Zi Chuanxiu
a2f84e943a
update ansible api
2015-11-10 17:46:44 +08:00
ibuler
4ae36d319c
修复用户信息显示bug
2015-11-10 16:14:32 +08:00
ibuler
7fe0bb21b2
修改无日志记录提示
2015-11-10 16:00:05 +08:00
ibuler
0174da6c77
修改index页面
2015-11-10 15:50:35 +08:00
root
3d6d714495
asset alert history
2015-11-10 00:11:54 +08:00
ibuler
adc3703fba
添加绘图
2015-11-10 00:02:56 +08:00
wangyong
6de253df58
delete xlsx
2015-11-09 21:04:47 +08:00
ibuler
f31bea2c70
使用echart
2015-11-09 19:19:28 +08:00
liuzheng712
b61286891f
update
2015-11-09 17:12:57 +08:00
liuzheng712
6db7642331
Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into NormalUserPageLZ
2015-11-09 16:58:55 +08:00
ibuler
91b5d039cc
修改邮件settings
2015-11-09 16:28:10 +08:00
ibuler
5692e9dc86
添加资产的默认设置
2015-11-09 11:56:31 +08:00
ibuler
7849ff2b92
解决搜索分页问题
2015-11-09 10:53:15 +08:00
halcyon
e77ec102d9
just do it
2015-11-08 22:39:30 +08:00
ibuler
7ea23e0fcc
修复无法终结web进程的bug
2015-11-08 12:01:08 +08:00
ibuler
e60a3a697e
添加测试web terminal按钮
2015-11-07 17:41:16 +08:00
ibuler
d899360c34
增加websocket认证
2015-11-07 17:32:32 +08:00
ibuler
98c4d9bdba
web terminal kill方法
2015-11-07 15:27:49 +08:00
ibuler
24730ebd0f
web terminal记录日志
2015-11-07 13:38:50 +08:00
liuzheng712
cab346686d
update
2015-11-07 10:27:55 +08:00
liuzheng712
d369d4b50f
Merge branch 'jlog' of https://git.coding.net/jumpserver/jumpserver into NormalUserPageLZ
...
# Conflicts:
# jumpserver/views.py
# juser/models.py
# juser/views.py
# templates/jperm/perm_apply.html
2015-11-07 09:37:10 +08:00
liuzheng712
6897d063c2
error = '用户未激活'
2015-11-07 09:09:36 +08:00
liuzheng712
4ddddc134a
禁用 change to 启用
2015-11-06 23:13:02 +08:00
liuzheng712
44a330ac02
download page: waiting...
2015-11-06 23:04:09 +08:00
liuzheng712
f220ea367e
upload file with user id path
2015-11-06 22:26:19 +08:00
ibuler
43c0770770
使用原生select
2015-11-06 12:09:23 +08:00
Zi Chuanxiu
82286ea7ed
fix set host vars and add set group vars
2015-11-06 11:32:59 +08:00
ibuler
01d6f751b1
解决实时监控特殊字符,使用term.js
2015-11-06 10:42:10 +08:00
liuzheng712
7a25f348e4
upload file: save a copy in ./upload/%Y/%M/%D/. TODO: distinguish userID
2015-11-06 00:56:16 +08:00
liuzheng712
12a0a35adf
upload page: need to fix click problem, want to show the list of machines, TODO
2015-11-06 00:21:59 +08:00
Zi Chuanxiu
0f8abb6026
update
2015-11-05 22:53:19 +08:00
Zi Chuanxiu
8e2f3fdecd
update
2015-11-05 22:52:02 +08:00
Zi Chuanxiu
26e3634814
mapping model
2015-11-05 22:47:45 +08:00
ibuler
9a897e0cf4
修正导入select错误
2015-11-05 20:07:21 +08:00
ibuler
1bc15e57a6
完成webtermial demo
2015-11-05 18:31:00 +08:00
liuzheng712
09087a4d8f
set user password , if you don't want to change the password , leave password empty
2015-11-05 14:30:59 +08:00
liuzheng712
6934380b9c
jperm/perm_apply.html
2015-11-05 13:16:23 +08:00
ibuler
618aed3278
移动api中关于tty到connect.py
2015-11-04 17:04:25 +08:00
ibuler
c8c0061244
添加权限鉴定
2015-11-04 16:24:52 +08:00
ibuler
ad4b68a390
Merge branch 'jlog' of git.coding.net:jumpserver/Jumpserver into jlog
2015-11-04 15:21:44 +08:00
kelianchun_miller
a95e313733
update api.py
2015-11-04 15:20:28 +08:00
ibuler
8b25d3e32e
Merge branch 'jlog' of git.coding.net:jumpserver/Jumpserver into jlog
2015-11-04 15:15:03 +08:00
ibuler
a0a7623743
修复log kill和在线查看命令统计
2015-11-04 15:11:14 +08:00
kelianchun_miller
5e20ac0454
update api.py
2015-11-04 14:56:50 +08:00
kelianchun_miller
d182736bd7
update api.py
2015-11-04 14:50:47 +08:00
root
159398b391
fix bugs
2015-11-03 23:53:12 +08:00
ibuler
e4ccb1c43f
修复日志打印的异常bug
2015-11-03 23:21:33 +08:00
ibuler
9d75ad6cea
多线程修复监控阻塞bug
2015-11-03 23:03:31 +08:00
ibuler
b30697ea20
基本完成
2015-11-03 19:12:15 +08:00
wangyong
0c0f05b6d9
jasset base
2015-11-03 17:07:46 +08:00
ibuler
50d21fcdca
for log monitor
2015-11-02 23:20:40 +08:00
Zi Chuanxiu
c49a02d1c5
update ansible_api, and update perm_list_user view
2015-11-02 23:07:04 +08:00
Zi Chuanxiu
c26594a3ec
update ansible_api, and update perm_list_user view
2015-11-02 23:05:19 +08:00
Zi Chuanxiu
6572e6f10e
update ansible_api, and update perm_list_user view
2015-11-02 23:03:41 +08:00
liuzheng712
5144907ec0
there is no need to set the password value, very change user info needs password, make sure this is legal
2015-11-02 16:00:34 +08:00
liuzheng712
ba8ed23292
add the @login_required(login_url='/login')
2015-11-02 15:51:18 +08:00
liuzheng712
6583b0f530
change the login response redirect
2015-11-02 15:50:46 +08:00
liuzheng712
a3bea76994
juser/urls.py format
2015-11-02 15:49:05 +08:00
ibuler@qq.com
ebe8ce7109
some
2015-11-02 11:18:06 +08:00
Zi Chuanxiu
df9d879f22
ansible api base complete...
2015-10-31 11:55:19 +08:00
halcyon
46b1aca5f1
model
2015-10-31 09:23:10 +08:00
Zi Chuanxiu
dd4ac4e6d6
Task add method push_key
2015-10-30 23:14:45 +08:00
root
fe23e61036
Task add method push_key
2015-10-30 23:08:45 +08:00
root
b88c4211b2
update ansible_api.py
2015-10-30 08:25:22 +08:00
root
9e0d1a7285
add ansible_api module
2015-10-29 16:32:02 +08:00
广宏伟
73f94fecb5
fix import some bug
2015-10-29 12:01:03 +08:00
ibuler@qq.com
0e24ebdb26
merge with dev
2015-10-29 11:11:05 +08:00
广宏伟
d5bd2143e2
命令搜素完成
2015-10-28 22:32:16 +08:00
root
7d412e4c18
update configure file
2015-10-28 22:30:34 +08:00
liuzheng712
ac5ac5e06b
change role finished , but need more think
2015-10-28 21:03:54 +08:00
ibuler@qq.com
53e4dc7acb
search detail
2015-10-28 19:24:02 +08:00
liuzheng712
4d3e7d694b
lots
2015-10-28 10:55:25 +08:00
liuzheng712
ca271900e6
remove request.session user_id and role_id, about role_id need more think, now is dirty
2015-10-27 23:57:37 +08:00
liuzheng712
f8c8c3deff
update
2015-10-27 23:34:38 +08:00
ibuler@qq.com
76ad67307b
search ok
2015-10-27 23:18:26 +08:00
ibuler@qq.com
ffab7ae697
some
2015-10-27 20:25:18 +08:00
wangyong
8909386d0c
models
2015-10-27 20:13:23 +08:00
liuzheng712
8e9f22537f
reuse asset_list for host_list
2015-10-27 17:40:53 +08:00
广宏伟
9366003f7b
jlog
2015-10-26 22:17:16 +08:00
蓝枫
9018536651
Merge pull request #21 from shadowzey/master
...
页面错误修复
2015-10-26 11:42:08 +08:00
zyan
ec8ef4d1d7
Update idc_detail.html
...
修复IDC详情页面显示错误
2015-10-26 10:35:50 +08:00
ibuler@qq.com
72a18d6abf
use map
2015-10-24 23:52:06 +08:00
ibuler@qq.com
79e81340dc
modify log
2015-10-21 22:39:53 +08:00
ibuler@qq.com
4baffed481
base commit
2015-10-21 21:19:18 +08:00
广宏伟
77131a39d4
recovery playboo_run
2015-10-21 20:53:07 +08:00
广宏伟
40d00f7cbd
lost playboo_run
2015-10-21 20:44:28 +08:00
ibuler@qq.com
fe1f825fdf
perm edit
2015-10-19 23:40:16 +08:00
shadowzey
64973e43de
修复从查看部门页面进入主机列表点击详情404错误
2015-10-13 17:19:47 +08:00
蓝枫
e284584506
Merge pull request #20 from shadowzey/master
...
捕获添加用户邮箱填写错误时邮件发送失败的异常
2015-10-13 16:55:13 +08:00
严泽
0667067c0c
捕获添加用户邮箱填写错误时邮件发送失败的异常
2015-10-13 16:36:16 +08:00
ibuler@qq.com
50d2bfb272
someday
2015-10-12 09:58:38 +08:00
ibuler@qq.com
06eedff49f
fix common
2015-10-07 20:14:07 +08:00
ibuler@qq.com
afbbad1604
授权管理
2015-10-07 17:16:20 +08:00
liuzheng712
9d5c4dbb33
juser/user_list change user password fix
2015-10-07 12:36:20 +08:00
liuzheng712
ce90472624
juser/user_list change user password fix
2015-10-07 12:31:40 +08:00
liuzheng712
85dcc8ba63
WARNINGS:
...
jlog.Log.pid: (fields.W122) 'max_length' is ignored when used with IntegerField
HINT: Remove 'max_length' from field
2015-10-07 12:20:59 +08:00
liuzheng712
c9e192fae4
recovery User's function
2015-10-07 12:17:20 +08:00
liuzheng712
cee8b2d787
rollback jumpserver/views.py 54 : user = get_object() part and delete useless 'class CustomUser'
2015-10-07 12:01:14 +08:00
ibuler@qq.com
d3465be672
修改Ignore
2015-10-06 23:48:15 +08:00
ibuler@qq.com
e99b33c51e
修改使用新表结构
2015-10-06 23:47:53 +08:00
Administrator
43fe985143
添加组授权
2015-10-06 18:51:49 +08:00
Administrator
699046dad5
修改settings
2015-10-05 23:48:03 +08:00
guanghongwei
6482a5e214
add ignore
2015-10-04 21:51:23 +08:00
guanghongwei
fef3879c85
rm tmpfile
2015-10-04 21:50:51 +08:00
guanghongwei
9f7b066ca6
shouquanxiugai
2015-10-04 21:50:29 +08:00
liuzheng712
02218e624a
lots
2015-10-04 19:07:42 +08:00
liuzheng712
5a5928483f
lots
2015-10-04 00:53:01 +08:00
liuzheng712
11b3cee346
gitignore
2015-10-03 22:50:05 +08:00
蓝枫
949065be2c
Update connect.py
...
修正vim颜色
2015-10-01 16:25:17 +08:00
蓝枫
6168ab270f
Merge pull request #19 from IYism/master
...
bugfix:connect.py log_online.html
2015-09-25 17:20:48 +08:00
IYism
667862223c
bugfix
...
修复chrome浏览器有时候不能阻断的bug
2015-09-25 16:33:11 +08:00
IYism
2f5cf429ed
bugfix ip_list
...
bugfix ip_list
2015-09-25 16:30:15 +08:00
liuzheng712
7a94724dbc
initial_data_test
2015-09-24 09:43:28 +08:00
liuzheng712
79c79432f5
usermodle
2015-09-15 23:38:06 +08:00
ibuler
d32ea9f9a1
授权管理
2015-09-11 00:04:07 +08:00
ibuler
907c2c7e97
资产修改基本完成
2015-09-10 22:51:42 +08:00
ibuler
960e45d0fa
添加asset_api
2015-09-09 00:19:36 +08:00
ibuler
8bf9103fcf
修改资产管理
2015-09-09 00:19:17 +08:00
ibuler
4eb78e151e
用户模块修改告一段落
2015-09-06 21:37:22 +08:00
ibuler
3efd810fe1
修改修改用户bug
2015-09-02 21:42:31 +08:00
ibuler
c21cdc2131
添加忘记密码
2015-08-31 23:04:53 +08:00
蓝枫
a4ac98332b
Merge pull request #15 from xiaopeng163/master
...
Delete .DS_Store file
2015-08-31 10:32:06 +08:00
Peng Xiao
073e7b36fa
Delete .DS_Store file
...
.DS_Store is the name of a file in the Apple OS X operating system for storing custom attributes of a folder such as the position of icons or the choice of a background image.
2015-08-31 10:28:54 +08:00
ibuler
44c69ded78
干掉ldap前
2015-08-30 14:03:10 +08:00
root
1e170714c0
修改用户添加视图
2015-08-29 00:09:36 +08:00
ibuler
f47cddbd5c
修改cpu占用问题
2015-08-28 10:04:07 +08:00
ibuler
1387e29591
解决cpu占用过大问题
2015-08-28 09:58:20 +08:00
ibuler
10d96a9767
修改用户组视图
2015-08-28 00:33:54 +08:00
ibuler
fd5041965b
分离juser方法
2015-08-27 00:08:45 +08:00
ibuler
33c624c76f
删除部门后
2015-08-27 00:08:20 +08:00
ibuler
913f93b91f
删除部门前
2015-08-26 23:31:32 +08:00
蓝枫
d34ec00a3a
Merge pull request #14 from pengyao/master
...
exact match, thanks for pengyao
2015-08-26 16:12:36 +08:00
pengyao
e9c6924530
exact match
2015-08-26 16:06:22 +08:00
ibuler
c1facb939e
优化connect.py排序
2015-08-22 00:01:54 +08:00
ibuler
ad16d8b532
优化connect.py 和 api.py
2015-08-21 23:45:41 +08:00
Guang
9f0620f97e
调整User,UserGroup类
2015-08-20 23:42:27 +08:00
蓝枫
a040b1c181
Update connect.py
...
fix cpu used 100%
2015-07-21 10:26:49 +08:00
蓝枫
8121e4942b
Merge pull request #13 from ljjjustin/master
...
fix error url in host search page
2015-07-08 19:20:00 +08:00
Jiajun Liu
f5e57da106
fix line break bug on add multiple hosts
2015-07-07 18:12:25 +08:00
Jiajun Liu
b8dfb26a3a
fix error url in host search page
2015-07-07 17:44:12 +08:00
蓝枫
079338f89d
Merge pull request #12 from ljjjustin/master
...
fix user can not get login logs bug
2015-07-07 17:13:18 +08:00
Jiajun Liu
627d627995
fix user can not get login logs bug
2015-07-07 16:59:24 +08:00
Jiajun Liu
19343540b9
fix line break bug
...
some system user '\n\r' as line break, if we split commands by '\n',
then '\r' will be considered as part of commands which will break sudo
authentication. we can use splitlines function to avoid the problem.
2015-07-07 16:59:24 +08:00
Jiajun Liu
915adb2fd3
fix user can not get permission applies bug
2015-07-07 16:59:21 +08:00
ibuler
c25cd3c005
Merge remote-tracking branch 'remotes/github/master'
2015-07-03 21:29:25 +08:00
ibuler
32ab051bbc
modify cmd_group num bug
2015-07-03 21:27:20 +08:00
ibuler
f7e70e56e3
modify sudo conn timeout bug
2015-07-03 21:09:17 +08:00
ibuler
9e52e6a320
modify some
2015-07-03 20:45:45 +08:00
ibuler
f3a0c390b1
connect.py base ok
2015-06-16 09:21:11 +08:00
ibuler
bb32c0480c
dev
2015-06-15 23:00:19 +08:00
ibuler
8d167baf46
modify some
2015-06-15 19:20:05 +08:00
蓝枫
acfa0171ca
Update log_offline.html
...
a small bug
2015-06-15 16:06:12 +08:00
ibuler
fdcaa358e5
modify some api.py bug
2015-06-13 00:36:10 +08:00
ibuler
ce8e1e0ae3
Merge remote-tracking branch 'remotes/github/master'
2015-06-11 14:05:16 +08:00
ibuler
7cb4ff97ea
modify cmd_edit bug
2015-06-11 14:01:49 +08:00
ibuler
5d16836b05
modify connect.py
2015-06-10 23:16:24 +08:00
ibuler
fc22677f3f
modify some
2015-06-09 23:06:32 +08:00
蓝枫
787a2591c4
Update layer.min.js
...
update url
2015-06-09 16:30:59 +08:00
ibuler
95cc2830c8
resolve kill process bug
2015-06-09 09:49:31 +08:00
ibuler
5bae8245bd
modify source ip bug
2015-06-09 09:32:35 +08:00
ibuler
e979c2753b
modify 1
2015-06-08 23:46:40 +08:00
ibuler
dcfd4e05ec
modify sudo cmd bug
2015-06-04 10:15:41 +08:00
ibuler
1662269153
websocket auth add
2015-05-28 17:00:03 +08:00
ibuler
ce99bf2266
placeholder
2015-05-25 18:35:32 +08:00
ibuler
1952d1ca23
modify sudo show
2015-05-25 18:27:57 +08:00
ibuler
bf80799fb6
modify port type
2015-05-25 17:13:08 +08:00
ibuler
38f89042ac
modify single user login bug
2015-05-25 14:16:08 +08:00
ibuler
67b2467bc9
Merge branch 'guanghongwei'
2015-05-25 10:10:49 +08:00
ibuler
345be469fa
Merge branch 'wangyong'
2015-05-25 10:07:25 +08:00
halcyon
04522c0b80
修改port字段
2015-05-25 10:03:55 +08:00
蓝枫
4a9e002440
Merge pull request #6 from losswei/master
...
修复当用户使用Ctrl+C结束进程时,没有正确退出
2015-05-22 17:24:46 +08:00
何威
6998036bdc
修复当用户使用Ctrl+C结束进程时,没有正确退出
2015-05-22 17:18:37 +08:00
ibuler
e09cb10439
modify a bug with 10.0.0.1 10.0.0.11 10.0.0.12 match problem
2015-05-18 17:22:26 +08:00
ibuler
caa318b808
modify a bug with 10.0.0.1 10.0.0.11 10.0.0.12 match problem
2015-05-18 16:40:36 +08:00
ibuler
58fd4374c7
Merge branch 'wangyong'
2015-05-15 12:01:51 +08:00
ibuler
f89d444ddf
modify requirements.txt
2015-05-15 11:53:31 +08:00
root
49bee0c3fd
修改主机添加或者修改没添加进ALL组bug
2015-05-14 18:02:20 +08:00
ibuler
00f7346578
resolve connect.py string start with g bug
2015-04-28 16:54:58 +08:00
ibuler
b1add204b6
ʾ
2015-04-28 15:08:28 +08:00
ibuler
6d34bd45d2
modify nav_bar_header.html
2015-04-24 20:42:15 +08:00
ibuler
992947ac99
modify service.sh bug
2015-04-24 20:39:44 +08:00
ibuler
ba55cdde87
modify service.sh bug
2015-04-24 19:12:14 +08:00
ibuler
c01a489dce
modify service.sh bug
2015-04-24 18:19:43 +08:00
ibuler
0beb683c40
Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver
2015-04-23 11:23:05 +08:00
root
b134c90bfd
解决阻断报错问题
2015-04-23 11:20:12 +08:00
ibuler
6c10cf1a5a
Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver
2015-04-22 18:58:26 +08:00
ibuler
311b65da00
bug
2015-04-22 18:57:55 +08:00
halcyon
8a8f68d908
使用username 去掉log_ha里的print
2015-04-22 18:04:23 +08:00
halcyon
b7aa1ab3dc
jperm问题
2015-04-22 17:50:46 +08:00
halcyon
27d6df7a38
解决django低版本不支持first()问题
2015-04-21 14:45:38 +08:00