allow full part match

danthe1st · Mar 1, 2024 · 2433397 · 2433397
1 parent 6b00a60
commit 2433397
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,7 +2,7 @@
 *.crt
 *.pem
 .secret
-ignoredHosts.txt
+intercept.yaml
 
 # Created by https://www.toptal.com/developers/gitignore/api/eclipse,maven,java,intellij+all
 # Edit at https://www.toptal.com/developers/gitignore?templates=eclipse,maven,java,intellij+all

diff --git a/src/main/java/io/github/danthe1st/httpsintercept/config/HostMatcher.java b/src/main/java/io/github/danthe1st/httpsintercept/config/HostMatcher.java
@@ -46,11 +46,11 @@ private boolean doesMatchPart(String hostname) {
 		}
 
 		int index = 0;
-		while((index = hostname.indexOf('.', index) + 1) != 0 && index < hostname.length()){
+		do{
 			if(hostParts.contains(hostname.substring(index))){
 				return true;
 			}
-		}
+		}while((index = hostname.indexOf('.', index) + 1) != 0 && index < hostname.length());
 
 		return false;
 	}

diff --git a/src/test/java/io/github/danthe1st/httpsintercept/config/HostMatcherTests.java b/src/test/java/io/github/danthe1st/httpsintercept/config/HostMatcherTests.java
@@ -21,6 +21,16 @@ void testExactMatch() {
 		assertFalse(matcher.matches("github.com"));
 	}
 
+	@Test
+	void testEmptyPartMatch() {
+		HostMatcher matcher = new HostMatcher(
+				Collections.emptySet(),
+				Set.of(""),
+				Collections.emptySet()
+		);
+		assertFalse(matcher.matches("localhost"));
+	}
+
 	@Test
 	void testPartMatch() {
 		HostMatcher matcher = new HostMatcher(
@@ -31,7 +41,7 @@ void testPartMatch() {
 		assertTrue(matcher.matches("host.example.com"));
 		assertTrue(matcher.matches(".example.com"));
 		assertFalse(matcher.matches("host.github.com"));
-		assertFalse(matcher.matches("example.com"));
+		assertTrue(matcher.matches("example.com"));
 		assertFalse(matcher.matches("example.com."));
 		assertFalse(matcher.matches(""));
 		assertFalse(matcher.matches("."));