Merge pull request #118 from doyensec:fixed_issue_106

PiperOrigin-RevId: 664842400 Change-Id: Idd8cec64fac4e8825032a938ca37ea8881f3f766
google · Aug 19, 2024 · 267bafd · 267bafd
2 parents 315dfe1 + e325994
commit 267bafd
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 9 deletions.
diff --git a/common/src/main/java/com/google/tsunami/common/net/http/HttpClient.java b/common/src/main/java/com/google/tsunami/common/net/http/HttpClient.java
@@ -93,8 +93,6 @@ public abstract static class Builder<T extends HttpClient> {
 
     public abstract Builder<T> setFollowRedirects(boolean followRedirects);
 
-    public abstract Builder<T> setTrustAllCertificates(boolean trustAllCertificates);
-
     public abstract Builder<T> setLogId(String logId);
 
     public abstract Builder<T> setConnectTimeout(Duration connectionTimeout);

diff --git a/common/src/main/java/com/google/tsunami/common/net/http/HttpClientCliOptions.java b/common/src/main/java/com/google/tsunami/common/net/http/HttpClientCliOptions.java
@@ -27,6 +27,7 @@ public final class HttpClientCliOptions implements CliOption {
 
   @Parameter(
       names = "--http-client-trust-all-certificates",
+      arity = 1,
       description = "Whether the HTTP client should trust all certificates on HTTPS traffic.")
   public Boolean trustAllCertificates;
 

diff --git a/common/src/main/java/com/google/tsunami/common/net/http/HttpClientModule.java b/common/src/main/java/com/google/tsunami/common/net/http/HttpClientModule.java
@@ -171,7 +171,7 @@ boolean shouldTrustAllCertificates(
     if (httpClientConfigProperties.trustAllCertificates != null) {
       return httpClientConfigProperties.trustAllCertificates;
     }
-    return false;
+    return true;
   }
 
   @Provides

diff --git a/common/src/main/java/com/google/tsunami/common/net/http/OkHttpHttpClient.java b/common/src/main/java/com/google/tsunami/common/net/http/OkHttpHttpClient.java
@@ -374,12 +374,6 @@ public OkHttpHttpClientBuilder setFollowRedirects(boolean followRedirects) {
       return this;
     }
 
-    @Override
-    public OkHttpHttpClientBuilder setTrustAllCertificates(boolean trustAllCertificates) {
-      this.trustAllCertificates = trustAllCertificates;
-      return this;
-    }
-
     @Override
     public OkHttpHttpClientBuilder setLogId(String logId) {
       this.logId = logId;