Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 93E8611854 for ; Mon, 15 Sep 2014 11:29:47 +0000 (UTC) Received: (qmail 63209 invoked by uid 500); 15 Sep 2014 11:29:47 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 63152 invoked by uid 500); 15 Sep 2014 11:29:47 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 63143 invoked by uid 99); 15 Sep 2014 11:29:47 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Sep 2014 11:29:47 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 04ED1A13240; Mon, 15 Sep 2014 11:29:46 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: coheigea@apache.org To: commits@cxf.apache.org Message-Id: <6a2f9383884d45efbdf1b76c404924d5@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: Test optionalSignatureParts Date: Mon, 15 Sep 2014 11:29:46 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/master a3d4b6f06 -> bc00a781c Test optionalSignatureParts Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/bc00a781 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/bc00a781 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/bc00a781 Branch: refs/heads/master Commit: bc00a781cda125b815297a2829991430be877146 Parents: a3d4b6f Author: Colm O hEigeartaigh Authored: Mon Sep 15 12:29:08 2014 +0100 Committer: Colm O hEigeartaigh Committed: Mon Sep 15 12:29:08 2014 +0100 ---------------------------------------------------------------------- .../CryptoCoverageCheckerTest.java | 48 ++++++++++++++++++++ 1 file changed, 48 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/bc00a781/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageCheckerTest.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageCheckerTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageCheckerTest.java index f521436..990b177 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageCheckerTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageCheckerTest.java @@ -560,6 +560,54 @@ public class CryptoCoverageCheckerTest extends AbstractBusClientServerTestBase { bus.shutdown(true); } + @org.junit.Test + public void testWSAddressingOptionalSignatureParts() throws Exception { + SpringBusFactory bf = new SpringBusFactory(); + URL busFile = CryptoCoverageCheckerTest.class.getResource("client.xml"); + + Bus bus = bf.createBus(busFile.toString()); + SpringBusFactory.setDefaultBus(bus); + SpringBusFactory.setThreadDefaultBus(bus); + + URL wsdl = CryptoCoverageCheckerTest.class.getResource("DoubleItCoverageChecker.wsdl"); + Service service = Service.create(wsdl, SERVICE_QNAME); + QName portQName = new QName(NAMESPACE, "DoubleItWSAPort"); + DoubleItPortType port = + service.getPort(portQName, DoubleItPortType.class); + updateAddressPort(port, test.getPort()); + + Map outProps = new HashMap(); + outProps.put("action", "Timestamp Signature"); + outProps.put("signaturePropFile", "alice.properties"); + outProps.put("user", "alice"); + outProps.put("passwordCallbackClass", + "org.apache.cxf.systest.ws.common.KeystorePasswordCallback"); + outProps.put("optionalSignatureParts", + "{}{http://schemas.xmlsoap.org/soap/envelope/}Body;" + + "{}{http://docs.oasis-open.org/wss/2004/01/oasis-" + + "200401-wss-wssecurity-utility-1.0.xsd}Timestamp;" + + "{}{http://www.w3.org/2005/08/addressing}ReplyTo;"); + + if (test.isStreaming()) { + SecurityTestUtil.enableStreaming(port); + } + + WSS4JStaxOutInterceptor staxOutInterceptor = null; + WSS4JOutInterceptor outInterceptor = null; + if (test.isStreaming()) { + staxOutInterceptor = new WSS4JStaxOutInterceptor(outProps); + bus.getOutInterceptors().add(staxOutInterceptor); + } else { + outInterceptor = new WSS4JOutInterceptor(outProps); + bus.getOutInterceptors().add(outInterceptor); + } + + port.doubleIt(25); + + ((java.io.Closeable)port).close(); + bus.shutdown(true); + } + // Here the service is sending an secured message back to the client. For a server Fault // message it returns the original fault, as the CryptoCoverageChecker is configured not // to check a fault (see CXF-4954)