From 647e482a53c2345985262f93fa5f5ca05664ae41 Mon Sep 17 00:00:00 2001
From: Daniel Gerhardt <code@dgerhardt.net>
Date: Sun, 26 Apr 2015 14:49:11 +0200
Subject: [PATCH] Migrate to Spring Security 4.0
See:
http://docs.spring.io/spring-security/site/migrate/current/3-to-4/html5/migrate-3-to-4-jc.html#m3to4-header-jc
http://docs.spring.io/spring-security/site/migrate/current/3-to-4/html5/migrate-3-to-4-jc.html#m3to4-filter-urls-cas
---
pom.xml | 2 +-
src/main/java/de/thm/arsnova/config/SecurityConfig.java | 6 +-----
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6721b3607..76471db76 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
<properties>
<org.springframework-version>4.1.6.RELEASE</org.springframework-version>
- <org.springframework.security-version>3.2.7.RELEASE</org.springframework.security-version>
+ <org.springframework.security-version>4.0.1.RELEASE</org.springframework.security-version>
<org.springframework.integration-mail-version>4.1.3.RELEASE</org.springframework.integration-mail-version>
<com.fasterxml.jackson-version>2.5.3</com.fasterxml.jackson-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/src/main/java/de/thm/arsnova/config/SecurityConfig.java b/src/main/java/de/thm/arsnova/config/SecurityConfig.java
index c6bc56c37..76a5b047a 100644
--- a/src/main/java/de/thm/arsnova/config/SecurityConfig.java
+++ b/src/main/java/de/thm/arsnova/config/SecurityConfig.java
@@ -117,10 +117,6 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter implements Serv
http.exceptionHandling().authenticationEntryPoint(restAuthenticationEntryPoint());
http.csrf().disable();
http.headers()
- .cacheControl()
- .contentTypeOptions()
- .frameOptions()
- .xssProtection()
.addHeaderWriter(new HstsHeaderWriter(false));
if (casEnabled) {
@@ -295,7 +291,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter implements Serv
@Bean
public ServiceProperties casServiceProperties() {
ServiceProperties properties = new ServiceProperties();
- properties.setService(rootUrl + servletContext.getContextPath() + "/j_spring_cas_security_check");
+ properties.setService(rootUrl + servletContext.getContextPath() + "/login/cas");
properties.setSendRenew(false);
return properties;
--
GitLab