From 40c85c48de9a294c783495dc325be7f5c405f06d Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 6 Jul 2015 11:41:28 +0100 Subject: [PATCH] SWS-907 - Become compatible with Spring Security 4 Spring Security 4.0 removed a number of APIs that were deprecated in 3.x. This commit updates SpringSecurityUtils to avoid using those APIs. This makes it compatible with Spring Security 4.0 while also retaining compatibility with Spring Security 3.2.x. Also, upgrade to Spring Security 3.2.7.RELEASE as the latest point release. --- build.gradle | 2 +- .../ws/soap/security/support/SpringSecurityUtils.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 3ca40766..dd74bc21 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ configure(allprojects) { group = "org.springframework.ws" ext.springVersion = "4.0.9.RELEASE" - ext.springSecurityVersion = "3.2.5.RELEASE" + ext.springSecurityVersion = "3.2.7.RELEASE" ext.axiomVersion = "1.2.14" apply plugin: "java" diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/support/SpringSecurityUtils.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/support/SpringSecurityUtils.java index effae3ad..0e8011b6 100644 --- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/support/SpringSecurityUtils.java +++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/support/SpringSecurityUtils.java @@ -42,19 +42,19 @@ public abstract class SpringSecurityUtils { public static void checkUserValidity(UserDetails user) throws AccountExpiredException, CredentialsExpiredException, DisabledException, LockedException { if (!user.isAccountNonLocked()) { - throw new LockedException("User account is locked", user); + throw new LockedException("Account for user '" + user + "' is locked"); } if (!user.isEnabled()) { - throw new DisabledException("User is disabled", user); + throw new DisabledException("User '" + user + "' is disabled"); } if (!user.isAccountNonExpired()) { - throw new AccountExpiredException("User account has expired", user); + throw new AccountExpiredException("Account for user '" + user + "' has expired"); } if (!user.isCredentialsNonExpired()) { - throw new CredentialsExpiredException("User credentials have expired", user); + throw new CredentialsExpiredException("Credentials for user '" + user + "' have expired"); } } }