From f9c94f7f53b57740c9f4e665b5fd6338db435765 Mon Sep 17 00:00:00 2001
From: James Senecal <james.senecal@icloud.com>
Date: Mon, 26 Oct 2026 16:12:45 -0400
Subject: [PATCH] security: omit characteristic identifiers from logs

---
 src/actions/adjust.rs |  8 ++------
 src/actions/switch.rs | 12 ++----------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/src/actions/adjust.rs b/src/actions/adjust.rs
index 64c9b25..3c88014 100644
--- a/src/actions/adjust.rs
+++ b/src/actions/adjust.rs
@@ -52,9 +52,7 @@ impl AdjustStateAction {
                     settings.characteristic_type(),
                 )
                 .ok_or_else(|| anyhow::anyhow!(
-                    "selected characteristic is no longer available; service_id='{}', characteristic_uuid='{}', characteristic_type='{}', available=[{}]",
-                    settings.accessory_id(),
-                    settings.characteristic_uuid(),
+                    "selected characteristic is no longer available; characteristic_type='{}', available=[{}]",
                     settings.characteristic_type(),
                     service.available_characteristic_types(),
                 ))?;
@@ -141,9 +139,7 @@ pub async fn refresh_adjust_instance(
                     instance,
                     "Missing\nstate",
                     format!(
-                        "selected characteristic is no longer available; service_id='{}', characteristic_uuid='{}', characteristic_type='{}', available=[{}]",
-                        settings.accessory_id(),
-                        settings.characteristic_uuid(),
+                        "selected characteristic is no longer available; characteristic_type='{}', available=[{}]",
                         settings.characteristic_type(),
                         service.available_characteristic_types(),
                     ),
diff --git a/src/actions/switch.rs b/src/actions/switch.rs
index 8143192..862b0d6 100644
--- a/src/actions/switch.rs
+++ b/src/actions/switch.rs
@@ -35,13 +35,7 @@ impl SwitchAction {
         }
 
         let global = self.state.global_settings().await;
-        log::info!(
-            "Switch {}: toggle requested for service_id='{}', characteristic_uuid='{}', characteristic_type='{}'",
-            instance.instance_id,
-            settings.accessory_id(),
-            settings.characteristic_uuid(),
-            settings.characteristic_type(),
-        );
+        log::info!("Switch {}: toggle requested", instance.instance_id,);
 
         let result: Result<SwitchDisplayState> = async {
             // Always query immediately before writing so the inverse is calculated from
@@ -191,9 +185,7 @@ fn selected_switch_characteristic<'a>(
         )
         .ok_or_else(|| {
             SwitchSelectionError::CharacteristicUnavailable(format!(
-                "service_id='{}', characteristic_uuid='{}', characteristic_type='{}', available=[{}]",
-                settings.accessory_id(),
-                settings.characteristic_uuid(),
+                "characteristic_type='{}', available=[{}]",
                 settings.characteristic_type(),
                 service.available_characteristic_types(),
             ))