Commit Graph

809 Commits (7708812556e9fdb055489775dcab38870f58eddc)

Author SHA1 Message Date
feng626 8e43e9ee2b fix: 授权过期通知
2 years ago
feng626 a024f26768 fix: 授权过期消息提示
2 years ago
ibuler 8c839784fb pref: 优化没有获取到节点的问题
2 years ago
fit2bot e0a2d03f44
fix: 修复授权过期通知bug (#8404)
2 years ago
feng626 f91bfedc50 perf: 授权过期通知
2 years ago
ibuler a5c6ba6cd6 perf: 优化 perm app node
3 years ago
ibuler e096244e75 pref: app tree 添加 icon
3 years ago
fit2bot c3de7b78c2
fix: 远程应用授权时 有些资产已经不存在了 导致授权失败 (#8127)
3 years ago
ibuler 0addba7c14 perf: 修改 command 命令执行
3 years ago
ibuler e4b0ab6a45 perf: 修改命令执行区分组织
3 years ago
fit2bot 1f8ded49fa
feat: 工作台区分组织 (#8040)
3 years ago
ibuler d418c28e98 perf: 修改 base
3 years ago
fit2bot b8e6bc932b
perf: 添加 mariadb port (#7989)
3 years ago
Jiangjie.Bai 26b3c60e5c fix: 删除一些perms相关的权限位
3 years ago
fit2bot aa022a02c1
fix: 修复用户认证失败的详细信息显示 (#7886)
3 years ago
Jiangjie.Bai aedd8ba589 fix: 修复查看我的应用翻译
3 years ago
fit2bot 90840a4417
fix: 工单创建bug (#7858)
3 years ago
feng626 e1a238b778 fix: 删除资产授权缓存接口
3 years ago
Jiangjie.Bai 2d7349d596 fix: 删除权限位connect_myasset/myapp
3 years ago
feng626 c41a81c8d0 fix: 修改授权权限
3 years ago
feng626 faf82d7cfb fix: del connect my asset
3 years ago
Jiangjie.Bai 224a9fbdb3 fix: 修复创建授权时actions为空保存时报错的问题
3 years ago
fit2bot d1e25e1fef
fix: 删除应用/授权应用相关权限 (#7792)
3 years ago
Jiangjie.Bai b017e68a56
Perf: 优化RBAC权限树 (#7782)
3 years ago
fit2bot 1b007c8c5c
perf: 修改权限树 (#7757)
3 years ago
fit2bot 3222687aaa
fix: 修复应用授权权限bug (#7756)
3 years ago
feng626 79994f5ddc fix: 资产授权权限bug
3 years ago
ibuler 0afff45bae fix: validate app perm error
3 years ago
fit2bot a20884e2ad
perf: 修改 rbac tree (#7743)
3 years ago
fit2bot dafc416783
Fix rbac (#7728)
3 years ago
Jiangjie.Bai 03afa4f974
Fix rbac (#7713)
3 years ago
老广 02ca473492
Fix rbac (#7690)
3 years ago
feng626 8604b9019f fix: 添加迁移文件
3 years ago
ibuler e76eec530f perf: 添加migrations
3 years ago
Jiangjie.Bai 64f721875b fix: 修复用户页面点击资产树节点提示对象找不到的问题
3 years ago
xinwen f460916e84 fix: swagger
3 years ago
Jiangjie.Bai 83ff8dbf26
fix: rbac 合并 (#7658)
3 years ago
ibuler db050e405d fix: 修改 migrations
3 years ago
fit2bot e259d2a9e9
fix: fix rbac to dev (#7636)
3 years ago
xinwen 35c6b581e2 feat: 远程应用支持磁盘挂载
3 years ago
Michael Bai ba695c4600 fix: 抽象permissions-serializer的actions字段值设置
3 years ago
feng626 e5659a1d07 fix: 修复翻译及迁移文件
3 years ago
feng626 b0932e5137 feat: 逃生通道
3 years ago
feng626 100bfe0304 feat: 新增获取k8s pod namespace container接口
3 years ago
Michael Bai 90299a508c fix: 授权actions serializer 设置default值
3 years ago
Michael Bai de9516dee5 feat: 应用授权增加Action动作控制
3 years ago
ibuler b92530f0b9 perf: 优化通知,对支持 markdown 的发 markdown
3 years ago
ibuler 434793bc41 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
3 years ago
xinwen 85a017b2c4 fix: 按资产ip搜索数据不全
3 years ago
ibuler 2ee26971c9 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
3 years ago
Michael Bai e838d974c3 fix: 修复根据节点/资产查询授权时报错的问题
3 years ago
chenqiao cb98b4f80a feat:新增对sqlserver数据库托管
3 years ago
xinwen 22c9dfc0f2 fix: 系统用户 actions
3 years ago
Eric e9dc1ad86a fix: 修复 ssh 工具连接无法二级登录的问题
3 years ago
Jiangjie.Bai 07c60ca75d
feat: 支持二级登录资产 (#7143)
3 years ago
ibuler cd5094f10d perf: 优化通知中的连接点击
3 years ago
fit2bot c244cf5f43
pref: 修改使用的消息内容 (#7061)
3 years ago
Michael Bai 06de6c3575 fix: 修复资产系统用户auth-info获取流程及创建时手动登录方式的校验
3 years ago
ibuler c341d01e5a perf: 修改工单信息
3 years ago
fit2bot 00d434ceea
perf: 优化消息通知 (#7024)
3 years ago
xinwen.xu d4bdc74bd8 feat: 授权过期通知
3 years ago
Michael Bai e6e2a35745 fix: 修复设置未分组节点显示单独授权资产的配置时,用户授权树没有变化的问题
3 years ago
Michael Bai 8f1c934f73 fix: 授权规则支持通过 from_ticket 工单过滤
3 years ago
feng626 11a9a49bf8 fix: 修复用户详情获取子节点bug
3 years ago
Michael Bai fa81652de5 perf: 修改授权中(资产/应用)系统用户字段不必填
3 years ago
fit2cloud-jiangweidong 905014d441
feat: 改密计划支持数据库改密 (#6709)
3 years ago
feng626 3e51f4d616 fix: 修复授权500
3 years ago
feng626 0a3e5aed56 perf: 授权分类采用from_ticket字段
3 years ago
feng626 4214b220e1 feat: 授权规则分类管理
3 years ago
xinwen 0cd3419e09 fix: 修复应用授权列表报错
3 years ago
xinwen 22406f47f7 fix: Luna 页面搜索资产,结果按资产名称排序
3 years ago
ibuler 2ab1bbaa2c chore: merge with dev
3 years ago
ibuler b43626b5a2 perf: 优化i18n
3 years ago
ibuler 5e4b3e924f perf: 优化树
3 years ago
feng626 da588ce0ae perf: 代码优化
3 years ago
feng626 d0680c3753 fix: 用户管理-用户-授权的资产-收藏夹下拉菜单报404bug修复
3 years ago
fit2bot 905d0d5131
perf: 统一应用树 (#6535)
3 years ago
xinwen fee3715d30 fix: 应用授权按type 过滤报错
3 years ago
xinwen 3f0a0b33b5 feat: 应用按类型筛选可以指定多个类型
3 years ago
xinwen 2e190c9ea9 fix: 授权过期自动刷新授权树
3 years ago
xinwen 2494418208 fix: 用户组删除时,授权树不会自动更新
3 years ago
fit2bot ec8dca90d6
refactor: 整合系统用户和管理用户 (#6236)
3 years ago
xinwen 937acbd0b5 fix: 资产授权不能打开或关闭
3 years ago
fghbng@qq.com c7dfd0edce 修复授权导入系统用户为空报错
4 years ago
fghbng@qq.com 4382921c57 修复授权导入优化资产、用户、用户组、节点、系统用户id为空报错的情况
4 years ago
xinwen c16319ec48 feat: 添加企业微信,钉钉扫码登录
4 years ago
xinwen 54f5e65d36 feat: 检查资产授权过期接口添加过期时间
4 years ago
fghbng@qq.com 72f9d0d371 serializer优化&&资产授权导入优化
4 years ago
fghbng@qq.com 9a92e24e50 serializer优化&&授权导入优化
4 years ago
fit2bot 4519ccfe1a
授权导入优化 (#6057)
4 years ago
xinwen b4ef7bef55 fix: 授权资产列表 platform 应该显示名称
4 years ago
xinwen f361621ab5 feat: 资产授权支持按名称模糊搜索
4 years ago
xinwen c9a9ca7923 fix: 授权树节点排序
4 years ago
xinwen 370e1628be fix: 禁用的资产限制访问
4 years ago
xinwen 313757dbe9 fix: 修复用户与用户组关系变化时 500
4 years ago
xinwen a47a9c0345 fix: Root 组织用户从用户组移除报错
4 years ago
ibuler 42afc1e0bf fix(perms): 修复删除 资产或授权引起的bug
4 years ago
Bai 1216f15e45 fix: 修复新旧版本对于default_node节点变更冲突的问题(旧版本会将新版本迁移后的default_node节点的key修改为非1)
4 years ago
xinwen 1e85805ea3 fix: 用户授权资产过滤失效
4 years ago
xinwen 3080bf3647 fix: 修复获取整个授权树缺少节点 bug
4 years ago
ibuler 09303ecc56 perf: 优化各serializer字段翻译
4 years ago
xinwen 102d3b590b perf: luna 页面获取资产系统用户按 name 排序
4 years ago
xinwen 615bcadf62 fix: 资产授权规则过滤添加 distinct
4 years ago
fit2bot 0aa2c2016f
perf(project): 优化命名的风格 (#5693)
4 years ago
xinwen 935947c97a fix: 用户详情页的资产授权列表慢
4 years ago
xinwen 3e7e01418d perf: 优化命令记录慢的问题
4 years ago
xinwen 78bf6f5817 refactor: 获取授权树或者资产列表时避免读时锁
4 years ago
xinwen 1870fc97d5 refactor: 适配新的 default 组织
4 years ago
fit2bot 51c9a89b1f
fix: 用户页面授权资产列表获取系统用户慢 (#5663)
4 years ago
xinwen 1036d1c132 fix: 修复授权树一些问题
4 years ago
xinwen 799d1e4043 feat: 资产授权规则添加是否有效的过滤条件
4 years ago
ibuler bb9790a50f feat: 为rdp 添加一个api
4 years ago
xinwen 9be3cbb936 perf: 优化用户详情页授权列表加载速度&添加可重入锁
4 years ago
fit2bot 501ad698b7
添加 UnionQuertSet (#5578)
4 years ago
Jiangjie.Bai 7cf6e54f01
refactor tree (重构&优化资产树/用户授权树加载速度) (#5548) (#5549)
4 years ago
fit2bot 542eb25e7b
fix(perms): 修复权限校验时的组织切换问题 (#5546)
4 years ago
ibuler e7a3c5a822 perf(api): filter_fields被filterset_fields取代
4 years ago
fit2bot 7167515a53
feat: 实现MethodSerializer, 满足serializer中SerializerField动态更改的需求 (#5382)
4 years ago
fit2bot 17a01a12db
reactor: 增加DynamicMappingSerializer类,实现Serializer中的字段可以动态改变的功能 (#5379)
4 years ago
fit2bot 7e7e24f51f
reactor&remove: 重构applications模块 & 移除applications、perms中已不再使用的模块 (#5374)
4 years ago
fit2bot cef93abb2f
feat: 抽象View Mapping Serializer架构设计; 重构工单View、Serializer模块 (#5371)
4 years ago
fit2bot 430e20a49c
feat: 优化工单模块 (#5361)
4 years ago
Jiangjie.Bai 3b056ff953
reactor&feat: 重构工单模块 & 支持申请应用工单 (#5352)
4 years ago
xinwen 89d8efe0f1 fix: perms.signals_handler.on_application_permission_applications_changed 修改名字
4 years ago
xinwen 3aed4955c8 fix: 远程应用授权的一些问题
4 years ago
fit2bot 9a5f9a9c92
fix: 应用授权不会自动推送的bug (#5271)
4 years ago
Bai 90df404931 fix: 修复swagger问题
4 years ago
ibuler b9717eece3 fix: 修改访问swagger会产生的错误
4 years ago
Bai 213221beae perf: 修改BasePermissionViewSet的custom_filter_fields
4 years ago
Bai 6703ab9a77 perf: 添加BasePermissionsViewSet,支持搜索过滤
4 years ago
Bai 5533114db5 feat: 用户授权应用树按组织节点进行区分
4 years ago
xinwen 91081d9423
refactor(perms): 在动态用户所绑定的授权规则中,如授权给用户组,当用户组增加成员后,动态系统用户下没有相应增加用户,因此也不会自动推送 (#5084) (#5086)
4 years ago
xinwen 75d7530ea5 fix(perms): 在动态用户所绑定的授权规则中,如授权给用户组,当用户组增加成员后,动态系统用户下没有相应增加用户,因此也不会自动推送
4 years ago
xinwen 39ab5978be perf(perms): 获取用户所有授权时转换成 list
4 years ago
ibuler 7be7c8cee1 fix(perms): 修复我的资产页面问题
4 years ago
xinwen 68b22cbdec fix(perms): 修复用户组授权树与资产问题
4 years ago
xinwen a7c704bea3 perf(celery-task): 优化检查节点资产数量的 Celery 任务
4 years ago
xinwen 21993b0d89 perf(perms): 优化用户授权资产列表加载速度
4 years ago
xinwen 73ccf3be5f fix(perms): 当用户授权为空时,清空旧的授权树
4 years ago
xinwen f2fd9f5990 perf(assets): 限制搜索授权资产返回的条数
4 years ago
xinwen 1af4fcd381 fix(perms): nodes-with-assets 接口添加刷新重构树
4 years ago
xinwen 3e78d627f8 fix(perms): 作业中心-批量命令-选择系统用户之后,左侧资产列表未筛选,还是全部资产
4 years ago
xinwen 6e8922da1c fix(trans): 完善翻译
4 years ago
fit2bot cd6dc6a722
fix(perms): 由于组织不对,导致生成或显示授权树错误 (#4957)
4 years ago
Bai 6df331cbed perf(perms): 用户/用户组授权的所有应用API返回attrs属性
4 years ago
xinwen 231332585d fix(perms): 重建授权树冲突时,响应里加 code
4 years ago
Bai 795245d7f4 perf(perms): 授权给用户应用列表API添加dispaly字段
4 years ago
Bai 7ea2a0d6a5 perf(perms): 应用授权规则序列类添加applications类型校验
4 years ago
xinwen c90b9d70dc perf(perms): 优化根据资产获取授权的系统用户
4 years ago
Bai ddc2d1106b perf(perms): 修改授权授权应用API,添加category/type过滤字段
4 years ago
Bai 36cd18ab9a perf(perms): 修改变量名
4 years ago
Bai 676ee93837 perf(perms): 优化方法名称;授权查询语句;
4 years ago
ibuler 4ebb4d1b6d chore: resolve conflict
4 years ago
Bai c9065fd96e perf(application): 优化一些小细节
4 years ago
Bai 55bfb942e2 perf(applications): 修改应用序列类字段label
4 years ago
Bai abe32e6c79 perf(perms): 添加应用/应用授权API的type_display/category_display字段
4 years ago
Bai 77c8ca5863 perf(perms): 应用授权表添加字段,type和category
4 years ago
Bai 8fa15b3378 perf(assets/terminal): 资产系统用户和Session会话添加协议选项: mysql/oracle/postgresql
4 years ago
Bai 038582a8c1 feat(applications): 修改应用/应用授权的迁移文件,解决多种应用/应用授权name字段重复的问题
4 years ago
Bai 5518e1e00f perf(application): 优化Application获取序列类attrs字段适配
4 years ago
Bai 1baf35004d refactor(perms): 添加应用授权规则迁移文件;迁移旧的应用授权(db/remoteapp/k8sapp)到新的应用授权
4 years ago
Bai fdded8b90f refactor(perms): 修改授权规则的目录结构(asset、application)
4 years ago
Bai 1d550cbe64 feat(perms): 添加ApplicationPermission API(包含用户/用户组/授权/校验等API)
4 years ago
Bai 4847b7a680 feat(perms): 添加ApplicationPermission Model 和 API(包含ViewSet和RelationViewSet)
4 years ago
ibuler e2d8eee629 fix(i18n): 修改收藏夹的翻译
4 years ago
ibuler 90afabdcb2 fix(perms): 修复用户的资产不区分组织的问题
4 years ago
ibuler de405be753 fix(perms): 修复asset permission导入的bug
4 years ago
xinwen cfd0098019 fix(perms): 修复一次性获取所有资产与节点sql泛滥问题
4 years ago
xinwen 459c5c07c9 fix(perms): 未激活资产不能使用
4 years ago
xinwen ef86a49c1e fix(perms): 修复失效资产授权action 还在的问题
4 years ago
fit2bot c73b49fe30
perf: 优化生成假数据 (#4759)
4 years ago
xinwen 535d7d8373 fix(perms): 授权树与资产列表的一些 bug
4 years ago
xinwen 8f52f79d91 fix(migrations): 增加迁移脚本
4 years ago
xinwen 3af0e68c84 fix(perms): 用户授权树bug
4 years ago
fit2bot da4f9efb42
fix(perms): 修改检查资产授权过期策略 (#4722)
4 years ago
xinwen 2a86c3a376 fix(perms): 完善检查资产授权过期的celery task
4 years ago
Bai 5558e854de perf(permms): 应用授权树返回授权应用的总数量
4 years ago
xinwen 1d49b3deca fix(perms): 用户搜索全部授权资产报错
4 years ago
xinwen 6701a1b604 fix(perms): 用户添加到用户组报错
4 years ago
fit2bot d3be16ffe8
fix (#4680)
4 years ago
xinwen 28da819735 perf(assets): 优化节点树
4 years ago
xinwen 91649a3908 feat(applications): 添加 k8s 应用
4 years ago
xinwen 1bc913ab13 feat(perms): 资产授权添加GUI复制粘贴动作
4 years ago
Bai 674ad40f67 fix(perms): 修复perms api UserPermissionMixin 中 kwargs 参数传递(未发现引出其他问题)
4 years ago
Bai 64064cb526 [Update] 注释节点树print
5 years ago
Eric_Lee 0ccd806eca
add system user perm api (#4108)
5 years ago
ibuler 4b2fd0d0da fix: 修复系统用户过滤权限规则的bug
5 years ago
ibuler 8efc0331de feat: 删掉所有view, templates, forms
5 years ago
ibuler 1a84661ca9 feat: 修改filterset_fields => filter_fields,option方法不支持filterset
5 years ago
xinwen f8142e23cd
[Fix] 权限管理-> 资产与数据库 Bug (#4049)
5 years ago
xinwen 7dde15cb04
[Feature] 权限管理-> 远程应用 添加 api (#4040)
5 years ago
ibuler caf0d85939 [feat] 修改remote app, database app的过滤参数
5 years ago
Bai 7afff5e392 [Update] merge from dev to lina
5 years ago
ibuler f528dd4888 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
5 years ago
ibuler 3c95c6fe11 [Feat] 添加失效用户权限的api
5 years ago
xinwen 93453cc8c3 [Update] perms.serializers.asset_permission.AssetPermissionSerializer 添加字段
5 years ago
Bai 75f4f6d0a2 [Update] 资产授权序列类is_expired, is_valid设置为read_only
5 years ago
Bai f224e49de7 [Update] 去掉资产授权序列类中不存在的字段
5 years ago
Bai 63ff868553 [Update] 授权资产树返回org_id字段值
5 years ago
Bai 728e4b7edd [Update] 修复授权模块的信号处理监听不到的问题
5 years ago
Bai 041d99f0be [Update] 更新remote-app用户/用户组时自动刷新页面
5 years ago
Bai 2f7b169405 [Update] 修改授权用户/用户组页面删除用户组失败的问题
5 years ago
ibuler d6debde566 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
5 years ago
Bai 0cff6ab29b [Update] Merge fromo dev to lina
5 years ago
ibuler cda677a30f [update] 修改remote apps的serializer
5 years ago
ibuler 227f97c2f5 [Update] 修改remote apps 字段
5 years ago
ibuler e39d8dce3c [Update] 修改fields
5 years ago
ibuler 0a7f63cc5e [Update] 修改remote app api
5 years ago
ibuler c6ed6d8acb [Update] 去掉debug信息
5 years ago
ibuler 331cfe2aed [Bugfix] 修复节点数量缓存显示不对的bug
5 years ago
ibuler 1936a6d5ee [Update] 去掉perms cache enable settings
5 years ago
ibuler 6bb13a26f5 [Update] 修改用户serializer
5 years ago
ibuler 6a2a0013a8 [Update] 去掉debug
5 years ago
ibuler 864a4c0485 [Bugfix] 修复显示未授权资产的bug
5 years ago
Bai 55fa5800b1 [Update] 修复系统设置-终端设置-资产排序设置不生效的Bug
5 years ago
ibuler 5ac1467564 [Update] 修复收藏数量不对的问题
5 years ago
ibuler 55554a025f [Bugfix] 修复动态系统用户更新用户时无法推送的bug, 修复通过relation api无法触发m2m_change的bug
5 years ago
老广 1fd2e782f8
1.5.7 Merge to dev (#3766)
5 years ago
ibuler bcae30814d [Update] 修改导入
5 years ago
老广 8b8b11ce1e
[Update] 恢复到原来的sql (#3707)
5 years ago
老广 3c69860b24
[Update] 优化sql, or方式改为union (#3682)
5 years ago
老广 aa2255a87e
[Update] sql优化,查询用户资产权限时,使用union替代or (#3681)
5 years ago
Bai dd52baae12 [Update] 翻译应用树更节点(API)
5 years ago
Bai 2827a64095 [Update] 更新命令批量执行资产树(将没有ssh协议的资产设置为nocheck)
5 years ago
八千流 29457ad867 Assets_permission_action 优化 (#3585)
5 years ago
Bai 2fc68ca6f1 [Update] 授权的 RemoteApp/DatabaseApp 进行去重
5 years ago
BaiJiangJie 7a6a1b9b59 [Update] 修改校验用户资产权限API不使用缓存
5 years ago
BaiJiangJie 829e1f4cac
[Update] 修改用户详情页面 (#3555)
5 years ago
BaiJiangJie 16f727c60d
[Feature] 添加功能:数据库应用 (#3551)
5 years ago
BaiJiangJie ac2ba63856
[Update] 修改资产授权url (#3550)
5 years ago
老广 55c95c58f6 Add new model to operate log (#3546)
5 years ago
老广 e1919d0a62
Asset meta (#3539)
5 years ago
老广 4944ac8e75 Config (#3502)
5 years ago
ibuler bfd8a9c66d [Update] 修改asset permission搜索
5 years ago
ibuler 2ef487a92f [Update] 修改收集用户
5 years ago
BaiJiangJie 5434b65773 [Update] Merge branch dev to 1.5.5
5 years ago
ibuler fb9e2ac9f6 [Update] 修改用户和用户组关系发生变化时,刷新权限
5 years ago
ibuler 6ce9815d51 [Update] 基本完成登录逻辑
5 years ago
BaiJiangJie c7ecfd7943 [Bugfix] 修复当终端设置包含多个命令存储时,访问 /docs/ 页面错误的问题
5 years ago
BaiJiangJie 36d98a237f
[Update] 资产授权 Action 添加 Help text (#3383)
5 years ago
BaiJiangJie 84b3e29db6
Merge pull request #3366 from jumpserver/bugfix
5 years ago
ibuler a33d5cc53b [Update] 修改返回asset tree带上组织
5 years ago
ibuler 82a6369568 [Update] 修改term大小
5 years ago
ibuler 86522627d3 [Update] 优化提交api报错时滚动到,优化table页面某些列宽度
5 years ago
ibuler f984acf1b2 [Bugfix] 修复导致favorite 和 empty 同时出现
5 years ago
BaiJiangJie a978bf990d
Merge pull request #3342 from jumpserver/perms_assets_search_bug
5 years ago
BaiJiangJie f3dc9b886b Asset favor (#3352)
5 years ago
jym503558564 70664d435f [Update] 修改小问题
5 years ago
jym503558564 ee97144a10 [Bugfix] 修复资产授权列表 节点搜索报500错误
5 years ago
jym503558564 01ead7c8e1 [Bugfix] 修复资产授权列表搜索 无效的 出现500错误
5 years ago