From 7d0aba3a2c4965cf2a93f233ceee24bcb01e2ca4 Mon Sep 17 00:00:00 2001
From: Santiago Pericasgeertsen <santiago.pericasgeertsen@oracle.com>
Date: Fri, 5 Feb 2021 08:47:00 -0500
Subject: [PATCH] Allow override of Jersey property via config (#2737)

* Allow the default value of property jersey.config.client.ignoreExceptionResponse to be overridden via config. New test.

Signed-off-by: Santiago Pericasgeertsen <santiago.pericasgeertsen@oracle.com>

* Fixed copyright year.

Signed-off-by: Santiago Pericasgeertsen <santiago.pericasgeertsen@oracle.com>
---
 microprofile/server/pom.xml                   |  7 ++-
 .../server/JerseyPropertiesTest.java          | 49 +++++++++++++++++++
 .../webserver/jersey/JerseySupport.java       | 20 +++++---
 3 files changed, 67 insertions(+), 9 deletions(-)
 create mode 100644 microprofile/server/src/test/java/io/helidon/microprofile/server/JerseyPropertiesTest.java

diff --git a/microprofile/server/pom.xml b/microprofile/server/pom.xml
index cebe9ab1a73..046918d1014 100644
--- a/microprofile/server/pom.xml
+++ b/microprofile/server/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018, 2020 Oracle and/or its affiliates.
+    Copyright (c) 2018, 2021 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -137,5 +137,10 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>io.helidon.microprofile.tests</groupId>
+            <artifactId>helidon-microprofile-tests-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>
diff --git a/microprofile/server/src/test/java/io/helidon/microprofile/server/JerseyPropertiesTest.java b/microprofile/server/src/test/java/io/helidon/microprofile/server/JerseyPropertiesTest.java
new file mode 100644
index 00000000000..2fae2989943
--- /dev/null
+++ b/microprofile/server/src/test/java/io/helidon/microprofile/server/JerseyPropertiesTest.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2021 Oracle and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.helidon.microprofile.server;
+
+import javax.inject.Inject;
+
+import io.helidon.config.Config;
+import io.helidon.microprofile.tests.junit5.AddConfig;
+import io.helidon.microprofile.tests.junit5.HelidonTest;
+import io.helidon.webserver.jersey.JerseySupport;
+import org.junit.jupiter.api.Test;
+
+import static org.glassfish.jersey.client.ClientProperties.IGNORE_EXCEPTION_RESPONSE;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+/**
+ * Test that it is possible to override {@code IGNORE_EXCEPTION_RESPONSE} in
+ * Jersey using config. See {@link io.helidon.webserver.jersey.JerseySupport}
+ * for more information.
+ */
+@HelidonTest
+@AddConfig(key = IGNORE_EXCEPTION_RESPONSE, value = "false")
+class JerseyPropertiesTest {
+
+    @Inject
+    Config config;
+
+    @Test
+    void testIgnoreExceptionResponseOverride() {
+        JerseySupport jerseySupport = JerseySupport.builder().config(config).build();
+        assertNotNull(jerseySupport);
+        assertThat(System.getProperty(IGNORE_EXCEPTION_RESPONSE), is("false"));
+    }
+}
diff --git a/webserver/jersey/src/main/java/io/helidon/webserver/jersey/JerseySupport.java b/webserver/jersey/src/main/java/io/helidon/webserver/jersey/JerseySupport.java
index a7d45855e9e..f4b8de3b43e 100644
--- a/webserver/jersey/src/main/java/io/helidon/webserver/jersey/JerseySupport.java
+++ b/webserver/jersey/src/main/java/io/helidon/webserver/jersey/JerseySupport.java
@@ -42,6 +42,7 @@
 import io.helidon.common.http.Http;
 import io.helidon.common.http.HttpRequest;
 import io.helidon.config.Config;
+import io.helidon.config.ConfigValue;
 import io.helidon.webserver.Handler;
 import io.helidon.webserver.HttpException;
 import io.helidon.webserver.Routing;
@@ -108,17 +109,10 @@ public class JerseySupport implements Service {
     private final Thread serviceShutdownHook;
 
     /**
-     * This configuration via system properties is for the Jersey Client API. Any
-     * response in an exception will be mapped to an empty one to prevent data leaks.
-     * See https://github.com/eclipse-ee4j/jersey/pull/4641.
+     * If set to {@code "true"}, Jersey will ignore responses in exceptions.
      */
     static final String IGNORE_EXCEPTION_RESPONSE = "jersey.config.client.ignoreExceptionResponse";
 
-    static {
-         System.setProperty(CommonProperties.ALLOW_SYSTEM_PROPERTIES_PROVIDER, "true");
-         System.setProperty(IGNORE_EXCEPTION_RESPONSE, "true");
-    }
-
     /**
      * Creates a Jersey Support based on the provided JAX-RS application.
      *
@@ -148,6 +142,16 @@ private JerseySupport(Builder builder) {
 
         this.appHandler = new ApplicationHandler(builder.resourceConfig, new ServerBinder(executorService));
         this.container = new HelidonJerseyContainer(appHandler, builder.resourceConfig);
+
+        // This configuration via system properties is for the Jersey Client API. Any
+        // response in an exception will be mapped to an empty one to prevent data leaks
+        // unless property in config is set to false.
+        // See https://github.com/eclipse-ee4j/jersey/pull/4641.
+        if (!System.getProperties().contains(IGNORE_EXCEPTION_RESPONSE)) {
+            System.setProperty(CommonProperties.ALLOW_SYSTEM_PROPERTIES_PROVIDER, "true");
+            ConfigValue<String> ignore = builder.config.get(IGNORE_EXCEPTION_RESPONSE).asString();
+            System.setProperty(IGNORE_EXCEPTION_RESPONSE, ignore.orElse("true"));
+        }
     }
 
     @Override