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 2016/01/08 14:44:22 UTC
[2/2] cxf git commit: Minor changes
Minor changes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/69b2098d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/69b2098d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/69b2098d
Branch: refs/heads/3.1.x-fixes
Commit: 69b2098d6e3bc83e26b614c5766b808f6d23f108
Parents: d2ee79c
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Jan 8 13:44:12 2016 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri Jan 8 13:44:12 2016 +0000
----------------------------------------------------------------------
.../wss4j/policyhandlers/AsymmetricBindingHandler.java | 8 ++++----
.../cxf/systest/sts/asymmetric/AsymmetricBindingTest.java | 2 ++
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/69b2098d/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 564cece..d16b521 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
@@ -19,7 +19,6 @@
package org.apache.cxf.ws.security.wss4j.policyhandlers;
-import java.security.PublicKey;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
import java.util.Collection;
@@ -479,13 +478,14 @@ public class AsymmetricBindingHandler extends AbstractBindingBuilder {
if (!isRequestor() && securityToken != null
&& securityToken.getX509Certificate() != null) {
encr.setUseThisCert(securityToken.getX509Certificate());
- } else if (!isRequestor() && securityToken != null
+ } else { /* TODO when WSS4J 2.1.5 is released else if (!isRequestor() && securityToken != null
&& securityToken.getKey() instanceof PublicKey) {
encr.setUseThisPublicKey((PublicKey)securityToken.getKey());
- } else {
+ } */
setEncryptionUser(encr, encrToken, false, crypto);
}
- if (!encr.isCertSet() && encr.getUseThisPublicKey() == null && crypto == null) {
+ if (!encr.isCertSet() // TODO when WSS4J 2.1.5 is released&& encr.getUseThisPublicKey() == null
+ && crypto == null) {
unassertPolicy(recToken, "Missing security configuration. "
+ "Make sure jaxws:client element is configured "
+ "with a " + SecurityConstants.ENCRYPT_PROPERTIES + " value.");
http://git-wip-us.apache.org/repos/asf/cxf/blob/69b2098d/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/AsymmetricBindingTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/AsymmetricBindingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/AsymmetricBindingTest.java
index cb4627c..68eaec5 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/AsymmetricBindingTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/AsymmetricBindingTest.java
@@ -177,7 +177,9 @@ public class AsymmetricBindingTest extends AbstractBusClientServerTestBase {
bus.shutdown(true);
}
+ // TODO enable when WSS4J 2.1.5 is released, and some stuff in the AsymmetricBindingHandler
@org.junit.Test
+ @org.junit.Ignore
public void testUsernameTokenSAML2KeyValue() throws Exception {
// TODO
if (test.isStreaming() || STAX_PORT.equals(test.getPort())) {