github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-08-09 01:58:42 +00:00
Code Issues Projects Releases Wiki Activity
5,516 Commits 86 Branches 259 Tags 146 MiB
v2.4
Commit Graph

2723 Commits

Author SHA1 Message Date
Bai
34be588887 fix: 删除pycryptodome依赖包安装(因为pycryptodome和pycrypto安装包目录冲突);只安装 pycryptodomex依赖包; 修改 from crypto 为 from cryptodome 2021-01-25 11:58:31 +08:00
fit2bot
c9a8775ae4
fix: 修复 celery 等日志文件的访问漏洞 (#5476) 
Co-authored-by: xinwen <coderWen@126.com>
 2021-01-19 14:36:18 +08:00
ibuler
8f792dc4b6 fix: bug 2021-01-14 10:44:36 +08:00
ibuler
d8ab81b53e fix(ops): 修复因为更改controlmaster引起的连接不服用维内托 2020-11-16 15:34:36 +08:00
ibuler
06008e5ac9 fix(assets): 修复动态系统用户推送的bug 2020-11-16 14:52:52 +08:00
xinwen
19a8a0806e fix(perms): 当用户授权为空时，清空旧的授权树 2020-11-09 03:27:44 -06:00
xinwen
49c17d18b3 fix(perms): 由于组织不对，导致生成或显示授权树错误 2020-11-06 06:57:10 -06:00
xinwen
02b8533ea0 perf(perms): 优化授权树生成速度 2020-11-06 15:50:46 +08:00
xinwen
5c46ff20de fix(orgs): org-member-relation url 拼写错误 2020-11-03 17:58:13 +08:00
xinwen
074121b957 fix(perms): 重建授权树冲突时，响应里加 code 2020-11-03 17:53:20 +08:00
xinwen
0eff79c47a perf(perms): 优化用户授权资产列表加载速度 2020-10-31 09:54:07 +08:00
xinwen
10ff7730ec perf(perms): 优化根据资产获取授权的系统用户 2020-10-30 00:38:05 -05:00
root
4f70e313b4 modify: AttributeError: 'UUID' object has no attribute 'name' 2020-10-26 06:18:25 -05:00
xinwen
c225fd584d fix(assets): 系统用户与用户组发生变化时报错 2020-10-26 05:30:46 -05:00
xinwen
8ed6a64a9e fix(assets): 资产列表添加默认 date_created 排序 2020-10-23 02:24:24 -05:00
ibuler
d7e97629aa fix(perms): 修复asset permission导入的bug 2020-10-20 14:50:36 +08:00
ibuler
2c20889540 fix(perms): 修复用户的资产不区分组织的问题 2020-10-19 21:50:31 -05:00
Bai
7d325856b9 perf(config): 升级依赖redis==3.5.3; 添加CACHES配置: health_check_interval=30; 解决因网络不稳定导致的redis连接失败异常 2020-10-19 04:45:01 -05:00
xinwen
28879d9314 fix(orgs): 更新用户时org_roles参数为None时不更新组织角色 2020-10-18 22:23:27 -05: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
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
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
2190db1bb5 fix(ops): 修复任务schedule属性的bug 2020-10-12 21:51:31 -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
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
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
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
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
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