only initialize ignored hosts matcher once

danthe1st · Mar 8, 2024 · a23c751 · a23c751
1 parent be4dff8
commit a23c751
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/main/java/io/github/danthe1st/httpsintercept/handler/ServerHandlersInit.java b/src/main/java/io/github/danthe1st/httpsintercept/handler/ServerHandlersInit.java
@@ -33,7 +33,8 @@ public class ServerHandlersInit extends ChannelInitializer<SocketChannel> {
 	private final SNIHandlerMapping sniMapping;
 	private final Config config;
 
-	private IterativeHostMatcher<PreForwardRule> preForwardMatcher;
+	private final IterativeHostMatcher<PreForwardRule> preForwardMatcher;
+	private final IterativeHostMatcher<Object> ignoredHostMatcher;
 
 	public ServerHandlersInit(Bootstrap clientBootstrap, Config config) throws KeyStoreException, NoSuchAlgorithmException, CertificateException, IOException, UnrecoverableKeyException {
 		this.clientBootstrapTemplate = clientBootstrap;
@@ -50,11 +51,12 @@ public ServerHandlersInit(Bootstrap clientBootstrap, Config config) throws KeySt
 			rules.add(Map.entry(hostMatcher, preForwardRule));
 		}
 		preForwardMatcher = new IterativeHostMatcher<>(rules);
+		ignoredHostMatcher = new IterativeHostMatcher<>(List.of(Map.entry(config.ignoredHosts(), new Object())));
 	}
 
 	@Override
 	protected void initChannel(SocketChannel socketChannel) throws Exception {
-		SniHandler sniHandler = new CustomSniHandler(sniMapping, clientBootstrapTemplate, config);
+		SniHandler sniHandler = new CustomSniHandler(sniMapping, clientBootstrapTemplate, ignoredHostMatcher);
 		socketChannel.pipeline().addLast(
 				sniHandler,
 				new HttpServerCodec(),

diff --git a/src/main/java/io/github/danthe1st/httpsintercept/handler/sni/CustomSniHandler.java b/src/main/java/io/github/danthe1st/httpsintercept/handler/sni/CustomSniHandler.java
@@ -2,10 +2,8 @@
 
 import java.io.IOException;
 import java.util.Iterator;
-import java.util.List;
 import java.util.Map;
 
-import io.github.danthe1st.httpsintercept.config.Config;
 import io.github.danthe1st.httpsintercept.handler.raw.RawForwardIncomingRequestHandler;
 import io.github.danthe1st.httpsintercept.matcher.IterativeHostMatcher;
 import io.netty.bootstrap.Bootstrap;
@@ -26,10 +24,10 @@ public class CustomSniHandler extends SniHandler {
 
 	private final IterativeHostMatcher<Object> ignoredHosts;
 
-	public CustomSniHandler(Mapping<? super String, ? extends SslContext> mapping, Bootstrap clientBootstrapTemplate, Config config) throws IOException {
+	public CustomSniHandler(Mapping<? super String, ? extends SslContext> mapping, Bootstrap clientBootstrapTemplate, IterativeHostMatcher<Object> ignoredHostMatcher) throws IOException {
 		super(mapping);
 		this.clientBootstrapTemplate = clientBootstrapTemplate;
-		ignoredHosts = new IterativeHostMatcher<>(List.of(Map.entry(config.ignoredHosts(), new Object())));
+		ignoredHosts = ignoredHostMatcher;
 	}
 
 	@Override