From e325994234613f9e7189fa8aca376ed199f1253e Mon Sep 17 00:00:00 2001
From: Luca Carettoni <luca@doyensec.com>
Date: Sat, 17 Aug 2024 16:52:32 +0200
Subject: [PATCH] Fix for issue #106 as discussed

---
 .../java/com/google/tsunami/common/net/http/HttpClient.java | 2 --
 .../tsunami/common/net/http/HttpClientCliOptions.java       | 1 +
 .../google/tsunami/common/net/http/HttpClientModule.java    | 2 +-
 .../google/tsunami/common/net/http/OkHttpHttpClient.java    | 6 ------
 4 files changed, 2 insertions(+), 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
index ae4a85f3..4b10cf50 100644
--- 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
index 12b65395..cd32ff33 100644
--- 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
index 40c9c785..97844f7c 100644
--- 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
index b463bf82..1f187bcf 100644
--- 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;