TS-40767 apply shouldValidateSsl option before attempting to contact …

…Teamscale
cqse · Oct 28, 2024 · 3921d33 · 3921d33
1 parent ab5d9a5
commit 3921d33
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/agent/src/main/java/com/teamscale/jacoco/agent/PreMain.java b/agent/src/main/java/com/teamscale/jacoco/agent/PreMain.java
@@ -129,7 +129,6 @@ private static AgentOptions getAndApplyAgentOptions(String options, String envir
 		initializeLogging(agentOptions, delayedLogger);
 		Logger logger = LoggingUtils.getLogger(Agent.class);
 		delayedLogger.logTo(logger);
-		HttpUtils.setShouldValidateSsl(agentOptions.shouldValidateSsl());
 		return agentOptions;
 	}
 

diff --git a/agent/src/main/java/com/teamscale/jacoco/agent/options/AgentOptionsParser.java b/agent/src/main/java/com/teamscale/jacoco/agent/options/AgentOptionsParser.java
@@ -6,6 +6,7 @@
 package com.teamscale.jacoco.agent.options;
 
 import com.google.common.annotations.VisibleForTesting;
+import com.teamscale.client.HttpUtils;
 import com.teamscale.client.ProxySystemProperties;
 import com.teamscale.client.StringUtils;
 import com.teamscale.client.TeamscaleProxySystemProperties;
@@ -107,6 +108,7 @@ public static AgentOptions parse(String optionsString, String environmentConfigI
 		// we have to put the proxy options into system properties before reading the configuration from Teamscale as we
 		// might need them to connect to Teamscale
 		putTeamscaleProxyOptionsIntoSystemProperties(options);
+		HttpUtils.setShouldValidateSsl(options.shouldValidateSsl());
 
 		handleConfigId(options);
 		handleConfigFile(options);