Skip to content

Consumer: fix set data validation #4138

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
LKuemmel merged 3 commits into from
Oct 19, 2026
Merged

Consumer: fix set data validation #4138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d0a133b
Consumer: fix set data validation
LKuemmel Oct 19, 2026
cf48887
fix pytest
LKuemmel Oct 19, 2026
bfd5129
Review
LKuemmel Oct 19, 2026
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: 6 additions & 6 deletions packages/helpermodules/command.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1206,12 +1206,12 @@ def addConsumer(self, connection_id: str, payload: dict) -> None:
pub_user_message(payload, connection_id,
str(e),
MessageType.ERROR)
Pub().pub(f'openWB/set/consumer/{new_id}/module', consumer_default)
Pub().pub(f"openWB/set/consumer/{new_id}/config", asdict(ConsumerConfig()))
self._publish_default_metadata_fields(f"openWB/set/consumer/{new_id}", ConsumerGet())
self._publish_default_metadata_fields(f"openWB/set/consumer/{new_id}", ConsumerSet())
Pub().pub(f"openWB/set/consumer/{new_id}/extra_meter", None)
Pub().pub(f"openWB/set/consumer/{new_id}/usage", asdict(Usage(type=consumer_default["usage"][0])))
Pub().pub(f'openWB/consumer/{new_id}/module', consumer_default)
Pub().pub(f"openWB/consumer/{new_id}/config", asdict(ConsumerConfig()))
self._publish_default_metadata_fields(f"openWB/consumer/{new_id}", ConsumerGet())
self._publish_default_metadata_fields(f"openWB/consumer/{new_id}", ConsumerSet())
Pub().pub(f"openWB/consumer/{new_id}/extra_meter", None)
Pub().pub(f"openWB/consumer/{new_id}/usage", asdict(Usage(type=consumer_default["usage"][0])))
self.max_id_hierarchy = new_id
Pub().pub("openWB/set/command/max_id/hierarchy", new_id)
# add ACL roles for consumer access, if user management is active
Expand Down
2 changes: 1 addition & 1 deletion packages/helpermodules/command_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ def test_add_consumer_uses_module_default_usage_type(usage_type, mock_pub, monke
command_instance.addConsumer("test", {"data": {"vendor": "test", "type": "test_consumer"}})

usage_calls = [call for call in mock_pub.pub.call_args_list
if call.args[0] == "openWB/set/consumer/1/usage"]
if call.args[0] == "openWB/consumer/1/usage"]
assert len(usage_calls) == 1
assert usage_calls[0].args[1]["type"] == usage_type.value

