From 3885d2329350451e822705ea13b8625aedf8938a Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Fri, 21 Aug 2026 23:51:52 +0200 Subject: [PATCH] Added protocol violations --- RNS/Interfaces/Interface.py | 3 ++- RNS/Interfaces/LocalInterface.py | 2 ++ RNS/Transport.py | 28 ++++++++++++++++++---------- 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/RNS/Interfaces/Interface.py b/RNS/Interfaces/Interface.py index 075d3e02..9d100e41 100755 --- a/RNS/Interfaces/Interface.py +++ b/RNS/Interfaces/Interface.py @@ -93,6 +93,7 @@ class Interface: AUTOCONFIGURE_MTU = False FIXED_MTU = False + DEFAULT_IFAC_SIZE = 16 def __init__(self): self.rxb = 0 @@ -271,7 +272,7 @@ class Interface: RNS.log("Releasing held announce packet "+str(selected_announce_packet)+" from "+str(self), RNS.LOG_EXTREME) self.ic_held_release = time.time() + self.ic_held_release_interval self.held_announces.pop(selected_announce_packet.destination_hash) - def release(): RNS.Transport.inbound(selected_announce_packet.raw, selected_announce_packet.receiving_interface, tc=RNS.Transport.TC_INGRESS_LIMITED) + def release(): RNS.Transport.inbound(selected_announce_packet.raw, selected_announce_packet.receiving_interface, tc=RNS.Transport.TC_INGRESS_LIMITED, ifac_handled=True) threading.Thread(target=release, daemon=True).start() except Exception as e: diff --git a/RNS/Interfaces/LocalInterface.py b/RNS/Interfaces/LocalInterface.py index 8afa83a0..a68c2d64 100644 --- a/RNS/Interfaces/LocalInterface.py +++ b/RNS/Interfaces/LocalInterface.py @@ -70,6 +70,7 @@ class LocalClientInterface(Interface): self.epoll_backend = False self.HW_MTU = 262144 self.online = False + self.ifac_size = self.DEFAULT_IFAC_SIZE if socket_path != None and RNS.Reticulum.get_instance().use_af_unix: self.socket_path = f"\0rns/{socket_path}" else: self.socket_path = None @@ -382,6 +383,7 @@ class LocalServerInterface(Interface): self.epoll_backend = False self.online = False self.clients = 0 + self.ifac_size = self.DEFAULT_IFAC_SIZE if socket_path != None and RNS.Reticulum.get_instance().use_af_unix: self.socket_path = f"\0rns/{socket_path}" else: self.socket_path = None diff --git a/RNS/Transport.py b/RNS/Transport.py index 38d8d722..89533df8 100755 --- a/RNS/Transport.py +++ b/RNS/Transport.py @@ -1634,7 +1634,7 @@ class Transport: RNS.trace_exception(e) @staticmethod - def preprocess_inbound(raw, interface=None, tc=None): + def preprocess_inbound(raw, interface=None, tc=None, ifac_handled=False): if not Transport.ready: wait_start = time.time() while not Transport.ready: @@ -1646,7 +1646,7 @@ class Transport: # If interface access codes are enabled, # we must authenticate each packet. if len(raw) > 2: - if interface != None and hasattr(interface, "ifac_identity") and interface.ifac_identity != None: + if not ifac_handled and interface != None and hasattr(interface, "ifac_identity") and interface.ifac_identity != None: # Check that IFAC flag is set if raw[0] & 0x80 == 0x80: if len(raw) > 2+interface.ifac_size: @@ -1697,8 +1697,11 @@ class Transport: if Transport.identity == None: return + if interface and len(raw) > interface.HW_MTU + (interface.ifac_size or 0): + return interface.protocol_violation(f"Frame size exceeded MTU of {interface.HW_MTU} on {interface}") + packet = RNS.Packet(None, raw) - if not packet.unpack(): return interface.protocol_violation("Malformed packet") if interface else None + if not packet.unpack(): return interface.protocol_violation(f"Malformed packet ({len(raw)} bytes)") if interface else None if not Transport.packet_filter(packet): return interface.packet_filter_hit() traffic_class = tc or Transport.TC_DATA @@ -1745,7 +1748,10 @@ class Transport: return packet.receiving_interface.protocol_violation("Tagless path request") if packet.receiving_interface else None else: - if len(tag_bytes) > RNS.Identity.TRUNCATED_HASHLENGTH//8: tag_bytes = tag_bytes[:RNS.Identity.TRUNCATED_HASHLENGTH//8] + if len(tag_bytes) > RNS.Identity.TRUNCATED_HASHLENGTH//8: + tag_bytes = tag_bytes[:RNS.Identity.TRUNCATED_HASHLENGTH//8] + if packet.receiving_interface: packet.receiving_interface.protocol_violation("Excessive path request tag size") + unique_tag = destination_hash+tag_bytes with Transport.discovery_pr_tags_lock: @@ -1986,6 +1992,7 @@ class Transport: new_raw = new_raw[:-RNS.Link.LINK_MTU_SIZE]+clamped_mtu except Exception as e: RNS.log(f"Dropping link request packet. The contained exception was: {e}", RNS.LOG_DEBUG) if RNS.sl(RNS.LOG_DEBUG) else None + if packet.receiving_interface: packet.receiving_interface.protocol_violation("Undecodable path MTU signalling bytes") return # Entry format is @@ -2473,6 +2480,7 @@ class Transport: packet.data = packet.data[:-RNS.Link.LINK_MTU_SIZE]+clamped_mtu except Exception as e: RNS.log(f"Dropping link request packet to local destination. The contained exception was: {e}", RNS.LOG_WARNING) + if packet.receiving_interface: packet.receiving_interface.protocol_violation("Undecodable path MTU signalling bytes") return packet.destination = destination @@ -2735,6 +2743,7 @@ class Transport: except Exception as e: RNS.log("An error occurred while validating tunnel establishment packet.", RNS.LOG_DEBUG) if RNS.sl(RNS.LOG_DEBUG) else None RNS.log("The contained exception was: "+str(e), RNS.LOG_DEBUG) if RNS.sl(RNS.LOG_DEBUG) else None + if packet.receiving_interface: packet.receiving_interface.protocol_violation("Invalid tunnel synthesis packet") @staticmethod def void_tunnel_interface(tunnel_id): @@ -3023,12 +3032,11 @@ class Transport: # cache, replay it to the Transport instance, # so that it can be directed towards it original # destination. - Transport.inbound(packet.raw, packet.receiving_interface) + Transport.inbound(packet.raw, packet.receiving_interface, ifac_handled=True) return True - else: - return False - else: - return False + + else: return False + else: return False @staticmethod def cache_request(packet_hash, destination): @@ -3036,7 +3044,7 @@ class Transport: if cached_packet: # The packet was found in the local cache, # replay it to the Transport instance. - Transport.inbound(cached_packet.raw, cached_packet.receiving_interface) + Transport.inbound(cached_packet.raw, cached_packet.receiving_interface, ifac_handled=True) else: # The packet is not in the local cache, # query the network.