resolved two parts to defect-2; dropped visibility of new AsyncUtil method to prevent use outside of package

Author: Mark Adamcin

api/src/main/java/net/adamcin/httpsig/api/Constants.java

@@ -123,21 +123,17 @@ public static List<String> parseTokens(String tokens) {
         if (tokens == null || tokens.trim().isEmpty()) {
             return Collections.emptyList();
         } else {
-            List<String> tokenList = new ArrayList<String>();
-            String[] _tokens = tokens.trim().split("\\s+");
-            for (String _token : _tokens) {
-                tokenList.add(_token);
-            }
-            return Collections.unmodifiableList(tokenList);
+            return Collections.unmodifiableList(Arrays.asList(tokens.trim().split("\\s+")));
         }
     }
 
     public static String constructTokensString(List<String> tokens) {
         StringBuilder sb = new StringBuilder();
-        if (tokens != null) {
+        if (tokens != null && !tokens.isEmpty()) {
             for (String token : tokens) {
                 sb.append(token).append(" ");
             }
+            sb.deleteCharAt(sb.length() - 1);
         }
         return sb.toString();
     }
@@ -154,10 +150,10 @@ public static Map<String, String> parseRFC2617(String header) {
     }
 
     public static String constructRFC2617(Map<String, String> params) {
-        StringBuilder sb = new StringBuilder(SCHEME);
+        StringBuilder sb = new StringBuilder(SCHEME + ' ');
         if (params != null && !params.isEmpty()) {
             for (Map.Entry<String, String> param : params.entrySet()) {
-                sb.append(" ").append(param.getKey()).append("=\"").append(param.getValue()).append("\"").append(",");
+                sb.append(param.getKey()).append("=\"").append(param.getValue()).append("\"").append(",");
             }
             sb.deleteCharAt(sb.length() - 1);
         }

api/src/test/java/net/adamcin/httpsig/api/ConstantsTest.java

@@ -0,0 +1,119 @@
+/*
+ * This is free and unencumbered software released into the public domain.
+ *
+ * Anyone is free to copy, modify, publish, use, compile, sell, or
+ * distribute this software, either in source code form or as a compiled
+ * binary, for any purpose, commercial or non-commercial, and by any
+ * means.
+ *
+ * In jurisdictions that recognize copyright laws, the author or authors
+ * of this software dedicate any and all copyright interest in the
+ * software to the public domain. We make this dedication for the benefit
+ * of the public at large and to the detriment of our heirs and
+ * successors. We intend this dedication to be an overt act of
+ * relinquishment in perpetuity of all present and future rights to this
+ * software under copyright law.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * For more information, please refer to <http://unlicense.org/>
+ */
+
+package net.adamcin.httpsig.api;
+
+import org.junit.Test;
+
+import java.util.*;
+
+import static org.junit.Assert.assertEquals;
+
+public class ConstantsTest {
+
+    /**
+     * Added for defect-2; Provided test case {@code headers="date content-type"}
+     */
+    @Test
+    public void testConstructTokensString() {
+
+        assertEquals("headers should be empty if provided with a null list", "",
+                Constants.constructTokensString(null));
+
+        assertEquals("headers should be empty if provided with an empty list", "",
+                Constants.constructTokensString(Collections.<String>emptyList()));
+
+        assertEquals("should be a single token with no leading or trailing whitespace", "date",
+                Constants.constructTokensString(Arrays.asList("date")));
+
+        assertEquals("headers should be separated by one space with no trailing spaces", "date content-type",
+                Constants.constructTokensString(Arrays.asList("date", "content-type")));
+    }
+
+    /**
+     * Added for defect-2; should support new and old formats
+     * Provided test case {@code headers="date content-type"} which should remain equivalent to
+     * {@code headers="date content-type "}
+     */
+    @Test
+    public void testParseTokens() {
+        List<String> tokens = Arrays.asList("date", "content-type");
+        List<String> parsedExpected = Constants.parseTokens("date content-type");
+        assertEquals("expected format should parse correctly", tokens, parsedExpected);
+
+        List<String> parsedLegacy = Constants.parseTokens("date content-type ");
+        assertEquals("legacy format should parse correctly", tokens, parsedLegacy);
+    }
+
+    /**
+     * Added for defect-2; Provided test case:
+     * {@code Signature keyId="unit", algorithm="hmac-sha1", headers="Content-Type Date", signature="8sY4dne3lta76PDMM+AUVaKkV7o="}
+     * which should be
+     * {@code Signature keyId="unit",algorithm="hmac-sha1",headers="Content-Type Date",signature="yIy5ujWnGZ0pKVR7vY6Qv08WfLE="}
+     */
+    @Test
+    public void testConstructRFC2617() {
+        Map<String, String> params = new LinkedHashMap<String, String>();
+        params.put("keyId", "unit");
+        params.put("algorithm", "hmac-sha1");
+        params.put("headers", "Content-Type Date");
+        params.put("signature", "yIy5ujWnGZ0pKVR7vY6Qv08WfLE=");
+
+        String formatted = Constants.constructRFC2617(params);
+
+        assertEquals("RFC 2617 string should be properly formatted",
+                "Signature keyId=\"unit\",algorithm=\"hmac-sha1\",headers=\"Content-Type Date\",signature=\"yIy5ujWnGZ0pKVR7vY6Qv08WfLE=\"",
+                formatted);
+    }
+
+    /**
+     * Added for defect-2; maintain support for both new and old formats.
+     * {@code Signature keyId="unit", algorithm="hmac-sha1", headers="Content-Type Date", signature="8sY4dne3lta76PDMM+AUVaKkV7o="}
+     * {@code Signature keyId="unit",algorithm="hmac-sha1",headers="Content-Type Date",signature="yIy5ujWnGZ0pKVR7vY6Qv08WfLE="}
+     */
+    @Test
+    public void testParseRFC2617() {
+        final String expectedFormat = "Signature keyId=\"unit\",algorithm=\"hmac-sha1\",headers=\"Content-Type Date\",signature=\"yIy5ujWnGZ0pKVR7vY6Qv08WfLE=\"";
+        final String legacyFormat = "Signature keyId=\"unit\", algorithm=\"hmac-sha1\", headers=\"Content-Type Date\", signature=\"yIy5ujWnGZ0pKVR7vY6Qv08WfLE=\"";
+
+        Map<String, String> params = new LinkedHashMap<String, String>();
+        params.put("keyId", "unit");
+        params.put("algorithm", "hmac-sha1");
+        params.put("headers", "Content-Type Date");
+        params.put("signature", "yIy5ujWnGZ0pKVR7vY6Qv08WfLE=");
+
+        Map<String, String> parsedExpected = Constants.parseRFC2617(expectedFormat);
+        for (Map.Entry<String, String> entry : params.entrySet()) {
+            assertEquals("parsed param values should be the same", entry.getValue(), parsedExpected.get(entry.getKey()));
+        }
+
+        Map<String, String> parsedLegacy = Constants.parseRFC2617(legacyFormat);
+        for (Map.Entry<String, String> entry : params.entrySet()) {
+            assertEquals("parsed param values should be the same", entry.getValue(), parsedLegacy.get(entry.getKey()));
+        }
+    }
+}

http-helpers/src/main/java/net/adamcin/httpsig/http/ning/AsyncUtil.java

@@ -164,7 +164,7 @@ public static <T> Future<T> login(final AsyncHttpClient client,
         return response;
     }
 
-    public static String getRequestPath(Request request) {
+    protected static String getRequestPath(Request request) {
         try {
             URL url = new URL(request.getUrl());
             return url.getPath() + (url.getQuery() != null ? "?" + url.getQuery() : "");