Update SPR-13379 to use Spring Security

Author: sdeleuze

SPR-13379/pom.xml

@@ -12,6 +12,7 @@
 
 		<java.version>1.6</java.version>
 		<spring.version>4.2.1.BUILD-SNAPSHOT</spring.version>
+		<spring-security.version>4.0.2.RELEASE</spring-security.version>
 		<slf4j.version>1.7.5</slf4j.version>
 
 		<jetty.version>9.1.2.v20140210</jetty.version>
@@ -42,6 +43,16 @@
 			<artifactId>spring-webmvc</artifactId>
 			<version>${spring.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.security</groupId>
+			<artifactId>spring-security-config</artifactId>
+			<version>${spring-security.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.security</groupId>
+			<artifactId>spring-security-web</artifactId>
+			<version>${spring-security.version}</version>
+		</dependency>
 
 		<!-- Logging -->
 		<dependency>

SPR-13379/src/main/java/org/springframework/issues/ScriptTemplateController.java

@@ -16,27 +16,25 @@
 
 package org.springframework.issues;
 
-import java.text.DateFormat;
-import java.util.Date;
-import java.util.Locale;
-import javax.servlet.http.HttpServletResponse;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
+import java.text.DateFormat;
+import java.util.Date;
+import java.util.Locale;
+
 @Controller
 public class ScriptTemplateController {
 
     private static final Logger logger = LoggerFactory
             .getLogger(ScriptTemplateController.class);
 
-    @RequestMapping(method = RequestMethod.GET)
-    public String home(Locale locale, Model model,HttpServletResponse response) {
+    @RequestMapping(path = {"", "security-with*"}, method = RequestMethod.GET)
+    public String home(Locale locale, Model model) {
         logger.info("Welcome home! The client locale is {}.", locale);
 
         DateFormat dateFormat = DateFormat.getDateTimeInstance(DateFormat.LONG,

SPR-13379/src/main/webapp/WEB-INF/spring/root-context.xml

@@ -1,9 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xmlns:sec="http://www.springframework.org/schema/security"
+	   xsi:schemaLocation="
+	     http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+	     http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd">
 
 	<!-- Root Context: defines shared resources visible to all other web components -->
-		
+	<sec:http auto-config="true" pattern="/security-with-cto/**">
+		<sec:headers>
+			<sec:content-type-options />
+		</sec:headers>
+	</sec:http>
+
+	<sec:http auto-config="true" pattern="/security-without-cto/**">
+		<sec:headers>
+			<sec:content-type-options disabled="true" />
+		</sec:headers>
+	</sec:http>
+
+	<sec:authentication-manager>
+		<sec:authentication-provider>
+			<sec:user-service>
+				<sec:user name="demo" authorities="ROLE_USER"/>
+			</sec:user-service>
+		</sec:authentication-provider>
+	</sec:authentication-manager>
+
 </beans>

SPR-13379/src/main/webapp/WEB-INF/web.xml

@@ -12,6 +12,15 @@
 		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
 	</listener>
 
+	<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>
+
 	<servlet>
 		<servlet-name>appServlet</servlet-name>
 		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>