You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2009/07/10 17:51:45 UTC
svn commit: r792993 - in /cxf/branches/2.2.x-fixes: ./
distribution/src/main/release/samples/ws_security/interopfest/wstrust10/src/main/resources/etc/client.xml
rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java
Author: dkulp
Date: Fri Jul 10 15:51:44 2009
New Revision: 792993
URL: http://svn.apache.org/viewvc?rev=792993&view=rev
Log:
Merged revisions 792685 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r792685 | dkulp | 2009-07-09 16:54:25 -0400 (Thu, 09 Jul 2009) | 2 lines
Turns out, we don't have to decrypt the internal token. Pass it back to
the target server and they should do it.
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/src/main/resources/etc/client.xml
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 10 15:51:44 2009
@@ -1 +1 @@
-/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788444,788451,788703,788752,788774,788819-788820,789013,789371,789387,789420,789527-789530,789704-789705,789788,789811,789896-789901,790074,790094,790134,790188,790294,790553,790637-790644,790868,791301,791354,791538,791753,791947,792007,792096,792183,792261-792265,792271,792604,792683-792684
+/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788444,788451,788703,788752,788774,788819-788820,789013,789371,789387,789420,789527-789530,789704-789705,789788,789811,789896-789901,790074,790094,790134,790188,790294,790553,790637-790644,790868,791301,791354,791538,791753,791947,792007,792096,792183,792261-792265,792271,792604,792683-792685
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/src/main/resources/etc/client.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/src/main/resources/etc/client.xml?rev=792993&r1=792992&r2=792993&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/src/main/resources/etc/client.xml (original)
+++ cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/src/main/resources/etc/client.xml Fri Jul 10 15:51:44 2009
@@ -128,7 +128,6 @@
<entry key="ws-security.password" value="abcd!1234"/>
<entry key="ws-security.signature.properties" value="etc/wssip.properties"/>
<entry key="ws-security.sts.token.properties" value="etc/wssip.properties"/>
- <entry key="ws-security.sts.token.properties.decrypt" value="etc/bob.properties"/>
<entry key="ws-security.callback-handler" value="interop.client.KeystorePasswordCallback"/>
</map>
</property>
Modified: cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java?rev=792993&r1=792992&r2=792993&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java (original)
+++ cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java Fri Jul 10 15:51:44 2009
@@ -101,7 +101,6 @@
import org.apache.ws.security.conversation.ConversationException;
import org.apache.ws.security.conversation.dkalgo.P_SHA1;
import org.apache.ws.security.message.token.Reference;
-import org.apache.ws.security.processor.EncryptedDataProcessor;
import org.apache.ws.security.processor.EncryptedKeyProcessor;
import org.apache.ws.security.util.Base64;
import org.apache.ws.security.util.WSSecurityUtil;
@@ -670,11 +669,6 @@
el = DOMUtils.getNextElement(el);
}
Element rstDec = rst;
- try {
- rstDec = decrypt(rst);
- } catch (IOException e1) {
- throw new TrustException(e1);
- }
String id = findID(rar, rur, rstDec);
if (StringUtils.isEmpty(id)) {
throw new TrustException(new Message("NO_ID", LOG));
@@ -736,27 +730,6 @@
return token;
}
- protected Element decrypt(Element firstElement) throws IOException {
- if ("EncryptedData".equals(firstElement.getLocalName())
- && "http://www.w3.org/2001/04/xmlenc#".equals(firstElement.getNamespaceURI())) {
- Node parent = firstElement.getParentNode();
- Node prev = firstElement.getPreviousSibling();
-
- // encrypted even more. WCF seems to do this periodically
- EncryptedDataProcessor processor = new EncryptedDataProcessor();
-
- processor.handleToken(firstElement, null, createCrypto(true), createHandler(), null,
- new Vector(), null);
-
- if (prev == null) {
- firstElement = (Element)parent.getFirstChild();
- } else {
- firstElement = (Element)prev.getNextSibling();
- }
- }
- return firstElement;
- }
-
private CallbackHandler createHandler() {
Object o = getProperty(SecurityConstants.CALLBACK_HANDLER);
if (o instanceof String) {