[brooklyn-server] branch master updated: make trustAll configuration trump trustSelfSigned

[he...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git


The following commit(s) were added to refs/heads/master by this push:
     new 19fb343285 make trustAll configuration trump trustSelfSigned
19fb343285 is described below

commit 19fb34328551acc253fa6d27c2410937e0fdedaf
Author: Alex Heneveld <al...@cloudsoft.io>
AuthorDate: Sun Jul 31 21:31:54 2022 +0100

    make trustAll configuration trump trustSelfSigned
---
 .../org/apache/brooklyn/util/core/javalang/BrooklynHttpConfig.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/apache/brooklyn/util/core/javalang/BrooklynHttpConfig.java b/core/src/main/java/org/apache/brooklyn/util/core/javalang/BrooklynHttpConfig.java
index db470eb5e9..992fca122d 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/javalang/BrooklynHttpConfig.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/javalang/BrooklynHttpConfig.java
@@ -118,7 +118,7 @@ public class BrooklynHttpConfig {
         HttpTool.HttpClientBuilder hcb = HttpTool.httpClientBuilder();
         if (defaultLaxAndTrusting) {
             hcb.trustAll(true);
-            hcb.trustSelfSigned(true);
+            // hcb.trustSelfSigned(true);   // don't set this as trustAll trumps it
             hcb.laxRedirect(true);
         }
         if (lookForContextEntity) {
@@ -152,4 +152,5 @@ public class BrooklynHttpConfig {
     // HttpExecutorImpl -- only used with config supplied by above
     // HttpExecutorFactory not set, except in tests; our HttpExecutorFactoryImpl only used in tests
     // HttpConfig.Builder -- all uses routed through here
+
 }