fix certificate adjacency list logging with java.net.http client

The SSLHandshakeException is wrapped in an IOException
runelite · Mar 12, 2024 · 6edc722 · 6edc722
1 parent 602ae31
commit 6edc722
Showing 1 changed file with 4 additions and 15 deletions.
diff --git a/src/main/java8/net/runelite/launcher/CertPathExtractor.java b/src/main/java8/net/runelite/launcher/CertPathExtractor.java
@@ -24,7 +24,6 @@
  */
 package net.runelite.launcher;
 
-import javax.net.ssl.SSLHandshakeException;
 import sun.security.provider.certpath.AdjacencyList;
 import sun.security.provider.certpath.SunCertPathBuilderException;
 import sun.security.validator.ValidatorException;
@@ -33,22 +32,12 @@ class CertPathExtractor
 {
 	static String extract(Throwable ex)
 	{
+		// IOException -> SSLHandshakeException -> ValidatorException -> SunCertPathBuilderException
 		try
 		{
-			if (ex instanceof SSLHandshakeException)
-			{
-				ex = ex.getCause();
-				if (ex instanceof ValidatorException)
-				{
-					ex = ex.getCause();
-					if (ex instanceof SunCertPathBuilderException)
-					{
-						SunCertPathBuilderException pathBuilderEx = (SunCertPathBuilderException) ex;
-						AdjacencyList adjList = pathBuilderEx.getAdjacencyList();
-						return adjList.toString();
-					}
-				}
-			}
+			SunCertPathBuilderException pathBuilderEx = (SunCertPathBuilderException) ex.getCause().getCause().getCause();
+			AdjacencyList adjList = pathBuilderEx.getAdjacencyList();
+			return adjList.toString();
 		}
 		catch (Throwable ex_)
 		{