lywsvip/hsweb-framework
1
0
Fork 0
mirror of https://github.com/hs-web/hsweb-framework.git synced 2026-06-20 17:56:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复未获取方法权限

Browse Source
This commit is contained in:
zhouhao
2017-06-16 23:02:48 +08:00
parent 68dbdbe66b
commit a110c505a3
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
hsweb-authorization/hsweb-authorization-shiro/src/main/java/org/hswebframework/web/authorization/shiro/boost/DataAccessAnnotationMethodInterceptor.java
View File

@@ -101,19 +101,29 @@ public class DataAccessAnnotationMethodInterceptor extends AuthorizingAnnotation
accessController = ApplicationContextHolder.get().getBean(accessAnn.controllerBeanName(), DataAccessController.class);
}
DataAccessController finalAccessController = accessController;
Authorize authorize = holder.findAnnotation(Authorize.class);
String permission = accessAnn.permission();
Authorize classAnnotation = holder.findClassAnnotation(Authorize.class);
Authorize methodAnnotation = holder.findMethodAnnotation(Authorize.class);
Set<String> permissions = new HashSet<>();
List<String> actionList = new ArrayList<>(Arrays.asList(accessAnn.action()));
if ("".equals(permission)) {
if (null == authorize) {
throw new NullPointerException("permission setting can not be null");
}
permission = authorize.permission()[0];
if (classAnnotation != null) {
permissions.addAll(Arrays.asList(classAnnotation.permission()));
if (actionList.isEmpty())
actionList.addAll(Arrays.asList(classAnnotation.action()));
}
if (actionList.isEmpty()) {
actionList.addAll(Arrays.asList(authorize.action()));
if (methodAnnotation != null) {
permissions.addAll(Arrays.asList(methodAnnotation.permission()));
if (actionList.isEmpty())
actionList.addAll(Arrays.asList(methodAnnotation.action()));
}
String permission = accessAnn.permission();
if ("".equals(permission)) {
if (permissions.size() != 1) {
throw new IndexOutOfBoundsException("permission setting size must be 1");
}
permission = permissions.iterator().next();
}
MethodInterceptorParamContext context = holder.createParamContext();
Permission permissionInfo = authentication.getPermission(permission).orElseThrow(AuthenticationException::new);