add URI-based component provider and query parser

Author: jricher

pom.xml

@@ -80,6 +80,11 @@
 			<artifactId>commons-lang3</artifactId>
 			<version>3.12.0</version>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.httpcomponents.core5</groupId>
+			<artifactId>httpcore5</artifactId>
+			<version>5.1.4</version>
+		</dependency>
 	</dependencies>
 	<distributionManagement>
 		<snapshotRepository>

src/main/java/io/bspk/httpsig/SignatureParameters.java

@@ -275,4 +275,9 @@ public static SignatureParameters fromDictionaryEntry(Dictionary signatureInput,
 		}
 
 	}
+
+	@Override
+	public String toString() {
+		return "SignatureParameters: " + toComponentValue().serialize();
+	}
 }

src/main/java/io/bspk/httpsig/UriRequestComponentProviderAdapter.java

@@ -0,0 +1,89 @@
+package io.bspk.httpsig;
+
+import java.net.URI;
+import java.nio.charset.Charset;
+import java.util.List;
+
+import org.apache.hc.core5.http.NameValuePair;
+import org.apache.hc.core5.net.WWWFormCodec;
+
+/**
+ * @author jricher
+ *
+ */
+public abstract class UriRequestComponentProviderAdapter extends RequestComponentProviderAdapter {
+
+
+    private final URI uri;
+
+
+    public UriRequestComponentProviderAdapter(URI uri)
+    {
+        this.uri = uri;
+    }
+
+
+    @Override
+    public String getAuthority()
+    {
+        return uri.getAuthority();
+    }
+
+
+    @Override
+    public String getScheme()
+    {
+        return uri.getScheme();
+    }
+
+
+    @Override
+    public String getTargetUri()
+    {
+        return uri.toString();
+    }
+
+
+    @Override
+    public String getRequestTarget()
+    {
+		String reqt = "";
+		if (uri.getRawPath() != null) {
+			reqt += uri.getRawPath();
+		}
+		if (uri.getRawQuery() != null) {
+			reqt += "?" + uri.getRawQuery();
+		}
+		return reqt;
+    }
+
+
+    @Override
+    public String getPath()
+    {
+        return uri.getPath();
+    }
+
+
+    @Override
+    public String getQuery()
+    {
+        return uri.getQuery();
+    }
+
+
+    @Override
+    public String getQueryParams(String name)
+    {
+        List<NameValuePair> params = WWWFormCodec.parse(getQuery(), Charset.defaultCharset());
+        return params.stream()
+                .filter(p -> p.getName().equals(name))
+                .map(NameValuePair::getValue)
+                .reduce((a, b) -> {
+                    throw new IllegalArgumentException("Found two named parameters, unsupported opperation");
+                })
+                .orElse(null);
+    }
+
+
+}

src/main/java/io/bspk/httpsig/servlet/HttpServletRequestProvider.java

@@ -2,104 +2,38 @@
 
 import java.net.URI;
 import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.springframework.util.MultiValueMap;
-import org.springframework.web.util.UriComponentsBuilder;
-
 import io.bspk.httpsig.ComponentProvider;
+import io.bspk.httpsig.UriRequestComponentProviderAdapter;
 
 /**
  * @author jricher
  *
  */
-public class HttpServletRequestProvider implements ComponentProvider {
+public class HttpServletRequestProvider extends UriRequestComponentProviderAdapter {
 
 	private HttpServletRequest request;
-	private URI uri;
-	private Map<String, Integer> counters;
 
 	public HttpServletRequestProvider(HttpServletRequest request) {
+		super(URI.create(request.getRequestURL().toString()
+			+ (request.getQueryString() != null ? "?" + request.getQueryString() : "")));
 		this.request = request;
-		this.uri = URI.create(request.getRequestURL().toString()
-			+ (request.getQueryString() != null ? "?" + request.getQueryString() : ""));
 	}
 
 	@Override
 	public String getMethod() {
 		return request.getMethod();
 	}
 
-	@Override
-	public String getAuthority() {
-		return uri.getHost();
-	}
-
-	@Override
-	public String getScheme() {
-		return uri.getScheme();
-	}
-
-	@Override
-	public String getTargetUri() {
-		return uri.toString();
-	}
-
-	@Override
-	public String getRequestTarget() {
-		String reqt = "";
-		if (uri.getRawPath() != null) {
-			reqt += uri.getRawPath();
-		}
-		if (uri.getRawQuery() != null) {
-			reqt += "?" + uri.getRawQuery();
-		}
-		return reqt;
-	}
-
-	@Override
-	public String getPath() {
-		return uri.getRawPath();
-	}
-
-	@Override
-	public String getQuery() {
-		return uri.getRawQuery();
-	}
-
-	@Override
-	public String getQueryParams(String name) {
-		MultiValueMap<String,String> queryParams = UriComponentsBuilder.fromUri(uri).build().getQueryParams();
-		List<String> values = queryParams.get(name);
-
-		if (values.size() == 1) {
-			// no problem, return one
-			return values.get(0);
-		} else if (values.size() == 0) {
-			throw new IllegalArgumentException("Could not find query parameter named " + name);
-		} else {
-			if (counters == null) {
-				// we have to count the accesses, initialize all to zero
-				counters = queryParams.keySet().stream()
-					.collect(Collectors.toMap(Function.identity(), (k) -> 0));
-			}
-			Integer count = counters.get(name); // get the current count (ie: 1)
-			counters.put(name, count + 1); // increment the count (ie: 2)
-			return values.get(count); // return the value at the position before the update (ie: 1)
-		}
-	}
-
 	@Override
 	public String getStatus() {
 		throw new UnsupportedOperationException("Requests cannot return a status code");
 	}
 
 	@Override
+	@SuppressWarnings("unchecked") // we know the enumeration returns strings
 	public String getField(String name) {
 		return ComponentProvider.combineFieldValues(Collections.list(request.getHeaders(name)));
 	}