From b2393b4fa9418db2db543c0f3939c877cc18c9dd Mon Sep 17 00:00:00 2001
From: paphko <git@paphko.de>
Date: Mon, 11 Mar 2019 20:48:15 +0100
Subject: [PATCH] Anel binding: mask pwd in log entries; issue #5716

---
 .../binding/anel/internal/AnelConnectorThread.java   | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/bundles/binding/org.openhab.binding.anel/src/main/java/org/openhab/binding/anel/internal/AnelConnectorThread.java b/bundles/binding/org.openhab.binding.anel/src/main/java/org/openhab/binding/anel/internal/AnelConnectorThread.java
index 5d6979b61dd..8005808e486 100644
--- a/bundles/binding/org.openhab.binding.anel/src/main/java/org/openhab/binding/anel/internal/AnelConnectorThread.java
+++ b/bundles/binding/org.openhab.binding.anel/src/main/java/org/openhab/binding/anel/internal/AnelConnectorThread.java
@@ -93,6 +93,10 @@ class AnelConnectorThread extends Thread {
         connector = new AnelUDPConnector(host, udpReceivePort, udpSendPort);
     }
 
+    private String maskPwd(String s) {
+        return s == null || password == null ? s : s.replace(password, "*****");
+    }
+
     /**
      * Switch relay on or off.
      *
@@ -123,11 +127,11 @@ void sendSwitch(int switchNr, boolean newState) {
                 // Format to switch off: Sw_off<nr><user><pwd>
                 // Example: Sw_on3adminanel
                 final String cmd = "Sw_" + (newState ? "on" : "off") + switchNr + user + password;
-                logger.debug("Sending to " + connector.host + ":" + connector.receivePort + " -> " + cmd);
+                logger.debug(maskPwd("Sending to " + connector.host + ":" + connector.receivePort + " -> " + cmd));
                 try {
                     connector.sendDatagram(cmd.getBytes());
                 } catch (Exception e) {
-                    logger.error("Error occurred when sending UDP data to Anel device: " + cmd, e);
+                    logger.error(maskPwd("Error occurred when sending UDP data to Anel device: " + cmd, e));
                 }
             } else {
                 logger.debug("switch " + switchNr + " is locked, nothing sent.");
@@ -172,14 +176,14 @@ protected void sendIO(int ioNr, boolean newState) {
         // Format to switch off: IO_off<nr><user><pwd>
         // Example: IO_on3adminanel
         final String cmd = "IO_" + (newState ? "on" : "off") + ioNr + user + password;
-        logger.debug("Sending to " + state.host + ": " + cmd);
+        logger.debug(maskPwd("Sending to " + state.host + ": " + cmd));
         try {
             connector.sendDatagram(cmd.getBytes());
         } catch (Exception e) {
             if (e.getCause() instanceof UnknownHostException) {
                 logger.error("Could not check status of Anel device '" + state.host + "'");
             } else {
-                logger.error("Error occurred when sending UDP data to Anel device: " + cmd, e);
+                logger.error(maskPwd("Error occurred when sending UDP data to Anel device: " + cmd), e);
             }
         }
     }