diff --git a/pom.xml b/pom.xml index 8f91f97a0f0d3eb37d323e59a314f30a1f2be199..74428d048bdd8a5472cd5a343185bfbb03a3d0b7 100644 --- a/pom.xml +++ b/pom.xml @@ -148,6 +148,10 @@ <artifactId>spring-integration-mail</artifactId> </dependency> <!-- Security --> + <dependency> + <groupId>org.springframework.security</groupId> + <artifactId>spring-security-aspects</artifactId> + </dependency> <dependency> <groupId>org.springframework.security</groupId> <artifactId>spring-security-config</artifactId> @@ -340,6 +344,10 @@ <groupId>org.springframework</groupId> <artifactId>spring-aspects</artifactId> </aspectLibrary> + <dependency> + <groupId>org.springframework.security</groupId> + <artifactId>spring-security-aspects</artifactId> + </dependency> </aspectLibraries> <showWeaveInfo>true</showWeaveInfo> </configuration> diff --git a/src/main/java/de/thm/arsnova/config/SecurityConfig.java b/src/main/java/de/thm/arsnova/config/SecurityConfig.java index f6a4c86927a31641504c92a07f51bd787ad25853..fbf39de4f9e3131d076871a8169ff304b7f0f141 100644 --- a/src/main/java/de/thm/arsnova/config/SecurityConfig.java +++ b/src/main/java/de/thm/arsnova/config/SecurityConfig.java @@ -35,6 +35,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.AdviceMode; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; @@ -83,7 +84,7 @@ import java.util.List; * Loads property file and configures components used for authentication. */ @Configuration -@EnableGlobalMethodSecurity(prePostEnabled = true) +@EnableGlobalMethodSecurity(mode = AdviceMode.ASPECTJ, prePostEnabled = true) @EnableWebSecurity @Profile("!test") public class SecurityConfig extends WebSecurityConfigurerAdapter { diff --git a/src/test/java/de/thm/arsnova/config/TestSecurityConfig.java b/src/test/java/de/thm/arsnova/config/TestSecurityConfig.java index ffac0f0f85896bf8e51b4b487e4176d2d22102d5..6ad50678aca2eccf4883f5bfaffc82e5d3e98d58 100644 --- a/src/test/java/de/thm/arsnova/config/TestSecurityConfig.java +++ b/src/test/java/de/thm/arsnova/config/TestSecurityConfig.java @@ -22,6 +22,7 @@ import org.jasig.cas.client.validation.Cas20ProxyTicketValidator; import org.pac4j.oauth.client.FacebookClient; import org.pac4j.oauth.client.Google2Client; import org.pac4j.oauth.client.TwitterClient; +import org.springframework.context.annotation.AdviceMode; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; @@ -38,7 +39,7 @@ import org.springframework.security.core.session.SessionRegistry; import org.springframework.security.core.session.SessionRegistryImpl; @Configuration -@EnableGlobalMethodSecurity(prePostEnabled = true) +@EnableGlobalMethodSecurity(mode = AdviceMode.ASPECTJ, prePostEnabled = true) @EnableWebSecurity @Profile("test") public class TestSecurityConfig extends SecurityConfig {