JBossWS SVN: r18502 - in stack/cxf/trunk/modules/testsuite: cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-03-13 18:47:17 -0400 (Thu, 13 Mar 2014)
New Revision: 18502
Removed:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/xclientKeystore.properties
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/xclientstore.jks
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustBearerTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/bearer/BearerIface.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/bearer/BearerImpl.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/sts/STSCallbackHandler.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/stsbearer/STSBearerCallbackHandler.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/stsbearer/SampleSTSBearer.java
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
[JBWS-3738] Code cleanup, removal of useless files, re-enabling WSTrustBearerTestCase for WFLY 8 container too
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustBearerTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustBearerTestCase.java 2014-03-13 17:00:43 UTC (rev 18501)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustBearerTestCase.java 2014-03-13 22:47:17 UTC (rev 18502)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2012, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2014, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -22,8 +22,6 @@
package org.jboss.test.ws.jaxws.samples.wsse.policy.trust;
import java.net.URL;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
import java.util.HashMap;
import java.util.Map;
@@ -35,27 +33,9 @@
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
-import org.apache.cxf.configuration.Configurer;
-import org.apache.cxf.configuration.jsse.TLSClientParameters;
-import org.apache.cxf.transport.ConduitInitiator;
-import org.apache.cxf.transport.ConduitInitiatorManager;
-import org.apache.cxf.transport.http.HTTPConduit;
-import org.apache.cxf.transport.http.URLConnectionHTTPConduit;
-import org.apache.cxf.ws.security.SecurityConstants;
-import org.apache.cxf.ws.security.trust.STSClient;
-import org.jboss.test.ws.jaxws.samples.wsse.policy.basic.UsernameOverTransportTestCase;
import org.jboss.test.ws.jaxws.samples.wsse.policy.trust.bearer.BearerIface;
-import org.jboss.test.ws.jaxws.samples.wsse.policy.trust.shared.ClientCallbackHandler;
-import org.jboss.wsf.stack.cxf.client.configuration.BeanCustomizer;
-import org.jboss.wsf.stack.cxf.client.configuration.JBossWSConfigurer;
import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
-import org.apache.cxf.service.model.EndpointInfo;
-import java.io.InputStream;
-import javax.net.ssl.KeyManager;
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.TrustManagerFactory;
/**
* A demo of using SAML Bearer key type
@@ -65,8 +45,7 @@
*/
public class WSTrustBearerTestCase extends JBossWSTest
{
- private final String serviceURL = "https://" + getServerHost()
- + ":8443/jaxws-samples-wsse-policy-trust-bearer/BearerService";
+ private final String serviceURL = "https://" + getServerHost() + ":8443/jaxws-samples-wsse-policy-trust-bearer/BearerService";
public static Test suite()
{
@@ -89,32 +68,29 @@
sslOptions.put("server-identity.ssl.keystore-password", "changeit");
sslOptions.put("server-identity.ssl.alias", "tomcat");
}
-
testSetup.setHttpsConnectorRequirement(sslOptions);
return testSetup;
-
}
public void testBearer() throws Exception
{
-
Bus bus = BusFactory.newInstance().createBus();
try
{
-
BusFactory.setThreadDefaultBus(bus);
final QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/bearerwssecuritypolicy", "BearerService");
- final URL wsdlURL = new URL(serviceURL + "?wsdl");
- Service service = Service.create(wsdlURL, serviceName);
+ Service service = Service.create(new URL(serviceURL + "?wsdl"), serviceName);
BearerIface proxy = (BearerIface) service.getPort(BearerIface.class);
WSTrustTestUtils.setupWsseAndSTSClientBearer((BindingProvider) proxy, bus);
assertEquals("Bearer WS-Trust Hello World!", proxy.sayHello());
- } catch(Exception e){
- assertTrue("Failed test setup of conduit.", false);
}
+ finally
+ {
+ bus.shutdown(true);
+ }
}
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/bearer/BearerIface.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/bearer/BearerIface.java 2014-03-13 17:00:43 UTC (rev 18501)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/bearer/BearerIface.java 2014-03-13 22:47:17 UTC (rev 18502)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2012, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2014, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/bearer/BearerImpl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/bearer/BearerImpl.java 2014-03-13 17:00:43 UTC (rev 18501)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/bearer/BearerImpl.java 2014-03-13 22:47:17 UTC (rev 18502)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2012, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2014, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/sts/STSCallbackHandler.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/sts/STSCallbackHandler.java 2014-03-13 17:00:43 UTC (rev 18501)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/sts/STSCallbackHandler.java 2014-03-13 22:47:17 UTC (rev 18502)
@@ -1,20 +1,23 @@
-/**
- * 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
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2014, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
*
- * 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.
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
package org.jboss.test.ws.jaxws.samples.wsse.policy.trust.sts;
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/stsbearer/STSBearerCallbackHandler.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/stsbearer/STSBearerCallbackHandler.java 2014-03-13 17:00:43 UTC (rev 18501)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/stsbearer/STSBearerCallbackHandler.java 2014-03-13 22:47:17 UTC (rev 18502)
@@ -1,20 +1,23 @@
-/**
- * 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
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2014, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
*
- * 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.
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
package org.jboss.test.ws.jaxws.samples.wsse.policy.trust.stsbearer;
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/stsbearer/SampleSTSBearer.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/stsbearer/SampleSTSBearer.java 2014-03-13 17:00:43 UTC (rev 18501)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/stsbearer/SampleSTSBearer.java 2014-03-13 22:47:17 UTC (rev 18502)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2012, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2014, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/xclientKeystore.properties
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/xclientKeystore.properties 2014-03-13 17:00:43 UTC (rev 18501)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/xclientKeystore.properties 2014-03-13 22:47:17 UTC (rev 18502)
@@ -1,24 +0,0 @@
-#
-# 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.
-#
-org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
-org.apache.ws.security.crypto.merlin.keystore.type=jks
-org.apache.ws.security.crypto.merlin.keystore.password=cspass
-org.apache.ws.security.crypto.merlin.keystore.alias=myclientkey
-org.apache.ws.security.crypto.merlin.keystore.file=xclientstore.jks
-
Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/xclientstore.jks
===================================================================
(Binary files differ)
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2014-03-13 17:00:43 UTC (rev 18501)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2014-03-13 22:47:17 UTC (rev 18502)
@@ -793,8 +793,6 @@
<!-- Manually setup KDC before run this test-->
<exclude>org/jboss/test/ws/jaxws/samples/wsse/kerberos/*TestCase*</exclude>
- <!-- [JBWS-3738] test still under development -->
- <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustBearerTestCase*</exclude>
</excludes>
</configuration>
</plugin>
@@ -885,8 +883,6 @@
<!-- Manually setup KDC before run this test-->
<exclude>org/jboss/test/ws/jaxws/samples/wsse/kerberos/*TestCase*</exclude>
- <!-- [JBWS-3738] test still under development -->
- <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustBearerTestCase*</exclude>
</excludes>
</configuration>
</plugin>
10 years, 1 month
- 1
- 0
JBossWS SVN: r18501 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2014-03-13 13:00:43 -0400 (Thu, 13 Mar 2014)
New Revision: 18501
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustBearerTestCase.java
Log:
[JBWS-3738] removed unneeded conduit setup.
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustBearerTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustBearerTestCase.java 2014-03-12 19:30:43 UTC (rev 18500)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustBearerTestCase.java 2014-03-13 17:00:43 UTC (rev 18501)
@@ -101,9 +101,7 @@
Bus bus = BusFactory.newInstance().createBus();
try
{
- // Must create and register conduit for https before creating service
- // and set in bus before setting default bus.
- setHTTPConduit(serviceURL, bus);
+
BusFactory.setThreadDefaultBus(bus);
final QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/bearerwssecuritypolicy", "BearerService");
@@ -119,57 +117,4 @@
}
}
- private void setHTTPConduit(String tmpServiceURL, Bus bus) throws Exception {
-
- URL myWsdlURL = new URL(tmpServiceURL + "?wsdl");
- EndpointInfo endpointInfo = new EndpointInfo();
- endpointInfo.setName(new QName("http://cxf.apache.org", "TransportURIResolver"));
- endpointInfo.setAddress(myWsdlURL.toURI().toString());
- HTTPConduit httpConduit = new URLConnectionHTTPConduit(bus, endpointInfo,
- endpointInfo.getTarget());
-
- TLSClientParameters tlsParams = new TLSClientParameters();
- tlsParams.setSecureSocketProtocol("SSL");
- setKeyManagers(tlsParams, "ckpass", "cspass", "META-INF/clientstore.jks");
- tlsParams.setDisableCNCheck(true);
-
- httpConduit.setTlsClientParameters(tlsParams);
-
- JBossWSConfigurer configurer = (JBossWSConfigurer)bus.getExtension(Configurer.class);
- BeanCustomizer customizer = configurer.getCustomizer();
- customizer.customize(httpConduit);
- }
-
-
- private TLSClientParameters setKeyManagers(TLSClientParameters tlsParams, String keyPassword,
- String keyStorePasswd, String keyStoreLoc) throws Exception {
-
- InputStream inStream = Thread.currentThread().getContextClassLoader()
- .getResourceAsStream(keyStoreLoc);
- KeyStore keyStore = KeyStore.getInstance("JKS");
- keyStore.load(inStream, keyStorePasswd.toCharArray());
- inStream.close();
-
-
- String alg = KeyManagerFactory.getDefaultAlgorithm();
- char[] keyPass = keyPassword != null
- ? keyPassword.toCharArray()
- : null;
- KeyManagerFactory keyMF = KeyManagerFactory.getInstance(alg);
- keyMF.init(keyStore, keyPass);
- KeyManager[] myKeyManagers = keyMF.getKeyManagers();
- tlsParams.setKeyManagers(myKeyManagers);
-
- inStream = Thread.currentThread().getContextClassLoader()
- .getResourceAsStream(keyStoreLoc);
- KeyStore trustStore = KeyStore.getInstance("JKS");
- trustStore.load(inStream, keyStorePasswd.toCharArray());
- inStream.close();
- TrustManagerFactory trustMF = TrustManagerFactory.getInstance(alg);
- trustMF.init(trustStore);
- TrustManager[] myTrustStoreKeyManagers = trustMF.getTrustManagers();
- tlsParams.setTrustManagers(myTrustStoreKeyManagers);
- return tlsParams;
- }
-
}
10 years, 1 month
- 1
- 0
JBossWS SVN: r18500 - in stack/cxf/trunk/modules/testsuite: cxf-tests/scripts and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2014-03-12 15:30:43 -0400 (Wed, 12 Mar 2014)
New Revision: 18500
Removed:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/bearer/BearerCallbackHandler.java
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustBearerTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestUtils.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/bearer/BearerImpl.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/stsbearer/STSBearerCallbackHandler.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/stsbearer/SampleSTSBearer.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/bearer/web.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/BearerService.wsdl
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/bearer-ws-trust-1.4-service.wsdl
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
[JBWS-3738] working bearer test.
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2014-03-12 15:23:05 UTC (rev 18499)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2014-03-12 19:30:43 UTC (rev 18500)
@@ -570,7 +570,6 @@
<include name="org/jboss/test/ws/jaxws/samples/wsse/policy/trust/bearer/BearerIface.class"/>
<include name="org/jboss/test/ws/jaxws/samples/wsse/policy/trust/bearer/BearerImpl.class"/>
<include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaxws/Say*.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/trust/bearer/BearerCallbackHandler.class"/>
</classes>
<webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/trust/WEB-INF">
<include name="wsdl/Bearer*"/>
@@ -579,13 +578,6 @@
<include name="servicestore.jks" />
<include name="serviceKeystore.properties" />
</zipfileset>
-
- <!-- rls start test
- <zipfileset dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/trust/WEB-INF" prefix="WEB-INF/classes">
- <include name="xclientstore.jks" />
- <include name="xclientKeystore.properties" />
- </zipfileset>
- - rls end test -->
<manifest>
<attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client"/>
</manifest>
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustBearerTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustBearerTestCase.java 2014-03-12 15:23:05 UTC (rev 18499)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustBearerTestCase.java 2014-03-12 19:30:43 UTC (rev 18500)
@@ -24,6 +24,7 @@
import java.net.URL;
import java.security.KeyStore;
import java.security.KeyStoreException;
+import java.util.HashMap;
import java.util.Map;
import javax.xml.namespace.QName;
@@ -64,65 +65,57 @@
*/
public class WSTrustBearerTestCase extends JBossWSTest
{
- private final String httpsserviceURL = "https://" + getServerHost()
+ private final String serviceURL = "https://" + getServerHost()
+ ":8443/jaxws-samples-wsse-policy-trust-bearer/BearerService";
- private final String serviceURL = "http://" + getServerHost()
- + ":8080/jaxws-samples-wsse-policy-trust-bearer/BearerService";
-
public static Test suite()
{
- // NOTE skip setting up security-domain in server config. This was done manually.
- JBossWSCXFTestSetup testSetup = new JBossWSCXFTestSetup(WSTrustBearerTestCase.class,
- "jaxws-samples-wsse-policy-trust-client.jar jaxws-samples-wsse-policy-trust-sts-bearer.war jaxws-samples-wsse-policy-trust-bearer.war");
+ //deploy client, STS and service; start a security domain to be used by the STS for authenticating client
+ JBossWSCXFTestSetup testSetup = WSTrustTestUtils.getTestSetup(WSTrustBearerTestCase.class,
+ "jaxws-samples-wsse-policy-trust-client.jar jaxws-samples-wsse-policy-trust-sts-bearer.war jaxws-samples-wsse-policy-trust-bearer.war");
+ // setup the https connector in the server config file.
+ Map<String, String> sslOptions = new HashMap<String, String>();
+ if (isTargetJBoss7())
+ {
+ sslOptions.put("certificate-key-file", System.getProperty("org.jboss.ws.testsuite.server.keystore"));
+ sslOptions.put("password", "changeit");
+ sslOptions.put("verify-client", "false");
+ sslOptions.put("key-alias", "tomcat");
+ }
+ else
+ {
+ sslOptions.put("server-identity.ssl.keystore-path", System.getProperty("org.jboss.ws.testsuite.server.keystore"));
+ sslOptions.put("server-identity.ssl.keystore-password", "changeit");
+ sslOptions.put("server-identity.ssl.alias", "tomcat");
+ }
+
+ testSetup.setHttpsConnectorRequirement(sslOptions);
return testSetup;
}
- public void testAllInOneBearer() throws Exception
+ public void testBearer() throws Exception
{
Bus bus = BusFactory.newInstance().createBus();
try
{
- String tmpServiceURL = httpsserviceURL; //serviceURL
-
- setHTTPConduit(tmpServiceURL, bus);
+ // Must create and register conduit for https before creating service
+ // and set in bus before setting default bus.
+ setHTTPConduit(serviceURL, bus);
BusFactory.setThreadDefaultBus(bus);
-
- //------------------------------
final QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/bearerwssecuritypolicy", "BearerService");
- final URL wsdlURL = new URL(tmpServiceURL + "?wsdl");
+ final URL wsdlURL = new URL(serviceURL + "?wsdl");
Service service = Service.create(wsdlURL, serviceName);
BearerIface proxy = (BearerIface) service.getPort(BearerIface.class);
- Map<String, Object> ctx = ((BindingProvider)proxy).getRequestContext();
+ WSTrustTestUtils.setupWsseAndSTSClientBearer((BindingProvider) proxy, bus);
+ assertEquals("Bearer WS-Trust Hello World!", proxy.sayHello());
- STSClient stsClient = new STSClient(bus);
-
- ctx.put(SecurityConstants.CALLBACK_HANDLER, new ClientCallbackHandler());
- ctx.put(SecurityConstants.SIGNATURE_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/clientKeystore.properties"));
- ctx.put(SecurityConstants.ENCRYPT_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/clientKeystore.properties"));
- ctx.put(SecurityConstants.SIGNATURE_USERNAME, "myclientkey");
- ctx.put(SecurityConstants.ENCRYPT_USERNAME, "myservicekey");
- ctx.put(appendIssuedTokenSuffix(SecurityConstants.USERNAME), "alice");
- ctx.put(appendIssuedTokenSuffix(SecurityConstants.CALLBACK_HANDLER), new ClientCallbackHandler());
- ctx.put(appendIssuedTokenSuffix(SecurityConstants.ENCRYPT_PROPERTIES), Thread.currentThread().getContextClassLoader().getResource("META-INF/clientKeystore.properties"));
- ctx.put(appendIssuedTokenSuffix(SecurityConstants.ENCRYPT_USERNAME), "mystskey");
- ctx.put(appendIssuedTokenSuffix(SecurityConstants.STS_TOKEN_USERNAME), "myclientkey");
- ctx.put(appendIssuedTokenSuffix(SecurityConstants.STS_TOKEN_PROPERTIES), Thread.currentThread().getContextClassLoader().getResource("META-INF/clientKeystore.properties"));
- ctx.put(appendIssuedTokenSuffix(SecurityConstants.STS_TOKEN_USE_CERT_FOR_KEYINFO), "true");
-
- ctx.put(SecurityConstants.STS_CLIENT, stsClient);
-
-
- proxy.sayHello();
-
} catch(Exception e){
- e.printStackTrace();
- assertTrue(false);
+ assertTrue("Failed test setup of conduit.", false);
}
}
@@ -136,8 +129,8 @@
endpointInfo.getTarget());
TLSClientParameters tlsParams = new TLSClientParameters();
- tlsParams.setSecureSocketProtocol("SSL"); //TLSv1 // SSL .. try this
- setKeyManagers(tlsParams, "ckpass", "META-INF/clientstore.jks");
+ tlsParams.setSecureSocketProtocol("SSL");
+ setKeyManagers(tlsParams, "ckpass", "cspass", "META-INF/clientstore.jks");
tlsParams.setDisableCNCheck(true);
httpConduit.setTlsClientParameters(tlsParams);
@@ -145,19 +138,16 @@
JBossWSConfigurer configurer = (JBossWSConfigurer)bus.getExtension(Configurer.class);
BeanCustomizer customizer = configurer.getCustomizer();
customizer.customize(httpConduit);
-
}
- private TLSClientParameters setKeyManagers(TLSClientParameters tlsParams,
- String keyPassword, String keyStoreLoc)
- throws KeyStoreException, Exception {
+ private TLSClientParameters setKeyManagers(TLSClientParameters tlsParams, String keyPassword,
+ String keyStorePasswd, String keyStoreLoc) throws Exception {
- keyStoreLoc = "META-INF/clientstore.jks";
InputStream inStream = Thread.currentThread().getContextClassLoader()
.getResourceAsStream(keyStoreLoc);
KeyStore keyStore = KeyStore.getInstance("JKS");
- keyStore.load(inStream, "cspass".toCharArray());
+ keyStore.load(inStream, keyStorePasswd.toCharArray());
inStream.close();
@@ -167,13 +157,13 @@
: null;
KeyManagerFactory keyMF = KeyManagerFactory.getInstance(alg);
keyMF.init(keyStore, keyPass);
- KeyManager[] myKeyManagers = keyMF.getKeyManagers();
+ KeyManager[] myKeyManagers = keyMF.getKeyManagers();
tlsParams.setKeyManagers(myKeyManagers);
inStream = Thread.currentThread().getContextClassLoader()
.getResourceAsStream(keyStoreLoc);
KeyStore trustStore = KeyStore.getInstance("JKS");
- trustStore.load(inStream, "cspass".toCharArray());
+ trustStore.load(inStream, keyStorePasswd.toCharArray());
inStream.close();
TrustManagerFactory trustMF = TrustManagerFactory.getInstance(alg);
trustMF.init(trustStore);
@@ -182,11 +172,4 @@
return tlsParams;
}
-
-
- private static String appendIssuedTokenSuffix(String prop)
- {
- return prop + ".it";
- }
-
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestUtils.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestUtils.java 2014-03-12 15:23:05 UTC (rev 18499)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestUtils.java 2014-03-12 19:30:43 UTC (rev 18500)
@@ -21,22 +21,20 @@
*/
package org.jboss.test.ws.jaxws.samples.wsse.policy.trust;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.BindingProvider;
-
import org.apache.cxf.Bus;
import org.apache.cxf.ws.security.SecurityConstants;
-import org.apache.cxf.ws.security.tokenstore.SecurityToken;
import org.apache.cxf.ws.security.trust.STSClient;
+import org.jboss.test.ws.jaxws.samples.wsse.policy.trust.service.ServiceIface;
import org.jboss.test.ws.jaxws.samples.wsse.policy.trust.shared.ClientCallbackHandler;
import org.jboss.test.ws.jaxws.samples.wsse.policy.trust.shared.UsernameTokenCallbackHandler;
import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTestHelper;
-import org.jboss.test.ws.jaxws.samples.wsse.policy.trust.service.ServiceIface;
+import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
+import java.util.HashMap;
+import java.util.Map;
+
/**
* Some client util methods for WS-Trust testcases
*
@@ -205,16 +203,20 @@
STSClient stsClient = new STSClient(bus);
- Map<String, Object> props = stsClient.getProperties();
- props.put(SecurityConstants.USERNAME, "alice");
- props.put(SecurityConstants.CALLBACK_HANDLER, new ClientCallbackHandler());
- props.put(SecurityConstants.STS_TOKEN_USERNAME, "myclientkey");
- props.put(SecurityConstants.STS_TOKEN_PROPERTIES,
- Thread.currentThread().getContextClassLoader().getResource("META-INF/clientKeystore.properties"));
- props.put(SecurityConstants.STS_TOKEN_USE_CERT_FOR_KEYINFO, "true");
+ ctx.put(SecurityConstants.CALLBACK_HANDLER, new ClientCallbackHandler());
+ ctx.put(SecurityConstants.SIGNATURE_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/clientKeystore.properties"));
+ ctx.put(SecurityConstants.ENCRYPT_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/clientKeystore.properties"));
+ ctx.put(SecurityConstants.SIGNATURE_USERNAME, "myclientkey");
+ ctx.put(SecurityConstants.ENCRYPT_USERNAME, "myservicekey");
+ ctx.put(appendIssuedTokenSuffix(SecurityConstants.USERNAME), "alice");
+ ctx.put(appendIssuedTokenSuffix(SecurityConstants.CALLBACK_HANDLER), new ClientCallbackHandler());
+ ctx.put(appendIssuedTokenSuffix(SecurityConstants.ENCRYPT_PROPERTIES), Thread.currentThread().getContextClassLoader().getResource("META-INF/clientKeystore.properties"));
+ ctx.put(appendIssuedTokenSuffix(SecurityConstants.ENCRYPT_USERNAME), "mystskey");
+ ctx.put(appendIssuedTokenSuffix(SecurityConstants.STS_TOKEN_USERNAME), "myclientkey");
+ ctx.put(appendIssuedTokenSuffix(SecurityConstants.STS_TOKEN_PROPERTIES), Thread.currentThread().getContextClassLoader().getResource("META-INF/clientKeystore.properties"));
+ ctx.put(appendIssuedTokenSuffix(SecurityConstants.STS_TOKEN_USE_CERT_FOR_KEYINFO), "true");
ctx.put(SecurityConstants.STS_CLIENT, stsClient);
-
}
private static String appendIssuedTokenSuffix(String prop)
Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/bearer/BearerCallbackHandler.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/bearer/BearerCallbackHandler.java 2014-03-12 15:23:05 UTC (rev 18499)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/bearer/BearerCallbackHandler.java 2014-03-12 19:30:43 UTC (rev 18500)
@@ -1,42 +0,0 @@
-/**
- * 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.
- */
-package org.jboss.test.ws.jaxws.samples.wsse.policy.trust.bearer;
-
-import org.jboss.wsf.stack.cxf.extensions.security.PasswordCallbackHandler;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class BearerCallbackHandler extends PasswordCallbackHandler
-{
-
- public BearerCallbackHandler()
- {
- super(getInitMap());
- }
-
- private static Map<String, String> getInitMap()
- {
- Map<String, String> passwords = new HashMap<String, String>();
- passwords.put("myservicekey", "skpass");
-
- passwords.put("myclientkey", "ckpass"); // rls added
- return passwords;
- }
-}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/bearer/BearerImpl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/bearer/BearerImpl.java 2014-03-12 15:23:05 UTC (rev 18499)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/bearer/BearerImpl.java 2014-03-12 19:30:43 UTC (rev 18500)
@@ -23,12 +23,8 @@
import org.apache.cxf.annotations.EndpointProperties;
import org.apache.cxf.annotations.EndpointProperty;
-import org.jboss.test.ws.jaxws.samples.wsse.policy.trust.service.ServiceIface;
import javax.jws.WebService;
-import javax.servlet.annotation.HttpConstraint;
-import javax.servlet.annotation.ServletSecurity;
-import javax.servlet.annotation.ServletSecurity.TransportGuarantee;
@WebService
(
@@ -39,17 +35,8 @@
endpointInterface = "org.jboss.test.ws.jaxws.samples.wsse.policy.trust.bearer.BearerIface"
)
@EndpointProperties(value = {
- @EndpointProperty(key = "ws-security.is-bsp-compliant", value = "false"),
- //- @EndpointProperty(key = "ws-security.signature.username", value = "myservicekey" ),
- @EndpointProperty(key = "ws-security.signature.properties", value = "serviceKeystore.properties"),
- //- @EndpointProperty(key = "ws-security.encryption.properties", value = "serviceKeystore.properties"),
- @EndpointProperty(key = "ws-security.callback-handler", value = "org.jboss.test.ws.jaxws.samples.wsse.policy.trust.bearer.BearerCallbackHandler")
+ @EndpointProperty(key = "ws-security.signature.properties", value = "serviceKeystore.properties")
})
-/**
-@ServletSecurity(
- @HttpConstraint(transportGuarantee = TransportGuarantee.CONFIDENTIAL
- ))
- **/
public class BearerImpl implements BearerIface
{
public String sayHello()
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/stsbearer/STSBearerCallbackHandler.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/stsbearer/STSBearerCallbackHandler.java 2014-03-12 15:23:05 UTC (rev 18499)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/stsbearer/STSBearerCallbackHandler.java 2014-03-12 19:30:43 UTC (rev 18500)
@@ -34,7 +34,6 @@
{
Map<String, String> passwords = new HashMap<String, String>();
passwords.put("mystskey", "stskpass");
- passwords.put("myclientkey", "ckpass");
passwords.put("alice", "clarinet");
return passwords;
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/stsbearer/SampleSTSBearer.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/stsbearer/SampleSTSBearer.java 2014-03-12 15:23:05 UTC (rev 18499)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/stsbearer/SampleSTSBearer.java 2014-03-12 19:30:43 UTC (rev 18500)
@@ -26,13 +26,11 @@
import org.apache.cxf.sts.StaticSTSProperties;
import org.apache.cxf.sts.operation.TokenIssueOperation;
import org.apache.cxf.sts.operation.TokenValidateOperation;
-import org.apache.cxf.sts.service.EncryptionProperties;
import org.apache.cxf.sts.service.ServiceMBean;
import org.apache.cxf.sts.service.StaticService;
import org.apache.cxf.sts.token.delegation.HOKDelegationHandler;
import org.apache.cxf.sts.token.provider.SAMLTokenProvider;
import org.apache.cxf.sts.token.validator.SAMLTokenValidator;
-import org.apache.cxf.ws.security.policy.SPConstants;
import org.apache.cxf.ws.security.sts.provider.SecurityTokenServiceProvider;
import javax.xml.ws.WebServiceProvider;
@@ -68,12 +66,9 @@
List<ServiceMBean> services = new LinkedList<ServiceMBean>();
StaticService service = new StaticService();
service.setEndpoints(Arrays.asList(
- // for STS testing only
- "https://localhost:(\\d)*/jaxws-samples-wsse-policy-trust-bearer/myBearerS...",
- // bearer serivce addresses
- "http://localhost:(\\d)*/jaxws-samples-wsse-policy-trust-bearer/BearerService",
- "http://\\[::1\\]:(\\d)*/jaxws-samples-wsse-policy-trust-bearer/BearerService",
- "http://\\[0:0:0:0:0:0:0:1\\]:(\\d)*/jaxws-samples-wsse-policy-trust-bearer/BearerService"
+ "https://localhost:(\\d)*/jaxws-samples-wsse-policy-trust-bearer/BearerSer...",
+ "https://\\[::1\\]:(\\d)*/jaxws-samples-wsse-policy-trust-bearer/BearerService",
+ "https://\\[0:0:0:0:0:0:0:1\\]:(\\d)*/jaxws-samples-wsse-policy-trust-bearer/BearerService"
));
services.add(service);
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/bearer/web.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/bearer/web.xml 2014-03-12 15:23:05 UTC (rev 18499)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/bearer/web.xml 2014-03-12 19:30:43 UTC (rev 18500)
@@ -12,17 +12,4 @@
<servlet-name>TestSecurityTokenService</servlet-name>
<url-pattern>/SecurityTokenService/*</url-pattern>
</servlet-mapping>
- <!--
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>restricted web services</web-resource-name>
- <url-pattern>/*</url-pattern>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
- </web-resource-collection>
- <user-data-constraint>
- <transport-guarantee>CONFIDENTIAL</transport-guarantee>
- </user-data-constraint>
- </security-constraint>
- -->
</web-app>
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/BearerService.wsdl
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/BearerService.wsdl 2014-03-12 15:23:05 UTC (rev 18499)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/BearerService.wsdl 2014-03-12 19:30:43 UTC (rev 18500)
@@ -5,8 +5,8 @@
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
xmlns="http://schemas.xmlsoap.org/wsdl/"
- xmlns:wsp="http://www.w3.org/ns/ws-policy"
- xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata"
+ xmlns:wsp="http://www.w3.org/ns/ws-policy"
+ xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata"
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
xmlns:wsaws="http://www.w3.org/2005/08/addressing"
xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex"
@@ -38,22 +38,15 @@
<soap:operation soapAction=""/>
<input>
<soap:body use="literal"/>
- <!--
- <wsp:PolicyReference URI="#Input_Policy" />-->
-
</input>
<output>
<soap:body use="literal"/>
- <!--
- <wsp:PolicyReference URI="#Output_Policy" />-->
-
</output>
</operation>
</binding>
<service name="BearerService">
<port name="BearerServicePort" binding="tns:BearerServicePortBinding">
<soap:address location="https://@jboss.bind.address@:8443/jaxws-samples-wsse-policy-trust-bearer/BearerService"/>
-
</port>
</service>
@@ -64,7 +57,7 @@
<wsam:Addressing wsp:Optional="false">
<wsp:Policy />
</wsam:Addressing>
- <!-- -->
+
<sp:TransportBinding
xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
<wsp:Policy>
@@ -102,17 +95,18 @@
<sp:RequireInternalReference />
</wsp:Policy>
+ <sp:Issuer>
+ <wsaws:Address>http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-trust-sts-bearer/SecurityTokenService</wsaws:Address>
+ <wsaws:Metadata
+ xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
+ wsdli:wsdlLocation="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-trust-sts-bearer/SecurityTokenService?wsdl">
+ <wsaw:ServiceName
+ xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
+ xmlns:stsns="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"
+ EndpointName="UT_Port">stsns:SecurityTokenService</wsaw:ServiceName>
+ </wsaws:Metadata>
+ </sp:Issuer>
- <sp:Issuer>
- <wsaws:Address>http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-trust-sts-bearer/SecurityTokenService</wsaws:Address>
- <wsaws:Metadata xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
- wsdli:wsdlLocation="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-trust-sts-bearer/SecurityTokenService?wsdl">
- <wsaw:ServiceName xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
- xmlns:stsns="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"
- EndpointName="UT_Port">stsns:SecurityTokenService</wsaw:ServiceName>
- </wsaws:Metadata>
- </sp:Issuer>
-
</sp:IssuedToken>
</wsp:Policy>
</sp:SignedSupportingTokens>
@@ -134,6 +128,4 @@
</wsp:ExactlyOne>
</wsp:Policy>
-
-
</definitions>
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/bearer-ws-trust-1.4-service.wsdl
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/bearer-ws-trust-1.4-service.wsdl 2014-03-12 15:23:05 UTC (rev 18499)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/bearer-ws-trust-1.4-service.wsdl 2014-03-12 19:30:43 UTC (rev 18500)
@@ -1,43 +1,52 @@
<?xml version="1.0" encoding="UTF-8"?>
<wsdl:definitions
- targetNamespace="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"
- xmlns:tns="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"
- xmlns:wstrust="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:wsap10="http://www.w3.org/2006/05/addressing/wsdl"
- xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
- xmlns:wsp="http://www.w3.org/ns/ws-policy"
- xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata">
+ targetNamespace="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"
+ xmlns:tns="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"
+ xmlns:wstrust="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:wsap10="http://www.w3.org/2006/05/addressing/wsdl"
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
+ xmlns:wsp="http://www.w3.org/ns/ws-policy"
+ xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata">
<wsdl:types>
- <xs:schema elementFormDefault="qualified" targetNamespace='http://docs.oasis-open.org/ws-sx/ws-trust/200512'>
+ <xs:schema elementFormDefault="qualified"
+ targetNamespace='http://docs.oasis-open.org/ws-sx/ws-trust/200512'>
- <xs:element name='RequestSecurityToken' type='wst:AbstractRequestSecurityTokenType' />
- <xs:element name='RequestSecurityTokenResponse' type='wst:AbstractRequestSecurityTokenType' />
+ <xs:element name='RequestSecurityToken'
+ type='wst:AbstractRequestSecurityTokenType'/>
+ <xs:element name='RequestSecurityTokenResponse'
+ type='wst:AbstractRequestSecurityTokenType'/>
- <xs:complexType name='AbstractRequestSecurityTokenType' >
+ <xs:complexType name='AbstractRequestSecurityTokenType'>
<xs:sequence>
- <xs:any namespace='##any' processContents='lax' minOccurs='0' maxOccurs='unbounded' />
+ <xs:any namespace='##any' processContents='lax' minOccurs='0'
+ maxOccurs='unbounded'/>
</xs:sequence>
- <xs:attribute name='Context' type='xs:anyURI' use='optional' />
- <xs:anyAttribute namespace='##other' processContents='lax' />
+ <xs:attribute name='Context' type='xs:anyURI' use='optional'/>
+ <xs:anyAttribute namespace='##other' processContents='lax'/>
</xs:complexType>
- <xs:element name='RequestSecurityTokenCollection' type='wst:RequestSecurityTokenCollectionType' />
- <xs:complexType name='RequestSecurityTokenCollectionType' >
+ <xs:element name='RequestSecurityTokenCollection'
+ type='wst:RequestSecurityTokenCollectionType'/>
+ <xs:complexType name='RequestSecurityTokenCollectionType'>
<xs:sequence>
- <xs:element name='RequestSecurityToken' type='wst:AbstractRequestSecurityTokenType' minOccurs='2' maxOccurs='unbounded'/>
+ <xs:element name='RequestSecurityToken'
+ type='wst:AbstractRequestSecurityTokenType' minOccurs='2'
+ maxOccurs='unbounded'/>
</xs:sequence>
</xs:complexType>
- <xs:element name='RequestSecurityTokenResponseCollection' type='wst:RequestSecurityTokenResponseCollectionType' />
- <xs:complexType name='RequestSecurityTokenResponseCollectionType' >
+ <xs:element name='RequestSecurityTokenResponseCollection'
+ type='wst:RequestSecurityTokenResponseCollectionType'/>
+ <xs:complexType name='RequestSecurityTokenResponseCollectionType'>
<xs:sequence>
- <xs:element ref='wst:RequestSecurityTokenResponse' minOccurs='1' maxOccurs='unbounded' />
+ <xs:element ref='wst:RequestSecurityTokenResponse' minOccurs='1'
+ maxOccurs='unbounded'/>
</xs:sequence>
- <xs:anyAttribute namespace='##other' processContents='lax' />
+ <xs:anyAttribute namespace='##other' processContents='lax'/>
</xs:complexType>
</xs:schema>
@@ -45,19 +54,19 @@
<!-- WS-Trust defines the following GEDs -->
<wsdl:message name="RequestSecurityTokenMsg">
- <wsdl:part name="request" element="wst:RequestSecurityToken" />
+ <wsdl:part name="request" element="wst:RequestSecurityToken"/>
</wsdl:message>
<wsdl:message name="RequestSecurityTokenResponseMsg">
<wsdl:part name="response"
- element="wst:RequestSecurityTokenResponse" />
+ element="wst:RequestSecurityTokenResponse"/>
</wsdl:message>
<wsdl:message name="RequestSecurityTokenCollectionMsg">
<wsdl:part name="requestCollection"
- element="wst:RequestSecurityTokenCollection"/>
+ element="wst:RequestSecurityTokenCollection"/>
</wsdl:message>
<wsdl:message name="RequestSecurityTokenResponseCollectionMsg">
<wsdl:part name="responseCollection"
- element="wst:RequestSecurityTokenResponseCollection"/>
+ element="wst:RequestSecurityTokenResponseCollection"/>
</wsdl:message>
<!-- This portType an example of a Requestor (or other) endpoint that
@@ -72,24 +81,44 @@
<!-- This portType is an example of an STS supporting full protocol -->
<wsdl:portType name="STS">
<wsdl:operation name="Cancel">
- <wsdl:input wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Cancel" message="tns:RequestSecurityTokenMsg"/>
- <wsdl:output wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RSTR/CancelFinal" message="tns:RequestSecurityTokenResponseMsg"/>
+ <wsdl:input
+ wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Cancel"
+ message="tns:RequestSecurityTokenMsg"/>
+ <wsdl:output
+ wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RSTR/CancelFinal"
+ message="tns:RequestSecurityTokenResponseMsg"/>
</wsdl:operation>
<wsdl:operation name="Issue">
- <wsdl:input wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Issue" message="tns:RequestSecurityTokenMsg"/>
- <wsdl:output wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RSTRC/IssueFinal" message="tns:RequestSecurityTokenResponseCollectionMsg"/>
+ <wsdl:input
+ wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Issue"
+ message="tns:RequestSecurityTokenMsg"/>
+ <wsdl:output
+ wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RSTRC/IssueFinal"
+ message="tns:RequestSecurityTokenResponseCollectionMsg"/>
</wsdl:operation>
<wsdl:operation name="Renew">
- <wsdl:input wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Renew" message="tns:RequestSecurityTokenMsg"/>
- <wsdl:output wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RSTR/RenewFinal" message="tns:RequestSecurityTokenResponseMsg"/>
+ <wsdl:input
+ wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Renew"
+ message="tns:RequestSecurityTokenMsg"/>
+ <wsdl:output
+ wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RSTR/RenewFinal"
+ message="tns:RequestSecurityTokenResponseMsg"/>
</wsdl:operation>
<wsdl:operation name="Validate">
- <wsdl:input wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Validate" message="tns:RequestSecurityTokenMsg"/>
- <wsdl:output wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RSTR/ValidateFinal" message="tns:RequestSecurityTokenResponseMsg"/>
+ <wsdl:input
+ wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Validate"
+ message="tns:RequestSecurityTokenMsg"/>
+ <wsdl:output
+ wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RSTR/ValidateFinal"
+ message="tns:RequestSecurityTokenResponseMsg"/>
</wsdl:operation>
<wsdl:operation name="KeyExchangeToken">
- <wsdl:input wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/KET" message="tns:RequestSecurityTokenMsg"/>
- <wsdl:output wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RSTR/KETFinal" message="tns:RequestSecurityTokenResponseMsg"/>
+ <wsdl:input
+ wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/KET"
+ message="tns:RequestSecurityTokenMsg"/>
+ <wsdl:output
+ wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RSTR/KETFinal"
+ message="tns:RequestSecurityTokenResponseMsg"/>
</wsdl:operation>
<wsdl:operation name="RequestCollection">
<wsdl:input message="tns:RequestSecurityTokenCollectionMsg"/>
@@ -106,207 +135,199 @@
</wsdl:portType>
<wsdl:binding name="UT_Binding" type="wstrust:STS">
- <wsp:PolicyReference URI="#UT_policy" />
- <soap:binding style="document"
- transport="http://schemas.xmlsoap.org/soap/http" />
- <wsdl:operation name="Issue">
- <soap:operation
- soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Issue" />
- <wsdl:input>
- <wsp:PolicyReference
- URI="#Input_policy" />
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <wsp:PolicyReference
- URI="#Output_policy" />
- <soap:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="Validate">
- <soap:operation
- soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Validate" />
- <wsdl:input>
- <wsp:PolicyReference
- URI="#Input_policy" />
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <wsp:PolicyReference
- URI="#Output_policy" />
- <soap:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="Cancel">
- <soap:operation
- soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Cancel" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="Renew">
- <soap:operation
- soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Renew" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="KeyExchangeToken">
- <soap:operation
- soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/KeyExchangeToken" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="RequestCollection">
- <soap:operation
- soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/RequestCollection" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
+ <wsp:PolicyReference URI="#UT_policy"/>
+ <soap:binding style="document"
+ transport="http://schemas.xmlsoap.org/soap/http"/>
+ <wsdl:operation name="Issue">
+ <soap:operation
+ soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Issue"/>
+ <wsdl:input>
+ <wsp:PolicyReference
+ URI="#Input_policy"/>
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output>
+ <wsp:PolicyReference
+ URI="#Output_policy"/>
+ <soap:body use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="Validate">
+ <soap:operation
+ soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Validate"/>
+ <wsdl:input>
+ <wsp:PolicyReference
+ URI="#Input_policy"/>
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output>
+ <wsp:PolicyReference
+ URI="#Output_policy"/>
+ <soap:body use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="Cancel">
+ <soap:operation
+ soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Cancel"/>
+ <wsdl:input>
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="Renew">
+ <soap:operation
+ soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Renew"/>
+ <wsdl:input>
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="KeyExchangeToken">
+ <soap:operation
+ soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/KeyExchangeToken"/>
+ <wsdl:input>
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="RequestCollection">
+ <soap:operation
+ soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/RequestCollection"/>
+ <wsdl:input>
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
</wsdl:binding>
-
+
<wsdl:service name="SecurityTokenService">
- <wsdl:port name="UT_Port" binding="tns:UT_Binding">
- <soap:address location="http://localhost:8080/SecurityTokenService/UT" />
- </wsdl:port>
+ <wsdl:port name="UT_Port" binding="tns:UT_Binding">
+ <soap:address location="http://localhost:8080/SecurityTokenService/UT"/>
+ </wsdl:port>
</wsdl:service>
-
+
<wsp:Policy wsu:Id="UT_policy">
- <wsp:ExactlyOne>
- <wsp:All>
- <wsap10:UsingAddressing/>
- <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:Lax />
- </wsp:Policy>
- </sp:Layout>
- <sp:IncludeTimestamp />
- <sp:EncryptSignature />
- <sp:OnlySignEntireHeadersAndBody />
- </wsp:Policy>
- </sp:SymmetricBinding>
- <sp:SignedSupportingTokens
- 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/Al...">
- <wsp:Policy>
- <sp:WssUsernameToken10 />
- </wsp:Policy>
- </sp:UsernameToken>
- </wsp:Policy>
- </sp:SignedSupportingTokens>
- <sp:Wss11
- xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
- <wsp:Policy>
- <sp:MustSupportRefKeyIdentifier />
- <sp:MustSupportRefIssuerSerial />
- <sp:MustSupportRefThumbprint />
- <sp:MustSupportRefEncryptedKey />
- </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>
- </wsp:All>
- </wsp:ExactlyOne>
- </wsp:Policy>
-
- <wsp:Policy wsu:Id="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="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:ExactlyOne>
+ <wsp:All>
+ <wsap10:UsingAddressing/>
+ <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:Lax/>
+ </wsp:Policy>
+ </sp:Layout>
+ <sp:IncludeTimestamp/>
+ <sp:EncryptSignature/>
+ <sp:OnlySignEntireHeadersAndBody/>
+ </wsp:Policy>
+ </sp:SymmetricBinding>
+ <sp:SignedSupportingTokens
+ 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/Al...">
+ <wsp:Policy>
+ <sp:WssUsernameToken10/>
+ </wsp:Policy>
+ </sp:UsernameToken>
+ </wsp:Policy>
+ </sp:SignedSupportingTokens>
+ <sp:Wss11
+ xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+ <wsp:Policy>
+ <sp:MustSupportRefKeyIdentifier/>
+ <sp:MustSupportRefIssuerSerial/>
+ <sp:MustSupportRefThumbprint/>
+ <sp:MustSupportRefEncryptedKey/>
+ </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>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+ <wsp:Policy wsu:Id="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>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+
+ <wsp:Policy wsu:Id="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>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+
</wsdl:definitions>
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2014-03-12 15:23:05 UTC (rev 18499)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2014-03-12 19:30:43 UTC (rev 18500)
@@ -704,9 +704,6 @@
<!-- [JBWS-3773][CXF-5602] HttpServletRequestSnapshot is not created for requests with WSA ReplyTo prop set -->
<exclude>org/jboss/test/ws/jaxws/cxf/jbws3773/**</exclude>
-
- <!-- [JBWS-3738] test still under development -->
- <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustBearerTestCase*</exclude>
</excludes>
</configuration>
</plugin>
10 years, 1 month
- 1
- 0
JBossWS SVN: r18499 - in stack/cxf/trunk/modules/testsuite/cxf-tests: src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2014-03-12 11:23:05 -0400 (Wed, 12 Mar 2014)
New Revision: 18499
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustBearerTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/BearerService.wsdl
Log:
[JBWS-3738] (2nd attenpt) unclean code in attempting to resolve bearer test issues.
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2014-03-12 08:09:51 UTC (rev 18498)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2014-03-12 15:23:05 UTC (rev 18499)
@@ -466,10 +466,6 @@
<include name="clientKeystore.properties" />
<include name="clientstore.jks" />
</metainf>
- <!-- rls test only -->
- <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl">
- <include name="bearer-ws-trust-1.4-service.wsdl" />
- </metainf>
</jar>
<!-- jaxws-samples-wsse-policy-trust-actas -->
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustBearerTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustBearerTestCase.java 2014-03-12 08:09:51 UTC (rev 18498)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustBearerTestCase.java 2014-03-12 15:23:05 UTC (rev 18499)
@@ -22,6 +22,8 @@
package org.jboss.test.ws.jaxws.samples.wsse.policy.trust;
import java.net.URL;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
import java.util.Map;
import javax.xml.namespace.QName;
@@ -32,14 +34,28 @@
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
+import org.apache.cxf.configuration.Configurer;
+import org.apache.cxf.configuration.jsse.TLSClientParameters;
+import org.apache.cxf.transport.ConduitInitiator;
+import org.apache.cxf.transport.ConduitInitiatorManager;
+import org.apache.cxf.transport.http.HTTPConduit;
+import org.apache.cxf.transport.http.URLConnectionHTTPConduit;
import org.apache.cxf.ws.security.SecurityConstants;
import org.apache.cxf.ws.security.trust.STSClient;
+import org.jboss.test.ws.jaxws.samples.wsse.policy.basic.UsernameOverTransportTestCase;
import org.jboss.test.ws.jaxws.samples.wsse.policy.trust.bearer.BearerIface;
import org.jboss.test.ws.jaxws.samples.wsse.policy.trust.shared.ClientCallbackHandler;
+import org.jboss.wsf.stack.cxf.client.configuration.BeanCustomizer;
+import org.jboss.wsf.stack.cxf.client.configuration.JBossWSConfigurer;
import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
+import org.apache.cxf.service.model.EndpointInfo;
+import java.io.InputStream;
+import javax.net.ssl.KeyManager;
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.TrustManagerFactory;
-
/**
* A demo of using SAML Bearer key type
*
@@ -48,17 +64,20 @@
*/
public class WSTrustBearerTestCase extends JBossWSTest
{
+ private final String httpsserviceURL = "https://" + getServerHost()
+ + ":8443/jaxws-samples-wsse-policy-trust-bearer/BearerService";
private final String serviceURL = "http://" + getServerHost()
+ ":8080/jaxws-samples-wsse-policy-trust-bearer/BearerService";
public static Test suite()
{
- //deploy client, STS and service; start a security domain to be used by the STS for authenticating client
- JBossWSCXFTestSetup testSetup = WSTrustTestUtils.getTestSetup(WSTrustBearerTestCase.class,
+ // NOTE skip setting up security-domain in server config. This was done manually.
+ JBossWSCXFTestSetup testSetup = new JBossWSCXFTestSetup(WSTrustBearerTestCase.class,
"jaxws-samples-wsse-policy-trust-client.jar jaxws-samples-wsse-policy-trust-sts-bearer.war jaxws-samples-wsse-policy-trust-bearer.war");
return testSetup;
+
}
public void testAllInOneBearer() throws Exception
@@ -67,12 +86,15 @@
Bus bus = BusFactory.newInstance().createBus();
try
{
+ String tmpServiceURL = httpsserviceURL; //serviceURL
+ setHTTPConduit(tmpServiceURL, bus);
BusFactory.setThreadDefaultBus(bus);
+
//------------------------------
final QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/bearerwssecuritypolicy", "BearerService");
- final URL wsdlURL = new URL(serviceURL + "?wsdl");
+ final URL wsdlURL = new URL(tmpServiceURL + "?wsdl");
Service service = Service.create(wsdlURL, serviceName);
BearerIface proxy = (BearerIface) service.getPort(BearerIface.class);
@@ -103,7 +125,65 @@
assertTrue(false);
}
}
-
+
+ private void setHTTPConduit(String tmpServiceURL, Bus bus) throws Exception {
+
+ URL myWsdlURL = new URL(tmpServiceURL + "?wsdl");
+ EndpointInfo endpointInfo = new EndpointInfo();
+ endpointInfo.setName(new QName("http://cxf.apache.org", "TransportURIResolver"));
+ endpointInfo.setAddress(myWsdlURL.toURI().toString());
+ HTTPConduit httpConduit = new URLConnectionHTTPConduit(bus, endpointInfo,
+ endpointInfo.getTarget());
+
+ TLSClientParameters tlsParams = new TLSClientParameters();
+ tlsParams.setSecureSocketProtocol("SSL"); //TLSv1 // SSL .. try this
+ setKeyManagers(tlsParams, "ckpass", "META-INF/clientstore.jks");
+ tlsParams.setDisableCNCheck(true);
+
+ httpConduit.setTlsClientParameters(tlsParams);
+
+ JBossWSConfigurer configurer = (JBossWSConfigurer)bus.getExtension(Configurer.class);
+ BeanCustomizer customizer = configurer.getCustomizer();
+ customizer.customize(httpConduit);
+
+ }
+
+
+ private TLSClientParameters setKeyManagers(TLSClientParameters tlsParams,
+ String keyPassword, String keyStoreLoc)
+ throws KeyStoreException, Exception {
+
+ keyStoreLoc = "META-INF/clientstore.jks";
+ InputStream inStream = Thread.currentThread().getContextClassLoader()
+ .getResourceAsStream(keyStoreLoc);
+ KeyStore keyStore = KeyStore.getInstance("JKS");
+ keyStore.load(inStream, "cspass".toCharArray());
+ inStream.close();
+
+
+ String alg = KeyManagerFactory.getDefaultAlgorithm();
+ char[] keyPass = keyPassword != null
+ ? keyPassword.toCharArray()
+ : null;
+ KeyManagerFactory keyMF = KeyManagerFactory.getInstance(alg);
+ keyMF.init(keyStore, keyPass);
+ KeyManager[] myKeyManagers = keyMF.getKeyManagers();
+ tlsParams.setKeyManagers(myKeyManagers);
+
+ inStream = Thread.currentThread().getContextClassLoader()
+ .getResourceAsStream(keyStoreLoc);
+ KeyStore trustStore = KeyStore.getInstance("JKS");
+ trustStore.load(inStream, "cspass".toCharArray());
+ inStream.close();
+ TrustManagerFactory trustMF = TrustManagerFactory.getInstance(alg);
+ trustMF.init(trustStore);
+ TrustManager[] myTrustStoreKeyManagers = trustMF.getTrustManagers();
+ tlsParams.setTrustManagers(myTrustStoreKeyManagers);
+ return tlsParams;
+ }
+
+
+
private static String appendIssuedTokenSuffix(String prop)
{
return prop + ".it";
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/BearerService.wsdl
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/BearerService.wsdl 2014-03-12 08:09:51 UTC (rev 18498)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/BearerService.wsdl 2014-03-12 15:23:05 UTC (rev 18499)
@@ -52,7 +52,8 @@
</binding>
<service name="BearerService">
<port name="BearerServicePort" binding="tns:BearerServicePortBinding">
- <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-trust-bearer/BearerService"/>
+ <soap:address location="https://@jboss.bind.address@:8443/jaxws-samples-wsse-policy-trust-bearer/BearerService"/>
+
</port>
</service>
@@ -63,7 +64,7 @@
<wsam:Addressing wsp:Optional="false">
<wsp:Policy />
</wsam:Addressing>
- <!--
+ <!-- -->
<sp:TransportBinding
xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
<wsp:Policy>
@@ -86,7 +87,7 @@
</sp:Layout>
<sp:IncludeTimestamp />
</wsp:Policy>
- </sp:TransportBinding>-->
+ </sp:TransportBinding>
<sp:SignedSupportingTokens
xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
10 years, 1 month
- 1
- 0
JBossWS SVN: r18498 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-03-12 04:09:51 -0400 (Wed, 12 Mar 2014)
New Revision: 18498
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
[JBWS-3773] Fixing exclude
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2014-03-11 18:16:19 UTC (rev 18497)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2014-03-12 08:09:51 UTC (rev 18498)
@@ -703,7 +703,7 @@
<exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/jaspi/Jaspi*TestCase*</exclude>
<!-- [JBWS-3773][CXF-5602] HttpServletRequestSnapshot is not created for requests with WSA ReplyTo prop set -->
- <exclude>org/jboss/test/ws/jaxws/jbws3773/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/cxf/jbws3773/**</exclude>
<!-- [JBWS-3738] test still under development -->
<exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustBearerTestCase*</exclude>
10 years, 1 month
- 1
- 0
JBossWS SVN: r18497 - in stack/cxf/trunk/modules/testsuite/cxf-tests/src/test: resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-03-11 14:16:19 -0400 (Tue, 11 Mar 2014)
New Revision: 18497
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustBearerTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/BearerService.wsdl
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/bearer-ws-trust-1.4-service.wsdl
Log:
[JBWS-3738] Some changes & cleanup for the bearer scenario with supporting token only on service endpoint policy + usual symmetric binding with UT on sts policy. Still need to check keystores' contents etc
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustBearerTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustBearerTestCase.java 2014-03-11 16:31:56 UTC (rev 18496)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustBearerTestCase.java 2014-03-11 18:16:19 UTC (rev 18497)
@@ -21,50 +21,25 @@
*/
package org.jboss.test.ws.jaxws.samples.wsse.policy.trust;
-import java.io.InputStream;
+import java.net.URL;
+import java.util.Map;
+import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Service;
+
import junit.framework.Test;
+
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
-import org.apache.cxf.bus.spring.SpringBusFactory;
-import org.apache.cxf.configuration.Configurer;
-import org.apache.cxf.configuration.jsse.TLSClientParameters;
-import org.apache.cxf.security.SecurityContext;
-import org.apache.cxf.transport.ConduitInitiator;
-import org.apache.cxf.transport.ConduitInitiatorManager;
-import org.apache.cxf.transport.http.HTTPConduit;
-import org.apache.cxf.transport.http.URLConnectionHTTPConduit;
import org.apache.cxf.ws.security.SecurityConstants;
-import org.apache.cxf.ws.security.tokenstore.SecurityToken;
import org.apache.cxf.ws.security.trust.STSClient;
import org.jboss.test.ws.jaxws.samples.wsse.policy.trust.bearer.BearerIface;
import org.jboss.test.ws.jaxws.samples.wsse.policy.trust.shared.ClientCallbackHandler;
-import org.jboss.wsf.stack.cxf.client.configuration.BeanCustomizer;
-import org.jboss.wsf.stack.cxf.client.configuration.JBossWSConfigurer;
-import org.jboss.wsf.stack.cxf.client.configuration.JBossWSSpringBusFactory;
import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
-import org.w3c.dom.Element;
-import javax.net.ssl.KeyManager;
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.TrustManagerFactory;
-import javax.xml.namespace.QName;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.Service;
-import java.io.FileInputStream;
-import java.net.URL;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.cert.X509Certificate;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.apache.cxf.service.model.EndpointInfo;
-import org.apache.cxf.service.model.ServiceInfo;
-
/**
* A demo of using SAML Bearer key type
*
@@ -76,34 +51,13 @@
private final String serviceURL = "http://" + getServerHost()
+ ":8080/jaxws-samples-wsse-policy-trust-bearer/BearerService";
- private final String stsURL = "http://" + getServerHost()
- + ":8080/jaxws-samples-wsse-policy-trust-sts-bearer/SecurityTokenService";
public static Test suite()
{
- /** ***/
- // this must be set before testSetup is returned
- System.setProperty("javax.net.ssl.trustStore", "/home/rsearls/j1/jbossws/trunk/modules/testsuite/cxf-tests/target/test-resources/jaxws/samples/wsse/policy/trust/WEB-INF/stsstore.jks");
- System.setProperty("javax.net.ssl.trustStorePassword", "stsspass");
- System.setProperty("javax.net.ssl.trustStoreType", "jks");
- System.setProperty("org.jboss.security.ignoreHttpsHost", "true");
-
-
//deploy client, STS and service; start a security domain to be used by the STS for authenticating client
JBossWSCXFTestSetup testSetup = WSTrustTestUtils.getTestSetup(WSTrustBearerTestCase.class,
"jaxws-samples-wsse-policy-trust-client.jar jaxws-samples-wsse-policy-trust-sts-bearer.war jaxws-samples-wsse-policy-trust-bearer.war");
-
- /**
- // the server looks for the file /home/rsearls/.keystore no matter what
- // path given for keystore-path. Fails to deploy war; test never runs
- Map<String, String> sslOptions = new HashMap<String, String>();
- sslOptions.put("server-identity.ssl.keystore-path", "servicestore.jks");
- sslOptions.put("server-identity.ssl.keystore-password", "sspass");
- sslOptions.put("authentication.truststore.keystore-path", "stsstore.jks");
- sslOptions.put("authentication.truststore.keystore-password", "stsspass");
- testSetup.setHttpsConnectorRequirement(sslOptions);
- **/
return testSetup;
}
@@ -124,36 +78,21 @@
Map<String, Object> ctx = ((BindingProvider)proxy).getRequestContext();
- //jaxws-samples-wsse-policy-trust-sts-bearer
- // 8443
STSClient stsClient = new STSClient(bus);
- /**/
- //stsClient.setWsdlLocation("https://localhost:8443/jaxws-samples-wsse-policy-trust-sts-bearer/Securit...");
- //-stsClient.setWsdlLocation("http://localhost:8080/jaxws-samples-wsse-policy-trust-sts-bearer/Security...");
- //WEB-INF/wsdl/bearer-ws-trust-1.4-service.wsdl
- URL stsWsdlURL =
- Thread.currentThread().getContextClassLoader().getResource("META-INF/bearer-ws-trust-1.4-service.wsdl");
- System.out.println("## stsWsdlURL: " + stsWsdlURL.toString());
- //.getResourceAsStream("WEB-INF/wsdl/bearer-ws-trust-1.4-service.wsdl");
- stsClient.setWsdlLocation(stsWsdlURL.toString());
-
- //stsClient.setWsdlLocation("http://localhost:8080/jaxws-samples-wsse-policy-trust-sts-bearer/Security...");
-
- stsClient.setServiceName("{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}SecurityTokenService");
- stsClient.setEndpointName("{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}UT_Port");
-
- //stsClient.setServiceName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/SecurityTokenService");
- // stsClient.setEndpointName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/UT_Port");
- /**/
- Map<String, Object> props = stsClient.getProperties();
- props.put(SecurityConstants.USERNAME, "alice");
- props.put(SecurityConstants.CALLBACK_HANDLER, new ClientCallbackHandler());
- props.put(SecurityConstants.STS_TOKEN_USERNAME, "myclientkey");
- props.put(SecurityConstants.STS_TOKEN_PROPERTIES,
- Thread.currentThread().getContextClassLoader().getResource("META-INF/clientKeystore.properties"));
- props.put(SecurityConstants.STS_TOKEN_USE_CERT_FOR_KEYINFO, "true");
-
+ ctx.put(SecurityConstants.CALLBACK_HANDLER, new ClientCallbackHandler());
+ ctx.put(SecurityConstants.SIGNATURE_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/clientKeystore.properties"));
+ ctx.put(SecurityConstants.ENCRYPT_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/clientKeystore.properties"));
+ ctx.put(SecurityConstants.SIGNATURE_USERNAME, "myclientkey");
+ ctx.put(SecurityConstants.ENCRYPT_USERNAME, "myservicekey");
+ ctx.put(appendIssuedTokenSuffix(SecurityConstants.USERNAME), "alice");
+ ctx.put(appendIssuedTokenSuffix(SecurityConstants.CALLBACK_HANDLER), new ClientCallbackHandler());
+ ctx.put(appendIssuedTokenSuffix(SecurityConstants.ENCRYPT_PROPERTIES), Thread.currentThread().getContextClassLoader().getResource("META-INF/clientKeystore.properties"));
+ ctx.put(appendIssuedTokenSuffix(SecurityConstants.ENCRYPT_USERNAME), "mystskey");
+ ctx.put(appendIssuedTokenSuffix(SecurityConstants.STS_TOKEN_USERNAME), "myclientkey");
+ ctx.put(appendIssuedTokenSuffix(SecurityConstants.STS_TOKEN_PROPERTIES), Thread.currentThread().getContextClassLoader().getResource("META-INF/clientKeystore.properties"));
+ ctx.put(appendIssuedTokenSuffix(SecurityConstants.STS_TOKEN_USE_CERT_FOR_KEYINFO), "true");
+
ctx.put(SecurityConstants.STS_CLIENT, stsClient);
@@ -164,112 +103,10 @@
assertTrue(false);
}
}
-
- public void XX_testBearer() throws Exception
+
+ private static String appendIssuedTokenSuffix(String prop)
{
- Bus bus = BusFactory.newInstance().createBus();
- try
- {
- /** **/
- // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- //-ServiceInfo servInfo = new ServiceInfo();
- //-servInfo.setTargetNamespace("http://www.jboss.org/jbossws/ws-extensions/bearerwssecuritypolicy");
- //-servInfo.setName(new QName("http://www.jboss.org/jbossws/ws-extensions/bearerwssecuritypolicy", "BearerService"));
-
- ConduitInitiatorManager mgr = bus.getExtension(ConduitInitiatorManager.class);
- ConduitInitiator ci = null;
- ci = mgr.getConduitInitiator("http://cxf.apache.org/transports/http");
-
- URL myWsdlURL = new URL(serviceURL + "?wsdl");
- EndpointInfo endpointInfo = new EndpointInfo();
- endpointInfo.setName(new QName("http://cxf.apache.org", "TransportURIResolver"));
- endpointInfo.setAddress(myWsdlURL.toURI().toString());
- HTTPConduit httpConduit = new URLConnectionHTTPConduit(bus, endpointInfo,
- endpointInfo.getTarget());
-
- TLSClientParameters tlsParams = new TLSClientParameters();
- tlsParams.setSecureSocketProtocol("TLSv1"); // SSL .. try this
- setKeyManagers(tlsParams, "ckpass", "META-INF/clientstore.jks");
- tlsParams.setDisableCNCheck(true);
-
- /** fix this
- * FiltersType filter = new FiltersType();
- filter.getInclude().add(".*_EXPORT_.*");
- filter.getInclude().add(".*_EXPORT1024_.*");
- filter.getInclude().add(".*_WITH_DES_.*");
- filter.getInclude().add(".*_WITH_NULL_.*");
- filter.getExclude().add(".*_DH_anon_.*");
- tlsParams.setCipherSuitesFilter(filter);
-
- */
- httpConduit.setTlsClientParameters(tlsParams);
-
- JBossWSConfigurer configurer = (JBossWSConfigurer)bus.getExtension(Configurer.class);
- BeanCustomizer customizer = configurer.getCustomizer();
- customizer.customize(httpConduit);
-
- // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-
- BusFactory.setThreadDefaultBus(bus);
-
- //------------------------------
- final QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/bearerwssecuritypolicy", "BearerService");
- final URL wsdlURL = new URL(serviceURL + "?wsdl");
- Service service = Service.create(wsdlURL, serviceName);
- BearerIface proxy = (BearerIface) service.getPort(BearerIface.class);
-
- WSTrustTestUtils.setupWsseAndSTSClientBearer((BindingProvider) proxy, bus);
-
- assertEquals("Bearer WS-Trust Hello World!", proxy.sayHello());
-
- //- proxy.sayHello();
-
-
- } catch (Exception e) { // rls added
- e.printStackTrace(); // rls added
- assertTrue(false); // rls added
- } // rls added
-
- finally
- {
- bus.shutdown(true);
- }
+ return prop + ".it";
}
-
- //
- private TLSClientParameters setKeyManagers(TLSClientParameters tlsParams,
- String keyPassword, String keyStoreLoc)
- throws KeyStoreException, Exception {
- keyStoreLoc = "META-INF/clientstore.jks";
- InputStream inStream = Thread.currentThread().getContextClassLoader()
- .getResourceAsStream(keyStoreLoc);
- KeyStore keyStore = KeyStore.getInstance("JKS");
- keyStore.load(inStream, "cspass".toCharArray());
- inStream.close();
-
-
- String alg = KeyManagerFactory.getDefaultAlgorithm();
- char[] keyPass = keyPassword != null
- ? keyPassword.toCharArray()
- : null;
- KeyManagerFactory keyMF = KeyManagerFactory.getInstance(alg);
- keyMF.init(keyStore, keyPass);
- KeyManager[] myKeyManagers = keyMF.getKeyManagers();
- tlsParams.setKeyManagers(myKeyManagers);
-
-
- inStream = Thread.currentThread().getContextClassLoader()
- .getResourceAsStream(keyStoreLoc);
- KeyStore trustStore = KeyStore.getInstance("JKS");
- trustStore.load(inStream, "cspass".toCharArray());
- inStream.close();
- TrustManagerFactory trustMF = TrustManagerFactory.getInstance(alg);
- trustMF.init(trustStore);
- TrustManager[] myTrustStoreKeyManagers = trustMF.getTrustManagers();
- tlsParams.setTrustManagers(myTrustStoreKeyManagers);
- return tlsParams;
- }
-
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/BearerService.wsdl
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/BearerService.wsdl 2014-03-11 16:31:56 UTC (rev 18496)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/BearerService.wsdl 2014-03-11 18:16:19 UTC (rev 18497)
@@ -38,29 +38,21 @@
<soap:operation soapAction=""/>
<input>
<soap:body use="literal"/>
- <!-- -->
- <wsp:PolicyReference URI="#Input_Policy" />
+ <!--
+ <wsp:PolicyReference URI="#Input_Policy" />-->
</input>
<output>
<soap:body use="literal"/>
- <!-- -->
- <wsp:PolicyReference URI="#Output_Policy" />
+ <!--
+ <wsp:PolicyReference URI="#Output_Policy" />-->
</output>
</operation>
</binding>
<service name="BearerService">
<port name="BearerServicePort" binding="tns:BearerServicePortBinding">
- <!-- -->
- <soap:address
- location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-trust-bearer/BearerService"/>
-
- <!-- rls require use the SSL address of JBoss (8443 is industry stnd address) -->
- <!--
- <soap:address
- location="https://@jboss.bind.address@:8443/jaxws-samples-wsse-policy-trust-bearer/BearerService"/>
- -->
+ <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-trust-bearer/BearerService"/>
</port>
</service>
@@ -71,7 +63,7 @@
<wsam:Addressing wsp:Optional="false">
<wsp:Policy />
</wsam:Addressing>
- <!-- -->
+ <!--
<sp:TransportBinding
xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
<wsp:Policy>
@@ -94,7 +86,7 @@
</sp:Layout>
<sp:IncludeTimestamp />
</wsp:Policy>
- </sp:TransportBinding>
+ </sp:TransportBinding>-->
<sp:SignedSupportingTokens
xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
@@ -108,45 +100,18 @@
<wsp:Policy>
<sp:RequireInternalReference />
</wsp:Policy>
- <!--
- <sp:Issuer>
- <wsaw:Address>http://localhost:8080/SecurityTokenService/UT
- </wsaw:Address>
- <wsaw:Metadata>
- <wsx:Metadata>
- <wsx:MetadataSection>
- <wsx:MetadataReference>
- <wsaw:Address>http://localhost:8080/SecurityTokenService/UT/mex
- </wsaw:Address>
- </wsx:MetadataReference>
- </wsx:MetadataSection>
- </wsx:Metadata>
- </wsaw:Metadata>
- </sp:Issuer>
- -->
- <!--
- <wsaws:Address>http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-trust-sts-bearer/SecurityTokenService/UT</wsaws:Address>
- -->
- <!--
- <wsaws:Metadata xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
- wsdli:wsdlLocation="http://@jboss.bind.address@:8443/jaxws-samples-wsse-policy-trust-sts-bearer/SecurityTokenService?wsdl">
- -->
-
- <!--
- <sp:Issuer>
- <wsaws:Address>http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-trust-sts-bearer/SecurityTokenService</wsaws:Address>
-
- <wsaws:Metadata xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
- wsdli:wsdlLocation="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-trust-sts-bearer/SecurityTokenService?wsdl">
-
- <wsaw:ServiceName xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
- xmlns:stsns="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"
- EndpointName="UT_Port">stsns:SecurityTokenService</wsaw:ServiceName>
- </wsaws:Metadata>
- </sp:Issuer>
- -->
+ <sp:Issuer>
+ <wsaws:Address>http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-trust-sts-bearer/SecurityTokenService</wsaws:Address>
+ <wsaws:Metadata xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
+ wsdli:wsdlLocation="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-trust-sts-bearer/SecurityTokenService?wsdl">
+ <wsaw:ServiceName xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
+ xmlns:stsns="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"
+ EndpointName="UT_Port">stsns:SecurityTokenService</wsaw:ServiceName>
+ </wsaws:Metadata>
+ </sp:Issuer>
+
</sp:IssuedToken>
</wsp:Policy>
</sp:SignedSupportingTokens>
@@ -169,65 +134,5 @@
</wsp:Policy>
- <wsp:Policy wsu:Id="Input_Policy">
- <wsp:ExactlyOne>
- <wsp:All>
- <sp:EncryptedParts>
- <sp:Body />
- </sp:EncryptedParts>
- <sp:SignedParts>
- <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:Header Name="AckRequested"
- Namespace="http://docs.oasis-open.org/ws-rx/wsrm/200702" />
- <sp:Header Name="SequenceAcknowledgement"
- Namespace="http://docs.oasis-open.org/ws-rx/wsrm/200702" />
- <sp:Header Name="Sequence"
- Namespace="http://docs.oasis-open.org/ws-rx/wsrm/200702" />
- <sp:Header Name="CreateSequence"
- Namespace="http://docs.oasis-open.org/ws-rx/wsrm/200702" />
- -->
- </sp:SignedParts>
- </wsp:All>
- </wsp:ExactlyOne>
- </wsp:Policy>
-
- <wsp:Policy wsu:Id="Output_Policy">
- <wsp:ExactlyOne>
- <wsp:All>
- <sp:EncryptedParts>
- <sp:Body />
- </sp:EncryptedParts>
- <sp:SignedParts>
- <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:Header Name="AckRequested"
- Namespace="http://docs.oasis-open.org/ws-rx/wsrm/200702" />
- <sp:Header Name="SequenceAcknowledgement"
- Namespace="http://docs.oasis-open.org/ws-rx/wsrm/200702" />
- <sp:Header Name="Sequence"
- Namespace="http://docs.oasis-open.org/ws-rx/wsrm/200702" />
- <sp:Header Name="CreateSequence"
- Namespace="http://docs.oasis-open.org/ws-rx/wsrm/200702" />
- -->
- </sp:SignedParts>
- </wsp:All>
- </wsp:ExactlyOne>
- </wsp:Policy>
-
</definitions>
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/bearer-ws-trust-1.4-service.wsdl
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/bearer-ws-trust-1.4-service.wsdl 2014-03-11 16:31:56 UTC (rev 18496)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/bearer-ws-trust-1.4-service.wsdl 2014-03-11 18:16:19 UTC (rev 18497)
@@ -13,38 +13,29 @@
xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata">
<wsdl:types>
- <xs:schema elementFormDefault="qualified"
- targetNamespace='http://docs.oasis-open.org/ws-sx/ws-trust/200512'>
+ <xs:schema elementFormDefault="qualified" targetNamespace='http://docs.oasis-open.org/ws-sx/ws-trust/200512'>
- <xs:element name='RequestSecurityToken'
- type='wst:AbstractRequestSecurityTokenType' />
- <xs:element name='RequestSecurityTokenResponse'
- type='wst:AbstractRequestSecurityTokenType' />
+ <xs:element name='RequestSecurityToken' type='wst:AbstractRequestSecurityTokenType' />
+ <xs:element name='RequestSecurityTokenResponse' type='wst:AbstractRequestSecurityTokenType' />
<xs:complexType name='AbstractRequestSecurityTokenType' >
<xs:sequence>
- <xs:any namespace='##any' processContents='lax'
- minOccurs='0' maxOccurs='unbounded' />
+ <xs:any namespace='##any' processContents='lax' minOccurs='0' maxOccurs='unbounded' />
</xs:sequence>
<xs:attribute name='Context' type='xs:anyURI' use='optional' />
<xs:anyAttribute namespace='##other' processContents='lax' />
</xs:complexType>
- <xs:element name='RequestSecurityTokenCollection'
- type='wst:RequestSecurityTokenCollectionType' />
+ <xs:element name='RequestSecurityTokenCollection' type='wst:RequestSecurityTokenCollectionType' />
<xs:complexType name='RequestSecurityTokenCollectionType' >
<xs:sequence>
- <xs:element name='RequestSecurityToken'
- type='wst:AbstractRequestSecurityTokenType'
- minOccurs='2' maxOccurs='unbounded'/>
+ <xs:element name='RequestSecurityToken' type='wst:AbstractRequestSecurityTokenType' minOccurs='2' maxOccurs='unbounded'/>
</xs:sequence>
</xs:complexType>
- <xs:element name='RequestSecurityTokenResponseCollection'
- type='wst:RequestSecurityTokenResponseCollectionType' />
+ <xs:element name='RequestSecurityTokenResponseCollection' type='wst:RequestSecurityTokenResponseCollectionType' />
<xs:complexType name='RequestSecurityTokenResponseCollectionType' >
<xs:sequence>
- <xs:element ref='wst:RequestSecurityTokenResponse'
- minOccurs='1' maxOccurs='unbounded' />
+ <xs:element ref='wst:RequestSecurityTokenResponse' minOccurs='1' maxOccurs='unbounded' />
</xs:sequence>
<xs:anyAttribute namespace='##other' processContents='lax' />
</xs:complexType>
@@ -115,22 +106,20 @@
</wsdl:portType>
<wsdl:binding name="UT_Binding" type="wstrust:STS">
- <wsp:PolicyReference URI="#Bearer_Transport_policy" />
+ <wsp:PolicyReference URI="#UT_policy" />
<soap:binding style="document"
transport="http://schemas.xmlsoap.org/soap/http" />
<wsdl:operation name="Issue">
<soap:operation
soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Issue" />
<wsdl:input>
- <!-- -->
- <wsp:PolicyReference URI="#Input_policy" />
-
+ <wsp:PolicyReference
+ URI="#Input_policy" />
<soap:body use="literal" />
</wsdl:input>
<wsdl:output>
- <!-- -->
- <wsp:PolicyReference URI="#Output_policy" />
-
+ <wsp:PolicyReference
+ URI="#Output_policy" />
<soap:body use="literal" />
</wsdl:output>
</wsdl:operation>
@@ -138,15 +127,13 @@
<soap:operation
soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Validate" />
<wsdl:input>
- <!-- -->
- <wsp:PolicyReference URI="#Input_policy" />
-
+ <wsp:PolicyReference
+ URI="#Input_policy" />
<soap:body use="literal" />
</wsdl:input>
<wsdl:output>
- <!-- -->
- <wsp:PolicyReference URI="#Output_policy" />
-
+ <wsp:PolicyReference
+ URI="#Output_policy" />
<soap:body use="literal" />
</wsdl:output>
</wsdl:operation>
@@ -194,141 +181,132 @@
<wsdl:service name="SecurityTokenService">
<wsdl:port name="UT_Port" binding="tns:UT_Binding">
- <!--
- <soap:address location="http://localhost:8080/SecurityTokenService/UT" />
- -->
- <!-- -->
- <soap:address location="https://localhost:8443/SecurityTokenService/UT" />
-
+ <soap:address location="http://localhost:8080/SecurityTokenService/UT" />
</wsdl:port>
</wsdl:service>
-
-
- <wsp:Policy wsu:Id="Bearer_Transport_policy">
- <wsp:ExactlyOne>
- <wsp:All>
- <wsap10:UsingAddressing />
- <!-- rls testing -->
- <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:HttpsToken>
- </wsp:Policy>
- </sp:TransportToken>
- <sp:AlgorithmSuite>
- <wsp:Policy>
- <sp:Basic128 />
- </wsp:Policy>
- </sp:AlgorithmSuite>
- <sp:Layout>
- <wsp:Policy>
- <sp:Lax />
- </wsp:Policy>
- </sp:Layout>
- <sp:IncludeTimestamp />
- </wsp:Policy>
- </sp:TransportBinding>
-
- <sp:SignedSupportingTokens
- xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
- <wsp:Policy>
- <wsp:ExactlyOne>
- <!-- -->
- <wsp:All>
- <wsp:Policy>
+
+ <wsp:Policy wsu:Id="UT_policy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <wsap10:UsingAddressing/>
+ <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:Lax />
+ </wsp:Policy>
+ </sp:Layout>
+ <sp:IncludeTimestamp />
+ <sp:EncryptSignature />
+ <sp:OnlySignEntireHeadersAndBody />
+ </wsp:Policy>
+ </sp:SymmetricBinding>
+ <sp:SignedSupportingTokens
+ 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/Al...">
- <wsp:Policy>
- <sp:WssUsernameToken10 />
- </wsp:Policy>
+ sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Al...">
+ <wsp:Policy>
+ <sp:WssUsernameToken10 />
+ </wsp:Policy>
</sp:UsernameToken>
- </wsp:Policy>
- </wsp:All>
+ </wsp:Policy>
+ </sp:SignedSupportingTokens>
+ <sp:Wss11
+ xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+ <wsp:Policy>
+ <sp:MustSupportRefKeyIdentifier />
+ <sp:MustSupportRefIssuerSerial />
+ <sp:MustSupportRefThumbprint />
+ <sp:MustSupportRefEncryptedKey />
+ </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>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+
+ <wsp:Policy wsu:Id="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="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:All>
- <wsp:Policy>
- <sp:SamlToken
- sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Al...">
- <wsp:Policy>
- <sp:WssSamlV20Token11 />
- </wsp:Policy>
- </sp:SamlToken>
- </wsp:Policy>
- </wsp:All>
- </wsp:ExactlyOne>
- </wsp:Policy>
- </sp:SignedSupportingTokens>
- <sp:Wss11
- xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
- <wsp:Policy>
- <sp:MustSupportRefKeyIdentifier />
- <sp:MustSupportRefIssuerSerial />
- <sp:MustSupportRefThumbprint />
- <sp:MustSupportRefEncryptedKey />
- </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>
- </wsp:All>
- </wsp:ExactlyOne>
- </wsp:Policy>
-
- <wsp:Policy wsu:Id="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="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>
-
</wsdl:definitions>
10 years, 1 month
- 1
- 0
JBossWS SVN: r18496 - in stack/cxf/trunk/modules/testsuite/cxf-tests: src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2014-03-11 12:31:56 -0400 (Tue, 11 Mar 2014)
New Revision: 18496
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustBearerTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestUtils.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/bearer/BearerImpl.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/stsbearer/SampleSTSBearer.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/bearer/web.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/BearerService.wsdl
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/bearer-ws-trust-1.4-service.wsdl
Log:
[JBWS-3738] unclean code in attempting to resolve bearer test issues.
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2014-03-11 16:07:15 UTC (rev 18495)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2014-03-11 16:31:56 UTC (rev 18496)
@@ -466,6 +466,10 @@
<include name="clientKeystore.properties" />
<include name="clientstore.jks" />
</metainf>
+ <!-- rls test only -->
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl">
+ <include name="bearer-ws-trust-1.4-service.wsdl" />
+ </metainf>
</jar>
<!-- jaxws-samples-wsse-policy-trust-actas -->
@@ -575,18 +579,17 @@
<webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/trust/WEB-INF">
<include name="wsdl/Bearer*"/>
</webinf>
- <!-- rls test
<zipfileset dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/trust/WEB-INF" prefix="WEB-INF/classes">
<include name="servicestore.jks" />
<include name="serviceKeystore.properties" />
</zipfileset>
- -->
- <!-- rls start test -->
+
+ <!-- rls start test
<zipfileset dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/trust/WEB-INF" prefix="WEB-INF/classes">
<include name="xclientstore.jks" />
<include name="xclientKeystore.properties" />
</zipfileset>
- <!-- rls end test -->
+ - rls end test -->
<manifest>
<attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client"/>
</manifest>
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustBearerTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustBearerTestCase.java 2014-03-11 16:07:15 UTC (rev 18495)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustBearerTestCase.java 2014-03-11 16:31:56 UTC (rev 18496)
@@ -21,25 +21,50 @@
*/
package org.jboss.test.ws.jaxws.samples.wsse.policy.trust;
+import java.io.InputStream;
+
import junit.framework.Test;
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
+import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.configuration.Configurer;
+import org.apache.cxf.configuration.jsse.TLSClientParameters;
import org.apache.cxf.security.SecurityContext;
+import org.apache.cxf.transport.ConduitInitiator;
+import org.apache.cxf.transport.ConduitInitiatorManager;
+import org.apache.cxf.transport.http.HTTPConduit;
+import org.apache.cxf.transport.http.URLConnectionHTTPConduit;
import org.apache.cxf.ws.security.SecurityConstants;
import org.apache.cxf.ws.security.tokenstore.SecurityToken;
import org.apache.cxf.ws.security.trust.STSClient;
import org.jboss.test.ws.jaxws.samples.wsse.policy.trust.bearer.BearerIface;
import org.jboss.test.ws.jaxws.samples.wsse.policy.trust.shared.ClientCallbackHandler;
+import org.jboss.wsf.stack.cxf.client.configuration.BeanCustomizer;
+import org.jboss.wsf.stack.cxf.client.configuration.JBossWSConfigurer;
+import org.jboss.wsf.stack.cxf.client.configuration.JBossWSSpringBusFactory;
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
import org.w3c.dom.Element;
+import javax.net.ssl.KeyManager;
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.TrustManagerFactory;
import javax.xml.namespace.QName;
import javax.xml.ws.BindingProvider;
import javax.xml.ws.Service;
+import java.io.FileInputStream;
import java.net.URL;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
import java.security.cert.X509Certificate;
+import java.util.HashMap;
+import java.util.List;
import java.util.Map;
+import org.apache.cxf.service.model.EndpointInfo;
+import org.apache.cxf.service.model.ServiceInfo;
+
/**
* A demo of using SAML Bearer key type
*
@@ -48,6 +73,7 @@
*/
public class WSTrustBearerTestCase extends JBossWSTest
{
+
private final String serviceURL = "http://" + getServerHost()
+ ":8080/jaxws-samples-wsse-policy-trust-bearer/BearerService";
private final String stsURL = "http://" + getServerHost()
@@ -55,89 +81,195 @@
public static Test suite()
{
+ /** ***/
+ // this must be set before testSetup is returned
+ System.setProperty("javax.net.ssl.trustStore", "/home/rsearls/j1/jbossws/trunk/modules/testsuite/cxf-tests/target/test-resources/jaxws/samples/wsse/policy/trust/WEB-INF/stsstore.jks");
+ System.setProperty("javax.net.ssl.trustStorePassword", "stsspass");
+ System.setProperty("javax.net.ssl.trustStoreType", "jks");
+ System.setProperty("org.jboss.security.ignoreHttpsHost", "true");
+
+
//deploy client, STS and service; start a security domain to be used by the STS for authenticating client
- return WSTrustTestUtils.getTestSetup(WSTrustBearerTestCase.class,
+ JBossWSCXFTestSetup testSetup = WSTrustTestUtils.getTestSetup(WSTrustBearerTestCase.class,
"jaxws-samples-wsse-policy-trust-client.jar jaxws-samples-wsse-policy-trust-sts-bearer.war jaxws-samples-wsse-policy-trust-bearer.war");
+
+
+ /**
+ // the server looks for the file /home/rsearls/.keystore no matter what
+ // path given for keystore-path. Fails to deploy war; test never runs
+ Map<String, String> sslOptions = new HashMap<String, String>();
+ sslOptions.put("server-identity.ssl.keystore-path", "servicestore.jks");
+ sslOptions.put("server-identity.ssl.keystore-password", "sspass");
+ sslOptions.put("authentication.truststore.keystore-path", "stsstore.jks");
+ sslOptions.put("authentication.truststore.keystore-password", "stsspass");
+ testSetup.setHttpsConnectorRequirement(sslOptions);
+ **/
+ return testSetup;
}
- /**
- * @throws Exception
- */
- public void testBearer() throws Exception
+ public void testAllInOneBearer() throws Exception
{
+
Bus bus = BusFactory.newInstance().createBus();
try
{
+
BusFactory.setThreadDefaultBus(bus);
+ //------------------------------
final QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/bearerwssecuritypolicy", "BearerService");
final URL wsdlURL = new URL(serviceURL + "?wsdl");
Service service = Service.create(wsdlURL, serviceName);
BearerIface proxy = (BearerIface) service.getPort(BearerIface.class);
- WSTrustTestUtils.setupWsseAndSTSClientBearer((BindingProvider) proxy, bus);
+ Map<String, Object> ctx = ((BindingProvider)proxy).getRequestContext();
- assertEquals("Bearer WS-Trust Hello World!", proxy.sayHello());
- /*
- try {
- proxy.sayHello();
- } catch (Exception e) { // rls added
- e.printStackTrace(); // rls added
- } // rls added
- */
+ //jaxws-samples-wsse-policy-trust-sts-bearer
+ // 8443
+ STSClient stsClient = new STSClient(bus);
+ /**/
+ //stsClient.setWsdlLocation("https://localhost:8443/jaxws-samples-wsse-policy-trust-sts-bearer/Securit...");
+ //-stsClient.setWsdlLocation("http://localhost:8080/jaxws-samples-wsse-policy-trust-sts-bearer/Security...");
+
+ //WEB-INF/wsdl/bearer-ws-trust-1.4-service.wsdl
+ URL stsWsdlURL =
+ Thread.currentThread().getContextClassLoader().getResource("META-INF/bearer-ws-trust-1.4-service.wsdl");
+ System.out.println("## stsWsdlURL: " + stsWsdlURL.toString());
+ //.getResourceAsStream("WEB-INF/wsdl/bearer-ws-trust-1.4-service.wsdl");
+ stsClient.setWsdlLocation(stsWsdlURL.toString());
+
+ //stsClient.setWsdlLocation("http://localhost:8080/jaxws-samples-wsse-policy-trust-sts-bearer/Security...");
+
+ stsClient.setServiceName("{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}SecurityTokenService");
+ stsClient.setEndpointName("{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}UT_Port");
+
+ //stsClient.setServiceName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/SecurityTokenService");
+ // stsClient.setEndpointName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/UT_Port");
+ /**/
+ Map<String, Object> props = stsClient.getProperties();
+ props.put(SecurityConstants.USERNAME, "alice");
+ props.put(SecurityConstants.CALLBACK_HANDLER, new ClientCallbackHandler());
+ props.put(SecurityConstants.STS_TOKEN_USERNAME, "myclientkey");
+ props.put(SecurityConstants.STS_TOKEN_PROPERTIES,
+ Thread.currentThread().getContextClassLoader().getResource("META-INF/clientKeystore.properties"));
+ props.put(SecurityConstants.STS_TOKEN_USE_CERT_FOR_KEYINFO, "true");
+
+ ctx.put(SecurityConstants.STS_CLIENT, stsClient);
+
+
+ proxy.sayHello();
+
+ } catch(Exception e){
+ e.printStackTrace();
+ assertTrue(false);
}
- finally
- {
- bus.shutdown(true);
- }
}
- /**
- * TMEP: Just for isolating testing of STS' generation of Bearer security token
- * @throws Exception
- */
- public void TMP_DISABLE_testSTSBearer() throws Exception
+ public void XX_testBearer() throws Exception
{
- final QName stsServiceName = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "SecurityTokenService");
- final QName stsPortName = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "UT_Port");
-
-
Bus bus = BusFactory.newInstance().createBus();
try
{
+ /** **/
+ // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ //-ServiceInfo servInfo = new ServiceInfo();
+ //-servInfo.setTargetNamespace("http://www.jboss.org/jbossws/ws-extensions/bearerwssecuritypolicy");
+ //-servInfo.setName(new QName("http://www.jboss.org/jbossws/ws-extensions/bearerwssecuritypolicy", "BearerService"));
+
+ ConduitInitiatorManager mgr = bus.getExtension(ConduitInitiatorManager.class);
+ ConduitInitiator ci = null;
+ ci = mgr.getConduitInitiator("http://cxf.apache.org/transports/http");
+
+ URL myWsdlURL = new URL(serviceURL + "?wsdl");
+ EndpointInfo endpointInfo = new EndpointInfo();
+ endpointInfo.setName(new QName("http://cxf.apache.org", "TransportURIResolver"));
+ endpointInfo.setAddress(myWsdlURL.toURI().toString());
+ HTTPConduit httpConduit = new URLConnectionHTTPConduit(bus, endpointInfo,
+ endpointInfo.getTarget());
+
+ TLSClientParameters tlsParams = new TLSClientParameters();
+ tlsParams.setSecureSocketProtocol("TLSv1"); // SSL .. try this
+ setKeyManagers(tlsParams, "ckpass", "META-INF/clientstore.jks");
+ tlsParams.setDisableCNCheck(true);
+
+ /** fix this
+ * FiltersType filter = new FiltersType();
+ filter.getInclude().add(".*_EXPORT_.*");
+ filter.getInclude().add(".*_EXPORT1024_.*");
+ filter.getInclude().add(".*_WITH_DES_.*");
+ filter.getInclude().add(".*_WITH_NULL_.*");
+ filter.getExclude().add(".*_DH_anon_.*");
+ tlsParams.setCipherSuitesFilter(filter);
+
+ */
+ httpConduit.setTlsClientParameters(tlsParams);
+
+ JBossWSConfigurer configurer = (JBossWSConfigurer)bus.getExtension(Configurer.class);
+ BeanCustomizer customizer = configurer.getCustomizer();
+ customizer.customize(httpConduit);
+
+ // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+
BusFactory.setThreadDefaultBus(bus);
- STSClient stsClient = new STSClient(bus);
- stsClient.setWsdlLocation(stsURL + "?wsdl");
- stsClient.setServiceQName(stsServiceName);
- stsClient.setEndpointQName(stsPortName);
+ //------------------------------
+ final QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/bearerwssecuritypolicy", "BearerService");
+ final URL wsdlURL = new URL(serviceURL + "?wsdl");
+ Service service = Service.create(wsdlURL, serviceName);
+ BearerIface proxy = (BearerIface) service.getPort(BearerIface.class);
- stsClient.setTokenType("http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0");
- stsClient.setKeyType("http://docs.oasis-open.org/ws-sx/ws-trust/200512/Bearer");
+ WSTrustTestUtils.setupWsseAndSTSClientBearer((BindingProvider) proxy, bus);
- stsClient.setAddressingNamespace("http://www.w3.org/2005/08/addressing");
+ assertEquals("Bearer WS-Trust Hello World!", proxy.sayHello());
- Map<String, Object> props = stsClient.getProperties();
- props.put(SecurityConstants.USERNAME, "alice");
- props.put(SecurityConstants.CALLBACK_HANDLER, new ClientCallbackHandler());
- props.put(SecurityConstants.SIGNATURE_USERNAME, "myclientkey");
- props.put(SecurityConstants.SIGNATURE_PROPERTIES,
- Thread.currentThread().getContextClassLoader().getResource("META-INF/clientKeystore.properties"));
- //props.put(SecurityConstants.STS_TOKEN_USE_CERT_FOR_KEYINFO, "true");
+ //- proxy.sayHello();
- try {
- //- rls test -- NOTE: using https and NOT http here.
- SecurityToken st = stsClient.requestSecurityToken(
- "https://localhost:8080/jaxws-samples-wsse-policy-trust-bearer/myBearerSer...");
- } catch (Exception e){
- System.out.println("##Error: " + e);
- e.printStackTrace();
- }
- }
+ } catch (Exception e) { // rls added
+ e.printStackTrace(); // rls added
+ assertTrue(false); // rls added
+ } // rls added
+
finally
{
bus.shutdown(true);
}
}
+
+
+ //
+ private TLSClientParameters setKeyManagers(TLSClientParameters tlsParams,
+ String keyPassword, String keyStoreLoc)
+ throws KeyStoreException, Exception {
+ keyStoreLoc = "META-INF/clientstore.jks";
+ InputStream inStream = Thread.currentThread().getContextClassLoader()
+ .getResourceAsStream(keyStoreLoc);
+ KeyStore keyStore = KeyStore.getInstance("JKS");
+ keyStore.load(inStream, "cspass".toCharArray());
+ inStream.close();
+
+
+ String alg = KeyManagerFactory.getDefaultAlgorithm();
+ char[] keyPass = keyPassword != null
+ ? keyPassword.toCharArray()
+ : null;
+ KeyManagerFactory keyMF = KeyManagerFactory.getInstance(alg);
+ keyMF.init(keyStore, keyPass);
+ KeyManager[] myKeyManagers = keyMF.getKeyManagers();
+ tlsParams.setKeyManagers(myKeyManagers);
+
+
+ inStream = Thread.currentThread().getContextClassLoader()
+ .getResourceAsStream(keyStoreLoc);
+ KeyStore trustStore = KeyStore.getInstance("JKS");
+ trustStore.load(inStream, "cspass".toCharArray());
+ inStream.close();
+ TrustManagerFactory trustMF = TrustManagerFactory.getInstance(alg);
+ trustMF.init(trustStore);
+ TrustManager[] myTrustStoreKeyManagers = trustMF.getTrustManagers();
+ tlsParams.setTrustManagers(myTrustStoreKeyManagers);
+ return tlsParams;
+ }
+
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestUtils.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestUtils.java 2014-03-11 16:07:15 UTC (rev 18495)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestUtils.java 2014-03-11 16:31:56 UTC (rev 18496)
@@ -202,40 +202,19 @@
public static void setupWsseAndSTSClientBearer(BindingProvider proxy, Bus bus) {
Map<String, Object> ctx = proxy.getRequestContext();
- ctx.put(SecurityConstants.CALLBACK_HANDLER, new ClientCallbackHandler());
- ctx.put(SecurityConstants.SIGNATURE_USERNAME, "myclientkey");
- ctx.put(SecurityConstants.SIGNATURE_PROPERTIES,
- Thread.currentThread().getContextClassLoader().getResource("META-INF/clientKeystore.properties"));
- ctx.put(SecurityConstants.ENCRYPT_PROPERTIES,
- Thread.currentThread().getContextClassLoader().getResource("META-INF/clientKeystore.properties"));
- //- used in at org.apache.cxf.ws.security.wss4j.policyhandlers.AsymmetricBindingHandler.doEncryption(AsymmetricBindingHandler.java:461)
- //- value MUST be myclientkey. 647 Merlin checks if alias isKeyEntry of keystore. Using
- //- clientstore.jks. It appears signature and encrypt must be the same.
- ctx.put(SecurityConstants.ENCRYPT_USERNAME, "myclientkey" /*"myservicekey"*/);
- ctx.put(SecurityConstants.TIMESTAMP_FUTURE_TTL, "1200"); // rls DEBUGGING only (20 min)
-
STSClient stsClient = new STSClient(bus);
+
Map<String, Object> props = stsClient.getProperties();
props.put(SecurityConstants.USERNAME, "alice");
props.put(SecurityConstants.CALLBACK_HANDLER, new ClientCallbackHandler());
- props.put(SecurityConstants.SIGNATURE_USERNAME, "myclientkey");
- props.put(SecurityConstants.SIGNATURE_PROPERTIES,
+ props.put(SecurityConstants.STS_TOKEN_USERNAME, "myclientkey");
+ props.put(SecurityConstants.STS_TOKEN_PROPERTIES,
Thread.currentThread().getContextClassLoader().getResource("META-INF/clientKeystore.properties"));
props.put(SecurityConstants.STS_TOKEN_USE_CERT_FOR_KEYINFO, "true");
- //todo: rls explain required use
- stsClient.setTokenType("http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0");
- stsClient.setKeyType("http://docs.oasis-open.org/ws-sx/ws-trust/200512/Bearer");
- /*//- rls testing
- ctx.put(SecurityConstants.ENCRYPT_PROPERTIES,
- Thread.currentThread().getContextClassLoader().getResource("META-INF/clientKeystore.properties"));
- ctx.put(SecurityConstants.ENCRYPT_USERNAME, "mystskey"); //"myservicekey");
- //----
- */
-
- // CXF is ignoring this because of the proxy WSDL policy type X509Token
ctx.put(SecurityConstants.STS_CLIENT, stsClient);
+
}
private static String appendIssuedTokenSuffix(String prop)
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/bearer/BearerImpl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/bearer/BearerImpl.java 2014-03-11 16:07:15 UTC (rev 18495)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/bearer/BearerImpl.java 2014-03-11 16:31:56 UTC (rev 18496)
@@ -26,6 +26,9 @@
import org.jboss.test.ws.jaxws.samples.wsse.policy.trust.service.ServiceIface;
import javax.jws.WebService;
+import javax.servlet.annotation.HttpConstraint;
+import javax.servlet.annotation.ServletSecurity;
+import javax.servlet.annotation.ServletSecurity.TransportGuarantee;
@WebService
(
@@ -36,11 +39,17 @@
endpointInterface = "org.jboss.test.ws.jaxws.samples.wsse.policy.trust.bearer.BearerIface"
)
@EndpointProperties(value = {
- @EndpointProperty(key = "ws-security.signature.username", value = "myclientkey" ), // "myservicekey"
- @EndpointProperty(key = "ws-security.signature.properties", value = "xclientKeystore.properties"), // rls test serviceKeystore.properties
- @EndpointProperty(key = "ws-security.encryption.properties", value = "xclientKeystore.properties"), // rls test serviceKeystore.properties
- @EndpointProperty(key = "ws-security.callback-handler", value = "org.jboss.test.ws.jaxws.samples.wsse.policy.trust.bearer.BearerCallbackHandler")
+ @EndpointProperty(key = "ws-security.is-bsp-compliant", value = "false"),
+ //- @EndpointProperty(key = "ws-security.signature.username", value = "myservicekey" ),
+ @EndpointProperty(key = "ws-security.signature.properties", value = "serviceKeystore.properties"),
+ //- @EndpointProperty(key = "ws-security.encryption.properties", value = "serviceKeystore.properties"),
+ @EndpointProperty(key = "ws-security.callback-handler", value = "org.jboss.test.ws.jaxws.samples.wsse.policy.trust.bearer.BearerCallbackHandler")
})
+/**
+@ServletSecurity(
+ @HttpConstraint(transportGuarantee = TransportGuarantee.CONFIDENTIAL
+ ))
+ **/
public class BearerImpl implements BearerIface
{
public String sayHello()
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/stsbearer/SampleSTSBearer.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/stsbearer/SampleSTSBearer.java 2014-03-11 16:07:15 UTC (rev 18495)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/stsbearer/SampleSTSBearer.java 2014-03-11 16:31:56 UTC (rev 18496)
@@ -25,10 +25,13 @@
import org.apache.cxf.annotations.EndpointProperty;
import org.apache.cxf.sts.StaticSTSProperties;
import org.apache.cxf.sts.operation.TokenIssueOperation;
+import org.apache.cxf.sts.operation.TokenValidateOperation;
import org.apache.cxf.sts.service.EncryptionProperties;
import org.apache.cxf.sts.service.ServiceMBean;
import org.apache.cxf.sts.service.StaticService;
+import org.apache.cxf.sts.token.delegation.HOKDelegationHandler;
import org.apache.cxf.sts.token.provider.SAMLTokenProvider;
+import org.apache.cxf.sts.token.validator.SAMLTokenValidator;
import org.apache.cxf.ws.security.policy.SPConstants;
import org.apache.cxf.ws.security.sts.provider.SecurityTokenServiceProvider;
@@ -49,6 +52,7 @@
})
public class SampleSTSBearer extends SecurityTokenServiceProvider
{
+
public SampleSTSBearer() throws Exception
{
super();
@@ -58,35 +62,31 @@
props.setSignatureUsername("mystskey");
props.setCallbackHandlerClass(STSBearerCallbackHandler.class.getName());
props.setEncryptionCryptoProperties("stsKeystore.properties");
- props.setEncryptionUsername("useReqSigCert");
-
- // programmatic setting of the same encryption algorithm as in WSDL (sp:TripleDes)
- EncryptionProperties eProps = new EncryptionProperties();
- eProps.setEncryptionAlgorithm(SPConstants.TRIPLE_DES);
- props.setEncryptionProperties(eProps);
-
+ props.setEncryptionUsername("myservicekey");
props.setIssuer("DoubleItSTSIssuer");
-
List<ServiceMBean> services = new LinkedList<ServiceMBean>();
StaticService service = new StaticService();
service.setEndpoints(Arrays.asList(
// for STS testing only
"https://localhost:(\\d)*/jaxws-samples-wsse-policy-trust-bearer/myBearerS...",
-
// bearer serivce addresses
"http://localhost:(\\d)*/jaxws-samples-wsse-policy-trust-bearer/BearerService",
"http://\\[::1\\]:(\\d)*/jaxws-samples-wsse-policy-trust-bearer/BearerService",
"http://\\[0:0:0:0:0:0:0:1\\]:(\\d)*/jaxws-samples-wsse-policy-trust-bearer/BearerService"
));
-
services.add(service);
TokenIssueOperation issueOperation = new TokenIssueOperation();
issueOperation.getTokenProviders().add(new SAMLTokenProvider());
+ issueOperation.getDelegationHandlers().add(new HOKDelegationHandler());
issueOperation.setServices(services);
- issueOperation.setEncryptIssuedToken(true); //todo: rls explain this
issueOperation.setStsProperties(props);
this.setIssueOperation(issueOperation);
+
+ TokenValidateOperation validationOperation = new TokenValidateOperation();
+ validationOperation.getTokenValidators().add(new SAMLTokenValidator());
+ validationOperation.setStsProperties(props);
+ this.setValidateOperation(validationOperation);
}
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/bearer/web.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/bearer/web.xml 2014-03-11 16:07:15 UTC (rev 18495)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/bearer/web.xml 2014-03-11 16:31:56 UTC (rev 18496)
@@ -12,4 +12,17 @@
<servlet-name>TestSecurityTokenService</servlet-name>
<url-pattern>/SecurityTokenService/*</url-pattern>
</servlet-mapping>
+ <!--
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>restricted web services</web-resource-name>
+ <url-pattern>/*</url-pattern>
+ <http-method>GET</http-method>
+ <http-method>POST</http-method>
+ </web-resource-collection>
+ <user-data-constraint>
+ <transport-guarantee>CONFIDENTIAL</transport-guarantee>
+ </user-data-constraint>
+ </security-constraint>
+ -->
</web-app>
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/BearerService.wsdl
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/BearerService.wsdl 2014-03-11 16:07:15 UTC (rev 18495)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/BearerService.wsdl 2014-03-11 16:31:56 UTC (rev 18496)
@@ -32,33 +32,70 @@
</operation>
</portType>
<binding name="BearerServicePortBinding" type="tns:BearerIface">
- <wsp:PolicyReference URI="#AsymmetricSAML2Policy" />
+ <wsp:PolicyReference URI="#TransportSAML2BearerPolicy" />
<soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
<operation name="sayHello">
<soap:operation soapAction=""/>
<input>
<soap:body use="literal"/>
+ <!-- -->
<wsp:PolicyReference URI="#Input_Policy" />
+
</input>
<output>
<soap:body use="literal"/>
+ <!-- -->
<wsp:PolicyReference URI="#Output_Policy" />
+
</output>
</operation>
</binding>
<service name="BearerService">
<port name="BearerServicePort" binding="tns:BearerServicePortBinding">
- <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-trust-bearer/BearerService"/>
+ <!-- -->
+ <soap:address
+ location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-trust-bearer/BearerService"/>
+
+ <!-- rls require use the SSL address of JBoss (8443 is industry stnd address) -->
+ <!--
+ <soap:address
+ location="https://@jboss.bind.address@:8443/jaxws-samples-wsse-policy-trust-bearer/BearerService"/>
+ -->
</port>
</service>
-
- <wsp:Policy wsu:Id="AsymmetricSAML2Policy">
- <wsp:ExactlyOne>
- <wsp:All>
- <wsam:Addressing wsp:Optional="false">
- <wsp:Policy />
- </wsam:Addressing>
- <!--
+
+
+ <wsp:Policy wsu:Id="TransportSAML2BearerPolicy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <wsam:Addressing wsp:Optional="false">
+ <wsp:Policy />
+ </wsam:Addressing>
+ <!-- -->
+ <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:HttpsToken>
+ </wsp:Policy>
+ </sp:TransportToken>
+ <sp:AlgorithmSuite>
+ <wsp:Policy>
+ <sp:TripleDes />
+ </wsp:Policy>
+ </sp:AlgorithmSuite>
+ <sp:Layout>
+ <wsp:Policy>
+ <sp:Lax />
+ </wsp:Policy>
+ </sp:Layout>
+ <sp:IncludeTimestamp />
+ </wsp:Policy>
+ </sp:TransportBinding>
+
<sp:SignedSupportingTokens
xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
<wsp:Policy>
@@ -71,121 +108,98 @@
<wsp:Policy>
<sp:RequireInternalReference />
</wsp:Policy>
+ <!--
<sp:Issuer>
- <wsaws:Address>http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-trust-sts-bearer/SecurityTokenService</wsaws:Address>
+ <wsaw:Address>http://localhost:8080/SecurityTokenService/UT
+ </wsaw:Address>
+ <wsaw:Metadata>
+ <wsx:Metadata>
+ <wsx:MetadataSection>
+ <wsx:MetadataReference>
+ <wsaw:Address>http://localhost:8080/SecurityTokenService/UT/mex
+ </wsaw:Address>
+ </wsx:MetadataReference>
+ </wsx:MetadataSection>
+ </wsx:Metadata>
+ </wsaw:Metadata>
+ </sp:Issuer>
+ -->
- <wsaws:Metadata xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
- wsdli:wsdlLocation="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-trust-sts-bearer/SecurityTokenService?wsdl">
- <wsaw:ServiceName xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
- xmlns:stsns="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"
- EndpointName="UT_Port">stsns:SecurityTokenService</wsaw:ServiceName>
- </wsaws:Metadata>
- </sp:Issuer>
- </sp:IssuedToken>
- </wsp:Policy>
- </sp:SignedSupportingTokens>
- -->
+ <!--
+ <wsaws:Address>http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-trust-sts-bearer/SecurityTokenService/UT</wsaws:Address>
+ -->
+ <!--
+ <wsaws:Metadata xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
+ wsdli:wsdlLocation="http://@jboss.bind.address@:8443/jaxws-samples-wsse-policy-trust-sts-bearer/SecurityTokenService?wsdl">
+ -->
- <sp:AsymmetricBinding
- xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
- <wsp:Policy>
- <sp:InitiatorToken>
- <wsp:Policy>
+ <!--
+ <sp:Issuer>
+ <wsaws:Address>http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-trust-sts-bearer/SecurityTokenService</wsaws:Address>
- <sp:IssuedToken
- IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Al...">
- <sp:RequestSecurityTokenTemplate>
- <wsp:Policy>
- <sp:WssX509V3Token10 />
- </wsp:Policy>
- </sp:RequestSecurityTokenTemplate>
- <wsp:Policy>
- <sp:WssX509V3Token10 />
- </wsp:Policy>
- <sp:Issuer>
- <wsaws:Address>http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-trust-sts-bearer/SecurityTokenService</wsaws:Address>
- <wsaws:Metadata xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
+ <wsaws:Metadata xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
wsdli:wsdlLocation="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-trust-sts-bearer/SecurityTokenService?wsdl">
+
<wsaw:ServiceName xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
xmlns:stsns="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"
EndpointName="UT_Port">stsns:SecurityTokenService</wsaw:ServiceName>
</wsaws:Metadata>
</sp:Issuer>
- </sp:IssuedToken>
-
- </wsp:Policy>
- </sp:InitiatorToken>
- <sp:RecipientToken>
- <wsp:Policy>
- <sp:X509Token
- sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
- <wsp:Policy>
- <sp:WssX509V3Token10 />
- <sp:RequireIssuerSerialReference />
- </wsp:Policy>
- </sp:X509Token>
- </wsp:Policy>
- </sp:RecipientToken>
- <sp:AlgorithmSuite>
- <wsp:Policy>
- <sp:TripleDes />
- </wsp:Policy>
- </sp:AlgorithmSuite>
- <sp:Layout>
- <wsp:Policy>
- <sp:Lax />
- </wsp:Policy>
- </sp:Layout>
- <sp:IncludeTimestamp />
- <sp:OnlySignEntireHeadersAndBody />
+ -->
+ </sp:IssuedToken>
</wsp:Policy>
- </sp:AsymmetricBinding>
-
- <sp:Wss11
- xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+ </sp:SignedSupportingTokens>
+ <sp:Wss11>
<wsp:Policy>
- <!--
- <sp:MustSupportRefKeyIdentifier />
- -->
<sp:MustSupportRefIssuerSerial />
<sp:MustSupportRefThumbprint />
<sp:MustSupportRefEncryptedKey />
</wsp:Policy>
</sp:Wss11>
- <sp:Trust13
- xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+ <sp:Trust13>
<wsp:Policy>
<sp:MustSupportIssuedTokens />
<sp:RequireClientEntropy />
<sp:RequireServerEntropy />
</wsp:Policy>
</sp:Trust13>
- </wsp:All>
- </wsp:ExactlyOne>
- </wsp:Policy>
- <!-- rls -->
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+
+
<wsp:Policy wsu:Id="Input_Policy">
- <wsp:ExactlyOne>
- <wsp:All>
- <sp:EncryptedParts>
- <sp:Body />
- </sp:EncryptedParts>
- <sp:SignedParts>
- <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>
- </wsp:All>
- </wsp:ExactlyOne>
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:EncryptedParts>
+ <sp:Body />
+ </sp:EncryptedParts>
+ <sp:SignedParts>
+ <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:Header Name="AckRequested"
+ Namespace="http://docs.oasis-open.org/ws-rx/wsrm/200702" />
+ <sp:Header Name="SequenceAcknowledgement"
+ Namespace="http://docs.oasis-open.org/ws-rx/wsrm/200702" />
+ <sp:Header Name="Sequence"
+ Namespace="http://docs.oasis-open.org/ws-rx/wsrm/200702" />
+ <sp:Header Name="CreateSequence"
+ Namespace="http://docs.oasis-open.org/ws-rx/wsrm/200702" />
+ -->
+ </sp:SignedParts>
+ </wsp:All>
+ </wsp:ExactlyOne>
</wsp:Policy>
- <!-- rls -->
+
<wsp:Policy wsu:Id="Output_Policy">
<wsp:ExactlyOne>
<wsp:All>
@@ -195,12 +209,22 @@
<sp:SignedParts>
<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:Header Name="AckRequested"
+ Namespace="http://docs.oasis-open.org/ws-rx/wsrm/200702" />
+ <sp:Header Name="SequenceAcknowledgement"
+ Namespace="http://docs.oasis-open.org/ws-rx/wsrm/200702" />
+ <sp:Header Name="Sequence"
+ Namespace="http://docs.oasis-open.org/ws-rx/wsrm/200702" />
+ <sp:Header Name="CreateSequence"
+ Namespace="http://docs.oasis-open.org/ws-rx/wsrm/200702" />
+ -->
</sp:SignedParts>
</wsp:All>
</wsp:ExactlyOne>
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/bearer-ws-trust-1.4-service.wsdl
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/bearer-ws-trust-1.4-service.wsdl 2014-03-11 16:07:15 UTC (rev 18495)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/bearer-ws-trust-1.4-service.wsdl 2014-03-11 16:31:56 UTC (rev 18496)
@@ -115,16 +115,22 @@
</wsdl:portType>
<wsdl:binding name="UT_Binding" type="wstrust:STS">
- <wsp:PolicyReference URI="#UT_policy" />
+ <wsp:PolicyReference URI="#Bearer_Transport_policy" />
<soap:binding style="document"
transport="http://schemas.xmlsoap.org/soap/http" />
<wsdl:operation name="Issue">
<soap:operation
soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Issue" />
<wsdl:input>
+ <!-- -->
+ <wsp:PolicyReference URI="#Input_policy" />
+
<soap:body use="literal" />
</wsdl:input>
<wsdl:output>
+ <!-- -->
+ <wsp:PolicyReference URI="#Output_policy" />
+
<soap:body use="literal" />
</wsdl:output>
</wsdl:operation>
@@ -132,9 +138,15 @@
<soap:operation
soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Validate" />
<wsdl:input>
+ <!-- -->
+ <wsp:PolicyReference URI="#Input_policy" />
+
<soap:body use="literal" />
</wsdl:input>
<wsdl:output>
+ <!-- -->
+ <wsp:PolicyReference URI="#Output_policy" />
+
<soap:body use="literal" />
</wsdl:output>
</wsdl:operation>
@@ -182,41 +194,34 @@
<wsdl:service name="SecurityTokenService">
<wsdl:port name="UT_Port" binding="tns:UT_Binding">
- <soap:address location="http://localhost:8080/SecurityTokenService/UT" />
+ <!--
+ <soap:address location="http://localhost:8080/SecurityTokenService/UT" />
+ -->
+ <!-- -->
+ <soap:address location="https://localhost:8443/SecurityTokenService/UT" />
+
</wsdl:port>
</wsdl:service>
-
- <wsp:Policy wsu:Id="UT_policy">
+
+
+ <wsp:Policy wsu:Id="Bearer_Transport_policy">
<wsp:ExactlyOne>
<wsp:All>
- <wsap10:UsingAddressing/>
- <sp:AsymmetricBinding
+ <wsap10:UsingAddressing />
+ <!-- rls testing -->
+ <sp:TransportBinding
xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
<wsp:Policy>
- <sp:InitiatorToken>
- <wsp:Policy>
- <sp:X509Token
- sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Al...">
- <wsp:Policy>
- <sp:WssX509V3Token10 />
- </wsp:Policy>
- </sp:X509Token>
- </wsp:Policy>
- </sp:InitiatorToken>
- <sp:RecipientToken>
- <wsp:Policy>
- <sp:X509Token
- sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
- <wsp:Policy>
- <sp:WssX509V3Token10 />
- <sp:RequireIssuerSerialReference />
- </wsp:Policy>
- </sp:X509Token>
- </wsp:Policy>
- </sp:RecipientToken>
+ <sp:TransportToken>
+ <wsp:Policy>
+ <sp:HttpsToken>
+ <wsp:Policy />
+ </sp:HttpsToken>
+ </wsp:Policy>
+ </sp:TransportToken>
<sp:AlgorithmSuite>
<wsp:Policy>
- <sp:TripleDes />
+ <sp:Basic128 />
</wsp:Policy>
</sp:AlgorithmSuite>
<sp:Layout>
@@ -225,9 +230,38 @@
</wsp:Policy>
</sp:Layout>
<sp:IncludeTimestamp />
- <sp:OnlySignEntireHeadersAndBody />
</wsp:Policy>
- </sp:AsymmetricBinding>
+ </sp:TransportBinding>
+
+ <sp:SignedSupportingTokens
+ xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+ <wsp:Policy>
+ <wsp:ExactlyOne>
+ <!-- -->
+ <wsp:All>
+ <wsp:Policy>
+ <sp:UsernameToken
+ sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Al...">
+ <wsp:Policy>
+ <sp:WssUsernameToken10 />
+ </wsp:Policy>
+ </sp:UsernameToken>
+ </wsp:Policy>
+ </wsp:All>
+
+ <wsp:All>
+ <wsp:Policy>
+ <sp:SamlToken
+ sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Al...">
+ <wsp:Policy>
+ <sp:WssSamlV20Token11 />
+ </wsp:Policy>
+ </sp:SamlToken>
+ </wsp:Policy>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+ </sp:SignedSupportingTokens>
<sp:Wss11
xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
<wsp:Policy>
@@ -247,5 +281,54 @@
</sp:Trust13>
</wsp:All>
</wsp:ExactlyOne>
- </wsp:Policy>
+ </wsp:Policy>
+
+ <wsp:Policy wsu:Id="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="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>
+
</wsdl:definitions>
10 years, 1 month
- 1
- 0
JBossWS SVN: r18495 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-03-11 12:07:15 -0400 (Tue, 11 Mar 2014)
New Revision: 18495
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
[JBWS-3773] Excluding test
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2014-03-11 16:05:34 UTC (rev 18494)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2014-03-11 16:07:15 UTC (rev 18495)
@@ -701,6 +701,9 @@
<!--There is no jbossws-cxf-jaspi installed in as720-->
<exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/jaspi/Jaspi*TestCase*</exclude>
+
+ <!-- [JBWS-3773][CXF-5602] HttpServletRequestSnapshot is not created for requests with WSA ReplyTo prop set -->
+ <exclude>org/jboss/test/ws/jaxws/jbws3773/**</exclude>
<!-- [JBWS-3738] test still under development -->
<exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustBearerTestCase*</exclude>
10 years, 1 month
- 1
- 0
JBossWS SVN: r18494 - in stack/cxf/trunk/modules/testsuite/cxf-tests: src/test/java/org/jboss/test/ws/jaxws/cxf and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-03-11 12:05:34 -0400 (Tue, 11 Mar 2014)
New Revision: 18494
Added:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3773/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3773/Greeter.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3773/GreeterImpl.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3773/JBWS3773TestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3773/TargetServlet.java
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
Log:
[JBWS-3773] Adding testcase
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2014-03-11 09:24:44 UTC (rev 18493)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2014-03-11 16:05:34 UTC (rev 18494)
@@ -499,6 +499,15 @@
</classes>
</war>
+ <!-- jaxws-cxf-jbws3773 -->
+ <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jbws3773.war"
+ needxmlfile='false'>
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/cxf/jbws3773/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxws/cxf/jbws3773/*TestCase.class"/>
+ </classes>
+ </war>
+
<!-- jaxws-cxf-logging -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-logging.jar">
<fileset dir="${tests.output.dir}/test-classes">
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3773/Greeter.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3773/Greeter.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3773/Greeter.java 2014-03-11 16:05:34 UTC (rev 18494)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2014, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.cxf.jbws3773;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+
+@WebService(targetNamespace = "http://jboss.org/hello_world", name = "Greeter")
+public interface Greeter {
+
+ @WebMethod(action = "sayHiAction")
+ public String sayHi(String request);
+}
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3773/Greeter.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3773/GreeterImpl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3773/GreeterImpl.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3773/GreeterImpl.java 2014-03-11 16:05:34 UTC (rev 18494)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2014, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.cxf.jbws3773;
+
+import javax.annotation.Resource;
+import javax.jws.WebService;
+import javax.servlet.http.HttpServletRequest;
+import javax.xml.ws.WebServiceContext;
+import javax.xml.ws.handler.MessageContext;
+import javax.xml.ws.soap.Addressing;
+
+@WebService(serviceName = "SOAPService", portName = "SoapPort",
+ endpointInterface = "org.jboss.test.ws.jaxws.cxf.jbws3773.Greeter",
+ targetNamespace = "http://jboss.org/hello_world")
+@Addressing
+public class GreeterImpl implements Greeter
+{
+ @Resource
+ private WebServiceContext webServiceCtx;
+
+ public String sayHi(String request)
+ {
+ MessageContext ctx = webServiceCtx.getMessageContext();
+ HttpServletRequest hsr = (HttpServletRequest)ctx.get(MessageContext.SERVLET_REQUEST);
+ String scheme = hsr.getScheme();
+ return scheme;
+ }
+}
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3773/GreeterImpl.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3773/JBWS3773TestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3773/JBWS3773TestCase.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3773/JBWS3773TestCase.java 2014-03-11 16:05:34 UTC (rev 18494)
@@ -0,0 +1,87 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2014, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.cxf.jbws3773;
+
+import java.net.URL;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Service;
+import javax.xml.ws.soap.AddressingFeature;
+
+import junit.framework.Test;
+
+import org.apache.cxf.ws.addressing.AddressingProperties;
+import org.apache.cxf.ws.addressing.AttributedURIType;
+import org.apache.cxf.ws.addressing.EndpointReferenceType;
+import org.apache.cxf.ws.addressing.JAXWSAConstants;
+import org.apache.cxf.ws.addressing.impl.AddressingPropertiesImpl;
+import org.jboss.ws.common.IOUtils;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+public class JBWS3773TestCase extends JBossWSTest
+{
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(JBWS3773TestCase.class, "jaxws-cxf-jbws3773.war");
+ }
+
+ public void testServletRequestAvailability() throws Exception
+ {
+ Greeter greeter = initPort();
+
+ AddressingProperties addrProperties = new AddressingPropertiesImpl();
+
+ EndpointReferenceType replyTo = new EndpointReferenceType();
+ AttributedURIType replyToURI = new AttributedURIType();
+ replyToURI.setValue("http://" + getServerHost() + ":8080/jaxws-cxf-jbws3773/target/replyTo");
+ replyTo.setAddress(replyToURI);
+ addrProperties.setReplyTo(replyTo);
+
+ BindingProvider provider = (BindingProvider)greeter;
+ Map<String, Object> requestContext = provider.getRequestContext();
+ requestContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES, addrProperties);
+
+ greeter.sayHi("Foo");
+ Thread.sleep(1500);
+ String result = getTargetServletResult();
+ assertTrue("Expected ReplyTo:", result.startsWith("ReplyTo:"));
+ assertTrue("Expected <return>http</return>:", result.indexOf("<return>http</return>") > 0);
+ }
+
+ private Greeter initPort() throws Exception
+ {
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-jbws3773/SOAPService?wsdl");
+ QName qname = new QName("http://jboss.org/hello_world", "SOAPService");
+ Service service = Service.create(wsdlURL, qname);
+ Greeter greeter = service.getPort(Greeter.class, new AddressingFeature());
+ return greeter;
+ }
+
+ private String getTargetServletResult() throws Exception
+ {
+ URL url = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-jbws3773/target/result");
+ return IOUtils.readAndCloseStream(url.openStream());
+ }
+}
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3773/JBWS3773TestCase.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3773/TargetServlet.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3773/TargetServlet.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3773/TargetServlet.java 2014-03-11 16:05:34 UTC (rev 18494)
@@ -0,0 +1,69 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2014, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.cxf.jbws3773;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@SuppressWarnings("serial")
+@WebServlet(name = "TestServlet", urlPatterns = "/target/*")
+public class TargetServlet extends HttpServlet
+{
+ private final StringBuffer result = new StringBuffer();
+
+ protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
+ {
+ if (result.length() > 0 && req.getRequestURI().endsWith("result"))
+ {
+ PrintWriter pw = new PrintWriter(res.getWriter());
+ pw.write(result.toString());
+ pw.close();
+ }
+ //clear result
+ result.setLength(0);
+ }
+
+ protected void doPost(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
+ {
+ byte[] buffer = null;
+ int length = req.getContentLength();
+ if (length > 0)
+ {
+ buffer = new byte[length];
+ req.getInputStream().read(buffer);
+
+ }
+ if (req.getRequestURI().endsWith("replyTo"))
+ {
+ result.append("ReplyTo:");
+ result.append(new String(buffer));
+ }
+
+ }
+
+}
\ No newline at end of file
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3773/TargetServlet.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
10 years, 1 month
- 1
- 0
JBossWS SVN: r18493 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-03-11 05:24:44 -0400 (Tue, 11 Mar 2014)
New Revision: 18493
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
[JBWS-3738] Adding tests to exclude-integration-tests-unlimited-strength-related profile
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2014-03-07 16:49:35 UTC (rev 18492)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2014-03-11 09:24:44 UTC (rev 18493)
@@ -966,6 +966,8 @@
<excludes combine.children="append">
<exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples22xTestCase*</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples23xTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustActAsTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustOnBehalfOfTestCase*</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestCase*</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase*</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptGCMTestCase*</exclude>
10 years, 1 month
- 1
- 0