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/04/15 15:48:59 UTC
[3/3] cxf git commit: Fixing build
Fixing build
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f7c0e627
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f7c0e627
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f7c0e627
Branch: refs/heads/3.0.x-fixes
Commit: f7c0e627926961d63d6710076dc0d82bd1817be2
Parents: 7f33d15
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Apr 15 14:48:41 2015 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Apr 15 14:48:41 2015 +0100
----------------------------------------------------------------------
parent/pom.xml | 2 +-
.../grants/jwt/AbstractJwtHandlerTest.java | 1 +
.../policyhandlers/AbstractBindingBuilder.java | 28 +++-----------------
.../policyhandlers/TransportBindingHandler.java | 7 -----
.../systest/ws/algsuite/AlgorithmSuiteTest.java | 2 --
5 files changed, 5 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/f7c0e627/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 540bbad..eff3914 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -160,7 +160,7 @@
<cxf.woodstox.core.version>4.4.1</cxf.woodstox.core.version>
<cxf.woodstox.stax2-api.version>3.1.4</cxf.woodstox.stax2-api.version>
<cxf.wsdl4j.version>1.6.3</cxf.wsdl4j.version>
- <cxf.wss4j.version>2.0.3</cxf.wss4j.version>
+ <cxf.wss4j.version>2.0.4-SNAPSHOT</cxf.wss4j.version>
<cxf.xerces.version>2.11.0</cxf.xerces.version>
<cxf.xmlbeans.version>2.6.0</cxf.xmlbeans.version>
<cxf.xmlschema.version>2.2.1</cxf.xmlschema.version>
http://git-wip-us.apache.org/repos/asf/cxf/blob/f7c0e627/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/jwt/AbstractJwtHandlerTest.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/jwt/AbstractJwtHandlerTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/jwt/AbstractJwtHandlerTest.java
index 5ee0145..33d593c 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/jwt/AbstractJwtHandlerTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/jwt/AbstractJwtHandlerTest.java
@@ -82,6 +82,7 @@ public class AbstractJwtHandlerTest {
handler.validateSignature(headers, UNSIGNED_TEXT, SIGNATURE);
fail("OAuthServiceException expected");
} catch (OAuthServiceException expected) {
+ // expected
}
verify(signatureVerifier);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/f7c0e627/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 a996944..8f7c118 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
@@ -1373,18 +1373,9 @@ public abstract class AbstractBindingBuilder extends AbstractCommonBindingHandle
return null;
}
-<<<<<<< HEAD
- protected WSSecEncryptedKey getEncryptedKeyBuilder(AbstractTokenWrapper wrapper,
- AbstractToken token) throws WSSecurityException {
- WSSecEncryptedKey encrKey = new WSSecEncryptedKey(wssConfig);
- Crypto crypto = getEncryptionCrypto(wrapper);
-=======
protected WSSecEncryptedKey getEncryptedKeyBuilder(AbstractToken token) throws WSSecurityException {
- WSSecEncryptedKey encrKey = new WSSecEncryptedKey();
- encrKey.setIdAllocator(wssConfig.getIdAllocator());
- encrKey.setCallbackLookup(callbackLookup);
+ WSSecEncryptedKey encrKey = new WSSecEncryptedKey(wssConfig);
Crypto crypto = getEncryptionCrypto();
->>>>>>> aaad96f... [CXF-6327] - Invalid Policy exception for EndorsingSupportingTokens with more than one token assertions
message.getExchange().put(SecurityConstants.ENCRYPT_CRYPTO, crypto);
setKeyIdentifierType(encrKey, token);
@@ -1435,24 +1426,11 @@ public abstract class AbstractBindingBuilder extends AbstractCommonBindingHandle
return getCrypto(SecurityConstants.SIGNATURE_CRYPTO, SecurityConstants.SIGNATURE_PROPERTIES);
}
-<<<<<<< HEAD
-
- public Crypto getEncryptionCrypto(AbstractTokenWrapper wrapper) throws WSSecurityException {
- Crypto crypto = getCrypto(wrapper, SecurityConstants.ENCRYPT_CRYPTO,
- SecurityConstants.ENCRYPT_PROPERTIES);
- boolean enableRevocation = MessageUtils.isTrue(
- message.getContextualProperty(SecurityConstants.ENABLE_REVOCATION));
-=======
public Crypto getEncryptionCrypto() throws WSSecurityException {
Crypto crypto =
getCrypto(SecurityConstants.ENCRYPT_CRYPTO, SecurityConstants.ENCRYPT_PROPERTIES);
- boolean enableRevocation = false;
- String enableRevStr =
- (String)SecurityUtils.getSecurityPropertyValue(SecurityConstants.ENABLE_REVOCATION, message);
- if (enableRevStr != null) {
- enableRevocation = Boolean.parseBoolean(enableRevStr);
- }
->>>>>>> aaad96f... [CXF-6327] - Invalid Policy exception for EndorsingSupportingTokens with more than one token assertions
+ boolean enableRevocation = MessageUtils.isTrue(
+ message.getContextualProperty(SecurityConstants.ENABLE_REVOCATION));
if (enableRevocation && crypto != null) {
CryptoType cryptoType = new CryptoType(CryptoType.TYPE.ALIAS);
String encrUser = (String)message.getContextualProperty(SecurityConstants.ENCRYPT_USERNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/f7c0e627/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java
index c35d202..5594a6c 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java
@@ -364,15 +364,8 @@ public class TransportBindingHandler extends AbstractBindingBuilder {
}
encrKey.appendToHeader(secHeader);
-<<<<<<< HEAD
WSSecDKSign dkSig = new WSSecDKSign(wssConfig);
- if (wrapper.getToken().getVersion() == SPConstants.SPVersion.SP11) {
-=======
- WSSecDKSign dkSig = new WSSecDKSign();
- dkSig.setIdAllocator(wssConfig.getIdAllocator());
- dkSig.setCallbackLookup(callbackLookup);
if (token.getVersion() == SPConstants.SPVersion.SP11) {
->>>>>>> aaad96f... [CXF-6327] - Invalid Policy exception for EndorsingSupportingTokens with more than one token assertions
dkSig.setWscVersion(ConversationConstants.VERSION_05_02);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/f7c0e627/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/AlgorithmSuiteTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/AlgorithmSuiteTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/AlgorithmSuiteTest.java
index 527fc8d..134dcf1 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/AlgorithmSuiteTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/AlgorithmSuiteTest.java
@@ -258,9 +258,7 @@ public class AlgorithmSuiteTest extends AbstractBusClientServerTestBase {
bus.shutdown(true);
}
- // TODO Unignore when we pick up WSS4J 2.0.4
@org.junit.Test
- @org.junit.Ignore
public void testInclusiveC14NPolicy() throws Exception {
SpringBusFactory bf = new SpringBusFactory();