From 738eb701bf7ed1ca824bf629143835bc0f5ec2fc Mon Sep 17 00:00:00 2001
From: Greg Turnquist <gturnquist@pivotal.io>
Date: Thu, 13 Sep 2018 11:02:21 -0500
Subject: [PATCH] SWS-1033 - Introduce Spring-based X.509 cache support

Backported to 2.x
---
 .../x509/cache/EhCacheBasedX509UserCache.java |  4 +
 .../x509/cache/SpringBasedX509UserCache.java  | 90 +++++++++++++++++++
 2 files changed, 94 insertions(+)
 create mode 100644 spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/cache/SpringBasedX509UserCache.java

diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/cache/EhCacheBasedX509UserCache.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/cache/EhCacheBasedX509UserCache.java
index 067b4ea2..daa5da26 100644
--- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/cache/EhCacheBasedX509UserCache.java
+++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/cache/EhCacheBasedX509UserCache.java
@@ -37,7 +37,11 @@ import org.springframework.util.Assert;
  *
  * @author Luke Taylor
  * @author Ben Alex
+ * @author Greg Turnquist
+ *
+ * * @deprecated Migrate to {@link SpringBasedX509UserCache} and inject a platform neutral Spring-based {@link org.springframework.cache.Cache}.
  */
+@Deprecated
 public class EhCacheBasedX509UserCache implements X509UserCache, InitializingBean {
 	//~ Static fields/initializers =====================================================================================
 
diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/cache/SpringBasedX509UserCache.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/cache/SpringBasedX509UserCache.java
new file mode 100644
index 00000000..a3994c16
--- /dev/null
+++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/cache/SpringBasedX509UserCache.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2005-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.ws.soap.security.x509.cache;
+
+import java.security.cert.X509Certificate;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.cache.Cache;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.util.Assert;
+
+
+/**
+ * Caches {@code User} objects using a Spring Framework-based {@link Cache}.
+ *
+ * <p>Migrated from Spring Security 2 since it has been removed in Spring Security 3.</p>
+ *
+ * @author Luke Taylor
+ * @author Ben Alex
+ * @author Greg Turnquist
+ */
+public class SpringBasedX509UserCache implements X509UserCache, InitializingBean {
+
+	private static final Log logger = LogFactory.getLog(SpringBasedX509UserCache.class);
+
+	private Cache cache;
+
+	@Override
+	public void afterPropertiesSet() throws Exception {
+		Assert.notNull(cache, "cache is mandatory");
+	}
+
+	@Override
+	public UserDetails getUserFromCache(X509Certificate userCert) {
+
+		if (logger.isDebugEnabled()) {
+
+			String subjectDN = "unknown";
+
+			if ((userCert != null) && (userCert.getSubjectDN() != null)) {
+				subjectDN = userCert.getSubjectDN().toString();
+			}
+
+			logger.debug("X.509 Cache hit. SubjectDN: " + subjectDN);
+		}
+
+		return cache.get(userCert, UserDetails.class);
+	}
+
+	@Override
+	public void putUserInCache(X509Certificate userCert, UserDetails user) {
+
+		if (logger.isDebugEnabled()) {
+			logger.debug("Cache put: " + userCert.getSubjectDN());
+		}
+
+		cache.put(userCert, user);
+	}
+
+	@Override
+	public void removeUserFromCache(X509Certificate userCert) {
+
+		if (logger.isDebugEnabled()) {
+			logger.debug("Cache remove: " + userCert.getSubjectDN());
+		}
+
+		cache.evict(userCert);
+	}
+
+	public void setCache(Cache cache) {
+		this.cache = cache;
+	}
+}