Author: coheigea Date: Thu Jul 19 14:40:35 2012 New Revision: 1363353 URL: http://svn.apache.org/viewvc?rev=1363353&view=rev Log: Merged revisions 1363345 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
........ r1363345 | coheigea | 2012-07-19 15:19:31 +0100 (Thu, 19 Jul 2012) | 18 lines Merged revisions 1363338 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes ........ r1363338 | coheigea | 2012-07-19 15:01:29 +0100 (Thu, 19 Jul 2012) | 10 lines Merged revisions 1363334 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1363334 | coheigea | 2012-07-19 14:50:36 +0100 (Thu, 19 Jul 2012) | 2 lines [CXF-4434] - SecurityConstants.TIMESTAMP_TTL property is not parsed ........ ........ ........ Modified: cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JInterceptor.java Modified: cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java?rev=1363353&r1=1363352&r2=1363353&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java (original) +++ cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java Thu Jul 19 14:40:35 2012 @@ -58,6 +58,10 @@ public final class SecurityConstants { public static final String STS_CLIENT = "ws-security.sts.client"; public static final String STS_APPLIES_TO = "ws-security.sts.applies-to"; + /** + * This configuration tag specifies the time in seconds after Creation that an incoming + * Timestamp is valid for. The default value is 300 seconds (5 minutes). + */ public static final String TIMESTAMP_TTL = "ws-security.timestamp.timeToLive"; public static final String ENABLE_REVOCATION = "ws-security.enableRevocation"; Modified: cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JInterceptor.java URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JInterceptor.java?rev=1363353&r1=1363352&r2=1363353&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JInterceptor.java (original) +++ cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JInterceptor.java Thu Jul 19 14:40:35 2012 @@ -167,6 +167,11 @@ public abstract class AbstractWSS4JInter if (futureTTL != null) { msg.setContextualProperty(WSHandlerConstants.TTL_FUTURE_TIMESTAMP, futureTTL); } + String ttl = + (String)msg.getContextualProperty(SecurityConstants.TIMESTAMP_TTL); + if (ttl != null) { + msg.setContextualProperty(WSHandlerConstants.TTL_TIMESTAMP, ttl); + } String certConstraints = (String)msg.getContextualProperty(SecurityConstants.SUBJECT_CERT_CONSTRAINTS); if (certConstraints != null) {
