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 2015/07/09 18:43:21 UTC
[3/5] cxf git commit: Fixing backmerge
Fixing backmerge
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/69aff5e6
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/69aff5e6
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/69aff5e6
Branch: refs/heads/3.0.x-fixes
Commit: 69aff5e6a15579ac713e9f109249e42e86623067
Parents: b158ddf
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Thu Jul 9 17:36:33 2015 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Jul 9 17:36:33 2015 +0100
----------------------------------------------------------------------
.../cxf/ws/security/SecurityConstants.java | 12 +----------
.../policyhandlers/AbstractBindingBuilder.java | 22 --------------------
.../AsymmetricBindingHandler.java | 12 -----------
3 files changed, 1 insertion(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/69aff5e6/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
index 885a9b8..fd4c090 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
@@ -244,12 +244,8 @@ public final class SecurityConstants {
* SAML Token contains Audience Restriction URIs, one of them must match either the
* request URL or the Service QName. The default is "true".
*/
-<<<<<<< HEAD
public static final String AUDIENCE_RESTRICTION_VALIDATION = "ws-security.validate.audience-restriction";
-=======
- public static final String ENABLE_SAML_ONE_TIME_USE_CACHE = "ws-security.enable.saml.cache";
-
/**
* Whether to store bytes (CipherData or BinarySecurityToken) in an attachment. The default is
* true if MTOM is enabled. Set it to false to BASE-64 encode the bytes and "inlined" them in
@@ -258,7 +254,6 @@ public final class SecurityConstants {
*/
public static final String STORE_BYTES_IN_ATTACHMENT = "ws-security.store.bytes.in.attachment";
->>>>>>> f399b92... Support the ability to store BASE-64 encoded (encryption) bytes in message attachments
//
// Non-boolean WS-Security Configuration parameters
//
@@ -663,13 +658,8 @@ public final class SecurityConstants {
CACHE_IDENTIFIER, CACHE_ISSUED_TOKEN_IN_ENDPOINT, PREFER_WSMEX_OVER_STS_CLIENT_CONFIG,
DELEGATED_CREDENTIAL, KERBEROS_USE_CREDENTIAL_DELEGATION,
KERBEROS_IS_USERNAME_IN_SERVICENAME_FORM, STS_TOKEN_IMMINENT_EXPIRY_VALUE,
-<<<<<<< HEAD
KERBEROS_REQUEST_CREDENTIAL_DELEGATION, ENABLE_UNSIGNED_SAML_ASSERTION_PRINCIPAL,
- AUDIENCE_RESTRICTION_VALIDATION
-=======
- KERBEROS_REQUEST_CREDENTIAL_DELEGATION, POLICY_VALIDATOR_MAP,
- STORE_BYTES_IN_ATTACHMENT
->>>>>>> f399b92... Support the ability to store BASE-64 encoded (encryption) bytes in message attachments
+ AUDIENCE_RESTRICTION_VALIDATION, STORE_BYTES_IN_ATTACHMENT
}));
ALL_PROPERTIES = Collections.unmodifiableSet(s);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/69aff5e6/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
index 0a3734c..e0245e3 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
@@ -50,11 +50,8 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-<<<<<<< HEAD
import org.apache.cxf.Bus;
-=======
import org.apache.cxf.attachment.AttachmentUtil;
->>>>>>> f399b92... Support the ability to store BASE-64 encoded (encryption) bytes in message attachments
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.binding.soap.saaj.SAAJUtils;
import org.apache.cxf.common.classloader.ClassLoaderUtils;
@@ -173,12 +170,8 @@ public abstract class AbstractBindingBuilder extends AbstractCommonBindingHandle
protected Element bstElement;
protected Element lastEncryptedKeyElement;
-<<<<<<< HEAD
-=======
- protected final CallbackLookup callbackLookup;
protected boolean storeBytesInAttachment;
->>>>>>> f399b92... Support the ability to store BASE-64 encoded (encryption) bytes in message attachments
private Element lastSupportingTokenElement;
private Element lastDerivedKeyElement;
@@ -200,8 +193,6 @@ public abstract class AbstractBindingBuilder extends AbstractCommonBindingHandle
this.secHeader = secHeader;
this.saaj = saaj;
message.getExchange().put(WSHandlerConstants.SEND_SIGV, signatures);
-<<<<<<< HEAD
-=======
boolean storeBytes =
MessageUtils.getContextualBoolean(
@@ -219,13 +210,6 @@ public abstract class AbstractBindingBuilder extends AbstractCommonBindingHandle
}
}
- Element soapBody = SAAJUtils.getBody(saaj);
- if (soapBody != null) {
- callbackLookup = new CXFCallbackLookup(soapBody.getOwnerDocument(), soapBody);
- } else {
- callbackLookup = null;
- }
->>>>>>> f399b92... Support the ability to store BASE-64 encoded (encryption) bytes in message attachments
}
protected void insertAfter(Element child, Element sib) {
@@ -1419,15 +1403,9 @@ public abstract class AbstractBindingBuilder extends AbstractCommonBindingHandle
}
protected WSSecEncryptedKey getEncryptedKeyBuilder(AbstractToken token) throws WSSecurityException {
-<<<<<<< HEAD
WSSecEncryptedKey encrKey = new WSSecEncryptedKey(wssConfig);
-=======
- WSSecEncryptedKey encrKey = new WSSecEncryptedKey();
- encrKey.setIdAllocator(wssConfig.getIdAllocator());
- encrKey.setCallbackLookup(callbackLookup);
encrKey.setAttachmentCallbackHandler(new AttachmentCallbackHandler(message));
encrKey.setStoreBytesInAttachment(storeBytesInAttachment);
->>>>>>> f399b92... Support the ability to store BASE-64 encoded (encryption) bytes in message attachments
Crypto crypto = getEncryptionCrypto();
message.getExchange().put(SecurityConstants.ENCRYPT_CRYPTO, crypto);
setKeyIdentifierType(encrKey, token);
http://git-wip-us.apache.org/repos/asf/cxf/blob/69aff5e6/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
index c41580f..3a5edea 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
@@ -453,15 +453,9 @@ public class AsymmetricBindingHandler extends AbstractBindingBuilder {
AlgorithmSuite algorithmSuite = abinding.getAlgorithmSuite();
if (encrToken.getDerivedKeys() == DerivedKeys.RequireDerivedKeys) {
try {
-<<<<<<< HEAD
WSSecDKEncrypt dkEncr = new WSSecDKEncrypt(wssConfig);
-=======
- WSSecDKEncrypt dkEncr = new WSSecDKEncrypt();
- dkEncr.setIdAllocator(wssConfig.getIdAllocator());
- dkEncr.setCallbackLookup(callbackLookup);
dkEncr.setAttachmentCallbackHandler(new AttachmentCallbackHandler(message));
dkEncr.setStoreBytesInAttachment(storeBytesInAttachment);
->>>>>>> f399b92... Support the ability to store BASE-64 encoded (encryption) bytes in message attachments
if (recToken.getToken().getVersion() == SPConstants.SPVersion.SP11) {
dkEncr.setWscVersion(ConversationConstants.VERSION_05_02);
}
@@ -624,15 +618,9 @@ public class AsymmetricBindingHandler extends AbstractBindingBuilder {
// Set up the encrypted key to use
setupEncryptedKey(wrapper, sigToken);
-<<<<<<< HEAD
WSSecDKSign dkSign = new WSSecDKSign(wssConfig);
-=======
- WSSecDKSign dkSign = new WSSecDKSign();
- dkSign.setIdAllocator(wssConfig.getIdAllocator());
- dkSign.setCallbackLookup(callbackLookup);
dkSign.setAttachmentCallbackHandler(new AttachmentCallbackHandler(message));
dkSign.setStoreBytesInAttachment(storeBytesInAttachment);
->>>>>>> f399b92... Support the ability to store BASE-64 encoded (encryption) bytes in message attachments
if (wrapper.getToken().getVersion() == SPConstants.SPVersion.SP11) {
dkSign.setWscVersion(ConversationConstants.VERSION_05_02);
}