From 437f944e7c18f1cbbea7a39f61246e3ff3496098 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20Gond=C5=BEa?= <ogondza@gmail.com> Date: Tue, 16 Oct 2018 14:25:45 +0200 Subject: [PATCH] Make NovaErrorHandler logging of sensitive information configurable --- .../openstack/nova/v2_0/handlers/NovaErrorHandler.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/handlers/NovaErrorHandler.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/handlers/NovaErrorHandler.java index 01fd2e8022..67a4930d9e 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/handlers/NovaErrorHandler.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/handlers/NovaErrorHandler.java @@ -26,8 +26,10 @@ import java.util.Set; import javax.annotation.Resource; import javax.inject.Inject; +import javax.inject.Named; import javax.inject.Singleton; +import org.jclouds.Constants; import org.jclouds.date.DateCodecFactory; import org.jclouds.fallbacks.HeaderToRetryAfterException; import org.jclouds.http.HttpCommand; @@ -52,6 +54,10 @@ import com.google.common.collect.ImmutableSet; @Singleton public class NovaErrorHandler implements HttpErrorHandler { + @com.google.inject.Inject(optional = true) + @Named(Constants.PROPERTY_LOGGER_WIRE_LOG_SENSITIVE_INFO) + private boolean logSensitiveInformation = false; + @Resource protected Logger logger = Logger.NULL; protected final HeaderToRetryAfterException retryAfterParser; @@ -76,7 +82,7 @@ public class NovaErrorHandler implements HttpErrorHandler { String content = data != null ? emptyToNull(new String(data)) : null; Exception exception = content != null ? new HttpResponseException(command, response, content) - : new HttpResponseException(command, response); + : new HttpResponseException(command, response, logSensitiveInformation); String requestLine = command.getCurrentRequest().getRequestLine(); String message = content != null ? content : String.format("%s -> %s", requestLine, response.getStatusLine()); switch (response.getStatusCode()) {