Commit c84b2cec authored by Julien Muchembled's avatar Julien Muchembled

security: drop UDP packets that are empty or from outside same re6st network

Also accepts packets from loopback.
parent 543e4faa
...@@ -412,7 +412,13 @@ class TunnelManager(object): ...@@ -412,7 +412,13 @@ class TunnelManager(object):
def handlePeerEvent(self): def handlePeerEvent(self):
msg, address = self.sock.recvfrom(1<<16) msg, address = self.sock.recvfrom(1<<16)
if not (msg or utils.binFromIp(address[0]).startswith(self._network)): if address[0] == '::1':
sender = None
else:
sender = utils.binFromIp(address[0])
if not sender.startswith(self._network):
return
if not msg:
return return
code = ord(msg[0]) code = ord(msg[0])
if code == 1: # answer if code == 1: # answer
...@@ -442,7 +448,7 @@ class TunnelManager(object): ...@@ -442,7 +448,7 @@ class TunnelManager(object):
#else: # I don't know my IP yet! #else: # I don't know my IP yet!
elif code == 255: elif code == 255:
# the registry wants to know the topology for debugging purpose # the registry wants to know the topology for debugging purpose
if utils.binFromIp(address[0])[len(self._network):].startswith( if not sender or sender[len(self._network):].startswith(
self.peer_db.registry_prefix): self.peer_db.registry_prefix):
msg = ['\xfe%s%u/%u\n%u\n' % (msg[1:], msg = ['\xfe%s%u/%u\n%u\n' % (msg[1:],
int(self._prefix, 2), len(self._prefix), int(self._prefix, 2), len(self._prefix),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment