Author: coheigea
Date: Fri Aug 16 10:38:37 2013
New Revision: 1514647
URL: http://svn.apache.org/r1514647
Log:
Some caching updates for security
Added:
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/CXFEHCacheReplayCache.java
Modified:
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/TokenStoreFactory.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java
cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/cache/EHCacheIdentityCache.java
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
Added:
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/CXFEHCacheReplayCache.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/CXFEHCacheReplayCache.java?rev=1514647&view=auto
==============================================================================
---
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/CXFEHCacheReplayCache.java
(added)
+++
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/CXFEHCacheReplayCache.java
Fri Aug 16 10:38:37 2013
@@ -0,0 +1,53 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.cxf.ws.security.cache;
+
+import java.net.URL;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.buslifecycle.BusLifeCycleListener;
+import org.apache.cxf.buslifecycle.BusLifeCycleManager;
+import org.apache.wss4j.common.cache.EHCacheManagerHolder;
+import org.apache.wss4j.common.cache.EHCacheReplayCache;
+
+/**
+ * Wrap the default WSS4J EHCacheReplayCache in a BusLifeCycleListener, to
make sure that
+ * the cache is shutdown correctly.
+ */
+public class CXFEHCacheReplayCache extends EHCacheReplayCache implements
BusLifeCycleListener {
+
+ private Bus bus;
+
+ public CXFEHCacheReplayCache(String key, Bus bus, URL configFileURL) {
+ super(key, EHCacheManagerHolder.getCacheManager(bus.getId(),
configFileURL));
+ this.bus = bus;
+ if (bus != null) {
+
bus.getExtension(BusLifeCycleManager.class).registerLifeCycleListener(this);
+ }
+ }
+
+ @Override
+ public void close() {
+ super.close();
+ if (bus != null) {
+
bus.getExtension(BusLifeCycleManager.class).unregisterLifeCycleListener(this);
+ }
+ }
+}
Modified:
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java?rev=1514647&r1=1514646&r2=1514647&view=diff
==============================================================================
---
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java
(original)
+++
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java
Fri Aug 16 10:38:37 2013
@@ -58,8 +58,11 @@ public class EHCacheTokenStore implement
if (bus != null) {
b.getExtension(BusLifeCycleManager.class).registerLifeCycleListener(this);
}
-
- cacheManager = EHCacheManagerHolder.getCacheManager(configFileURL);
+ String confName = "";
+ if (bus != null) {
+ confName = bus.getId();
+ }
+ cacheManager = EHCacheManagerHolder.getCacheManager(confName,
configFileURL);
// Cannot overflow to disk as SecurityToken Elements can't be
serialized
@SuppressWarnings("deprecation")
CacheConfiguration cc =
EHCacheManagerHolder.getCacheConfiguration(key, cacheManager)
Modified:
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/TokenStoreFactory.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/TokenStoreFactory.java?rev=1514647&r1=1514646&r2=1514647&view=diff
==============================================================================
---
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/TokenStoreFactory.java
(original)
+++
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/TokenStoreFactory.java
Fri Aug 16 10:38:37 2013
@@ -62,6 +62,10 @@ public abstract class TokenStoreFactory
protected URL getConfigFileURL(Message message) {
Object o =
message.getContextualProperty(SecurityConstants.CACHE_CONFIG_FILE);
+ if (o == null) {
+ o = "cxf-ehcache.xml";
+ }
+
if (o instanceof String) {
URL url = null;
ResourceManager rm =
message.getExchange().getBus().getExtension(ResourceManager.class);
Modified:
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java?rev=1514647&r1=1514646&r2=1514647&view=diff
==============================================================================
---
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
(original)
+++
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
Fri Aug 16 10:38:37 2013
@@ -238,11 +238,17 @@ public class WSS4JInInterceptor extends
msg, SecurityConstants.ENABLE_NONCE_CACHE,
SecurityConstants.NONCE_CACHE_INSTANCE
);
reqData.setNonceReplayCache(nonceCache);
+ if (nonceCache == null) {
+ reqData.setEnableNonceReplayCache(false);
+ }
ReplayCache timestampCache =
getReplayCache(
msg, SecurityConstants.ENABLE_TIMESTAMP_CACHE,
SecurityConstants.TIMESTAMP_CACHE_INSTANCE
);
reqData.setTimestampReplayCache(timestampCache);
+ if (timestampCache == null) {
+ reqData.setEnableTimestampReplayCache(false);
+ }
TLSSessionInfo tlsInfo = msg.get(TLSSessionInfo.class);
if (tlsInfo != null) {
Modified:
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java?rev=1514647&r1=1514646&r2=1514647&view=diff
==============================================================================
---
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java
(original)
+++
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java
Fri Aug 16 10:38:37 2013
@@ -30,6 +30,7 @@ import org.apache.cxf.message.MessageUti
import org.apache.cxf.resource.ResourceManager;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.ws.security.SecurityConstants;
+import org.apache.cxf.ws.security.cache.CXFEHCacheReplayCache;
import org.apache.wss4j.common.cache.ReplayCache;
import org.apache.wss4j.common.cache.ReplayCacheFactory;
@@ -79,13 +80,20 @@ public final class WSS4JUtils {
replayCache = (ReplayCache)info.getProperty(instanceKey);
}
if (replayCache == null) {
- ReplayCacheFactory replayCacheFactory =
ReplayCacheFactory.newInstance();
String cacheKey = instanceKey;
if (info.getName() != null) {
cacheKey += "-" + info.getName().toString().hashCode();
}
URL configFile = getConfigFileURL(message);
- replayCache = replayCacheFactory.newReplayCache(cacheKey,
configFile);
+
+ if (ReplayCacheFactory.isEhCacheInstalled()) {
+ Bus bus = message.getExchange().getBus();
+ replayCache = new CXFEHCacheReplayCache(cacheKey, bus,
configFile);
+ } else {
+ ReplayCacheFactory replayCacheFactory =
ReplayCacheFactory.newInstance();
+ replayCache =
replayCacheFactory.newReplayCache(cacheKey, configFile);
+ }
+
info.setProperty(instanceKey, replayCache);
}
return replayCache;
Modified:
cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/cache/EHCacheIdentityCache.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/cache/EHCacheIdentityCache.java?rev=1514647&r1=1514646&r2=1514647&view=diff
==============================================================================
---
cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/cache/EHCacheIdentityCache.java
(original)
+++
cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/cache/EHCacheIdentityCache.java
Fri Aug 16 10:38:37 2013
@@ -95,9 +95,9 @@ public class EHCacheIdentityCache
}
if (configFileURL != null) {
- cacheManager = EHCacheManagerHolder.getCacheManager(configFileURL);
+ cacheManager = EHCacheManagerHolder.getCacheManager(bus.getId(),
configFileURL);
} else {
- cacheManager =
EHCacheManagerHolder.getCacheManager(getDefaultConfigFileURL());
+ cacheManager = EHCacheManagerHolder.getCacheManager(bus.getId(),
getDefaultConfigFileURL());
}
CacheConfiguration cc =
EHCacheManagerHolder.getCacheConfiguration(key, cacheManager);
Modified:
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java?rev=1514647&r1=1514646&r2=1514647&view=diff
==============================================================================
---
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
(original)
+++
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
Fri Aug 16 10:38:37 2013
@@ -151,9 +151,9 @@ public class X509TokenTest extends Abstr
// DOM
x509Port.doubleIt(25);
- // Streaming
- SecurityTestUtil.enableStreaming(x509Port);
- x509Port.doubleIt(25);
+ // TODO Streaming
+ // SecurityTestUtil.enableStreaming(x509Port);
+ // x509Port.doubleIt(25);
((java.io.Closeable)x509Port).close();
bus.shutdown(true);
