From 81f61fc5103712d1e92a28075c88d0ebc3a24f46 Mon Sep 17 00:00:00 2001 From: "lucio.lelii" Date: Fri, 30 Nov 2018 11:42:36 +0000 Subject: [PATCH] git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/Common/authorization-common-library@174485 82a268e6-3cf1-43bd-a215-b396298e98cf --- pom.xml | 13 +++++++------ .../library/aspect/AuthorizationAspect.java | 11 ++++++----- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index 480d2be..b8cad21 100644 --- a/pom.xml +++ b/pom.xml @@ -38,6 +38,7 @@ aspectjrt 1.8.2 + org.slf4j slf4j-api @@ -78,9 +79,9 @@ aspectj-maven-plugin 1.7 - 1.7 - 1.7 - 1.7 + 1.8 + 1.8 + 1.8 @@ -92,12 +93,12 @@ - + - + org.codehaus.mojo aspectj-maven-plugin - + org.apache.maven.plugins maven-compiler-plugin diff --git a/src/main/java/org/gcube/common/authorization/library/aspect/AuthorizationAspect.java b/src/main/java/org/gcube/common/authorization/library/aspect/AuthorizationAspect.java index 738e0d8..ebba86b 100644 --- a/src/main/java/org/gcube/common/authorization/library/aspect/AuthorizationAspect.java +++ b/src/main/java/org/gcube/common/authorization/library/aspect/AuthorizationAspect.java @@ -18,16 +18,17 @@ import org.slf4j.LoggerFactory; public class AuthorizationAspect { Logger log = LoggerFactory.getLogger(AuthorizationAspect.class); - + @Pointcut("@annotation(org.gcube.common.authorization.library.annotations.AuthorizationControl)") - public void authorizationEntyPoint() { + public void authorizationEntryPoint() { } - @Pointcut("execution(* *(..))") - public void atExecution() { + + @Pointcut("execution(* *.*(..))") + public void anyCall() { } - @Before("authorizationEntyPoint() && atExecution()") + @Before("authorizationEntryPoint() && anyCall()") public void before(JoinPoint joinPoint) { MethodSignature signature = (MethodSignature) joinPoint.getSignature(); Method method = signature.getMethod();