Improve ip6 redaction

Author: CoMPaTech

airos/data.py

@@ -61,7 +61,7 @@ def _redact(d: dict[str, Any]) -> dict[str, Any]:
         for k, v in d.items():
             if k in sensitive_keys:
                 if isinstance(v, str) and (is_mac_address(v) or is_mac_address_mask(v)):
-                    # Redact only the first 6 hex characters of a MAC address
+                    # Redact only the last part of a MAC address to a dummy value
                     redacted_d[k] = "00:11:22:33:" + v.replace("-", ":").upper()[-5:]
                 elif isinstance(v, str) and is_ip_address(v):
                     # Redact to a dummy local IP address
@@ -71,6 +71,21 @@ def _redact(d: dict[str, Any]) -> dict[str, Any]:
                 ):
                     # Redact list of IPs to a dummy list
                     redacted_d[k] = ["127.0.0.3"]  # type: ignore[assignment]
+                elif isinstance(v, list) and all(
+                    isinstance(i, dict) and "addr" in i and is_ip_address(i["addr"])
+                    for i in v
+                ):
+                    # Redact list of dictionaries with IP addresses to a dummy list
+                    redacted_list = []
+                    for item in v:
+                        redacted_item = item.copy()
+                        redacted_item["addr"] = (
+                            "127.0.0.3"
+                            if ipaddress.ip_address(redacted_item["addr"]).version == 4
+                            else "::1"
+                        )
+                        redacted_list.append(redacted_item)
+                    redacted_d[k] = redacted_list  # type: ignore[assignment]
                 else:
                     redacted_d[k] = "REDACTED"
             elif isinstance(v, dict):

script/mashumaro-step-debug.py

@@ -12,7 +12,7 @@
 if project_root_dir not in sys.path:
     sys.path.append(project_root_dir)
 
-from airos.data import AirOS8Data, Remote, Station, Wireless  # noqa: E402
+from airos.data import AirOS8Data, Interface, Remote, Station, Wireless  # noqa: E402
 
 logging.basicConfig(level=logging.DEBUG, stream=sys.stdout)
 _LOGGER = logging.getLogger(__name__)
@@ -63,6 +63,15 @@ def main() -> None:
         wireless_obj = Wireless.from_dict(wireless_data)  # noqa: F841
         _LOGGER.info("  -> Success! The Wireless object is valid.")
 
+        _LOGGER.info("  -> Checking list of Interface objects...")
+        interfaces = data["interfaces"]
+        interface_obj_list = []  # noqa: F841
+        for i, interface_data in enumerate(interfaces):
+            _LOGGER.info("    -> Checking Interface object at index %s...", i)
+            _LOGGER.info("         Interface should be %s.", interface_data["ifname"])
+            interface_obj = Interface.from_dict(interface_data)  # noqa: F841
+            _LOGGER.info("         Success! Interface is valid.")
+
         _LOGGER.info("Attempting to deserialize full AirOS8Data object...")
         airos_data_obj = AirOS8Data.from_dict(data)  # noqa: F841
         _LOGGER.info("Success! Full AirOS8Data object is valid.")