You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2014/07/14 17:37:44 UTC
git commit: [CXF-5877] - SCT in a (SAML1.1 + SCT) scenario failing to
renew ore reissue. Thanks to Freddy Exposito for the patch.
Repository: cxf
Updated Branches:
refs/heads/master 923117b48 -> d1c484526
[CXF-5877] - SCT in a (SAML1.1 + SCT) scenario failing to renew ore reissue. Thanks to Freddy Exposito for the patch.
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d1c48452
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d1c48452
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d1c48452
Branch: refs/heads/master
Commit: d1c484526c83ef3568e2e97c2638cccd8af34c3b
Parents: 923117b
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Mon Jul 14 16:37:08 2014 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Mon Jul 14 16:37:38 2014 +0100
----------------------------------------------------------------------
.../interceptors/SecureConversationTokenInterceptorProvider.java | 2 +-
.../java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/d1c48452/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationTokenInterceptorProvider.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationTokenInterceptorProvider.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationTokenInterceptorProvider.java
old mode 100644
new mode 100755
index 4932c2c..b876b21
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationTokenInterceptorProvider.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationTokenInterceptorProvider.java
@@ -117,7 +117,7 @@ public class SecureConversationTokenInterceptorProvider extends AbstractPolicyIn
if (v == null) {
v = message.getContextualProperty(s);
}
- if (v != null) {
+ if (v != null && !s.equals(SecurityConstants.TOKEN) && !s.equals(SecurityConstants.TOKEN_ID)) {
ctx.put(s, v);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/d1c48452/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
old mode 100644
new mode 100755
index 0812928..797d314
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
@@ -980,6 +980,7 @@ public abstract class AbstractSTSClient implements Configurable, InterceptorProv
BindingOperationInfo boi = findOperation("/RST/Renew");
client.getRequestContext().putAll(ctx);
+ client.getRequestContext().remove(SecurityConstants.TOKEN_ID);
if (isSecureConv) {
client.getRequestContext().put(SoapBindingConstants.SOAP_ACTION, namespace + "/RST/SCT/Renew");
} else {
@@ -1030,7 +1031,6 @@ public abstract class AbstractSTSClient implements Configurable, InterceptorProv
}
writer.writeStartElement("wst", "RenewTarget", namespace);
- client.getRequestContext().put(SecurityConstants.TOKEN, tok);
StaxUtils.copy(tok.getToken(), writer);
writer.writeEndElement();