better ssl

cip4 · Jun 16, 2023 · ee3b9c9 · ee3b9c9
1 parent ee90f7a
commit ee3b9c9
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 10 deletions.
diff --git a/src/main/java/org/cip4/jdfutility/server/BambiRequestCustomizer.java b/src/main/java/org/cip4/jdfutility/server/BambiRequestCustomizer.java
@@ -83,19 +83,22 @@ protected void customize(SSLEngine sslEngine, Request request)
 
 			try
 			{
-				InetAddress add = InetAddress.getByName(server);
-				if (InetAddress.getLocalHost().equals(add) || "localhost".equalsIgnoreCase(add.getHostName()))
+				InetAddress[] adds = InetAddress.getAllByName(server);
+				for (InetAddress add : adds)
 				{
-					String message = "bypassing sni for " + server;
-					if (logged.add(message))
+					if (InetAddress.getLocalHost().equals(add) || "localhost".equalsIgnoreCase(add.getHostName()) || add.isLoopbackAddress())
 					{
-						log.warn(message);
+						String message = "bypassing sni for " + server;
+						if (logged.add(message))
+						{
+							log.warn(message);
+						}
+						BambiRequestCustomizer delegate = new BambiRequestCustomizer(this);
+						delegate.setSniHostCheck(false);
+						delegate.setSniRequired(false);
+						delegate.delegate(sslEngine, request);
+						return;
 					}
-					BambiRequestCustomizer delegate = new BambiRequestCustomizer(this);
-					delegate.setSniHostCheck(false);
-					delegate.setSniRequired(false);
-					delegate.delegate(sslEngine, request);
-					return;
 				}
 			}
 			catch (UnknownHostException e)

diff --git a/src/test/java/org/cip4/jdfutility/server/BambiRequestCustomizerTest.java b/src/test/java/org/cip4/jdfutility/server/BambiRequestCustomizerTest.java
@@ -74,9 +74,19 @@ public void testCustomize() throws UnknownHostException
 
 		Mockito.when(request.getServerName()).thenReturn("localhost");
 		rq.customize(e, request);
+		Mockito.when(request.getServerName()).thenReturn("127.0.0.1");
+		rq.customize(e, request);
 
 		Mockito.when(request.getServerName()).thenReturn(InetAddress.getLocalHost().getHostName());
 		rq.customize(e, request);
+		Mockito.when(request.getServerName()).thenReturn(InetAddress.getLocalHost().getHostName().toLowerCase());
+		rq.customize(e, request);
+		Mockito.when(request.getServerName()).thenReturn(InetAddress.getLocalHost().getHostName().toUpperCase());
+		rq.customize(e, request);
+		Mockito.when(request.getServerName()).thenReturn(InetAddress.getLocalHost().getHostAddress());
+		rq.customize(e, request);
+		Mockito.when(request.getServerName()).thenReturn(InetAddress.getLocalHost().getCanonicalHostName());
+		rq.customize(e, request);
 
 	}