From 0d9e91328fd118b39da23a85fdd4d4a5b6fa246d Mon Sep 17 00:00:00 2001 From: lolodomo Date: Mon, 25 May 2020 04:48:08 +0200 Subject: [PATCH] [weatherunderground] Log URL with masked API key (#7756) * [weatherunderground] Log URL with masked API key Relative to #3990 * Add isDebugEnabled Signed-off-by: Laurent Garnier Signed-off-by: Daan Meijer --- .../internal/handler/WeatherUndergroundHandler.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/bundles/org.openhab.binding.weatherunderground/src/main/java/org/openhab/binding/weatherunderground/internal/handler/WeatherUndergroundHandler.java b/bundles/org.openhab.binding.weatherunderground/src/main/java/org/openhab/binding/weatherunderground/internal/handler/WeatherUndergroundHandler.java index a321e50c4e8a6..454961005d97d 100644 --- a/bundles/org.openhab.binding.weatherunderground/src/main/java/org/openhab/binding/weatherunderground/internal/handler/WeatherUndergroundHandler.java +++ b/bundles/org.openhab.binding.weatherunderground/src/main/java/org/openhab/binding/weatherunderground/internal/handler/WeatherUndergroundHandler.java @@ -535,9 +535,7 @@ private boolean updateWeatherData(Set features) { try { WeatherUndergroundConfiguration config = getConfigAs(WeatherUndergroundConfiguration.class); - String urlStr = URL_QUERY.replace("%APIKEY%", StringUtils.trimToEmpty(bridgeHandler.getApikey())); - - urlStr = urlStr.replace("%FEATURES%", String.join("/", features)); + String urlStr = URL_QUERY.replace("%FEATURES%", String.join("/", features)); String lang = StringUtils.trimToEmpty(config.language); if (lang.isEmpty()) { @@ -553,7 +551,11 @@ private boolean updateWeatherData(Set features) { } urlStr = urlStr.replace("%QUERY%", StringUtils.trimToEmpty(config.location)); - logger.debug("URL = {}", urlStr); + if (logger.isDebugEnabled()) { + logger.debug("URL = {}", urlStr.replace("%APIKEY%", "***")); + } + + urlStr = urlStr.replace("%APIKEY%", StringUtils.trimToEmpty(bridgeHandler.getApikey())); // Run the HTTP request and get the JSON response from Weather Underground String response = null;