Skip to content

gh-125651: Fix UUID hex parsing with underscores #125652

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

gh-125651: Fix UUID hex parsing with underscores #125652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bcac51f
gh-125651: Fix UUID hex parsing with underscores
sevdog Oct 17, 2024
2f59b40
gh-125651: Use regex to avoid any unallowed character to passed to int
sevdog Oct 18, 2024
265ecb1
gh-125651: Remove duplicated check in test
sevdog Oct 18, 2024
f666868
📜🤖 Added by blurb_it.
blurb-it[bot] Oct 18, 2024
412da70
gh-125651: Add test for unicode sequence and adjust news message
sevdog Oct 18, 2024
f21225a
Use str.maketrans to ensure that only hex characters are given to UUI…
sevdog Sep 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Lib/test/test_uuid.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,9 +277,17 @@ def test_exceptions(self):
# Badly formed hex strings.
badvalue(lambda: self.uuid.UUID(''))
badvalue(lambda: self.uuid.UUID('abc'))
badvalue(lambda: self.uuid.UUID('123_4567812345678123456781234567'))
badvalue(lambda: self.uuid.UUID('123_4567812345678123456781_23456'))
badvalue(lambda: self.uuid.UUID('1234567812345678123456781234567'))
badvalue(lambda: self.uuid.UUID('123456781234567812345678123456789'))
badvalue(lambda: self.uuid.UUID('123456781234567812345678z2345678'))
badvalue(lambda: self.uuid.UUID('0x123456781234567812345678z23456'))
badvalue(lambda: self.uuid.UUID('0X123456781234567812345678z23456'))
badvalue(lambda: self.uuid.UUID('+123456781234567812345678z234567'))
badvalue(lambda: self.uuid.UUID(' 123456781234567812345678z23456 '))
badvalue(lambda: self.uuid.UUID(' 123456781234567812345678z2345 '))
badvalue(lambda: self.uuid.UUID('\uff10123456781234567812345678z234567'))

# Badly formed bytes.
badvalue(lambda: self.uuid.UUID(bytes='abc'))
Expand Down
4 changes: 3 additions & 1 deletion Lib/uuid.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@
_MAC_DELIM = b'.'
_MAC_OMITS_LEADING_ZEROES = True

_HEX_TT = str.maketrans('', '', 'abcdefABCDEF0123456789')
RESERVED_NCS, RFC_4122, RESERVED_MICROSOFT, RESERVED_FUTURE = [
'reserved for NCS compatibility', 'specified in RFC 4122',
'reserved for Microsoft compatibility', 'reserved for future definition']
Expand Down Expand Up @@ -215,7 +216,8 @@ def __init__(self, hex=None, bytes=None, bytes_le=None, fields=None,
elif hex is not None:
hex = hex.replace('urn:', '').replace('uuid:', '')
hex = hex.strip('{}').replace('-', '')
if len(hex) != 32:
# ensure that only 32 hex characters pass through
if len(hex) != 32 or hex.translate(_HEX_TT):
raise ValueError('badly formed hexadecimal UUID string')
int = int_(hex, 16)
elif bytes_le is not None:
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2024-10-18-09-45-34.gh-issue-125651.M0wSAS.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix HEX parsing of :class:`uuid.UUID`.
Loading