Publish encrypted properties when PUBLISH_ADVDATA is 1 (#150)

theengs · Jul 16, 2023 · 42ccb81 · 42ccb81
1 parent 35dd5bf
commit 42ccb81
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/TheengsGateway/ble_gateway.py b/TheengsGateway/ble_gateway.py
@@ -379,6 +379,11 @@ def detection_callback(
                                 decrypted_data, data_json, decoded_json
                             )
 
+                            # Keep encrypted properties
+                            cipher = decoded_json["cipher"]
+                            mic = decoded_json["mic"]
+                            ctr = decoded_json["ctr"]
+
                             # Re-decode advertisement, this time unencrypted
                             decoded_json = decodeBLE(json.dumps(data_json))
                             if decoded_json:
@@ -389,6 +394,11 @@ def detection_callback(
                                     data_json["servicedata"],
                                 )
 
+                            # Re-add encrypted properties
+                            decoded_json["cipher"] = cipher
+                            decoded_json["mic"] = mic
+                            decoded_json["ctr"] = ctr
+
                         except KeyError:
                             logger.exception(
                                 "Can't find bindkey for %s.", device.address
@@ -413,6 +423,9 @@ def detection_callback(
                             "cont",
                             "track",
                             "encr",
+                            "cipher",
+                            "mic",
+                            "ctr",
                         ):
                             decoded_json.pop(key, None)