mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Issue #1027206: getnameinfo is now restricted to numeric addresses as input.

Browse source
This commit is contained in:
Martin v. Löwis 2010-08-25 07:38:15 +00:00
parent 219d1c8ae3
commit 112c0f3411
3 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/test/test_socket.py
View file

@ -637,6 +637,10 @@ class GeneralModuleTests(unittest.TestCase):
flags=socket.AI_PASSIVE) flags=socket.AI_PASSIVE)
self.assertEqual(a, b) self.assertEqual(a, b)
def test_getnameinfo(self):
# only IP addresses are allowed
self.assertRaises(socket.error, socket.getnameinfo, ('mail.python.org',0), 0)
def test_idna(self): def test_idna(self):
# these should all be successful # these should all be successful
socket.gethostbyname('испытание.python.org') socket.gethostbyname('испытание.python.org')

3
Misc/NEWS
View file

@ -70,7 +70,8 @@ Extensions
---------- ----------
- Issue #1027206: Support IDNA in gethostbyname, gethostbyname_ex, - Issue #1027206: Support IDNA in gethostbyname, gethostbyname_ex,
getaddrinfo and gethostbyaddr. getaddrinfo and gethostbyaddr. getnameinfo is now restricted to numeric
addresses as input.
- Issue #9214: Set operations on a KeysView or ItemsView in collections - Issue #9214: Set operations on a KeysView or ItemsView in collections
now correctly return a set. (Patch by Eli Bendersky.) now correctly return a set. (Patch by Eli Bendersky.)

1
Modules/socketmodule.c
View file

@ -3969,6 +3969,7 @@ socket_getnameinfo(PyObject *self, PyObject *args)
memset(&hints, 0, sizeof(hints)); memset(&hints, 0, sizeof(hints));
hints.ai_family = AF_UNSPEC; hints.ai_family = AF_UNSPEC;
hints.ai_socktype = SOCK_DGRAM; /* make numeric port happy */ hints.ai_socktype = SOCK_DGRAM; /* make numeric port happy */
hints.ai_flags = AI_NUMERICHOST; /* don't do any name resolution */
Py_BEGIN_ALLOW_THREADS Py_BEGIN_ALLOW_THREADS
ACQUIRE_GETADDRINFO_LOCK ACQUIRE_GETADDRINFO_LOCK
error = getaddrinfo(hostp, pbuf, &hints, &res); error = getaddrinfo(hostp, pbuf, &hints, &res);