From e9e2fd75ccbc6e9a5221cf3525e39e9d042d843f Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Mon, 21 May 2018 15:20:55 +0300 Subject: [PATCH] [3.6] bpo-33542: Ignore DUID in uuid.get_node on Windows. (GH-6922) (GH-7014) uuid._ipconfig_getnode did not validate the maximum length of the value, so long as the value had the same type of formatting as a MAC address. This let it select DUIDs as MAC addresses. It now requires an exact length match. (cherry picked from commit c66c342cb42ab8a88884527ddfe3a5086bc06316) Co-authored-by: CtrlZvi --- Lib/uuid.py | 2 +- Misc/ACKS | 1 + .../next/Library/2018-05-16-09-30-27.bpo-33542.idNAcs.rst | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 Misc/NEWS.d/next/Library/2018-05-16-09-30-27.bpo-33542.idNAcs.rst diff --git a/Lib/uuid.py b/Lib/uuid.py index 32a48eaeac..db8b2ef94e 100644 --- a/Lib/uuid.py +++ b/Lib/uuid.py @@ -438,7 +438,7 @@ def _ipconfig_getnode(): with proc: for line in proc.stdout: value = line.split(':')[-1].strip().lower() - if re.match('([0-9a-f][0-9a-f]-){5}[0-9a-f][0-9a-f]', value): + if re.fullmatch('(?:[0-9a-f][0-9a-f]-){5}[0-9a-f][0-9a-f]', value): return int(value.replace('-', ''), 16) def _netbios_getnode(): diff --git a/Misc/ACKS b/Misc/ACKS index cda62f5790..8414b9140f 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -415,6 +415,7 @@ Ulrich Eckhardt David Edelsohn John Edmonds Grant Edwards +Zvi Effron John Ehresman Tal Einat Eric Eisner diff --git a/Misc/NEWS.d/next/Library/2018-05-16-09-30-27.bpo-33542.idNAcs.rst b/Misc/NEWS.d/next/Library/2018-05-16-09-30-27.bpo-33542.idNAcs.rst new file mode 100644 index 0000000000..16ba799131 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2018-05-16-09-30-27.bpo-33542.idNAcs.rst @@ -0,0 +1,2 @@ +Prevent ``uuid.get_node`` from using a DUID instead of a MAC on Windows. +Patch by Zvi Effron -- 2.40.0