Author: coheigea
Date: Wed Nov 10 16:20:06 2010
New Revision: 1033562
URL: http://svn.apache.org/viewvc?rev=1033562&view=rev
Log:
Committing a fix for failing systests.
Modified:
cxf/sandbox/wss4j-1.6-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
cxf/sandbox/wss4j-1.6-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java
cxf/sandbox/wss4j-1.6-port/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssec10/server/UTPasswordCallback.java
cxf/sandbox/wss4j-1.6-port/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssec11/server/KeystorePasswordCallback.java
Modified:
cxf/sandbox/wss4j-1.6-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
URL:
http://svn.apache.org/viewvc/cxf/sandbox/wss4j-1.6-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java?rev=1033562&r1=1033561&r2=1033562&view=diff
==============================================================================
---
cxf/sandbox/wss4j-1.6-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
(original)
+++
cxf/sandbox/wss4j-1.6-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
Wed Nov 10 16:20:06 2010
@@ -388,8 +388,7 @@ public class AsymmetricBindingHandler ex
bottomUpElement = dkSign.getSignatureElement();
signatures.add(dkSign.getSignatureValue());
- // TODO mainSigId =
addWsuIdToElement(dkSign.getSignatureElement());
- mainSigId = dkSign.getId();
+ mainSigId = dkSign.getSignatureId();
} catch (Exception e) {
//REVISIT
e.printStackTrace();
@@ -417,7 +416,6 @@ public class AsymmetricBindingHandler ex
signatures.add(sig.getSignatureValue());
- //TODO mainSigId = addWsuIdToElement(sig.getSignatureElement());
mainSigId = sig.getId();
}
}
Modified:
cxf/sandbox/wss4j-1.6-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java
URL:
http://svn.apache.org/viewvc/cxf/sandbox/wss4j-1.6-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java?rev=1033562&r1=1033561&r2=1033562&view=diff
==============================================================================
---
cxf/sandbox/wss4j-1.6-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java
(original)
+++
cxf/sandbox/wss4j-1.6-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java
Wed Nov 10 16:20:06 2010
@@ -640,8 +640,7 @@ public class SymmetricBindingHandler ext
}
bottomUpElement = dkSign.getSignatureElement();
- // TODO this.mainSigId =
addWsuIdToElement(dkSign.getSignatureElement());
- this.mainSigId = dkSign.getId();
+ this.mainSigId = dkSign.getSignatureId();
return dkSign.getSignatureValue();
}
@@ -718,7 +717,6 @@ public class SymmetricBindingHandler ext
}
bottomUpElement = sig.getSignatureElement();
- // TODO mainSigId = addWsuIdToElement(mainSigElement);
this.mainSigId = sig.getId();
return sig.getSignatureValue();
}
Modified:
cxf/sandbox/wss4j-1.6-port/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssec10/server/UTPasswordCallback.java
URL:
http://svn.apache.org/viewvc/cxf/sandbox/wss4j-1.6-port/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssec10/server/UTPasswordCallback.java?rev=1033562&r1=1033561&r2=1033562&view=diff
==============================================================================
---
cxf/sandbox/wss4j-1.6-port/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssec10/server/UTPasswordCallback.java
(original)
+++
cxf/sandbox/wss4j-1.6-port/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssec10/server/UTPasswordCallback.java
Wed Nov 10 16:20:06 2010
@@ -50,15 +50,8 @@ public class UTPasswordCallback implemen
public void handle(Callback[] callbacks) throws IOException,
UnsupportedCallbackException {
for (int i = 0; i < callbacks.length; i++) {
WSPasswordCallback pc = (WSPasswordCallback)callbacks[i];
- String sentPassword = pc.getPassword();
String pass = passwords.get(pc.getIdentifier());
- if (sentPassword == null) {
- throw new IOException("Reveived password from clienthas null
value");
- }
- if (pass == null) {
- throw new IOException("Unknown username sent from client");
- }
- if (pass.equals(sentPassword)) {
+ if (pass != null) {
pc.setPassword(pass);
return;
}
Modified:
cxf/sandbox/wss4j-1.6-port/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssec11/server/KeystorePasswordCallback.java
URL:
http://svn.apache.org/viewvc/cxf/sandbox/wss4j-1.6-port/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssec11/server/KeystorePasswordCallback.java?rev=1033562&r1=1033561&r2=1033562&view=diff
==============================================================================
---
cxf/sandbox/wss4j-1.6-port/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssec11/server/KeystorePasswordCallback.java
(original)
+++
cxf/sandbox/wss4j-1.6-port/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssec11/server/KeystorePasswordCallback.java
Wed Nov 10 16:20:06 2010
@@ -42,6 +42,7 @@ public class KeystorePasswordCallback im
passwords.put("alice", "password");
passwords.put("Bob", "abcd!1234");
passwords.put("bob", "password");
+ passwords.put("abcd", "dcba");
}
/**
@@ -56,8 +57,6 @@ public class KeystorePasswordCallback im
if (pass != null) {
pc.setPassword(pass);
return;
- } else {
- pc.setPassword("password");
}
}
}
