Return-Path: Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org Received: (qmail 57951 invoked from network); 18 Feb 2008 16:59:52 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 18 Feb 2008 16:59:51 -0000 Received: (qmail 90318 invoked by uid 500); 18 Feb 2008 16:59:46 -0000 Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org Received: (qmail 90272 invoked by uid 500); 18 Feb 2008 16:59:45 -0000 Mailing-List: contact cxf-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cxf-dev@incubator.apache.org Delivered-To: mailing list cxf-commits@incubator.apache.org Received: (qmail 90263 invoked by uid 99); 18 Feb 2008 16:59:45 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Feb 2008 08:59:45 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Feb 2008 16:59:06 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 28A161A9832; Mon, 18 Feb 2008 08:59:26 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r628813 - in /incubator/cxf/trunk/rt: transports/http/src/main/java/org/apache/cxf/transport/http/ ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/ ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/ Date: Mon, 18 Feb 2008 16:59:25 -0000 To: cxf-commits@incubator.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080218165926.28A161A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Mon Feb 18 08:59:23 2008 New Revision: 628813 URL: http://svn.apache.org/viewvc?rev=628813&view=rev Log: Update the client side cookie handling to support multiple Set-Cookie headers Re-enable the SignatureConfirmationTest by working around a bug in wss4j Modified: incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Cookie.java incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java incubator/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java incubator/cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SignatureConfirmationTest.java Modified: incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Cookie.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Cookie.java?rev=628813&r1=628812&r2=628813&view=diff ============================================================================== --- incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Cookie.java (original) +++ incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Cookie.java Mon Feb 18 08:59:23 2008 @@ -18,9 +18,8 @@ */ package org.apache.cxf.transport.http; -import java.util.ArrayList; -import java.util.Iterator; import java.util.List; +import java.util.Map; /** * Container for HTTP cookies used to track @@ -147,22 +146,15 @@ /** * Convert a list of cookies into a string suitable for sending * as a "Cookie:" header - * @param cookies * @return Cookie header text */ - public static String requestCookieHeader(List cookies) { - if (cookies == null || cookies.size() == 0) { - return null; - } - + public String requestCookieHeader() { StringBuilder b = new StringBuilder(); b.append("$Version=\"1\""); - for (Cookie cookie : cookies) { - b.append("; ").append(cookie.getName()) - .append("=").append(cookie.getValue()); - if (cookie.getPath() != null && cookie.getPath().length() > 0) { - b.append("; $Path=").append(cookie.getPath()); - } + b.append("; ").append(getName()) + .append("=").append(getValue()); + if (getPath() != null && getPath().length() > 0) { + b.append("; $Path=").append(getPath()); } return b.toString(); } @@ -174,57 +166,47 @@ * @param header Text of a Set-Cookie: header * @return New set of cookies */ - public static List handleSetCookie(List current, String header) { - if (header == null || header.length() == 0) { - return current; - } - List result; - result = new ArrayList(); - if (current != null) { - result.addAll(current); - } - - String[] cookies = header.split(","); - for (String cookie : cookies) { - String[] parts = cookie.split(";"); - - String[] kv = parts[0].split("=", 2); - if (kv.length != 2) { - continue; - } - String name = kv[0].trim(); - String value = kv[1].trim(); - Cookie newCookie = new Cookie(name, value); - - for (int i = 1; i < parts.length; i++) { - kv = parts[i].split("=", 2); - name = kv[0].trim(); - value = (kv.length > 1) ? kv[1].trim() : null; - if (name.equalsIgnoreCase(DISCARD_ATTRIBUTE)) { - newCookie.setMaxAge(0); - } else if (name.equalsIgnoreCase(MAX_AGE_ATTRIBUTE) && value != null) { - try { - newCookie.setMaxAge(Integer.parseInt(value)); - } catch (NumberFormatException e) { - // do nothing here + public static void handleSetCookie(Map current, List headers) { + if (headers == null || headers.size() == 0) { + return; + } + + + for (String header : headers) { + String[] cookies = header.split(","); + for (String cookie : cookies) { + String[] parts = cookie.split(";"); + + String[] kv = parts[0].split("=", 2); + if (kv.length != 2) { + continue; + } + String name = kv[0].trim(); + String value = kv[1].trim(); + Cookie newCookie = new Cookie(name, value); + + for (int i = 1; i < parts.length; i++) { + kv = parts[i].split("=", 2); + name = kv[0].trim(); + value = (kv.length > 1) ? kv[1].trim() : null; + if (name.equalsIgnoreCase(DISCARD_ATTRIBUTE)) { + newCookie.setMaxAge(0); + } else if (name.equalsIgnoreCase(MAX_AGE_ATTRIBUTE) && value != null) { + try { + newCookie.setMaxAge(Integer.parseInt(value)); + } catch (NumberFormatException e) { + // do nothing here + } + } else if (name.equalsIgnoreCase(PATH_ATTRIBUTE) && value != null) { + newCookie.setPath(value); } - } else if (name.equalsIgnoreCase(PATH_ATTRIBUTE) && value != null) { - newCookie.setPath(value); } - } - - Iterator iter = result.iterator(); - while (iter.hasNext()) { - Cookie oldCookie = iter.next(); - if (newCookie.equals(oldCookie)) { - iter.remove(); - break; + if (newCookie.getMaxAge() != 0) { + current.put(newCookie.getName(), newCookie); + } else { + current.remove(newCookie.getName()); } } - if (newCookie.getMaxAge() != 0) { - result.add(newCookie); - } } - return result; } } Modified: incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java?rev=628813&r1=628812&r2=628813&view=diff ============================================================================== --- incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java (original) +++ incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java Mon Feb 18 08:59:23 2008 @@ -36,6 +36,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; import java.util.logging.Logger; @@ -257,7 +258,7 @@ /** * Variables for holding session state if sessions are supposed to be maintained */ - private List sessionCookies; + private Map sessionCookies = new ConcurrentHashMap(); private boolean maintainSession; /** @@ -424,6 +425,14 @@ } /** + * Allow access to the cookies that the conduit is maintaining + * @return the sessionCookies map + */ + public Map getCookies() { + return sessionCookies; + } + + /** * This method sets the connectionFactory field for this object. It is called * after an SSL Client Policy is set or an HttpsHostnameVerifier * because we need to reinitialize the connection factory. @@ -530,12 +539,14 @@ maintainSession = Boolean.TRUE.equals((Boolean)message.get(Message.MAINTAIN_SESSION)); //If we have any cookies and we are maintaining sessions, then use them - if (maintainSession && sessionCookies != null && sessionCookies.size() > 0) { - connection.setRequestProperty(HttpHeaderHelper.COOKIE, - Cookie.requestCookieHeader(sessionCookies)); + if (maintainSession && sessionCookies.size() > 0) { + for (Cookie c : sessionCookies.values()) { + connection.addRequestProperty(HttpHeaderHelper.COOKIE, + c.requestCookieHeader()); + } } - // The trust decision is relagated to after the "flushing" of the + // The trust decision is relegated to after the "flushing" of the // request headers. // We place the connection on the message to pick it up @@ -1937,8 +1948,8 @@ inMessage.put(Message.ENCODING, normalizedEncoding); if (maintainSession) { - String cookieStr = connection.getHeaderField("Set-Cookie"); - sessionCookies = Cookie.handleSetCookie(sessionCookies, cookieStr); + List cookies = connection.getHeaderFields().get("Set-Cookie"); + Cookie.handleSetCookie(sessionCookies, cookies); } in = in == null Modified: incubator/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java?rev=628813&r1=628812&r2=628813&view=diff ============================================================================== --- incubator/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java (original) +++ incubator/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java Mon Feb 18 08:59:23 2008 @@ -158,6 +158,13 @@ if (reqData.getWssConfig().isEnableSignatureConfirmation()) { checkSignatureConfirmation(reqData, wsResult); } + + // + // Now remove the Signature Confirmation results. This is needed to work around the + // wsResult.size() != actions.size() comparison below. The real issue is to fix the + // broken checkReceiverResults method in WSS4J. + // + removeSignatureConfirmationResults(wsResult); /* * Now we can check the certificate used to sign the message. In the @@ -294,5 +301,18 @@ cbHandler = getPasswordCB(reqData); } return cbHandler; + } + + private void removeSignatureConfirmationResults(List