lywsvip/hsweb-framework
1
0
Fork 0
mirror of https://github.com/hs-web/hsweb-framework.git synced 2026-05-31 09:53:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化数据权限验证事件逻辑

Browse Source
This commit is contained in:
zhou-hao
2018-01-07 21:15:03 +08:00
parent 89b8ef036d
commit f4a5ac6412
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/handler/DefaultAuthorizingHandler.java
View File

@@ -58,7 +58,7 @@ public class DefaultAuthorizingHandler implements AuthorizingHandler {
return;
}
//进行rdac权限控制
handleRdac(context.getAuthentication(), context.getDefinition());
handleRBAC(context.getAuthentication(), context.getDefinition());
//表达式权限控制
handleExpression(context.getAuthentication(), context.getDefinition(), context.getParamContext());
@@ -78,9 +78,7 @@ public class DefaultAuthorizingHandler implements AuthorizingHandler {
return false;
}
public void handleDataAccess(AuthorizingContext context) {
if(handleEvent(context,HandleType.DATA)){
return;
}
if (dataAccessController == null) {
logger.warn("dataAccessController is null,skip result access control!");
return;
@@ -88,6 +86,10 @@ public class DefaultAuthorizingHandler implements AuthorizingHandler {
if(context.getDefinition().getDataAccessDefinition()==null){
return;
}
if(handleEvent(context,HandleType.DATA)){
return;
}
List<Permission> permission = context.getAuthentication().getPermissions()
.stream()
.filter(per -> context.getDefinition().getPermissions().contains(per.getId()))
@@ -140,7 +142,7 @@ public class DefaultAuthorizingHandler implements AuthorizingHandler {
}
}
protected void handleRdac(Authentication authentication, AuthorizeDefinition definition) {
protected void handleRBAC(Authentication authentication, AuthorizeDefinition definition) {
boolean access = true;
//多个设置时的判断逻辑
Logical logical = definition.getLogical() == Logical.DEFAULT ? Logical.OR : definition.getLogical();