Skip to content

TS-40767 apply shouldValidateSsl option before attempting to contact … #591

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
flameJam wants to merge 1 commit into
base: master
Choose a base branch
from
+2 −1
Open

TS-40767 apply shouldValidateSsl option before attempting to contact … #591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion agent/src/main/java/com/teamscale/jacoco/agent/PreMain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 2 additions & 0 deletions agent/src/main/java/com/teamscale/jacoco/agent/options/AgentOptionsParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down