Skip to content

fix: handle null IDs and token in virtual heater #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matchews merged 1 commit into from
Sep 9, 2025
Merged

fix: handle null IDs and token in virtual heater #39

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
15 changes: 13 additions & 2 deletions ...g/openhab/binding/haywardomnilogiclocal/internal/handler/HaywardVirtualHeaterHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;

import org.eclipse.jdt.annotation.NonNullByDefault;
import org.openhab.binding.haywardomnilogiclocal.internal.HaywardBindingConstants;
Expand Down Expand Up @@ -121,6 +122,14 @@ public void handleCommand(ChannelUID channelUID, Command command) {
if (bridge != null && bridge.getHandler() instanceof HaywardBridgeHandler bridgehandler) {
String cmdString = this.cmdToString(command);
String cmdURL = null;
String token = bridgehandler.getAccount().getToken();

if (poolID == null || systemID == null || token == null) {
logger.warn("haywardCommand missing configuration (poolID={}, systemID={}, token={})", poolID,
systemID, token);
Comment on lines +127 to +129

@chatgpt-codex-connector chatgpt-codex-connector Bot Sep 9, 2025

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[P1] Stop logging authentication token

The warning emitted when any of poolID, systemID, or token is null logs the raw token value even when only one of the other fields is missing. The token is an account credential and this statement now leaks it at WARN level whenever misconfiguration occurs. Consider omitting the token entirely or masking it so that secret material is never written to logs.

Useful? React with 👍 / 👎.

return;
}

int mspId = Integer.parseInt(bridgehandler.getAccount().getMspSystemID());

if (command == OnOffType.ON) {
Expand All @@ -133,7 +142,8 @@ public void handleCommand(ChannelUID channelUID, Command command) {
switch (channelUID.getId()) {
case HaywardBindingConstants.CHANNEL_VIRTUALHEATER_ENABLE:
cmdURL = CommandBuilder.buildSetHeaterEnable(HaywardBindingConstants.COMMAND_PARAMETERS,
bridgehandler.getAccount().getToken(), mspId, poolID, systemID, cmdString);
Objects.requireNonNull(token), mspId, Objects.requireNonNull(poolID),
Objects.requireNonNull(systemID), cmdString);
break;

case HaywardBindingConstants.CHANNEL_VIRTUALHEATER_CURRENTSETPOINT:
Expand All @@ -146,7 +156,8 @@ public void handleCommand(ChannelUID channelUID, Command command) {
}

cmdURL = CommandBuilder.buildSetUIHeaterCmd(HaywardBindingConstants.COMMAND_PARAMETERS,
bridgehandler.getAccount().getToken(), mspId, poolID, systemID, cmdString);
Objects.requireNonNull(token), mspId, Objects.requireNonNull(poolID),
Objects.requireNonNull(systemID), cmdString);
break;
default:
logger.warn("haywardCommand Unsupported type {}", channelUID);
Expand Down