zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-03-20 07:43:35 -05:00
Code Issues Packages Projects Releases Wiki Activity

Replace gethostbyname to getaddrinfo for plugins ipv6 support related #11450 (#12561)

Browse Source 
Co-authored-by: yukiy <yyamashi@redhat.com>
This commit is contained in:
Yuki Yamashita
2022-08-22 23:07:10 +09:00
committed by GitHub
parent db2649d7ba
commit dba33f9ef5
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
awx_collection/plugins/module_utils/controller_api.py
View File

@@ -12,7 +12,7 @@ from ansible.module_utils.six.moves.http_cookiejar import CookieJar
from ansible.module_utils.six.moves.urllib.parse import urlparse, urlencode from ansible.module_utils.six.moves.urllib.parse import urlparse, urlencode
from ansible.module_utils.six.moves.configparser import ConfigParser, NoOptionError from ansible.module_utils.six.moves.configparser import ConfigParser, NoOptionError
from distutils.version import LooseVersion as Version from distutils.version import LooseVersion as Version
from socket import gethostbyname from socket import getaddrinfo, IPPROTO_TCP
import time import time
import re import re
from json import loads, dumps from json import loads, dumps
@@ -138,12 +138,17 @@ class ControllerModule(AnsibleModule):
except Exception as e: except Exception as e:
self.fail_json(msg="Unable to parse controller_host as a URL ({1}): {0}".format(self.host, e)) self.fail_json(msg="Unable to parse controller_host as a URL ({1}): {0}".format(self.host, e))
# Remove ipv6 square brackets
remove_target = '[]'
for char in remove_target:
self.url.hostname.replace(char, "")
# Try to resolve the hostname # Try to resolve the hostname
hostname = self.url.netloc.split(':')[0]
try: try:
gethostbyname(hostname) addrinfolist = getaddrinfo(self.url.hostname, self.url.port, proto=IPPROTO_TCP)
for family, kind, proto, canonical, sockaddr in addrinfolist:
sockaddr[0]
except Exception as e: except Exception as e:
self.fail_json(msg="Unable to resolve controller_host ({1}): {0}".format(hostname, e)) self.fail_json(msg="Unable to resolve controller_host ({1}): {0}".format(self.url.hostname, e))
def build_url(self, endpoint, query_params=None): def build_url(self, endpoint, query_params=None):
# Make sure we start with /api/vX # Make sure we start with /api/vX