Mirror/Reticulum
1
0
Fork 0
mirror of https://github.com/markqvist/Reticulum.git synced 2026-07-03 07:13:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Improved interface discovery data sanitization

Browse Source
This commit is contained in:
Mark Qvist
2026-05-06 04:24:07 +02:00
parent 3d8079c02b
commit f9625b2b88
1 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RNS/Discovery.py
+33 -8
View File
@@ -200,6 +200,15 @@ class InterfaceAnnounceHandler:
self.callback = callback self.callback = callback
self.stamper = LXStamper self.stamper = LXStamper
@staticmethod
def sanitize_name(name):
if not name: return None
name = name.encode("ascii", "ignore").decode("ascii").strip()
for i in [5,3,2]: name = name.replace(" "*i, " ")
while len(name) and name[0] not in san_map: name = name[1:]
while len(name) and name[-1] not in san_map+")": name = name[:-1]
return name
def received_announce(self, destination_hash, announced_identity, app_data): def received_announce(self, destination_hash, announced_identity, app_data):
try: try:
discovery_sources = RNS.Reticulum.interface_discovery_sources() discovery_sources = RNS.Reticulum.interface_discovery_sources()
@@ -234,10 +243,24 @@ class InterfaceAnnounceHandler:
info = None info = None
unpacked = msgpack.unpackb(packed) unpacked = msgpack.unpackb(packed)
if INTERFACE_TYPE in unpacked: if INTERFACE_TYPE in unpacked:
interface_type = unpacked[INTERFACE_TYPE] interface_type = unpacked[INTERFACE_TYPE]
name = self.sanitize_name(unpacked[NAME])
if type(unpacked[TRANSPORT]) != bool: raise ValueError("Invalid data in transport field of announce")
if type(unpacked[LATITUDE]) not in [type(None), float]: raise ValueError("Invalid data in latitude field of announce")
if type(unpacked[LONGITUDE]) not in [type(None), float]: raise ValueError("Invalid data in longitude field of announce")
if type(unpacked[HEIGHT]) not in [type(None), float]: raise ValueError("Invalid data in height field of announce")
if len(unpacked[TRANSPORT_ID]) != RNS.Identity.TRUNCATED_HASHLENGTH//8: raise ValueError("Invalid data in transport_id field of announce")
if not interface_type in InterfaceAnnouncer.DISCOVERABLE_INTERFACE_TYPES:
raise ValueError("Invalid interface type in announce data")
if REACHABLE_ON in unpacked:
if not (is_ip_address(unpacked[REACHABLE_ON]) or is_hostname(unpacked[REACHABLE_ON])):
raise ValueError("Invalid data in reachable_on field of announce")
info = {"type": interface_type, info = {"type": interface_type,
"transport": unpacked[TRANSPORT], "transport": unpacked[TRANSPORT],
"name": unpacked[NAME] or f"Discovered {interface_type}", "name": name or f"Discovered {interface_type}",
"received": time.time(), "received": time.time(),
"stamp": stamp, "stamp": stamp,
"value": value, "value": value,
@@ -248,12 +271,8 @@ class InterfaceAnnounceHandler:
"longitude": unpacked[LONGITUDE], "longitude": unpacked[LONGITUDE],
"height": unpacked[HEIGHT]} "height": unpacked[HEIGHT]}
if REACHABLE_ON in unpacked: if IFAC_NETNAME in unpacked: info["ifac_netname"] = str(unpacked[IFAC_NETNAME])
if not (is_ip_address(unpacked[REACHABLE_ON]) or is_hostname(unpacked[REACHABLE_ON])): if IFAC_NETKEY in unpacked: info["ifac_netkey"] = str(unpacked[IFAC_NETKEY])
raise ValueError("Invalid data in reachable_on field of announce")
if IFAC_NETNAME in unpacked: info["ifac_netname"] = unpacked[IFAC_NETNAME]
if IFAC_NETKEY in unpacked: info["ifac_netkey"] = unpacked[IFAC_NETKEY]
if interface_type in ["BackboneInterface", "TCPServerInterface"]: if interface_type in ["BackboneInterface", "TCPServerInterface"]:
backbone_support = not RNS.vendor.platformutils.is_windows() backbone_support = not RNS.vendor.platformutils.is_windows()
@@ -386,6 +405,7 @@ class InterfaceDiscovery():
with open(filepath, "rb") as f: info = msgpack.unpackb(f.read()) with open(filepath, "rb") as f: info = msgpack.unpackb(f.read())
should_remove = False should_remove = False
heard_delta = now-info["last_heard"] heard_delta = now-info["last_heard"]
info["name"] = InterfaceAnnounceHandler.sanitize_name(info["name"])
if heard_delta > self.THRESHOLD_REMOVE: should_remove = True if heard_delta > self.THRESHOLD_REMOVE: should_remove = True
elif discovery_sources and not "network_id" in info: should_remove = True elif discovery_sources and not "network_id" in info: should_remove = True
@@ -744,3 +764,8 @@ def is_hostname(hostname):
if re.match(r"[0-9]+$", components[-1]): return False if re.match(r"[0-9]+$", components[-1]): return False
allowed = re.compile(r"(?!-)[a-z0-9-]{1,63}(?<!-)$", re.IGNORECASE) allowed = re.compile(r"(?!-)[a-z0-9-]{1,63}(?<!-)$", re.IGNORECASE)
return all(allowed.match(label) for label in components) return all(allowed.match(label) for label in components)
san_map = ""
for i in range(48, 58): san_map += bytes([i]).decode("ascii")
for i in range(65, 91): san_map += bytes([i]).decode("ascii")
for i in range(97, 123): san_map += bytes([i]).decode("ascii")