dandri/zigbee2mqtt
1
0
Fork 0
mirror of https://github.com/Koenkk/zigbee2mqtt.git synced 2026-08-22 02:29:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Don't allow publishing wildcards in MQTT topic (#27025)

Browse Source
This commit is contained in:
Koen Kanters
2025-04-08 20:26:22 +02:00
committed by GitHub
parent 17adc44a63
commit 850f0820ac
2 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/mqtt.ts
+6
View File
@@ -176,6 +176,12 @@ export default class MQTT {
skipLog = false,
skipReceive = true,
): Promise<void> {
if (topic.includes('+') || topic.includes('#')) {
// https://github.com/Koenkk/zigbee2mqtt/issues/26939#issuecomment-2772309646
logger.error(`Topic '${topic}' includes wildcard characters, skipping publish.`);
return;
}
const defaultOptions = {qos: 0 as const, retain: false};
topic = `${base}/${topic}`;
test/controller.test.ts
+14
View File
@@ -283,6 +283,20 @@ describe('Controller', () => {
controller.mqtt.client.reconnecting = false;
});
it('Should not allow publishing wildcard characters in topic', async () => {
await controller.start();
await flushPromises();
mockMQTTPublishAsync.mockClear();
// @ts-expect-error private
await controller.mqtt.publish('z2m/#/status', 'empty');
expect(mockMQTTPublishAsync).toHaveBeenCalledTimes(0);
expect(mockLogger.error).toHaveBeenCalledWith(`Topic 'z2m/#/status' includes wildcard characters, skipping publish.`);
// @ts-expect-error private
await controller.mqtt.publish('z2m/+/status', 'empty');
expect(mockMQTTPublishAsync).toHaveBeenCalledTimes(0);
expect(mockLogger.error).toHaveBeenCalledWith(`Topic 'z2m/+/status' includes wildcard characters, skipping publish.`);
});
it('Load empty state when state file does not exist', async () => {
data.removeState();
await controller.start();