From 09ce824c85a410947d5617cb043aa6956dda133d Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Tue, 14 Feb 2023 14:46:09 -0500 Subject: [PATCH] Fix bad lookup attempts on slashed addr While this should in theory be harmless, it exacerbates some DNS setups that would look up the normal result quickly, but would stall on a bad lookup. --- confluent_server/confluent/netutil.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/confluent_server/confluent/netutil.py b/confluent_server/confluent/netutil.py index b98228e5..dcce1544 100644 --- a/confluent_server/confluent/netutil.py +++ b/confluent_server/confluent/netutil.py @@ -198,8 +198,9 @@ class NetManager(object): ipv4addr = attribs.get('ipv4_address', None) if ipv4addr: try: - for ai in socket.getaddrinfo(ipv4addr, 0, socket.AF_INET, socket.SOCK_STREAM): - ipv4addr = ai[-1][0] + luaddr = ipv4addr.split('/', 1)[0] + for ai in socket.getaddrinfo(luaddr, 0, socket.AF_INET, socket.SOCK_STREAM): + ipv4addr.replace(luaddr, ai[-1][0]) except socket.gaierror: pass else: