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>
|
4 years ago |
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)
|
4 years ago |
ibuler
|
09303ecc56
|
perf: 优化各serializer字段翻译
|
4 years ago |
ibuler
|
25dfce621b
|
perf: 优化,添加登录页面图片链接到 github
|
4 years ago |
xinwen
|
102d3b590b
|
perf: luna 页面获取资产系统用户按 name 排序
|
4 years ago |
fit2bot
|
a45f581b0e
|
fix: 将 user 添加到 default 组织时进度数量显示不准确 (#5720)
Co-authored-by: xinwen <coderWen@126.com>
|
4 years ago |
ibuler
|
b3991d0388
|
fix: 修复Migrate的问题
fix: 修复 org migrations 依赖
|
4 years ago |
xinwen
|
184e8b31e6
|
perf: 优化下 `orgid_nodekey_assetsid_mapping`
|
4 years ago |
xinwen
|
615bcadf62
|
fix: 资产授权规则过滤添加 distinct
|
4 years ago |
fit2bot
|
7b2f813e7f
|
feat: 支持修改忘记密码重置密码的连接 (#5700)
perf: 优化代码暗示
Co-authored-by: ibuler <ibuler@qq.com>
|
4 years ago |
ibuler
|
81170b4b7b
|
perf: 优化登录页面,非常给力
perf: 优化报错
perf: 优化忘记密码
perf: 添加注释
|
4 years ago |
xinwen
|
c4eacbabc6
|
refactor: 重构缓存框架
|
4 years ago |
xinwen
|
ccb0509d85
|
feat: 批量导入解析为Json的接口添加 `title` 字段
|
4 years ago |
xinwen
|
886393c539
|
feat: 添加批量导入时将其他格式(csv, excel)解析为Json的接口
|
4 years ago |
xinwen
|
15b0ad9c12
|
refactor: 清理代码 `orgs.mixins.api.OrgMembershipModelViewSetMixin`
|
4 years ago |
wojiushixiaobai
|
19e2a5b9f9
|
fix(terminal): 修正录像接口返回状态码
|
4 years ago |
fit2bot
|
0aa2c2016f
|
perf(project): 优化命名的风格 (#5693)
perf: 修改错误的地
perf: 优化写错的几个
Co-authored-by: ibuler <ibuler@qq.com>
|
4 years ago |
xinwen
|
935947c97a
|
fix: 用户详情页的资产授权列表慢
|
4 years ago |
xinwen
|
3e7e01418d
|
perf: 优化命令记录慢的问题
|
4 years ago |
xinwen
|
840e5e8863
|
fix: 修复 default 组织迁移脚本问题
|
4 years ago |
xinwen
|
24fb8b2a89
|
feat: 管理用户详情页添加认证方式与秘钥指纹
|
4 years ago |
xinwen
|
ab23a357f7
|
feat: 推送动态系统用户,系统上用户的 comment 字段是 userdisplayname
|
4 years ago |
xinwen
|
78bf6f5817
|
refactor: 获取授权树或者资产列表时避免读时锁
|
4 years ago |
ibuler
|
91a26abf9e
|
perf: 优化default节点
|
4 years ago |
ibuler
|
d7e7c62c7a
|
perf: 优化表结构迁移
|
4 years ago |
xinwen
|
09bdff4a67
|
fix: 缓存框架 expire_fields 可能报错
|
4 years ago |
Bai
|
56328e112a
|
perf: 移除资源创建时对于Auditor用户的限制
|
4 years ago |
Bai
|
1d15f7125e
|
perf: 优化org获取逻辑 - 采用redis订阅机制实现orgs_mapping数据的维护;删除get_org_by_id等方法;
perf: 优化get_instance接口
|
4 years ago |
xinwen
|
1870fc97d5
|
refactor: 适配新的 default 组织
|
4 years ago |
fit2bot
|
f548b4bd2b
|
feat: serializer 添加默认值,前端可以调用 (#5666)
perf: 优化默认值
Co-authored-by: ibuler <ibuler@qq.com>
|
4 years ago |
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>
|
4 years ago |
fit2bot
|
51c9a89b1f
|
fix: 用户页面授权资产列表获取系统用户慢 (#5663)
Co-authored-by: xinwen <coderWen@126.com>
|
4 years ago |
fit2bot
|
6f3ead3c42
|
perf: 优化系统用户生成密码的复杂度 (#5648)
* perf: 优化系统用户生成密码的复杂度
* perf: 修改 common.random_string
Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: Bai <bugatti_it@163.com>
|
4 years ago |
xinwen
|
1036d1c132
|
fix: 修复授权树一些问题
|
4 years ago |
ibuler
|
5de5fa2e96
|
fix: 修复获取不到 org 的问题
|
4 years ago |
ibuler
|
19043d0a66
|
perf: 添加 xrdp type
|
4 years ago |
ibuler
|
bc3e50a529
|
fix: 修复代码更改引起的bug
|
4 years ago |
fit2bot
|
a7ab7da61c
|
feat: 添加限制用户只能从source登录的功能 (#5592)
* stash it
* feat: 添加限制用户只能从source登录的功能
* fix: 修复小错误
Co-authored-by: ibuler <ibuler@qq.com>
|
4 years ago |
fit2bot
|
b483f78d52
|
fix(assets): 系统用户支持 OPENSSH 格式的私钥 (#5604)
* fix(assets): 系统用户支持 OPENSSH 格式的私钥
* fix: 升级paramiko
Co-authored-by: ibuler <ibuler@qq.com>
|
4 years ago |
ibuler
|
88d8a3326f
|
perf(ops): 优化定期检查磁盘,添加开关控制
|
4 years ago |
ibuler
|
8f7dcd512a
|
perf(ops): ansible 增加 summary 汇总
|
4 years ago |
xinwen
|
d795867916
|
perf: 优化批量更新会查询全部数据的问题
|
4 years ago |
xinwen
|
4c4f544f0d
|
fix: 修复禁用 MFA 后还可以用 MFA 查看密码匣子
|
4 years ago |
xinwen
|
8ec26dea43
|
feat: 重置 MFA 发个邮件 #754
|
4 years ago |
xinwen
|
799d1e4043
|
feat: 资产授权规则添加是否有效的过滤条件
|
4 years ago |
ibuler
|
b03642847e
|
perf: 去掉 data_tree
|
4 years ago |
fit2bot
|
a4e635bff0
|
feat: 添加下载rdp文件的api (#5637)
* feat: 添加下载rdp文件的api
* perf: 优化一些权限
* perf: 优化一波token
Co-authored-by: ibuler <ibuler@qq.com>
|
4 years ago |
xinwen
|
83cc339d4b
|
refactor: 调整组织统计数据缓存的更新策略为懒更新模式
|
4 years ago |
ibuler
|
bb9790a50f
|
feat: 为rdp 添加一个api
|
4 years ago |
xinwen
|
9be3cbb936
|
perf: 优化用户详情页授权列表加载速度&添加可重入锁
|
4 years ago |
xinwen
|
e599bca951
|
fix: 命令存储 es 类型主机带用户名密码报错
|
4 years ago |
fit2bot
|
501ad698b7
|
添加 UnionQuertSet (#5578)
* 添加 UnionQuertSet
* 跑通了
* 改变了 count 这类方法的代理模式
* 使用了老广的
Co-authored-by: xinwen <coderWen@126.com>
|
4 years ago |
Bai
|
50e6c96358
|
fix: 修复 component status 获取key error 问题
|
4 years ago |
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>
|
4 years ago |
ibuler
|
93474766f6
|
perf(permission): 优化权限控制,显式的声明权限
|
4 years ago |
fit2bot
|
542eb25e7b
|
fix(perms): 修复权限校验时的组织切换问题 (#5546)
* fix(perms): 修复权限校验时的组织切换问题
* fix(perms): 修复获取actions的切换组织问题
* perf: 继续添加 application 的验证组织
Co-authored-by: ibuler <ibuler@qq.com>
|
4 years ago |
Bai
|
609d2710fa
|
perf: 会话列表添加search_fields字段
|
4 years ago |
ibuler
|
d852d2f670
|
perf: 还原回原来的用户来源字段
|
4 years ago |
ibuler
|
23afe81ff5
|
perf(authentication): 优化connection token的使用
|
4 years ago |
ibuler
|
dd5b2b9101
|
perf: 去掉 v2 的api
|
4 years ago |
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>
|
4 years ago |
fit2bot
|
351d4d8123
|
refactor(celery): 重构celery,使用 threads 模型,避免 占用太多内存 (#5525)
* refactor(celery): 重构celery,使用 threads 模型,避免 占用太多内存
* fix: 修复无法关闭fd的bug
Co-authored-by: ibuler <ibuler@qq.com>
|
4 years ago |
Bai
|
efb9f48c6f
|
perf: 删除`pycryptodome`依赖包安装(因为`pycryptodome`和`pycrypto`安装包目录冲突);只安装 `pycryptodomex`依赖包; 修改 `from crypto` 为 `from cryptodome`
|
4 years ago |
Bai
|
d04b90b8e8
|
feat: 修改copyright 2014-2021
|
4 years ago |
Jiangjie.Bai
|
66f57fdb27
|
Merge pull request #5504 from jumpserver/dev
Dev
|
4 years ago |
Bai
|
c949589564
|
perf: 修改翻译信息; 添加Domain迁移文件
|
4 years ago |
xinwen
|
f63f8d085d
|
fix: Web页面-> 命令执行 高危命令没有告警
|
4 years ago |
Jiangjie.Bai
|
3e55447327
|
Merge pull request #5497 from jumpserver/dev
Dev
|
4 years ago |
xinwen
|
3ac20d80d1
|
fix: 登录日志的登录方式不准确
|
4 years ago |
fit2bot
|
3e38e4fc59
|
i18n: 优化翻译 (#5492)
* i18n: 优化翻译
* i18n: 优化翻译(2)
* i18n: 优化翻译(3)
Co-authored-by: Bai <bugatti_it@163.com>
|
4 years ago |
xinwen
|
1090887b2b
|
fix: 管理用户-> 资产用户列表 更新密码报错
|
4 years ago |
Bai
|
7c55d462cd
|
fix: 修复工单翻译和登录确认工单开启问题
|
4 years ago |
fit2bot
|
ea16088c08
|
fix: 修改翻译内容 (#5489)
* fix: 修改翻译内容
* fix: 修改翻译内容(2)
Co-authored-by: Bai <bugatti_it@163.com>
|
4 years ago |
Bai
|
4de9e608b1
|
fix: 修改命令存储配置DOC_TYPE字段类型为ReadableHiddenField
|
4 years ago |
xinwen
|
dd9a55bd5f
|
fix: 用户名超过64字符,命令无法记录问题
|
4 years ago |
Jiangjie.Bai
|
ee22006683
|
Merge pull request #5485 from jumpserver/dev
Dev
|
4 years ago |
xinwen
|
09d91d8bf3
|
fix: 修复系统平台创建名称报错信息
|
4 years ago |
Bai
|
46fbc19697
|
i18n: 修改翻译
|
4 years ago |
Bai
|
44a42e4739
|
fix: 修改用户相关tickets为自己申请的或者待受理的
|
4 years ago |
xinwen
|
4de2ae607d
|
perf: 优化 日志审计-> 批量命令-> 用户显示格式
|
4 years ago |
Bai
|
9fee82cd14
|
fix: 添加录像存储endpoint校验逻辑
|
4 years ago |
fit2bot
|
9126c7780d
|
perf: 工单优化(审批人可以填写工单对应的授权规则名称) (#5468)
* perf: 工单优化(审批人可以填写工单对应的授权规则名称)
* perf: 工单优化(优化推荐的资产、应用、系统用户等逻辑)
* perf: 工单优化(优化工单邮件内容)
* perf: MethodSerializer优化(优化当Serializer不需要时, 默认可以不传递对应字段)
Co-authored-by: Bai <bugatti_it@163.com>
|
4 years ago |
fit2bot
|
0842553f8a
|
fix: 修复 celery 等日志文件的访问漏洞 (#5469)
Co-authored-by: xinwen <coderWen@126.com>
|
4 years ago |
xinwen
|
5fae919499
|
fix: 跳板机危险命令告警发送邮件失败
|
4 years ago |
Bai
|
a0cb16e5c4
|
perf: 修改关闭工单API权限, 申请人有权限关闭工单
|
4 years ago |
ibuler
|
7b8f932dcd
|
perf: 去掉几个不用的api
|
4 years ago |
Bai
|
243eedc4f9
|
perf: 优化工单body html显示格式及翻译信息
|
4 years ago |
xinwen
|
230ef2f662
|
fix: 修复用户离开组织信号被覆盖问题
|
4 years ago |
xinwen
|
42019c9e8a
|
fix: 修复 AssetUserFilterBackend
|
4 years ago |
Bai
|
f6622f5e01
|
fix: 修改翻译
|
4 years ago |
Bai
|
31f098449f
|
perf: 修改 OPTION 获取 choices 字段选项; 修改display字段翻译 (显示名称)
|
4 years ago |
Jiangjie.Bai
|
be5b4a5f71
|
Merge pull request #5440 from jumpserver/dev
Dev
|
4 years ago |
xinwen
|
e61511372c
|
fix: 修复缓存框架组织切换问题&组织的 resource_statistics 字段是只读
|
4 years ago |
Jiangjie.Bai
|
d4f3280427
|
Merge pull request #5437 from jumpserver/dev
Dev
|
4 years ago |
fit2bot
|
083f061665
|
perf: 更新翻译 (#5438)
* perf: 更新翻译
* perf: 更新翻译
Co-authored-by: Bai <bugatti_it@163.com>
|
4 years ago |
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>
|
4 years ago |
xinwen
|
156be0a64e
|
fix: 网域列表添加默认 name 排序
|
4 years ago |
fit2bot
|
a7fa2331bd
|
feat: 添加缓存模块,添加组织资源统计 (#5407)
* feat: 添加缓存模块,添加组织资源统计
* refactor
* recover .gitkeep
* refactor
* 合并信号处理
* 修复组织添加用户没有发信号
* 修改了一个log级别
Co-authored-by: xinwen <coderWen@126.com>
|
4 years ago |
ibuler
|
f04e2fa090
|
fix: bug
|
4 years ago |
Bai
|
83d12d02fb
|
perf: 重构工单处理流程 (7)
|
4 years ago |
ibuler
|
64257823c5
|
pref(common): 优化drf options的filterset 可能引起的问题
|
4 years ago |
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>
|
4 years ago |
fit2bot
|
86a055638c
|
reactor: 重构命令&录像存储模块的Serializer及相关模块 (#5392)
* reactor: 重构命令&录像存储模块的Serializer及相关模块
Co-authored-by: Bai <bugatti_it@163.com>
|
4 years ago |
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>
|
4 years ago |
Bai
|
dbe969b064
|
perf: 解决MethodSerializer被swagger调用时parent.Serializer会互相影响所需字段显示的问题
|
4 years ago |
Bai
|
b9258878fe
|
fix: 修复celery日志清除问题
|
4 years ago |
Bai
|
19c2973501
|
perf: 可以获取多种协议类型的系统用户列表
|
4 years ago |
ibuler
|
e7a3c5a822
|
perf(api): filter_fields被filterset_fields取代
https://django-filter.readthedocs.io/en/stable/guide/migration.html
|
4 years ago |
xinwen
|
60c19148dc
|
feat: 添加批量执行资产任务的接口
|
4 years ago |
老广
|
7eedc0635e
|
Merge pull request #5362 from jumpserver/pr@dev@fix_adhoc_excution
fix: 修复多个 AdHocExecution 在一个 celery task 执行时日志错误
|
4 years ago |
xinwen
|
f5fd40978e
|
fix: 修复多个 AdHocExecution 在一个 celery task 执行时日志错误
|
4 years ago |
Bai
|
72dd23dcce
|
perf: ticket 申请添加 comment
|
4 years ago |
老广
|
5b5c33116a
|
Merge pull request #5350 from hctech/dev
fix:资产自动推送UUIDD数组格式化字符串失败
|
4 years ago |
fit2bot
|
7167515a53
|
feat: 实现MethodSerializer, 满足serializer中SerializerField动态更改的需求 (#5382)
* feat: 实现MethodSerializer, 满足serializer中SerializerField动态更改的需求
* feat: 实现MethodSerializer, 满足serializer中SerializerField动态更改的需求 (2)
Co-authored-by: Bai <bugatti_it@163.com>
|
4 years ago |
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>
|
4 years ago |
Bai
|
3188692691
|
perf: 修改swagger问题
|
4 years ago |
Bai
|
aab59403e1
|
perf: 修改工单创建授权规则的字段(created_by)
|
4 years ago |
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>
|
4 years ago |
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>
|
4 years ago |
Bai
|
24b1c87121
|
perf: 修改细节
|
4 years ago |
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>
|
4 years ago |
Bai
|
5c483084b7
|
feat: 优化工单模块
|
4 years ago |
fit2bot
|
167734ca5d
|
feat: 优化工单模块 (#5365)
* feat: 优化工单模块
* feat: 优化工单模块2
Co-authored-by: Bai <bugatti_it@163.com>
|
4 years ago |
Bai
|
1a9a5c28f5
|
feat: 优化工单模块1
|
4 years ago |
fit2bot
|
430e20a49c
|
feat: 优化工单模块 (#5361)
* feat: 优化工单模块1
* feat: 优化工单模块2
* feat: 优化工单模块3
Co-authored-by: Bai <bugatti_it@163.com>
|
4 years ago |
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
|
4 years ago |
huangchao
|
795d1b59e0
|
fix:资产自动推送UUIDD数组格式化字符串失败
|
4 years ago |
xinwen
|
332f65cf2f
|
fix: 将节点的资产添加到系统用户时固定组织
|
4 years ago |
Bai
|
b79e6799c4
|
fix: 修复资产导入携带disk_info信息时失败的问题
|
4 years ago |
Bai
|
4eef425e2a
|
fix: 修复提交系统设置失败的问题
|
4 years ago |
Jiangjie.Bai
|
3f4877f26b
|
Merge pull request #5295 from jumpserver/dev
fix: 修复命令列表过滤字段文案`会话ID`
|
4 years ago |
Bai
|
0e4d778335
|
fix: 修复命令列表过滤字段文案`会话ID`
|
4 years ago |
Jiangjie.Bai
|
52d20080ff
|
Merge pull request #5293 from jumpserver/dev
fix: 修改系统监控问题
|
4 years ago |
Bai
|
ed8d72c06b
|
fix: 修改系统监控问题
|
4 years ago |
Jiangjie.Bai
|
5e9e3ec6f6
|
Merge pull request #5288 from jumpserver/dev
chore: Merge master from dev
|
4 years ago |
xinwen
|
4f5f92deb8
|
fix: 批量删除管理用户报错信息太丑
|
4 years ago |
xinwen
|
d2a15ee702
|
fix: 申请资产工单如果系统用户没填内容不推荐系统用户
|
4 years ago |
Bai
|
a3a591da4b
|
fix: 修复命令导出excel格式报错
|
4 years ago |
Bai
|
3f2925116e
|
fix: 修复metrics获取terminal过滤is_deleted字段
|
4 years ago |
xinwen
|
c3e2e536e0
|
fix: 【用户管理】-创建用户组-可将系统审计员加入到用户组 #579
|
4 years ago |
Jiangjie.Bai
|
8c133d5fdb
|
Merge pull request #5278 from jumpserver/dev
chore: Merge master from dev
|
4 years ago |
xinwen
|
89d8efe0f1
|
fix: perms.signals_handler.on_application_permission_applications_changed 修改名字
|
4 years ago |
Bai
|
54303ea33f
|
fix: 修复节点创建时更新孩子full_value日志输出问题
|
4 years ago |
Bai
|
4dcd8dd8dd
|
fix: 修复节点创建时更新孩子full_value日志输出问题
|
4 years ago |
xinwen
|
bf308e24b6
|
fix: 推送系统用户时 AdHocExecution id 重复
|
4 years ago |
Bai
|
b3642f3ff4
|
fix: 修复LDAP用户登录(未找到)时循环调用问题
|
4 years ago |
xinwen
|
3aed4955c8
|
fix: 远程应用授权的一些问题
|
4 years ago |
fit2bot
|
9a5f9a9c92
|
fix: 应用授权不会自动推送的bug (#5271)
Co-authored-by: xinwen <coderWen@126.com>
|
4 years ago |
Orange
|
6d5bec1ef2
|
Merge pull request #5269 from jumpserver/dev
chore: Merge master from dev
|
4 years ago |
Bai
|
e93fd1fd44
|
fix: 删除终端列表state的默认值0
|
4 years ago |
xinwen
|
7bf37611bd
|
fix: 系统审计员不应该能添加到组
|
4 years ago |
xinwen
|
b8ec4bfaa5
|
fix: 日志审计-操作日志中搜索-按动作搜索:需修改文字 删除文件-->删除 #524
|
4 years ago |
Bai
|
58b6293b76
|
fix: 组件监控添加offline数量
|
4 years ago |
xinwen
|
8e12eebceb
|
fix: 获得 oidc acs 等认证方式失败
|
4 years ago |
Bai
|
72d6ea43fa
|
fix: 修改命令列表过滤参数session
|
4 years ago |
Bai
|
deedd49dc5
|
fix: 修复命令记录导出excel文件格式未定义的问题
|
4 years ago |
fit2bot
|
a36e6fbf84
|
fix: 修改判断会话活跃逻辑;不必要判断协议 (#5262)
* fix: 修改判断会话活跃逻辑;不必要判断协议
* fix: 修改导入task问题
Co-authored-by: Bai <bugatti_it@163.com>
|
4 years ago |
Bai
|
b57453cc3c
|
fix: 修复命令列表过滤使用session_id字段
|
4 years ago |
Jiangjie.Bai
|
62f2909d59
|
Merge pull request #5256 from jumpserver/dev
chore: Merge master from dev
|
4 years ago |
xinwen
|
0d469ff95b
|
fix(orgs): 用户离开组织后授权的资产没主动刷新
|
4 years ago |
xinwen
|
ca883f1fb4
|
fix: 工单申请资产审批时系统用户没有推荐
|
4 years ago |
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>
|
4 years ago |
ibuler
|
0813cff74f
|
perf: 优化 docs swagger,不再要求debug
|
4 years ago |
ibuler
|
ff428b84f9
|
fix(assets): 修复asset更新子节点时的日志错误
|
4 years ago |
ibuler
|
d0c9aa2c55
|
fix(assets): 修复更新孩子节点时的log error
|
4 years ago |
老广
|
1d5e603c0d
|
Merge pull request #5231 from jumpserver/dev
chore(merge): 合并 dev 到 master
|
4 years ago |
Bai
|
90df404931
|
fix: 修复swagger问题
|
4 years ago |
Bai
|
b9cbff1a5f
|
del: 删除测试prometheus相关代码
|
4 years ago |
ibuler
|
b9717eece3
|
fix: 修改访问swagger会产生的错误
|
4 years ago |
Bai
|
f9cf2a243b
|
fix: 修复settings中搜索LDAP用户重复问题
|
4 years ago |
Bai
|
e056430fce
|
fix: 修复只配置DC域时,LDAP用户认证失败的问题
|
4 years ago |
Jiangjie.Bai
|
2b2821c0a1
|
Merge pull request #5223 from jumpserver/dev
chore(merge): 合并 dev 到 master
|
4 years ago |
Bai
|
213221beae
|
perf: 修改BasePermissionViewSet的custom_filter_fields
|
4 years ago |
Bai
|
2db9c90a74
|
feat: 修改翻译:认证方式
|
4 years ago |
Bai
|
8ced6f1168
|
fix: 用户ProfileAPI设置is_first_login不是可读写
|
4 years ago |
Bai
|
6703ab9a77
|
perf: 添加BasePermissionsViewSet,支持搜索过滤
|
4 years ago |
老广
|
2fc6e6cd54
|
Merge pull request #5213 from jumpserver/dev
chore(merge): 合并dev到master
|
4 years ago |
Bai
|
2176fd8fac
|
feat: 更新翻译
|
4 years ago |
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>
|
4 years ago |
fit2bot
|
d4feaf1e08
|
fix: 修复由于更新django captch版本引起的css丢失问题 (#5204)
* fix: 修复由于更新django captch版本引起的css丢失问题
* perf: 优化验证码的高度
Co-authored-by: ibuler <ibuler@qq.com>
|
4 years ago |
xinwen
|
4424c4bde2
|
perf(asset): 手动启动节点资产数量自检程序时区分组织
|
4 years ago |
fit2bot
|
5863e3e008
|
perf(asset): 资产树,右击增加计算节点数量的菜单,可以让后台去计算 #527 (#5207)
Co-authored-by: xinwen <coderWen@126.com>
|
4 years ago |
xinwen
|
79a371eb6c
|
perf(auth): 密码过期后,走重置密码流程 #530
|
4 years ago |
fit2bot
|
7c7de96158
|
feat(login): 登录日志要体现用哪个backend登录的 #4472 (#5199)
Co-authored-by: xinwen <coderWen@126.com>
|
4 years ago |
ibuler
|
80b03e73f6
|
feat(celery): 添加celery的health check接口
|
4 years ago |
fit2bot
|
32dbab2e34
|
perf: 数据库应用database字段添加allow_null=True (#5196)
* perf: 数据库应用database字段修改为required
* perf: 数据库应用database字段添加allow_null=True
Co-authored-by: Bai <bugatti_it@163.com>
|
4 years ago |
ibuler
|
b189e363cc
|
revert(system): 暂时去掉system组件
|
4 years ago |
Bai
|
4c3a655239
|
perf: 用户序列类禁止修改source字段
|
4 years ago |
Bai
|
5533114db5
|
feat: 用户授权应用树按组织节点进行区分
|
4 years ago |
Jiangjie.Bai
|
4c469afa95
|
feat: 取消资产配置相关字段只读模式 (#5182)
* feat: 取消资产配置相关字段只读模式
* feat: 取消资产配置相关字段只读模式
|
4 years ago |
xinwen
|
4b67d6925e
|
feat(asset): api 添加推送系统用户到多个资产
|
4 years ago |
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>
|
4 years ago |
Bai
|
042ea5e137
|
feat: 授权应用树API返回org_name字段
|
4 years ago |
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>
|
4 years ago |
fit2bot
|
3447eeda68
|
fix(applications): 修改attrs不能为null (#5172)
Co-authored-by: Bai <bugatti_it@163.com>
|
4 years ago |
fit2bot
|
75ef413ea5
|
fix(applications): 修改attrs不能为null (#5171)
Co-authored-by: Bai <bugatti_it@163.com>
|
4 years ago |
fit2bot
|
662c9092dc
|
reactor(dockerfile): 使用debian构建docker (#5169)
Co-authored-by: ibuler <ibuler@qq.com>
|
4 years ago |
Bai
|
36e9d8101a
|
fix: 添加迁移文件: Node ordering
|
4 years ago |
Bai
|
89ec6ba6ef
|
fix: Node ordering [`parent_key`, `value`]; 修复默认组织Default节点显示问题(存在key为0的Default节点)
|
4 years ago |
Bai
|
af40e46a75
|
fix: 优化迁移Default节点
|
4 years ago |