|
@@ -1,10 +1,28 @@
|
|
|
+/*
|
|
|
+ * Copyright 2002-2016 the original author or authors.
|
|
|
+ *
|
|
|
+ * Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
+ * you may not use this file except in compliance with the License.
|
|
|
+ * You may obtain a copy of the License at
|
|
|
+ *
|
|
|
+ * http://www.apache.org/licenses/LICENSE-2.0
|
|
|
+ *
|
|
|
+ * Unless required by applicable law or agreed to in writing, software
|
|
|
+ * distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
+ * See the License for the specific language governing permissions and
|
|
|
+ * limitations under the License.
|
|
|
+ */
|
|
|
package org.springframework.security.access.intercept.aspectj.aspect;
|
|
|
|
|
|
import org.springframework.beans.factory.InitializingBean;
|
|
|
import org.springframework.security.access.annotation.Secured;
|
|
|
-import org.springframework.security.access.prepost.*;
|
|
|
import org.springframework.security.access.intercept.aspectj.AspectJCallback;
|
|
|
import org.springframework.security.access.intercept.aspectj.AspectJMethodSecurityInterceptor;
|
|
|
+import org.springframework.security.access.prepost.PostAuthorize;
|
|
|
+import org.springframework.security.access.prepost.PostFilter;
|
|
|
+import org.springframework.security.access.prepost.PreAuthorize;
|
|
|
+import org.springframework.security.access.prepost.PreFilter;
|
|
|
|
|
|
/**
|
|
|
* Concrete AspectJ aspect using Spring Security @Secured annotation
|
|
@@ -22,55 +40,55 @@ import org.springframework.security.access.intercept.aspectj.AspectJMethodSecuri
|
|
|
*/
|
|
|
public aspect AnnotationSecurityAspect implements InitializingBean {
|
|
|
|
|
|
- /**
|
|
|
- * Matches the execution of any public method in a type with the Secured
|
|
|
- * annotation, or any subtype of a type with the Secured annotation.
|
|
|
- */
|
|
|
- private pointcut executionOfAnyPublicMethodInAtSecuredType() :
|
|
|
- execution(public * ((@Secured *)+).*(..)) && @this(Secured);
|
|
|
+ /**
|
|
|
+ * Matches the execution of any public method in a type with the Secured
|
|
|
+ * annotation, or any subtype of a type with the Secured annotation.
|
|
|
+ */
|
|
|
+ private pointcut executionOfAnyPublicMethodInAtSecuredType() :
|
|
|
+ execution(public * ((@Secured *)+).*(..)) && @this(Secured);
|
|
|
|
|
|
- /**
|
|
|
- * Matches the execution of any method with the Secured annotation.
|
|
|
- */
|
|
|
- private pointcut executionOfSecuredMethod() :
|
|
|
- execution(* *(..)) && @annotation(Secured);
|
|
|
+ /**
|
|
|
+ * Matches the execution of any method with the Secured annotation.
|
|
|
+ */
|
|
|
+ private pointcut executionOfSecuredMethod() :
|
|
|
+ execution(* *(..)) && @annotation(Secured);
|
|
|
|
|
|
- /**
|
|
|
- * Matches the execution of any method with Pre/Post annotations.
|
|
|
- */
|
|
|
- private pointcut executionOfPrePostAnnotatedMethod() :
|
|
|
- execution(* *(..)) && (@annotation(PreAuthorize) || @annotation(PreFilter)
|
|
|
- || @annotation(PostAuthorize) || @annotation(PostFilter));
|
|
|
+ /**
|
|
|
+ * Matches the execution of any method with Pre/Post annotations.
|
|
|
+ */
|
|
|
+ private pointcut executionOfPrePostAnnotatedMethod() :
|
|
|
+ execution(* *(..)) && (@annotation(PreAuthorize) || @annotation(PreFilter)
|
|
|
+ || @annotation(PostAuthorize) || @annotation(PostFilter));
|
|
|
|
|
|
- private pointcut securedMethodExecution() :
|
|
|
- executionOfAnyPublicMethodInAtSecuredType() ||
|
|
|
- executionOfSecuredMethod() ||
|
|
|
- executionOfPrePostAnnotatedMethod();
|
|
|
+ private pointcut securedMethodExecution() :
|
|
|
+ executionOfAnyPublicMethodInAtSecuredType() ||
|
|
|
+ executionOfSecuredMethod() ||
|
|
|
+ executionOfPrePostAnnotatedMethod();
|
|
|
|
|
|
- private AspectJMethodSecurityInterceptor securityInterceptor;
|
|
|
+ private AspectJMethodSecurityInterceptor securityInterceptor;
|
|
|
|
|
|
- Object around(): securedMethodExecution() {
|
|
|
- if (this.securityInterceptor == null) {
|
|
|
- return proceed();
|
|
|
- }
|
|
|
+ Object around(): securedMethodExecution() {
|
|
|
+ if (this.securityInterceptor == null) {
|
|
|
+ return proceed();
|
|
|
+ }
|
|
|
|
|
|
- AspectJCallback callback = new AspectJCallback() {
|
|
|
- public Object proceedWithObject() {
|
|
|
- return proceed();
|
|
|
- }
|
|
|
- };
|
|
|
+ AspectJCallback callback = new AspectJCallback() {
|
|
|
+ public Object proceedWithObject() {
|
|
|
+ return proceed();
|
|
|
+ }
|
|
|
+ };
|
|
|
|
|
|
- return this.securityInterceptor.invoke(thisJoinPoint, callback);
|
|
|
- }
|
|
|
+ return this.securityInterceptor.invoke(thisJoinPoint, callback);
|
|
|
+ }
|
|
|
|
|
|
- public void setSecurityInterceptor(AspectJMethodSecurityInterceptor securityInterceptor) {
|
|
|
- this.securityInterceptor = securityInterceptor;
|
|
|
- }
|
|
|
+ public void setSecurityInterceptor(AspectJMethodSecurityInterceptor securityInterceptor) {
|
|
|
+ this.securityInterceptor = securityInterceptor;
|
|
|
+ }
|
|
|
|
|
|
- public void afterPropertiesSet() throws Exception {
|
|
|
- if (this.securityInterceptor == null) {
|
|
|
- throw new IllegalArgumentException("securityInterceptor required");
|
|
|
- }
|
|
|
- }
|
|
|
+ public void afterPropertiesSet() throws Exception {
|
|
|
+ if (this.securityInterceptor == null) {
|
|
|
+ throw new IllegalArgumentException("securityInterceptor required");
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
}
|