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 2014/06/23 13:42:40 UTC

[1/3] git commit: Improving logging a bit in the STS

Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes b90489c90 -> fdd9c9707


Improving logging a bit in the STS


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b86d56a1
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b86d56a1
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b86d56a1

Branch: refs/heads/2.7.x-fixes
Commit: b86d56a10d41f3e470db2105775aec2b16178628
Parents: b90489c
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Mon Jun 23 12:28:34 2014 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Mon Jun 23 12:42:28 2014 +0100

----------------------------------------------------------------------
 .../org/apache/cxf/ws/security/trust/AbstractSTSClient.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/b86d56a1/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
index 70cc175..f2cda23 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
@@ -491,6 +491,8 @@ public abstract class AbstractSTSClient implements Configurable, InterceptorProv
         if (location != null) {
             location = location.trim();
         }
+        LOG.fine("EPR address: " + location);
+        
         final QName sName = EndpointReferenceUtils.getServiceName(ref, bus);
         if (sName != null) {
             serviceName = sName;
@@ -498,12 +500,15 @@ public abstract class AbstractSTSClient implements Configurable, InterceptorProv
             if (epName != null) {
                 endpointName = epName;
             }
+            LOG.fine("EPR endpoint: " + serviceName + " " + endpointName);
         }
         final String wsdlLoc = EndpointReferenceUtils.getWSDLLocation(ref);
         if (wsdlLoc != null) {
             wsdlLocation = wsdlLoc;
         }
+        
         String mexLoc = findMEXLocation(ref, useEPRWSAAddrAsMEXLocation);
+        LOG.fine("WS-MEX location: " + mexLoc);
         if (mexLoc != null) {
             try {
                 JaxWsProxyFactoryBean proxyFac = new JaxWsProxyFactoryBean();
@@ -556,6 +561,7 @@ public abstract class AbstractSTSClient implements Configurable, InterceptorProv
                                 if (ei.getAddress().equals(location)) {
                                     endpointName = ei.getName();
                                     serviceName = serv.getName();
+                                    LOG.fine("Matched endpoint to location");
                                 }
                             }
                         }
