From 2633db9d85ef00cc649013b4dc002dd3f71e28c2 Mon Sep 17 00:00:00 2001 From: Allen Porter Date: Sun, 21 Dec 2025 15:12:31 +0000 Subject: [PATCH 1/2] Redact additional unnecessary diagnostic fields --- homeassistant/components/roborock/diagnostics.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/homeassistant/components/roborock/diagnostics.py b/homeassistant/components/roborock/diagnostics.py index 02231909908cb..48f4cf539f176 100644 --- a/homeassistant/components/roborock/diagnostics.py +++ b/homeassistant/components/roborock/diagnostics.py @@ -13,7 +13,17 @@ _LOGGER = logging.getLogger(__name__) -TO_REDACT_CONFIG = ["token", "sn", "rruid", CONF_UNIQUE_ID, "username", "uid"] +TO_REDACT_CONFIG = [ + "token", + "sn", + "rruid", + CONF_UNIQUE_ID, + "username", + "uid", + "rriot", + "tuyaUuid", + "extra", +] async def async_get_config_entry_diagnostics( From 86cd2d90a22087c77f9fb1a3ce66c3a607c01dd8 Mon Sep 17 00:00:00 2001 From: Allen Porter Date: Sun, 21 Dec 2025 15:16:11 +0000 Subject: [PATCH 2/2] Update snapshots and diagnostic fields --- homeassistant/components/roborock/diagnostics.py | 7 ++++++- .../roborock/snapshots/test_diagnostics.ambr | 12 ++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/homeassistant/components/roborock/diagnostics.py b/homeassistant/components/roborock/diagnostics.py index 48f4cf539f176..642dd254c2179 100644 --- a/homeassistant/components/roborock/diagnostics.py +++ b/homeassistant/components/roborock/diagnostics.py @@ -20,7 +20,12 @@ CONF_UNIQUE_ID, "username", "uid", - "rriot", + "h", + "k", + "s", + "u", + "avatarurl", + "nickname", "tuyaUuid", "extra", ] diff --git a/tests/components/roborock/snapshots/test_diagnostics.ambr b/tests/components/roborock/snapshots/test_diagnostics.ambr index 6cc9db53a6ff4..5d79ea4458acf 100644 --- a/tests/components/roborock/snapshots/test_diagnostics.ambr +++ b/tests/components/roborock/snapshots/test_diagnostics.ambr @@ -4,22 +4,22 @@ 'config_entry': dict({ 'base_url': 'https://usiot.roborock.com', 'user_data': dict({ - 'avatarurl': 'https://files.roborock.com/iottest/default_avatar.png', + 'avatarurl': '**REDACTED**', 'country': 'US', 'countrycode': '1', - 'nickname': 'user_nickname', + 'nickname': '**REDACTED**', 'region': 'us', 'rriot': dict({ - 'h': 'abc123', - 'k': 'abc123', + 'h': '**REDACTED**', + 'k': '**REDACTED**', 'r': dict({ 'a': 'https://api-us.roborock.com', 'l': 'https://wood-us.roborock.com', 'm': 'ssl://mqtt-us-2.roborock.com:8883', 'r': 'US', }), - 's': 'abc123', - 'u': 'abc123', + 's': '**REDACTED**', + 'u': '**REDACTED**', }), 'rruid': '**REDACTED**', 'token': '**REDACTED**',