这是indexloc提供的服务，不要输入任何密码
Skip to content
This repository was archived by the owner on May 17, 2021. It is now read-only.

[anel] Added Masking of passwords in log entries #5828

Merged
merged 1 commit into from
Dec 8, 2019
Merged

[anel] Added Masking of passwords in log entries #5828

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions ...hab.binding.anel/src/main/java/org/openhab/binding/anel/internal/AnelConnectorThread.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
Expand Down Expand Up @@ -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.");
Expand Down Expand Up @@ -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);
}
}
}
Expand Down