add message wrapper for injecting headers, make component identifier search more robust

Author: jricher

pom.xml

@@ -75,6 +75,11 @@
 			<version>2.5</version>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+			<version>3.12.0</version>
+		</dependency>
 	</dependencies>
 	<distributionManagement>
 		<snapshotRepository>

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

@@ -0,0 +1,19 @@
+package io.bspk.httpsig;
+
+import org.apache.commons.lang3.RandomStringUtils;
+
+/**
+ * @author jricher
+ *
+ */
+public interface MessageWrapper {
+
+	default void addSignature(SignatureParameters signatureInput, byte[] signature) {
+		String sigId = RandomStringUtils.randomAlphabetic(5).toLowerCase();
+
+		addSignature(sigId, signatureInput, signature);
+	}
+
+	void addSignature(String signatureId, SignatureParameters signatureInput, byte[] signature);
+
+}

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

@@ -173,6 +173,9 @@ public InnerList toComponentValue() {
 		return list;
 	}
 
+	/**
+	 * Add a component without parameters.
+	 */
 	public SignatureParameters addComponentIdentifier(String identifier) {
 		if (!identifier.startsWith("@")) {
 			componentIdentifiers.add(StringItem.valueOf(identifier.toLowerCase()));
@@ -182,6 +185,10 @@ public SignatureParameters addComponentIdentifier(String identifier) {
 		return this;
 	}
 
+	/**
+	 * Add a component with optional parameters. Field components are assumed to be
+	 * already set to lowercase.
+	 */
 	public SignatureParameters addComponentIdentifier(StringItem identifier) {
 		componentIdentifiers.add(identifier);
 		return this;
@@ -196,7 +203,14 @@ public boolean containsComponentIdentifier(String identifier) {
 
 	// does not ignore parameters
 	public boolean containsComponentIdentifier(StringItem identifier) {
-		return componentIdentifiers.contains(identifier);
+		return componentIdentifiers.stream()
+			.filter((i) -> {
+				return
+					i.get().equals(identifier.get())
+					&& i.getParams().equals(identifier.getParams());
+			})
+			.findAny()
+			.isPresent();
 	}
 
 	/**

src/main/java/io/bspk/httpsig/spring/RestTemplateMessageWrapper.java

@@ -0,0 +1,37 @@
+package io.bspk.httpsig.spring;
+
+import java.util.Map;
+
+import org.greenbytes.http.sfv.ByteSequenceItem;
+import org.greenbytes.http.sfv.Dictionary;
+import org.springframework.http.HttpRequest;
+
+import io.bspk.httpsig.MessageWrapper;
+import io.bspk.httpsig.SignatureParameters;
+
+/**
+ * @author jricher
+ *
+ */
+public class RestTemplateMessageWrapper implements MessageWrapper {
+
+	private HttpRequest request;
+
+	public RestTemplateMessageWrapper(HttpRequest request) {
+		this.request = request;
+	}
+
+	@Override
+	public void addSignature(String signatureId, SignatureParameters signatureInput, byte[] signature) {
+		Dictionary sigHeader = Dictionary.valueOf(Map.of(
+			signatureId, ByteSequenceItem.valueOf(signature)));
+
+		Dictionary sigInputHeader = Dictionary.valueOf(Map.of(
+			signatureId, signatureInput.toComponentValue()));
+
+		request.getHeaders().add("Signature", sigHeader.serialize());
+		request.getHeaders().add("Signature-Input", sigInputHeader.serialize());
+	}
+
+
+}