refactor: move forwarded parsing into the UriFilterProxyHeaderParser

hyphanet · May 22, 2022 · cbfac8a · cbfac8a
1 parent 9ace02f
commit cbfac8a
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 42 deletions.
diff --git a/src/freenet/clients/http/FProxyToadlet.java b/src/freenet/clients/http/FProxyToadlet.java
@@ -15,10 +15,8 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 import freenet.client.DefaultMIMETypes;
@@ -998,41 +996,10 @@ private String getSchemeHostAndPort(ToadletContext ctx) {
 
 		// get uri host and headers
 		MultiValueTable<String, String> headers = ctx.getHeaders();
-		Map<String, String> forwarded = parseForwardedHeader(headers.get("forwarded"));
 		String uriScheme = ctx.getUri().getScheme();
 		String uriHost = ctx.getUri().getHost();
 
-		return UriFilterProxyHeaderParser.parse(fProxyPort, fProxyBindTo, uriScheme, uriHost, headers, forwarded).toString();
-	}
-
-	private Map<String, String> parseForwardedHeader(String forwarded) {
-		if (forwarded == null || forwarded.trim().isEmpty()) {
-			return new HashMap<>();
-		}
-		Map<String, String> headerParams = new HashMap<>();
-
-		// if a multi-value header is given, only use the first value.
-		int indexOfComma = forwarded.indexOf(',');
-		if (indexOfComma != -1) {
-			forwarded = forwarded.substring(0, indexOfComma);
-		}
-		boolean hasAtLeastOneKey = forwarded.indexOf('=') != -1;
-		boolean hasMultipleKeys = forwarded.indexOf(';') != -1;
-		String[] fields;
-		if (hasMultipleKeys) {
-			fields = forwarded.split(";");
-		} else if (hasAtLeastOneKey) {
-			fields = new String[]{ forwarded };
-		} else {
-			return headerParams;
-		}
-		for (String field : fields) {
-			if (field.indexOf('=') != 1) {
-				String[] keyAndValue = field.split("=");
-				headerParams.put(keyAndValue[0], keyAndValue[1]);
-			}
-		}
-		return headerParams;
+		return UriFilterProxyHeaderParser.parse(fProxyPort, fProxyBindTo, uriScheme, uriHost, headers).toString();
 	}
 
 	private boolean isBrowser(String ua) {

diff --git a/src/freenet/clients/http/utils/UriFilterProxyHeaderParser.java b/src/freenet/clients/http/utils/UriFilterProxyHeaderParser.java
@@ -1,6 +1,7 @@
 package freenet.clients.http.utils;
 
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -13,14 +14,13 @@
 public class UriFilterProxyHeaderParser {
     private UriFilterProxyHeaderParser() {}
 
-    public static SchemeAndHostWithPort parse (
+    public static SchemeAndHostWithPort parse(
         Option<?> fProxyPortConfig,
         Option<?> fProxyBindToConfig,
         String uriScheme,
         String uriHost,
-        MultiValueTable<String, String> headers,
-        Map<String, String> forwarded
-        ) {
+        MultiValueTable<String, String> headers
+    ) {
         Set<String> safeProtocols = new HashSet<>(Arrays.asList("http", "https"));
 
         List<String> bindToHosts = Arrays.stream(fProxyBindToConfig.getValueString().split(","))
@@ -41,6 +41,7 @@ public static SchemeAndHostWithPort parse (
                          .map(host -> host + ":" + port)
                          .collect(Collectors.toList()));
         // check uri host and headers
+        Map<String, String> forwarded = parseForwardedHeader(headers.get("forwarded"));
         String protocol = forwarded.getOrDefault("proto", headers.containsKey("x-forwarded-proto")
             ? headers.get("x-forwarded-proto")
             : uriScheme != null && !uriScheme.trim().isEmpty() ? uriScheme : "http");
@@ -73,4 +74,34 @@ public String toString() {
             return scheme + "://" + host;
         }
     }
+
+    private static Map<String, String> parseForwardedHeader(String forwarded) {
+        if (forwarded == null || forwarded.trim().isEmpty()) {
+            return new HashMap<>();
+        }
+        Map<String, String> headerParams = new HashMap<>();
+
+        // if a multi-value header is given, only use the first value.
+        int indexOfComma = forwarded.indexOf(',');
+        if (indexOfComma != -1) {
+            forwarded = forwarded.substring(0, indexOfComma);
+        }
+        boolean hasAtLeastOneKey = forwarded.indexOf('=') != -1;
+        boolean hasMultipleKeys = forwarded.indexOf(';') != -1;
+        String[] fields;
+        if (hasMultipleKeys) {
+            fields = forwarded.split(";");
+        } else if (hasAtLeastOneKey) {
+            fields = new String[]{ forwarded };
+        } else {
+            return headerParams;
+        }
+        for (String field : fields) {
+            if (field.indexOf('=') != 1) {
+                String[] keyAndValue = field.split("=");
+                headerParams.put(keyAndValue[0], keyAndValue[1]);
+            }
+        }
+        return headerParams;
+    }
 }
diff --git a/test/freenet/clients/http/utils/UriFilterProxyHeaderParserTest.java b/test/freenet/clients/http/utils/UriFilterProxyHeaderParserTest.java
@@ -2,8 +2,6 @@
 
 import static org.junit.Assert.assertTrue;
 
-import java.util.HashMap;
-
 import org.junit.Test;
 
 import freenet.config.Config;
@@ -287,8 +285,7 @@ private void testUriPrefixMatchesExpected(
         fakeBindToOption(fProxyBindTo),
         uriScheme,
         uriHost,
-        headers,
-        new HashMap<>())
+        headers)
         .toString();
     assertTrue(
         String.format(