oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #218 from caryoscelus/upnp-anonymous

Browse source 
more anonymous upnp
This commit is contained in:
caryoscelus 2023-07-25 15:06:18 +00:00 committed by GitHub
commit dd5976a08e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Peer/PeerPortchecker.py
View file

@ -28,11 +28,8 @@ class PeerPortchecker(object):
return urllib.request.urlopen(req, timeout=20.0) return urllib.request.urlopen(req, timeout=20.0)
def portOpen(self, port): def portOpen(self, port):
# self.log.info("Not trying to open port using UpnpPunch until it's proven robust...")
# return False
try: try:
UpnpPunch.ask_to_open_port(port, 'ZeroNet', retries=3, protos=["TCP"]) UpnpPunch.ask_to_open_port(port, retries=3, protos=["TCP"])
self.upnp_port_opened = True self.upnp_port_opened = True
except Exception as err: except Exception as err:
self.log.warning("UpnpPunch run error: %s" % Debug.formatException(err)) self.log.warning("UpnpPunch run error: %s" % Debug.formatException(err))

17
src/util/UpnpPunch.py
View file

@ -181,7 +181,6 @@ def _get_local_ips():
def _create_open_message(local_ip, def _create_open_message(local_ip,
port, port,
description="UPnPPunch",
protocol="TCP", protocol="TCP",
upnp_schema='WANIPConnection'): upnp_schema='WANIPConnection'):
""" """
@ -205,14 +204,13 @@ def _create_open_message(local_ip,
</s:Envelope>""".format(port=port, </s:Envelope>""".format(port=port,
protocol=protocol, protocol=protocol,
host_ip=local_ip, host_ip=local_ip,
description=description, description='',
upnp_schema=upnp_schema) upnp_schema=upnp_schema)
return (REMOVE_WHITESPACE.sub('><', soap_message), 'AddPortMapping') return (REMOVE_WHITESPACE.sub('><', soap_message), 'AddPortMapping')
def _create_close_message(local_ip, def _create_close_message(local_ip,
port, port,
description=None,
protocol='TCP', protocol='TCP',
upnp_schema='WANIPConnection'): upnp_schema='WANIPConnection'):
soap_message = """<?xml version="1.0"?> soap_message = """<?xml version="1.0"?>
@ -294,12 +292,12 @@ def _send_requests(messages, location, upnp_schema, control_path):
raise UpnpError('Sending requests using UPnP failed.') raise UpnpError('Sending requests using UPnP failed.')
def _orchestrate_soap_request(ip, port, msg_fn, desc=None, protos=("TCP", "UDP")): def _orchestrate_soap_request(ip, port, msg_fn, protos=("TCP", "UDP")):
logger.debug("Trying using local ip: %s" % ip) logger.debug("Trying using local ip: %s" % ip)
idg_data = _collect_idg_data(ip) idg_data = _collect_idg_data(ip)
soap_messages = [ soap_messages = [
msg_fn(ip, port, desc, proto, idg_data['upnp_schema']) msg_fn(ip, port, proto, idg_data['upnp_schema'])
for proto in protos for proto in protos
] ]
@ -307,7 +305,6 @@ def _orchestrate_soap_request(ip, port, msg_fn, desc=None, protos=("TCP", "UDP")
def _communicate_with_igd(port=15441, def _communicate_with_igd(port=15441,
desc="UpnpPunch",
retries=3, retries=3,
fn=_create_open_message, fn=_create_open_message,
protos=("TCP", "UDP")): protos=("TCP", "UDP")):
@ -321,7 +318,7 @@ def _communicate_with_igd(port=15441,
def job(local_ip): def job(local_ip):
for retry in range(retries): for retry in range(retries):
try: try:
_orchestrate_soap_request(local_ip, port, fn, desc, protos) _orchestrate_soap_request(local_ip, port, fn, protos)
return True return True
except Exception as e: except Exception as e:
logger.debug('Upnp request using "{0}" failed: {1}'.format(local_ip, e)) logger.debug('Upnp request using "{0}" failed: {1}'.format(local_ip, e))
@ -357,20 +354,18 @@ def _communicate_with_igd(port=15441,
return success return success
def ask_to_open_port(port=15441, desc="UpnpPunch", retries=3, protos=("TCP", "UDP")): def ask_to_open_port(port=15441, retries=3, protos=("TCP", "UDP")):
logger.debug("Trying to open port %d." % port) logger.debug("Trying to open port %d." % port)
return _communicate_with_igd(port=port, return _communicate_with_igd(port=port,
desc=desc,
retries=retries, retries=retries,
fn=_create_open_message, fn=_create_open_message,
protos=protos) protos=protos)
def ask_to_close_port(port=15441, desc="UpnpPunch", retries=3, protos=("TCP", "UDP")): def ask_to_close_port(port=15441, retries=3, protos=("TCP", "UDP")):
logger.debug("Trying to close port %d." % port) logger.debug("Trying to close port %d." % port)
# retries=1 because multiple successes cause 500 response and failure # retries=1 because multiple successes cause 500 response and failure
return _communicate_with_igd(port=port, return _communicate_with_igd(port=port,
desc=desc,
retries=retries, retries=retries,
fn=_create_close_message, fn=_create_close_message,
protos=protos) protos=protos)