Merge pull request #775 from ambrusadrianz/master

[BAEL-123] Integrated voter example into custom-permission module

spring-security-custom-permission/pom.xml

@@ -128,6 +128,7 @@
             <artifactId>spring-security-taglibs</artifactId>
             <version>4.1.3.RELEASE</version>
         </dependency>
+
         <dependency>
             <groupId>javax.servlet.jsp.jstl</groupId>
             <artifactId>jstl-api</artifactId>
@@ -239,6 +240,9 @@
 
 
     <properties>
+        <start-class>org.baeldung.Application</start-class>
+        <!--If you want to run the example with the voters comment the tag above and uncomment the one below-->
+        <!--<start-class>org.baeldung.voter.VoterApplication</start-class>-->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>1.8</java.version>
         <rest-assured.version>2.4.0</rest-assured.version>

spring-security-custom-permission/src/main/java/org/baeldung/Application.java

@@ -1,12 +1,17 @@
 package org.baeldung;
 
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.context.web.SpringBootServletInitializer;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.FilterType;
 
-@SpringBootApplication
+@Configuration
+@EnableAutoConfiguration
+@ComponentScan(excludeFilters = 
+  @ComponentScan.Filter(type = FilterType.REGEX, pattern = "org.baeldung.voter.*"))
 public class Application extends SpringBootServletInitializer {
-
     public static void main(String[] args) {
         SpringApplication.run(Application.class, args);
     }

spring-security-custom-permission/src/main/java/org/baeldung/voter/MinuteBasedVoter.java

@@ -1,4 +1,4 @@
-package org.baeldung.security;
+package org.baeldung.voter;
 
 import java.time.LocalDateTime;
 import java.util.Collection;

spring-security-custom-permission/src/main/java/org/baeldung/voter/VoterApplication.java

@@ -0,0 +1,17 @@
+package org.baeldung.voter;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.FilterType;
+
+@Configuration
+@EnableAutoConfiguration
+@ComponentScan(basePackages = {"org.baeldung.voter"})
+public class VoterApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(VoterApplication.class, args);
+    }
+}

spring-security-custom-permission/src/main/java/org/baeldung/voter/VoterMvcConfig.java

@@ -1,4 +1,4 @@
-package org.baeldung.web;
+package org.baeldung.voter;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
@@ -10,7 +10,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
  */
 
 @Configuration
