Fixing merge
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/fea7b4dc Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/fea7b4dc Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/fea7b4dc Branch: refs/heads/3.0.x-fixes Commit: fea7b4dc8fbace5264a7cc6b448cbbbc969ab2b7 Parents: 8cc16fc Author: Colm O hEigeartaigh <[email protected]> Authored: Mon Sep 7 16:41:11 2015 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Mon Sep 7 16:41:11 2015 +0100 ---------------------------------------------------------------------- .../org/apache/cxf/ws/security/SecurityConstants.java | 10 ++-------- .../security/wss4j/PolicyBasedWSS4JOutInterceptor.java | 13 +++++-------- .../org/apache/cxf/systest/ws/x509/client.xml | 4 ++-- .../org/apache/cxf/systest/ws/x509/server.xml | 4 ++-- .../org/apache/cxf/systest/ws/x509/stax-server.xml | 4 ++-- 5 files changed, 13 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/fea7b4dc/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 ae8b26b..9b797bd 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 @@ -671,18 +671,12 @@ public final class SecurityConstants { TOKEN, TOKEN_ID, SUBJECT_ROLE_CLASSIFIER, SUBJECT_ROLE_CLASSIFIER_TYPE, MUST_UNDERSTAND, ASYMMETRIC_SIGNATURE_ALGORITHM, PASSWORD_ENCRYPTOR_INSTANCE, ENABLE_SAML_ONE_TIME_USE_CACHE, SAML_ONE_TIME_USE_CACHE_INSTANCE, ENABLE_STREAMING_SECURITY, RETURN_SECURITY_ERROR, -<<<<<<< HEAD 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, KERBEROS_REQUEST_CREDENTIAL_DELEGATION, ENABLE_UNSIGNED_SAML_ASSERTION_PRINCIPAL, - AUDIENCE_RESTRICTION_VALIDATION, STORE_BYTES_IN_ATTACHMENT, USE_ATTACHMENT_ENCRYPTION_CONTENT_ONLY_TRANSFORM -======= - CACHE_IDENTIFIER, DELEGATED_CREDENTIAL, KERBEROS_USE_CREDENTIAL_DELEGATION, - KERBEROS_IS_USERNAME_IN_SERVICENAME_FORM, KERBEROS_REQUEST_CREDENTIAL_DELEGATION, - POLICY_VALIDATOR_MAP, STORE_BYTES_IN_ATTACHMENT, USE_ATTACHMENT_ENCRYPTION_CONTENT_ONLY_TRANSFORM, - SYMMETRIC_SIGNATURE_ALGORITHM ->>>>>>> 5fbe7b4... [CXF-6582] - Support newer symmetric signature algorithms with WS-SecurityPolicy + AUDIENCE_RESTRICTION_VALIDATION, STORE_BYTES_IN_ATTACHMENT, + USE_ATTACHMENT_ENCRYPTION_CONTENT_ONLY_TRANSFORM, SYMMETRIC_SIGNATURE_ALGORITHM })); ALL_PROPERTIES = Collections.unmodifiableSet(s); } http://git-wip-us.apache.org/repos/asf/cxf/blob/fea7b4dc/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java index a603c4e..99eea8e 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java @@ -168,7 +168,6 @@ public class PolicyBasedWSS4JOutInterceptor extends AbstractPhaseInterceptor<Soa policy); } -<<<<<<< HEAD if (transport != null) { WSSecHeader secHeader = new WSSecHeader(actor, mustUnderstand); Element el = null; @@ -198,13 +197,11 @@ public class PolicyBasedWSS4JOutInterceptor extends AbstractPhaseInterceptor<Soa if (asymSignatureAlgorithm != null && transport.getAlgorithmSuite() != null) { transport.getAlgorithmSuite().setAsymmetricSignature(asymSignatureAlgorithm); } -======= - String symSignatureAlgorithm = - (String)message.getContextualProperty(SecurityConstants.SYMMETRIC_SIGNATURE_ALGORITHM); - if (symSignatureAlgorithm != null && binding.getAlgorithmSuite() != null) { - binding.getAlgorithmSuite().setSymmetricSignature(symSignatureAlgorithm); - } ->>>>>>> 5fbe7b4... [CXF-6582] - Support newer symmetric signature algorithms with WS-SecurityPolicy + String symSignatureAlgorithm = + (String)message.getContextualProperty(SecurityConstants.SYMMETRIC_SIGNATURE_ALGORITHM); + if (symSignatureAlgorithm != null && transport.getAlgorithmSuite() != null) { + transport.getAlgorithmSuite().setSymmetricSignature(symSignatureAlgorithm); + } if (transport instanceof TransportBinding) { new TransportBindingHandler(config, (TransportBinding)transport, saaj, http://git-wip-us.apache.org/repos/asf/cxf/blob/fea7b4dc/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client.xml index 9977560..24c0486 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client.xml @@ -98,8 +98,8 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSymmetric256Port"; createdFromAPI="true"> <jaxws:properties> - <entry key="security.encryption.properties" value="bob.properties"/> - <entry key="security.encryption.username" value="bob"/> + <entry key="ws-security.encryption.properties" value="bob.properties"/> + <entry key="ws-security.encryption.username" value="bob"/> <entry key="ws-security.symmetric.signature.algorithm" value="http://www.w3.org/2001/04/xmldsig-more#hmac-sha256"/> </jaxws:properties> </jaxws:client> http://git-wip-us.apache.org/repos/asf/cxf/blob/fea7b4dc/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server.xml index 5409e8c..a339815 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server.xml @@ -113,8 +113,8 @@ </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Symmetric256" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509Symmetric256"; serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetric256Port" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl"> <jaxws:properties> - <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="security.signature.properties" value="bob.properties"/> + <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> + <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="ws-security.symmetric.signature.algorithm" value="http://www.w3.org/2001/04/xmldsig-more#hmac-sha256"/> </jaxws:properties> </jaxws:endpoint> http://git-wip-us.apache.org/repos/asf/cxf/blob/fea7b4dc/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/stax-server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/stax-server.xml index e79df31..c5bce96 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/stax-server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/stax-server.xml @@ -124,8 +124,8 @@ </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Symmetric256" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509Symmetric256"; serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetric256Port" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl"> <jaxws:properties> - <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="security.signature.properties" value="bob.properties"/> + <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> + <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="ws-security.enable.streaming" value="true"/> <entry key="ws-security.symmetric.signature.algorithm" value="http://www.w3.org/2001/04/xmldsig-more#hmac-sha256"/> </jaxws:properties>
