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/01/31 12:39:39 UTC
svn commit: r1563107 - in
/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers:
AbstractBindingBuilder.java AbstractStaxBindingHandler.java
Author: coheigea
Date: Fri Jan 31 11:39:39 2014
New Revision: 1563107
URL: http://svn.apache.org/r1563107
Log:
Fixing X.509 Token referencing problem
Modified:
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractStaxBindingHandler.java
Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java?rev=1563107&r1=1563106&r2=1563107&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java Fri Jan 31 11:39:39 2014
@@ -1520,6 +1520,9 @@ public abstract class AbstractBindingBui
} else if (token.getIncludeTokenType() == IncludeTokenType.INCLUDE_TOKEN_ALWAYS_TO_RECIPIENT
&& !isRequestor() && token instanceof X509Token) {
secBase.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
+ } else if (token.getIncludeTokenType() == IncludeTokenType.INCLUDE_TOKEN_ALWAYS_TO_INITIATOR
+ && isRequestor() && token instanceof X509Token) {
+ secBase.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
} else {
secBase.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
}
Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractStaxBindingHandler.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractStaxBindingHandler.java?rev=1563107&r1=1563106&r2=1563107&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractStaxBindingHandler.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractStaxBindingHandler.java Fri Jan 31 11:39:39 2014
@@ -589,6 +589,9 @@ public abstract class AbstractStaxBindin
} else if (token.getIncludeTokenType() == IncludeTokenType.INCLUDE_TOKEN_ALWAYS_TO_RECIPIENT
&& !isRequestor() && token instanceof X509Token) {
identifier = WSSecurityTokenConstants.KeyIdentifier_IssuerSerial;
+ } else if (token.getIncludeTokenType() == IncludeTokenType.INCLUDE_TOKEN_ALWAYS_TO_INITIATOR
+ && isRequestor() && token instanceof X509Token) {
+ identifier = WSSecurityTokenConstants.KeyIdentifier_IssuerSerial;
}
if (identifier != null) {