@@ -564,6 +570,7 @@ public abstract class AbstractSTSClient implements Configurable, InterceptorProv
                     EndpointInfo ei = service.getEndpointInfo(endpointName);
                     if (ei == null && anonymousAddress.equals(location)
                         && !services.isEmpty() && !services.get(0).getEndpoints().isEmpty()) {
+                        LOG.fine("Anonymous location so taking first endpoint");
                         serviceName = services.get(0).getName();
                         endpointName = services.get(0).getEndpoints().iterator().next().getName();
                         ei = service.getEndpointInfo(endpointName);
@@ -658,7 +665,7 @@ public abstract class AbstractSTSClient implements Configurable, InterceptorProv
         for (BindingOperationInfo boi : bi.getOperations()) {
             SoapOperationInfo soi = boi.getExtensor(SoapOperationInfo.class);
             String soapAction = soi != null ? soi.getAction() : null;
-            Object o  = boi.getOperationInfo().getInput()
+            Object o = boi.getOperationInfo().getInput()
                     .getExtensionAttribute(new QName("http://www.w3.org/2007/05/addressing/metadata",
                                                      "Action"));
             if (o instanceof QName) {


[2/3] [CXF-5817] - Adding unit test

Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/fdd9c970/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/sts/wcf.wsdl
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/sts/wcf.wsdl b/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/sts/wcf.wsdl
new file mode 100644
index 0000000..1b44bfd
--- /dev/null
+++ b/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/sts/wcf.wsdl
@@ -0,0 +1,1344 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+        Licensed to the Apache Software Foundation (ASF) under one or more
+        contributor license agreements. See the NOTICE file distributed with
+        this work for additional information regarding copyright ownership.
+        The ASF licenses this file to you under the Apache License, Version
+        2.0 (the "License"); you may not use this file except in compliance
+        with the License. You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+        applicable law or agreed to in writing, software distributed under the
+        License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+        CONDITIONS OF ANY KIND, either express or implied. See the License for
+        the specific language governing permissions and limitations under the
+        License.
+    -->
+<s:Envelope xmlns:s="http://www.w3.org/2003/05/soap-envelope" xmlns:a="http://www.w3.org/2005/08/addressing">
+        <s:Header>
+                <a:Action s:mustUnderstand="1">http://schemas.xmlsoap.org/ws/2004/09/transfer/GetResponse</a:Action>
+                <a:RelatesTo>urn:uuid:d31db436-2217-4d0a-810a-99d606d005c2</a:RelatesTo>
+        </s:Header>
+        <s:Body>
+                <Metadata xmlns="http://schemas.xmlsoap.org/ws/2004/09/mex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex">
+                        <wsx:MetadataSection Dialect="http://schemas.xmlsoap.org/wsdl/" Identifier="http://schemas.microsoft.com/ws/2008/06/identity/securitytokenservice" xmlns="">
+                                <wsdl:definitions name="SecurityTokenService" targetNamespace="http://schemas.microsoft.com/ws/2008/06/identity/securitytokenservice" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:t="http://schemas.xmlsoap.org/ws/2005/02/trust" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://schemas.microsoft.com/ws/2008/06/identity/securitytokenservice" xmlns:msc="http://schemas.microsoft.com/ws/2005/12/wsdl/contract" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:wsap="http://schemas.xmlsoap.org/ws/2004/08/addressing/policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:trust="http://docs.oasis-open.org/ws-sx/ws-trust/200512" xmlns:wsp="http:/
 /schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsa10="http://www.w3.org/2005/08/addressing">
+                                        <wsp:Policy wsu:Id="CustomBinding_IWSTrustFeb2005Async_policy">
+                                                <wsp:ExactlyOne>
+                                                        <wsp:All>
+                                                                <http:NegotiateAuthentication xmlns:http="http://schemas.microsoft.com/ws/06/2004/policy/http"/>
+                                                                <sp:TransportBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+                                                                        <wsp:Policy>
+                                                                                <sp:TransportToken>
+                                                                                        <wsp:Policy>
+                                                                                                <sp:HttpsToken RequireClientCertificate="false"/>
+                                                                                        </wsp:Policy>
+                                                                                </sp:TransportToken>
+                                                                                <sp:AlgorithmSuite>
+                                                                                        <wsp:Policy>
+                                                                                                <sp:Basic256/>
+                                                                                        </wsp:Policy>
+                                                                                </sp:AlgorithmSuite>
+                                                                                <sp:Layout>
+                                                                                        <wsp:Policy>
+                                                                                                <sp:Strict/>
+                                                                                        </wsp:Policy>
+                                                                                </sp:Layout>
+                                                                        </wsp:Policy>
+                                                                </sp:TransportBinding>
+                                                                <wsaw:UsingAddressing/>
+                                                        </wsp:All>
+                                                </wsp:ExactlyOne>
+                                        </wsp:Policy>
+                                        <wsp:Policy wsu:Id="CertificateWSTrustBinding_IWSTrustFeb2005Async_policy">
+                                                <wsp:ExactlyOne>
+                                                        <wsp:All>
+                                                                <sp:TransportBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+                                                                        <wsp:Policy>
+                                                                                <sp:TransportToken>
+                                                                                        <wsp:Policy>
+                                                                                                <sp:HttpsToken RequireClientCertificate="false"/>
+                                                                                        </wsp:Policy>
+                                                                                </sp:TransportToken>
+                                                                                <sp:AlgorithmSuite>
+                                                                                        <wsp:Policy>
+                                                                                                <sp:Basic256/>
+                                                                                        </wsp:Policy>
+                                                                                </sp:AlgorithmSuite>
+                                                                                <sp:Layout>
+                                                                                        <wsp:Policy>
+                                                                                                <sp:Strict/>
+                                                                                        </wsp:Policy>
+                                                                                </sp:Layout>
+                                                                                <sp:IncludeTimestamp/>
+                                                                        </wsp:Policy>
+                                                                </sp:TransportBinding>
+                                                                <sp:EndorsingSupportingTokens xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+                                                                        <wsp:Policy>
+                                                                                <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+                                                                                        <wsp:Policy>
+                                                                                                <sp:RequireThumbprintReference/>
+                                                                                                <sp:WssX509V3Token10/>
+                                                                                        </wsp:Policy>
+                                                                                </sp:X509Token>
+                                                                                <mssp:RsaToken sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never" wsp:Optional="true" xmlns:mssp="http://schemas.microsoft.com/ws/2005/07/securitypolicy"/>
+                                                                                <sp:SignedParts>
+                                                                                        <sp:Header Name="To" Namespace="http://www.w3.org/2005/08/addressing"/>
+                                                                                </sp:SignedParts>
+                                                                        </wsp:Policy>
+                                                                </sp:EndorsingSupportingTokens>
+                                                                <sp:Wss11 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+                                                                        <wsp:Policy>
+                                                                                <sp:MustSupportRefThumbprint/>
+                                                                        </wsp:Policy>
+                                                                </sp:Wss11>
+                                                                <sp:Trust10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+                                                                        <wsp:Policy>
+                                                                                <sp:MustSupportIssuedTokens/>
+                                                                                <sp:RequireClientEntropy/>
+                                                                                <sp:RequireServerEntropy/>
+                                                                        </wsp:Policy>
+                                                                </sp:Trust10>
+                                                                <wsaw:UsingAddressing/>
+                                                        </wsp:All>
+                                                </wsp:ExactlyOne>
+                                        </wsp:Policy>
+                                        <wsp:Policy wsu:Id="CertificateWSTrustBinding_IWSTrustFeb2005Async1_policy">
+                                                <wsp:ExactlyOne>
+                                                        <wsp:All>
+                                                                <sp:TransportBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+                                                                        <wsp:Policy>
+                                                                                <sp:TransportToken>
+                                                                                        <wsp:Policy>
+                                                                                                <sp:HttpsToken RequireClientCertificate="true"/>
+                                                                                        </wsp:Policy>
+                                                                                </sp:TransportToken>
+                                                                                <sp:AlgorithmSuite>
+                                                                                        <wsp:Policy>
+                                                                                                <sp:Basic256/>
+                                                                                        </wsp:Policy>
+                                                                                </sp:AlgorithmSuite>
+                                                                                <sp:Layout>
+                                                                                        <wsp:Policy>
+                                                                                                <sp:Strict/>
+                                                                                        </wsp:Policy>
+                                                                                </sp:Layout>
+                                                                        </wsp:Policy>
+                                                                </sp:TransportBinding>
+                                                                <wsaw:UsingAddressing/>
+                                                        </wsp:All>
+                                                </wsp:ExactlyOne>
+                                        </wsp:Policy>
+                                        <wsp:Policy wsu:Id="CustomBinding_IWSTrustFeb2005Async1_policy">
+                                                <wsp:ExactlyOne>
+                                                        <wsp:All>
+                                                                <sp:TransportBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+                                                                        <wsp:Policy>
+                                                                                <sp:TransportToken>
+                                                                                        <wsp:Policy>
+                                                                                                <sp:HttpsToken RequireClientCertificate="false"/>
+                                                                                        </wsp:Policy>
+                                                                                </sp:TransportToken>
+                                                                                <sp:AlgorithmSuite>
+                                                                                        <wsp:Policy>
+                                                                                                <sp:Basic128/>
+                                                                                        </wsp:Policy>
+                                                                                </sp:AlgorithmSuite>
+                                                                                <sp:Layout>
+                                                                                        <wsp:Policy>
+                                                                                                <sp:Strict/>
+                                                                                        </wsp:Policy>
+                                                                                </sp:Layout>
+                                                                                <sp:IncludeTimestamp/>
+                                                                        </wsp:Policy>
+                                                                </sp:TransportBinding>
+                                                                <sp:EndorsingSupportingTokens xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+                                                                        <wsp:Policy>
+                                                                                <sp:KerberosToken sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Once">
+                                                                                        <wsp:Policy>
+                                                                                                <sp:WssGssKerberosV5ApReqToken11/>
+                                                                                        </wsp:Policy>
+                                                                                </sp:KerberosToken>
+                                                                                <mssp:RsaToken sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never" wsp:Optional="true" xmlns:mssp="http://schemas.microsoft.com/ws/2005/07/securitypolicy"/>
+                                                                                <sp:SignedParts>
+                                                                                        <sp:Header Name="To" Namespace="http://www.w3.org/2005/08/addressing"/>
+                                                                                </sp:SignedParts>
+                                                                        </wsp:Policy>
+                                                                </sp:EndorsingSupportingTokens>
+                                                                <sp:Wss11 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+                                                                        <wsp:Policy/>
+                                                                </sp:Wss11>
+                                                                <sp:Trust10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+                                                                        <wsp:Policy>
+                                                                                <sp:MustSupportIssuedTokens/>
+                                                                                <sp:RequireClientEntropy/>
+                                                                                <sp:RequireServerEntropy/>
+                                                                        </wsp:Policy>
+                                                                </sp:Trust10>
+                                                                <wsaw:UsingAddressing/>
+                                                        </wsp:All>
+                                                </wsp:ExactlyOne>
+                                        </wsp:Policy>
+                                        <wsp:Policy wsu:Id="CustomBinding_IWSTrust13Async_policy">
+                                                <wsp:ExactlyOne>
+                                                        <wsp:All>
+                                                                <sp:TransportBinding xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+                                                                        <wsp:Policy>
+                                                                                <sp:TransportToken>
+                                                                                        <wsp:Policy>
+                                                                                                <sp:HttpsToken/>
+                                                                                        </wsp:Policy>
+                                                                                </sp:TransportToken>
+                                                                                <sp:AlgorithmSuite>
+                                                                                        <wsp:Policy>
+                                                                                                <sp:Basic128/>
+                                                                                        </wsp:Policy>
+                                                                                </sp:AlgorithmSuite>
+                                                                                <sp:Layout>
+                                                                                        <wsp:Policy>
+                                                                                                <sp:Strict/>
+                                                                                        </wsp:Policy>
+                                                                                </sp:Layout>
+                                                                                <sp:IncludeTimestamp/>
+                                                                        </wsp:Policy>
+                                                                </sp:TransportBinding>
+                                                                <sp:EndorsingSupportingTokens xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+                                                                        <wsp:Policy>
+                                                                                <sp:KerberosToken sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Once">
+                                                                                        <wsp:Policy>
+                                                                                                <sp:WssGssKerberosV5ApReqToken11/>
+                                                                                        </wsp:Policy>
+                                                                                </sp:KerberosToken>
+                                                                                <sp:KeyValueToken sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never" wsp:Optional="true"/>
+                                                                                <sp:SignedParts>
+                                                                                        <sp:Header Name="To" Namespace="http://www.w3.org/2005/08/addressing"/>
+                                                                                </sp:SignedParts>
+                                                                        </wsp:Policy>
+                                                                </sp:EndorsingSupportingTokens>
+                                                                <sp:Wss11 xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+                                                                        <wsp:Policy/>
+                                                                </sp:Wss11>
+                                                                <sp:Trust13 xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+                                                                        <wsp:Policy>
+                                                                                <sp:MustSupportIssuedTokens/>
+                                                                                <sp:RequireClientEntropy/>
+                                                                                <sp:RequireServerEntropy/>
+                                                                        </wsp:Policy>
+                                                                </sp:Trust13>
+                                                                <wsaw:UsingAddressing/>
+                                                        </wsp:All>
+                                                </wsp:ExactlyOne>
+                                        </wsp:Policy>
+                                        <wsp:Policy wsu:Id="UserNameWSTrustBinding_IWSTrust13Async_policy">
+                                                <wsp:ExactlyOne>
+                                                        <wsp:All>
+                                                                <sp:TransportBinding xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+                                                                        <wsp:Policy>
+                                                                                <sp:TransportToken>
+                                                                                        <wsp:Policy>
+                                                                                                <sp:HttpsToken/>
+                                                                                        </wsp:Policy>
+                                                                                </sp:TransportToken>
+                                                                                <sp:AlgorithmSuite>
+                                                                                        <wsp:Policy>
+                                                                                                <sp:Basic256/>
+                                                                                        </wsp:Policy>
+                                                                                </sp:AlgorithmSuite>
+                                                                                <sp:Layout>
+                                                                                        <wsp:Policy>
+                                                                                                <sp:Strict/>
+                                                                                        </wsp:Policy>
+                                                                                </sp:Layout>
+                                                                                <sp:IncludeTimestamp/>
+                                                                        </wsp:Policy>
+                                                                </sp:TransportBinding>
+                                                                <sp:SignedEncryptedSupportingTokens xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+                                                                        <wsp:Policy>
+                                                                                <sp:UsernameToken sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient">
+                                                                                        <wsp:Policy>
+                                                                                                <sp:WssUsernameToken10/>
+                                                                                        </wsp:Policy>
+                                                                                </sp:UsernameToken>
+                                                                        </wsp:Policy>
+                                                                </sp:SignedEncryptedSupportingTokens>
+                                                                <sp:EndorsingSupportingTokens xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+                                                                        <wsp:Policy>
+                                                                                <sp:KeyValueToken sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never" wsp:Optional="true"/>
+                                                                                <sp:SignedParts>
+                                                                                        <sp:Header Name="To" Namespace="http://www.w3.org/2005/08/addressing"/>
+                                                                                </sp:SignedParts>
+                                                                        </wsp:Policy>
+                                                                </sp:EndorsingSupportingTokens>
+                                                                <sp:Wss11 xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+                                                                        <wsp:Policy/>
+                                                                </sp:Wss11>
+                                                                <sp:Trust13 xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+                                                                        <wsp:Policy>
+                                                                                <sp:MustSupportIssuedTokens/>
+                                                                                <sp:RequireClientEntropy/>
+                                                                                <sp:RequireServerEntropy/>
+                                                                        </wsp:Policy>
+                                                                </sp:Trust13>
+                                                                <wsaw:UsingAddressing/>
+                                                        </wsp:All>
+                                                </wsp:ExactlyOne>
+                                        </wsp:Policy>
+                                        <wsp:Policy wsu:Id="IssuedTokenWSTrustBinding_IWSTrust13Async_policy">
+                                                <wsp:ExactlyOne>
+                                                        <wsp:All>
+                                                                <sp:SymmetricBinding xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+                                                                        <wsp:Policy>
+                                                                                <sp:ProtectionToken>
+                                                                                        <wsp:Policy>
+                                                                                                <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
+                                                                                                        <wsp:Policy>
+                                                                                                                <sp:RequireDerivedKeys/>
+                                                                                                                <sp:RequireThumbprintReference/>
+                                                                                                                <sp:WssX509V3Token10/>
+                                                                                                        </wsp:Policy>
+                                                                                                </sp:X509Token>
+                                                                                        </wsp:Policy>
+                                                                                </sp:ProtectionToken>
+                                                                                <sp:AlgorithmSuite>
+                                                                                        <wsp:Policy>
+                                                                                                <sp:Basic256/>
+                                                                                        </wsp:Policy>
+                                                                                </sp:AlgorithmSuite>
+                                                                                <sp:Layout>
+                                                                                        <wsp:Policy>
+                                                                                                <sp:Strict/>
+                                                                                        </wsp:Policy>
+                                                                                </sp:Layout>
+                                                                                <sp:IncludeTimestamp/>
+                                                                                <sp:EncryptSignature/>
+                                                                                <sp:OnlySignEntireHeadersAndBody/>
+                                                                        </wsp:Policy>
+                                                                </sp:SymmetricBinding>
+                                                                <sp:EndorsingSupportingTokens xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+                                                                        <wsp:Policy>
+                                                                                <sp:IssuedToken sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient">
+                                                                                        <sp:RequestSecurityTokenTemplate>
+                                                                                                <trust:KeyType>http://docs.oasis-open.org/ws-sx/ws-trust/200512/PublicKey</trust:KeyType>
+                                                                                                <trust:KeyWrapAlgorithm>http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p</trust:KeyWrapAlgorithm>
+                                                                                                <trust:EncryptWith>http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p</trust:EncryptWith>
+                                                                                                <trust:SignatureAlgorithm>http://www.w3.org/2000/09/xmldsig#rsa-sha1</trust:SignatureAlgorithm>
+                                                                                                <trust:CanonicalizationAlgorithm>http://www.w3.org/2001/10/xml-exc-c14n#</trust:CanonicalizationAlgorithm>
+                                                                                                <trust:EncryptionAlgorithm>http://www.w3.org/2001/04/xmlenc#aes256-cbc</trust:EncryptionAlgorithm>
+                                                                                        </sp:RequestSecurityTokenTemplate>
+                                                                                        <wsp:Policy>
+                                                                                                <sp:RequireDerivedKeys/>
+                                                                                                <sp:RequireInternalReference/>
+                                                                                        </wsp:Policy>
+                                                                                </sp:IssuedToken>
+                                                                                <sp:KeyValueToken sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never" wsp:Optional="true"/>
+                                                                        </wsp:Policy>
+                                                                </sp:EndorsingSupportingTokens>
+                                                                <sp:Wss11 xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+                                                                        <wsp:Policy>
+                                                                                <sp:MustSupportRefThumbprint/>
+                                                                                <sp:MustSupportRefEncryptedKey/>
+                                                                                <sp:RequireSignatureConfirmation/>
+                                                                        </wsp:Policy>
+                                                                </sp:Wss11>
+                                                                <sp:Trust13 xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+                                                                        <wsp:Policy>
+                                                                                <sp:MustSupportIssuedTokens/>
+                                                                                <sp:RequireClientEntropy/>
+                                                                                <sp:RequireServerEntropy/>
+                                                                        </wsp:Policy>
+                                                                </sp:Trust13>
+                                                                <wsaw:UsingAddressing/>
+                                                        </wsp:All>
+                                                </wsp:ExactlyOne>
+                                        </wsp:Policy>
+                                        <wsp:Policy wsu:Id="IssuedTokenWSTrustBinding_IWSTrust13Async_Trust13IssueAsync_Input_policy">
+                                                <wsp:ExactlyOne>
+                                                        <wsp:All>
+                                                                <sp:SignedParts xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+                                                                        <sp:Body/>
+                                                                        <sp:Header Name="To" Namespace="http://www.w3.org/2005/08/addressing"/>
+                                                                        <sp:Header Name="From" Namespace="http://www.w3.org/2005/08/addressing"/>
+                                                                        <sp:Header Name="FaultTo" Namespace="http://www.w3.org/2005/08/addressing"/>
+                                                                        <sp:Header Name="ReplyTo" Namespace="http://www.w3.org/2005/08/addressing"/>
+                                                                        <sp:Header Name="MessageID" Namespace="http://www.w3.org/2005/08/addressing"/>
+                                                                        <sp:Header Name="RelatesTo" Namespace="http://www.w3.org/2005/08/addressing"/>
+                                                                        <sp:Header Name="Action" Namespace="http://www.w3.org/2005/08/addressing"/>
+                                                                </sp:SignedParts>
+                                                                <sp:EncryptedParts xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+                                                                        <sp:Body/>
+                                                                </sp:EncryptedParts>
+                                                        </wsp:All>
+                                                </wsp:ExactlyOne>
+                                        </wsp:Policy>
+                                        <wsp:Policy wsu:Id="IssuedTokenWSTrustBinding_IWSTrust13Async_Trust13IssueAsync_output_policy">
+                                                <wsp:ExactlyOne>
+                                                        <wsp:All>
+                                                                <sp:SignedParts xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+                                                                        <sp:Body/>
+                                                                        <sp:Header Name="To" Namespace="http://www.w3.org/2005/08/addressing"/>
+                                                                        <sp:Header Name="From" Namespace="http://www.w3.org/2005/08/addressing"/>
+                                                                        <sp:Header Name="FaultTo" Namespace="http://www.w3.org/2005/08/addressing"/>
+                                                                        <sp:Header Name="ReplyTo" Namespace="http://www.w3.org/2005/08/addressing"/>
+                                                                        <sp:Header Name="MessageID" Namespace="http://www.w3.org/2005/08/addressing"/>
+                                                                        <sp:Header Name="RelatesTo" Namespace="http://www.w3.org/2005/08/addressing"/>
+                                                                        <sp:Header Name="Action" Namespace="http://www.w3.org/2005/08/addressing"/>
+                                                                </sp:SignedParts>
+                                                                <sp:EncryptedParts xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+                                                                        <sp:Body/>
+                                                                </sp:EncryptedParts>
+                                                        </wsp:All>
+                                                </wsp:ExactlyOne>
+                                        </wsp:Policy>
+                                        <wsp:Policy wsu:Id="IssuedTokenWSTrustBinding_IWSTrust13Async1_policy">
+                                                <wsp:ExactlyOne>
+                                                        <wsp:All>
+                                                                <sp:SymmetricBinding xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+                                                                        <wsp:Policy>
+                                                                                <sp:ProtectionToken>
+                                                                                        <wsp:Policy>
+                                                                                                <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
+                                                                                                        <wsp:Policy>
+                                                                                                                <sp:RequireDerivedKeys/>
+                                                                                                                <sp:RequireThumbprintReference/>
+                                                                                                                <sp:WssX509V3Token10/>
+                                                                                                        </wsp:Policy>
+                                                                                                </sp:X509Token>
+                                                                                        </wsp:Policy>
+                                                                                </sp:ProtectionToken>
+                                                                                <sp:AlgorithmSuite>
+                                                                                        <wsp:Policy>
+                                                                                                <sp:Basic256Sha256/>
+                                                                                        </wsp:Policy>
+                                                                                </sp:AlgorithmSuite>
+                                                                                <sp:Layout>
+                                                                                        <wsp:Policy>
+                                                                                                <sp:Strict/>
+                                                                                        </wsp:Policy>
+                                                                                </sp:Layout>
+                                                                                <sp:IncludeTimestamp/>
+                                                                                <sp:EncryptSignature/>
+                                                                                <sp:OnlySignEntireHeadersAndBody/>
+                                                                        </wsp:Policy>
+                                                                </sp:SymmetricBinding>
+                                                                <sp:EndorsingSupportingTokens xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+                                                                        <wsp:Policy>
+                                                                                <sp:IssuedToken sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient">
+                                                                                        <sp:RequestSecurityTokenTemplate>
+                                                                                                <trust:KeyType>http://docs.oasis-open.org/ws-sx/ws-trust/200512/PublicKey</trust:KeyType>
+                                                                                                <trust:KeyWrapAlgorithm>http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p</trust:KeyWrapAlgorithm>
+                                                                                                <trust:EncryptWith>http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p</trust:EncryptWith>
+                                                                                                <trust:SignatureAlgorithm>http://www.w3.org/2001/04/xmldsig-more#rsa-sha256</trust:SignatureAlgorithm>
+                                                                                                <trust:CanonicalizationAlgorithm>http://www.w3.org/2001/10/xml-exc-c14n#</trust:CanonicalizationAlgorithm>
+                                                                                                <trust:EncryptionAlgorithm>http://www.w3.org/2001/04/xmlenc#aes256-cbc</trust:EncryptionAlgorithm>
+                                                                                        </sp:RequestSecurityTokenTemplate>
+                                                                                        <wsp:Policy>
+                                                                                                <sp:RequireDerivedKeys/>
+                                                                                                <sp:RequireInternalReference/>
+                                                                                        </wsp:Policy>
+                                                                                </sp:IssuedToken>
+                                                                                <sp:KeyValueToken sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never" wsp:Optional="true"/>
+                                                                        </wsp:Policy>
+                                                                </sp:EndorsingSupportingTokens>
+                                                                <sp:Wss11 xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+                                                                        <wsp:Policy>
+                                                                                <sp:MustSupportRefThumbprint/>
+                                                                                <sp:MustSupportRefEncryptedKey/>
+                                                                                <sp:RequireSignatureConfirmation/>
+                                                                        </wsp:Policy>
+                                                                </sp:Wss11>
+                                                                <sp:Trust13 xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+                                                                        <wsp:Policy>
+                                                                                <sp:MustSupportIssuedTokens/>
+                                                                                <sp:RequireClientEntropy/>
+                                                                                <sp:RequireServerEntropy/>
+                                                                        </wsp:Policy>
+                                                                </sp:Trust13>
+                                                                <wsaw:UsingAddressing/>
+                                                        </wsp:All>
+                                                </wsp:ExactlyOne>
+                                        </wsp:Policy>
+                                        <wsp:Policy wsu:Id="IssuedTokenWSTrustBinding_IWSTrust13Async1_Trust13IssueAsync_Input_policy">
+                                                <wsp:ExactlyOne>
+                                                        <wsp:All>
+                                                                <sp:SignedParts xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+                                                                        <sp:Body/>
+                                                                        <sp:Header Name="To" Namespace="http://www.w3.org/2005/08/addressing"/>
+                                                                        <sp:Header Name="From" Namespace="http://www.w3.org/2005/08/addressing"/>
+                                                                        <sp:Header Name="FaultTo" Namespace="http://www.w3.org/2005/08/addressing"/>
+                                                                        <sp:Header Name="ReplyTo" Namespace="http://www.w3.org/2005/08/addressing"/>
+                                                                        <sp:Header Name="MessageID" Namespace="http://www.w3.org/2005/08/addressing"/>
+                                                                        <sp:Header Name="RelatesTo" Namespace="http://www.w3.org/2005/08/addressing"/>
+                                                                        <sp:Header Name="Action" Namespace="http://www.w3.org/2005/08/addressing"/>
+                                                                </sp:SignedParts>
+                                                                <sp:EncryptedParts xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+                                                                        <sp:Body/>
+                                                                </sp:EncryptedParts>
+                                                        </wsp:All>
+                                                </wsp:ExactlyOne>
+                                        </wsp:Policy>
+                                        <wsp:Policy wsu:Id="IssuedTokenWSTrustBinding_IWSTrust13Async1_Trust13IssueAsync_output_policy">
+                                                <wsp:ExactlyOne>
+                                                        <wsp:All>
+                                                                <sp:SignedParts xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+                                                                        <sp:Body/>
+                                                                        <sp:Header Name="To" Namespace="http://www.w3.org/2005/08/addressing"/>
+                                                                        <sp:Header Name="From" Namespace="http://www.w3.org/2005/08/addressing"/>
+                                                                        <sp:Header Name="FaultTo" Namespace="http://www.w3.org/2005/08/addressing"/>
+                                                                        <sp:Header Name="ReplyTo" Namespace="http://www.w3.org/2005/08/addressing"/>
+                                                                        <sp:Header Name="MessageID" Namespace="http://www.w3.org/2005/08/addressing"/>
+                                                                        <sp:Header Name="RelatesTo" Namespace="http://www.w3.org/2005/08/addressing"/>
+                                                                        <sp:Header Name="Action" Namespace="http://www.w3.org/2005/08/addressing"/>
+                                                                </sp:SignedParts>
+                                                                <sp:EncryptedParts xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+                                                                        <sp:Body/>
+                                                                </sp:EncryptedParts>
+                                                        </wsp:All>
+                                                </wsp:ExactlyOne>
+                                        </wsp:Policy>
+                                        <wsp:Policy wsu:Id="IssuedTokenWSTrustBinding_IWSTrust13Async2_policy">
+                                                <wsp:ExactlyOne>
+                                                        <wsp:All>
+                                                                <sp:TransportBinding xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+                                                                        <wsp:Policy>
+                                                                                <sp:TransportToken>
+                                                                                        <wsp:Policy>
+                                                                                                <sp:HttpsToken/>
+                                                                                        </wsp:Policy>
+                                                                                </sp:TransportToken>
+                                                                                <sp:AlgorithmSuite>
+                                                                                        <wsp:Policy>
+                                                                                                <sp:Basic256/>
+                                                                                        </wsp:Policy>
+                                                                                </sp:AlgorithmSuite>
+                                                                                <sp:Layout>
+                                                                                        <wsp:Policy>
+                                                                                                <sp:Strict/>
+                                                                                        </wsp:Policy>
+                                                                                </sp:Layout>
+                                                                                <sp:IncludeTimestamp/>
+                                                                        </wsp:Policy>
+                                                                </sp:TransportBinding>
+                                                                <sp:EndorsingSupportingTokens xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+                                                                        <wsp:Policy>
+                                                                                <sp:IssuedToken sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient">
+                                                                                        <sp:RequestSecurityTokenTemplate>
+                                                                                                <trust:KeyType>http://docs.oasis-open.org/ws-sx/ws-trust/200512/PublicKey</trust:KeyType>
+                                                                                                <trust:KeyWrapAlgorithm>http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p</trust:KeyWrapAlgorithm>
+                                                                                                <trust:EncryptWith>http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p</trust:EncryptWith>
+                                                                                                <trust:SignatureAlgorithm>http://www.w3.org/2000/09/xmldsig#rsa-sha1</trust:SignatureAlgorithm>
+                                                                                                <trust:CanonicalizationAlgorithm>http://www.w3.org/2001/10/xml-exc-c14n#</trust:CanonicalizationAlgorithm>
+                                                                                                <trust:EncryptionAlgorithm>http://www.w3.org/2001/04/xmlenc#aes256-cbc</trust:EncryptionAlgorithm>
+                                                                                        </sp:RequestSecurityTokenTemplate>
+                                                                                        <wsp:Policy>
+                                                                                                <sp:RequireInternalReference/>
+                                                                                        </wsp:Policy>
+                                                                                </sp:IssuedToken>
+                                                                                <sp:KeyValueToken sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never" wsp:Optional="true"/>
+                                                                                <sp:SignedParts>
+                                                                                        <sp:Header Name="To" Namespace="http://www.w3.org/2005/08/addressing"/>
+                                                                                </sp:SignedParts>
+                                                                        </wsp:Policy>
+                                                                </sp:EndorsingSupportingTokens>
+                                                                <sp:Wss11 xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+                                                                        <wsp:Policy/>
+                                                                </sp:Wss11>
+                                                                <sp:Trust13 xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+                                                                        <wsp:Policy>
+                                                                                <sp:MustSupportIssuedTokens/>
+                                                                                <sp:RequireClientEntropy/>
+                                                                                <sp:RequireServerEntropy/>
+                                                                        </wsp:Policy>
+                                                                </sp:Trust13>
+                                                                <wsaw:UsingAddressing/>
+                                                        </wsp:All>
+                                                </wsp:ExactlyOne>
+                                        </wsp:Policy>
+                                        <wsp:Policy wsu:Id="IssuedTokenWSTrustBinding_IWSTrust13Async3_policy">
+                                                <wsp:ExactlyOne>
+                                                        <wsp:All>
+                                                                <sp:TransportBinding xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+                                                                        <wsp:Policy>
+                                                                                <sp:TransportToken>
+                                                                                        <wsp:Policy>
+                                                                                                <sp:HttpsToken/>
+                                                                                        </wsp:Policy>
+                                                                                </sp:TransportToken>
+                                                                                <sp:AlgorithmSuite>
+                                                                                        <wsp:Policy>
+                                                                                                <sp:Basic256Sha256/>
+                                                                                        </wsp:Policy>
+                                                                                </sp:AlgorithmSuite>
+                                                                                <sp:Layout>
+                                                                                        <wsp:Policy>
+                                                                                                <sp:Strict/>
+                                                                                        </wsp:Policy>
+                                                                                </sp:Layout>
+                                                                                <sp:IncludeTimestamp/>
+                                                                        </wsp:Policy>
+                                                                </sp:TransportBinding>
+                                                                <sp:EndorsingSupportingTokens xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+                                                                        <wsp:Policy>
+                                                                                <sp:IssuedToken sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient">
+                                                                                        <sp:RequestSecurityTokenTemplate>
+                                                                                                <trust:KeyType>http://docs.oasis-open.org/ws-sx/ws-trust/200512/PublicKey</trust:KeyType>
+                                                                                                <trust:KeyWrapAlgorithm>http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p</trust:KeyWrapAlgorithm>
+                                                                                                <trust:EncryptWith>http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p</trust:EncryptWith>
+                                                                                                <trust:SignatureAlgorithm>http://www.w3.org/2001/04/xmldsig-more#rsa-sha256</trust:SignatureAlgorithm>
+                                                                                                <trust:CanonicalizationAlgorithm>http://www.w3.org/2001/10/xml-exc-c14n#</trust:CanonicalizationAlgorithm>
+                                                                                                <trust:EncryptionAlgorithm>http://www.w3.org/2001/04/xmlenc#aes256-cbc</trust:EncryptionAlgorithm>
+                                                                                        </sp:RequestSecurityTokenTemplate>
+                                                                                        <wsp:Policy>
+                                                                                                <sp:RequireInternalReference/>
+                                                                                        </wsp:Policy>
+                                                                                </sp:IssuedToken>
+                                                                                <sp:KeyValueToken sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never" wsp:Optional="true"/>
+                                                                                <sp:SignedParts>
+                                                                                        <sp:Header Name="To" Namespace="http://www.w3.org/2005/08/addressing"/>
+                                                                                </sp:SignedParts>
+                                                                        </wsp:Policy>
+                                                                </sp:EndorsingSupportingTokens>
+                                                                <sp:Wss11 xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+                                                                        <wsp:Policy/>
+                                                                </sp:Wss11>
+                                                                <sp:Trust13 xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+                                                                        <wsp:Policy>
+                                                                                <sp:MustSupportIssuedTokens/>
+                                                                                <sp:RequireClientEntropy/>
+                                                                                <sp:RequireServerEntropy/>
+                                                                        </wsp:Policy>
+                                                                </sp:Trust13>
+                                                                <wsaw:UsingAddressing/>
+                                                        </wsp:All>
+                                                </wsp:ExactlyOne>
+                                        </wsp:Policy>
+                                        <wsp:Policy wsu:Id="IssuedTokenWSTrustBinding_IWSTrust13Async4_policy">
+                                                <wsp:ExactlyOne>
+                                                        <wsp:All>
+                                                                <sp:TransportBinding xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+                                                                        <wsp:Policy>
+                                                                                <sp:TransportToken>
+                                                                                        <wsp:Policy>
+                                                                                                <sp:HttpsToken/>
+                                                                                        </wsp:Policy>
+                                                                                </sp:TransportToken>
+                                                                                <sp:AlgorithmSuite>
+                                                                                        <wsp:Policy>
+                                                                                                <sp:Basic256/>
+                                                                                        </wsp:Policy>
+                                                                                </sp:AlgorithmSuite>
+                                                                                <sp:Layout>
+                                                                                        <wsp:Policy>
+                                                                                                <sp:Strict/>
+                                                                                        </wsp:Policy>
+                                                                                </sp:Layout>
+                                                                                <sp:IncludeTimestamp/>
+                                                                        </wsp:Policy>
+                                                                </sp:TransportBinding>
+                                                                <sp:EndorsingSupportingTokens xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+                                                                        <wsp:Policy>
+                                                                                <sp:IssuedToken sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient">
+                                                                                        <sp:RequestSecurityTokenTemplate>
+                                                                                                <trust:KeyType>http://docs.oasis-open.org/ws-sx/ws-trust/200512/SymmetricKey</trust:KeyType>
+                                                                                                <trust:KeySize>256</trust:KeySize>
+                                                                                                <trust:KeyWrapAlgorithm>http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p</trust:KeyWrapAlgorithm>
+                                                                                                <trust:EncryptWith>http://www.w3.org/2001/04/xmlenc#aes256-cbc</trust:EncryptWith>
+                                                                                                <trust:SignatureAlgorithm>http://www.w3.org/2000/09/xmldsig#hmac-sha1</trust:SignatureAlgorithm>
+                                                                                                <trust:CanonicalizationAlgorithm>http://www.w3.org/2001/10/xml-exc-c14n#</trust:CanonicalizationAlgorithm>
+                                                                                                <trust:EncryptionAlgorithm>http://www.w3.org/2001/04/xmlenc#aes256-cbc</trust:EncryptionAlgorithm>
+                                                                                        </sp:RequestSecurityTokenTemplate>
+                                                                                        <wsp:Policy>
+                                                                                                <sp:RequireInternalReference/>
+                                                                                        </wsp:Policy>
+                                                                                </sp:IssuedToken>
+                                                                                <sp:KeyValueToken sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never" wsp:Optional="true"/>
+                                                                                <sp:SignedParts>
+                                                                                        <sp:Header Name="To" Namespace="http://www.w3.org/2005/08/addressing"/>
+                                                                                </sp:SignedParts>
+                                                                        </wsp:Policy>
+                                                                </sp:EndorsingSupportingTokens>
+                                                                <sp:Wss11 xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+                                                                        <wsp:Policy/>
+                                                                </sp:Wss11>
+                                                                <sp:Trust13 xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+                                                                        <wsp:Policy>
+                                                                                <sp:MustSupportIssuedTokens/>
+                                                                                <sp:RequireClientEntropy/>
+                                                                                <sp:RequireServerEntropy/>
+                                                                        </wsp:Policy>
+                                                                </sp:Trust13>
+                                                                <wsaw:UsingAddressing/>
+                                                        </wsp:All>
+                                                </wsp:ExactlyOne>
+                                        </wsp:Policy>
+                                        <wsp:Policy wsu:Id="IssuedTokenWSTrustBinding_IWSTrust13Async5_policy">
+                                                <wsp:ExactlyOne>
+                                                        <wsp:All>
+                                                                <sp:TransportBinding xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+                                                                        <wsp:Policy>
+                                                                                <sp:TransportToken>
+                                                                                        <wsp:Policy>
+                                                                                                <sp:HttpsToken/>
+                                                                                        </wsp:Policy>
+                                                                                </sp:TransportToken>
+                                                                                <sp:AlgorithmSuite>
+                                                                                        <wsp:Policy>
+                                                                                                <sp:Basic256Sha256/>
+                                                                                        </wsp:Policy>
+                                                                                </sp:AlgorithmSuite>
+                                                                                <sp:Layout>
+                                                                                        <wsp:Policy>
+                                                                                                <sp:Strict/>
+                                                                                        </wsp:Policy>
+                                                                                </sp:Layout>
+                                                                                <sp:IncludeTimestamp/>
+                                                                        </wsp:Policy>
+                                                                </sp:TransportBinding>
+                                                                <sp:EndorsingSupportingTokens xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+                                                                        <wsp:Policy>
+                                                                                <sp:IssuedToken sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient">
+                                                                                        <sp:RequestSecurityTokenTemplate>
+                                                                                                <trust:KeyType>http://docs.oasis-open.org/ws-sx/ws-trust/200512/SymmetricKey</trust:KeyType>
+                                                                                                <trust:KeySize>256</trust:KeySize>
+                                                                                                <trust:KeyWrapAlgorithm>http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p</trust:KeyWrapAlgorithm>
+                                                                                                <trust:EncryptWith>http://www.w3.org/2001/04/xmlenc#aes256-cbc</trust:EncryptWith>
+                                                                                                <trust:SignatureAlgorithm>http://www.w3.org/2001/04/xmldsig-more#hmac-sha256</trust:SignatureAlgorithm>
+                                                                                                <trust:CanonicalizationAlgorithm>http://www.w3.org/2001/10/xml-exc-c14n#</trust:CanonicalizationAlgorithm>
+                                                                                                <trust:EncryptionAlgorithm>http://www.w3.org/2001/04/xmlenc#aes256-cbc</trust:EncryptionAlgorithm>
+                                                                                        </sp:RequestSecurityTokenTemplate>
+                                                                                        <wsp:Policy>
+                                                                                                <sp:RequireInternalReference/>
+                                                                                        </wsp:Policy>
+                                                                                </sp:IssuedToken>
+                                                                                <sp:KeyValueToken sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never" wsp:Optional="true"/>
+                                                                                <sp:SignedParts>
+                                                                                        <sp:Header Name="To" Namespace="http://www.w3.org/2005/08/addressing"/>
+                                                                                </sp:SignedParts>
+                                                                        </wsp:Policy>
+                                                                </sp:EndorsingSupportingTokens>
+                                                                <sp:Wss11 xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+                                                                        <wsp:Policy/>
+                                                                </sp:Wss11>
+                                                                <sp:Trust13 xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+                                                                        <wsp:Policy>
+                                                                                <sp:MustSupportIssuedTokens/>
+                                                                                <sp:RequireClientEntropy/>
+                                                                                <sp:RequireServerEntropy/>
+                                                                        </wsp:Policy>
+                                                                </sp:Trust13>
+                                                                <wsaw:UsingAddressing/>
+                                                        </wsp:All>
+                                                </wsp:ExactlyOne>
+                                        </wsp:Policy>
+                                        <wsp:Policy wsu:Id="IssuedTokenWSTrustBinding_IWSTrust13Async6_policy">
+                                                <wsp:ExactlyOne>
+                                                        <wsp:All>
+                                                                <sp:SymmetricBinding xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+                                                                        <wsp:Policy>
+                                                                                <sp:ProtectionToken>
+                                                                                        <wsp:Policy>
+                                                                                                <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
+                                                                                                        <wsp:Policy>
+                                                                                                                <sp:RequireDerivedKeys/>
+                                                                                                                <sp:RequireThumbprintReference/>
+                                                                                                                <sp:WssX509V3Token10/>
+                                                                                                        </wsp:Policy>
+                                                                                                </sp:X509Token>
+                                                                                        </wsp:Policy>
+                                                                                </sp:ProtectionToken>
+                                                                                <sp:AlgorithmSuite>
+                                                                                        <wsp:Policy>
+                                                                                                <sp:Basic256/>
+                                                                                        </wsp:Policy>
+                                                                                </sp:AlgorithmSuite>
+                                                                                <sp:Layout>
+                                                                                        <wsp:Policy>
+                                                                                                <sp:Strict/>
+                                                                                        </wsp:Policy>
+                                                                                </sp:Layout>
+                                                                                <sp:IncludeTimestamp/>
+                                                                                <sp:EncryptSignature/>
+                                                                                <sp:OnlySignEntireHeadersAndBody/>
+                                                                        </wsp:Policy>
+                                                                </sp:SymmetricBinding>
+                                                                <sp:EndorsingSupportingTokens xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+                                                                        <wsp:Policy>
+                                                                                <sp:IssuedToken sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient">
+                                                                                        <sp:RequestSecurityTokenTemplate>
+                                                                                                <trust:KeyType>http://docs.oasis-open.org/ws-sx/ws-trust/200512/SymmetricKey</trust:KeyType>
+                                                                                                <trust:KeySize>256</trust:KeySize>
+                                                                                                <trust:KeyWrapAlgorithm>http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p</trust:KeyWrapAlgorithm>
+                                                                                                <trust:EncryptWith>http://www.w3.org/2001/04/xmlenc#aes256-cbc</trust:EncryptWith>
+                                                                                                <trust:SignatureAlgorithm>http://www.w3.org/2000/09/xmldsig#hmac-sha1</trust:SignatureAlgorithm>
+                                                                                                <trust:CanonicalizationAlgorithm>http://www.w3.org/2001/10/xml-exc-c14n#</trust:CanonicalizationAlgorithm>
+                                                                                                <trust:EncryptionAlgorithm>http://www.w3.org/2001/04/xmlenc#aes256-cbc</trust:EncryptionAlgorithm>
+                                                                                        </sp:RequestSecurityTokenTemplate>
+                                                                                        <wsp:Policy>
+                                                                                                <sp:RequireDerivedKeys/>
+                                                                                                <sp:RequireInternalReference/>
+                                                                                        </wsp:Policy>
+                                                                                </sp:IssuedToken>
+                                                                                <sp:KeyValueToken sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never" wsp:Optional="true"/>
+                                                                        </wsp:Policy>
+                                                                </sp:EndorsingSupportingTokens>
+                                                                <sp:Wss11 xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+                                                                        <wsp:Policy>
+                                                                                <sp:MustSupportRefThumbprint/>
+                                                                                <sp:MustSupportRefEncryptedKey/>
+                                                                                <sp:RequireSignatureConfirmation/>
+                                                                        </wsp:Policy>
+                                                                </sp:Wss11>
+                                                                <sp:Trust13 xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+                                                                        <wsp:Policy>
+                                                                                <sp:MustSupportIssuedTokens/>
+                                                                                <sp:RequireClientEntropy/>
+   

<TRUNCATED>

[3/3] git commit: [CXF-5817] - Adding unit test

Posted by co...@apache.org.
[CXF-5817] - Adding unit test


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/fdd9c970
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/fdd9c970
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/fdd9c970

Branch: refs/heads/2.7.x-fixes
Commit: fdd9c970719cb73084dc442068658d53641d05b2
Parents: b86d56a
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Mon Jun 23 12:41:46 2014 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Mon Jun 23 12:42:30 2014 +0100

----------------------------------------------------------------------
 .../cxf/ws/security/sts/STSClientTest.java      |   67 +
 .../org/apache/cxf/ws/security/sts/wcf.wsdl     | 1344 ++++++++++++++++++
 2 files changed, 1411 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/fdd9c970/rt/ws/security/src/test/java/org/apache/cxf/ws/security/sts/STSClientTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/sts/STSClientTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/sts/STSClientTest.java
index ec58016..96363dd 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/sts/STSClientTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/sts/STSClientTest.java
@@ -19,19 +19,35 @@
 package org.apache.cxf.ws.security.sts;
 
 import java.io.InputStream;
+import java.util.ArrayList;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
+import javax.wsdl.Definition;
+import javax.wsdl.Types;
+import javax.wsdl.extensions.ExtensibilityElement;
+import javax.wsdl.extensions.schema.Schema;
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.Unmarshaller;
 import javax.xml.namespace.QName;
 
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.common.jaxb.JAXBContextCache;
+import org.apache.cxf.databinding.source.SourceDataBinding;
+import org.apache.cxf.helpers.DOMUtils;
+import org.apache.cxf.service.Service;
+import org.apache.cxf.staxutils.StaxUtils;
 import org.apache.cxf.ws.addressing.EndpointReferenceType;
 import org.apache.cxf.ws.security.trust.STSClient;
+import org.apache.cxf.wsdl.WSDLManager;
+import org.apache.cxf.wsdl11.WSDLServiceFactory;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -62,4 +78,55 @@ public class STSClientTest extends Assert {
         assertEquals(new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "UT_Port"),
                      client.getEndpointQName());
     }
+    
+    // A unit test to make sure that we can parse a WCF wsdl properly. See CXF-5817.
+    @Test
+    public void testWCFWsdl() throws Exception {
+        Bus bus = BusFactory.getThreadDefaultBus();
+        
+        // Load WSDL
+        InputStream inStream = getClass().getResourceAsStream("wcf.wsdl");
+        Document doc = StaxUtils.read(inStream);
+        
+        
+        NodeList metadataSections = 
+            doc.getElementsByTagNameNS("http://schemas.xmlsoap.org/ws/2004/09/mex", "MetadataSection");
+        Element wsdlDefinition = null;
+        List<Element> schemas = new ArrayList<Element>();
+        for (int i = 0; i < metadataSections.getLength(); i++) {
+            Node node = metadataSections.item(i);
+            if (node instanceof Element) {
+                Element element = (Element)node;
+                String dialect = element.getAttributeNS(null, "Dialect");
+                if ("http://schemas.xmlsoap.org/wsdl/".equals(dialect)) {
+                    wsdlDefinition = DOMUtils.getFirstElement(element);
+                } else if ("http://www.w3.org/2001/XMLSchema".equals(dialect)) {
+                    schemas.add(DOMUtils.getFirstElement(element));
+                }
+            }
+        }
+        
+        assertNotNull(wsdlDefinition);
+        assertTrue(!schemas.isEmpty());
+        
+        WSDLManager wsdlManager = bus.getExtension(WSDLManager.class);
+        Definition definition = wsdlManager.getDefinition(wsdlDefinition);
+        
+        for (Element schemaElement : schemas) {
+            QName schemaName = 
+                new QName(schemaElement.getNamespaceURI(), schemaElement.getLocalName());
+            ExtensibilityElement
+                exElement = wsdlManager.getExtensionRegistry().createExtension(Types.class, schemaName);
+            ((Schema)exElement).setElement(schemaElement);
+            definition.getTypes().addExtensibilityElement(exElement);
+        }
+        
+        WSDLServiceFactory factory = new WSDLServiceFactory(bus, definition);
+        SourceDataBinding dataBinding = new SourceDataBinding();
+        factory.setDataBinding(dataBinding);
+        Service service = factory.create();
+        service.setDataBinding(dataBinding);
+        
+    }
+    
 }