-public class MvcConfig extends WebMvcConfigurerAdapter {
+public class VoterMvcConfig extends WebMvcConfigurerAdapter {
     @Override
     public void addViewControllers(ViewControllerRegistry registry) {
         registry.addViewController("/").setViewName("private");

spring-security-custom-permission/src/main/java/org/baeldung/voter/WebSecurityConfig.java

@@ -1,4 +1,4 @@
-package org.baeldung.security;
+package org.baeldung.voter;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
@@ -18,8 +18,8 @@ import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
 import java.util.Arrays;
 import java.util.List;
 
-@Configuration
+//@Configuration
-@EnableWebSecurity
+//@EnableWebSecurity
 public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
     @Autowired
     public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {

spring-security-custom-permission/src/main/java/org/baeldung/voter/XmlSecurityConfig.java

@@ -1,4 +1,4 @@
-package org.baeldung.security;
+package org.baeldung.voter;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.ImportResource;
@@ -7,7 +7,7 @@ import org.springframework.context.annotation.ImportResource;
  * Created by ambrusadrianz on 09/10/2016.
  */
 @Configuration
-//@ImportResource({"classpath:spring-security.xml"})
+@ImportResource({"classpath:spring-security.xml"})
 public class XmlSecurityConfig {
     public XmlSecurityConfig() {
         super();

spring-security-custom-permission/src/main/resources/spring-security.xml

@@ -4,7 +4,7 @@
              xmlns:beans="http://www.springframework.org/schema/beans"
              xsi:schemaLocation="
       http://www.springframework.org/schema/security
-      http://www.springframework.org/schema/security/spring-security-4.1.xsd
+      http://www.springframework.org/schema/security/spring-security-4.0.xsd
       http://www.springframework.org/schema/beans
       http://www.springframework.org/schema/beans/spring-beans.xsd">
 
@@ -22,12 +22,12 @@
                 <beans:bean class="org.springframework.security.web.access.expression.WebExpressionVoter"/>
                 <beans:bean class="org.springframework.security.access.vote.AuthenticatedVoter"/>
                 <beans:bean class="org.springframework.security.access.vote.RoleVoter"/>
-                <beans:bean class="com.example.security.MinuteBasedVoter"/>
+                <beans:bean class="org.baeldung.voter.MinuteBasedVoter"/>
             </beans:list>
         </beans:constructor-arg>
     </beans:bean>
 
-    <beans:bean id="minuteBasedVoter" class="com.example.security.MinuteBasedVoter"/>
+    <beans:bean id="minuteBasedVoter" class="org.baeldung.voter.MinuteBasedVoter"/>
 
     <authentication-manager>
         <authentication-provider>

spring-security-custom-voter/pom.xml

@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>org.baeldung</groupId>
-    <artifactId>spring-security-custom-voter</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <packaging>war</packaging>
-
-    <name>spring-security-custom-voter</name>
-    <description>Custom AccessDecisionVoter with Spring Security</description>
-
-    <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.4.1.RELEASE</version>
-        <relativePath/> <!-- lookup parent from repository -->
-    </parent>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <rest-assured.version>3.0.1</rest-assured.version>
-        <java.version>1.8</java.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-security</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-thymeleaf</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <!--  -->
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-library</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <version>4.3.3.RELEASE</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-test</artifactId>
-            <version>4.1.3.RELEASE</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-web</artifactId>
-            <version>4.1.3.RELEASE</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-</project>

spring-security-custom-voter/src/main/java/org/baeldung/Application.java

@@ -1,12 +0,0 @@
-package org.baeldung;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@SpringBootApplication
-public class Application {
-
-    public static void main(String[] args) {
-        SpringApplication.run(Application.class, args);
-    }
-}

spring-security-custom-voter/src/main/webapp/WEB-INF/web.xml

@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
-                             http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
-         version="3.1">
-
-    <display-name>Spring Secured Application</display-name>
-
-    <!-- Spring MVC -->
-    <servlet>
-        <servlet-name>mvc</servlet-name>
-        <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>mvc</servlet-name>
-        <url-pattern>/</url-pattern>
-    </servlet-mapping>
-
-    <context-param>
-        <param-name>contextClass</param-name>
-        <param-value>
-            org.springframework.web.context.support.AnnotationConfigWebApplicationContext
-        </param-value>
-    </context-param>
-    <context-param>
-        <param-name>contextConfigLocation</param-name>
-        <param-value>org.baeldung.spring.web.config</param-value>
-    </context-param>
-    <listener>
-        <listener-class>
-            org.springframework.web.context.ContextLoaderListener
-        </listener-class>
-    </listener>
-
-    <!-- Spring Security -->
-    <filter>
-        <filter-name>springSecurityFilterChain</filter-name>
-        <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
-    </filter>
-    <filter-mapping>
-        <filter-name>springSecurityFilterChain</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
-
-</web-app>

spring-security-custom-voter/src/test/java/org/baeldung/web/LiveTest.java

@@ -1,42 +0,0 @@
-package org.baeldung.web;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
-import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.setup.MockMvcBuilders;
-import org.springframework.web.context.WebApplicationContext;
-
-import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestBuilders.formLogin;
-import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.user;
-import static org.springframework.security.test.web.servlet.response.SecurityMockMvcResultMatchers.authenticated;
-import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.springSecurity;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
-@RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration @WebAppConfiguration @SpringBootTest public class LiveTest {
-        @Autowired private WebApplicationContext context;
-
-        private MockMvc mvc;
-
-        @Before public void setup() {
-                mvc = MockMvcBuilders.webAppContextSetup(context).apply(springSecurity()).build();
-        }
-
-        @Test public void givenUnauthenticatedUser_whenAccessingMainPage_thenRedirect() throws Exception {
-                mvc.perform(get("/")).andExpect(status().is3xxRedirection());
-        }
-
-        @Test public void givenValidUsernameAndPassword_whenLogin_thenOK() throws Exception {
-                mvc.perform(formLogin("/login").user("user").password("pass")).andExpect(authenticated());
-        }
-
-        @Test public void givenAuthenticatedAdmin_whenAccessingMainPage_thenOK() throws Exception {
-                mvc.perform(get("/").with(user("admin").password("pass").roles("ADMIN"))).andExpect(status().isOk());
-        }
-}