Expand Down
89 changes: 47 additions & 42 deletions packages/helpermodules/setdata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1260,50 +1260,55 @@ def process_consumer_topic(self, msg):
"openWB/set/consumer/get/daily_imported" in msg.topic or
"openWB/set/consumer/get/daily_exported" in msg.topic):
self._validate_value(msg, float)
elif (re.search("openWB/set/consumer/[0-9]+/module$", msg.topic) is not None or
re.search("openWB/set/consumer/[0-9]+/module/simulation$", msg.topic) is not None or
re.search("openWB/set/consumer/[0-9]+/config$", msg.topic) is not None or
re.search("openWB/set/consumer/[0-9]+/usage$", msg.topic) is not None):
elif re.search("openWB/set/consumer/[0-9]+/config$", msg.topic) is not None:
self._validate_value(msg, "json")
elif re.search("openWB/set/consumer/[0-9]+/extra_meter$", msg.topic) is not None:
self._validate_value(msg, int)
elif (re.search("consumer/[0-9]+/get/power$", msg.topic) is not None or
re.search("consumer/[0-9]+/set/power$", msg.topic) is not None or
re.search("consumer/[0-9]+/set/current$", msg.topic) is not None or
re.search("consumer/[0-9]+/set/on_time$", msg.topic) is not None or
re.search("consumer/[0-9]+/set/plug_time$", msg.topic) is not None or
re.search("consumer/[0-9]+/set/timestamp_last_current_set$", msg.topic) is not None or
re.search("consumer/[0-9]+/set/timestamp_wrote_last_on_time$", msg.topic) is not None or
re.search("consumer/[0-9]+/get/set_power$", msg.topic) is not None):
self._validate_value(msg, float)
elif (re.search("consumer/[0-9]+/get/currents$", msg.topic) is not None or
re.search("consumer/[0-9]+/get/voltages$", msg.topic) is not None or
re.search("consumer/[0-9]+/get/powers$", msg.topic) is not None or
re.search("consumer/[0-9]+/get/temperatures$", msg.topic) is not None):
self._validate_value(msg, float, collection=list)
elif (re.search("consumer/[0-9]+/get/exported$", msg.topic) is not None or
re.search("consumer/[0-9]+/get/imported$", msg.topic) is not None or
re.search("consumer/[0-9]+/get/daily_exported$", msg.topic) is not None or
re.search("consumer/[0-9]+/get/daily_imported$", msg.topic) is not None):
self._validate_value(msg, float, [(0, float("inf"))])
elif (re.search("consumer/[0-9]+/get/fault_state$", msg.topic) is not None or
re.search("consumer/get/fault_state$", msg.topic) is not None):
self._validate_value(msg, int, [(0, 2)])
elif (re.search("consumer/get/fault_str$", msg.topic) is not None or
re.search("consumer/[0-9]+/get/fault_str$", msg.topic) is not None or
re.search("consumer/[0-9]+/get/state_str$", msg.topic) is not None or
re.search("consumer/[0-9]+/set/wait_for_start_state$", msg.topic) is not None):
self._validate_value(msg, str)
elif (re.search("consumer/[0-9]+/get/charge_state$", msg.topic) is not None or
re.search("consumer/[0-9]+/get/plug_state$", msg.topic) is not None or
re.search("consumer/[0-9]+/get/state$", msg.topic) is not None):
self._validate_value(msg, bool)
elif re.search("consumer/[0-9]+/set/phases_to_use$", msg.topic) is not None:
self._validate_value(msg, int, [(0, 3)])
elif re.search("consumer/[0-9]+/control_parameter/", msg.topic) is not None:
self.process_control_parameter_topics(msg)
elif subdata.SubData.consumer_data.get(f"consumer{get_index(msg.topic)}"):
if (re.search("openWB/set/consumer/[0-9]+/module$", msg.topic) is not None or
re.search("openWB/set/consumer/[0-9]+/module/simulation$", msg.topic) is not None or
re.search("openWB/set/consumer/[0-9]+/config$", msg.topic) is not None or
re.search("openWB/set/consumer/[0-9]+/usage$", msg.topic) is not None):
self._validate_value(msg, "json")
elif re.search("openWB/set/consumer/[0-9]+/extra_meter$", msg.topic) is not None:
self._validate_value(msg, int)
elif (re.search("consumer/[0-9]+/get/power$", msg.topic) is not None or
re.search("consumer/[0-9]+/set/power$", msg.topic) is not None or
re.search("consumer/[0-9]+/set/current$", msg.topic) is not None or
re.search("consumer/[0-9]+/set/on_time$", msg.topic) is not None or
re.search("consumer/[0-9]+/set/plug_time$", msg.topic) is not None or
re.search("consumer/[0-9]+/set/timestamp_last_current_set$", msg.topic) is not None or
re.search("consumer/[0-9]+/set/timestamp_wrote_last_on_time$", msg.topic) is not None or
re.search("consumer/[0-9]+/get/set_power$", msg.topic) is not None):
self._validate_value(msg, float)
elif (re.search("consumer/[0-9]+/get/currents$", msg.topic) is not None or
re.search("consumer/[0-9]+/get/voltages$", msg.topic) is not None or
re.search("consumer/[0-9]+/get/powers$", msg.topic) is not None or
re.search("consumer/[0-9]+/get/temperatures$", msg.topic) is not None):
self._validate_value(msg, float, collection=list)
elif (re.search("consumer/[0-9]+/get/exported$", msg.topic) is not None or
re.search("consumer/[0-9]+/get/imported$", msg.topic) is not None or
re.search("consumer/[0-9]+/get/daily_exported$", msg.topic) is not None or
re.search("consumer/[0-9]+/get/daily_imported$", msg.topic) is not None):
self._validate_value(msg, float, [(0, float("inf"))])
elif (re.search("consumer/[0-9]+/get/fault_state$", msg.topic) is not None or
re.search("consumer/get/fault_state$", msg.topic) is not None):
self._validate_value(msg, int, [(0, 2)])
elif (re.search("consumer/get/fault_str$", msg.topic) is not None or
re.search("consumer/[0-9]+/get/fault_str$", msg.topic) is not None or
re.search("consumer/[0-9]+/get/state_str$", msg.topic) is not None or
re.search("consumer/[0-9]+/set/wait_for_start_state$", msg.topic) is not None):
self._validate_value(msg, str)
elif (re.search("consumer/[0-9]+/get/charge_state$", msg.topic) is not None or
re.search("consumer/[0-9]+/get/plug_state$", msg.topic) is not None or
re.search("consumer/[0-9]+/get/state$", msg.topic) is not None):
self._validate_value(msg, bool)
elif re.search("consumer/[0-9]+/set/phases_to_use$", msg.topic) is not None:
self._validate_value(msg, int, [(0, 3)])
elif re.search("consumer/[0-9]+/control_parameter/", msg.topic) is not None:
self.process_control_parameter_topics(msg)
else:
self.__unknown_topic(msg)
else:
self.__unknown_topic(msg)
self.__unknown_id(msg)
except Exception:
log.exception(f"Fehler im setdata-Modul: Topic {msg.topic}, Value: {msg.payload}")

Expand Down
Loading