老广
|
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 |