diff --git a/regexes.yaml b/regexes.yaml index fe50bf71..ce180fbf 100644 --- a/regexes.yaml +++ b/regexes.yaml @@ -964,6 +964,10 @@ os_parsers: - regex: '(Windows ?Mobile)' os_replacement: 'Windows Mobile' + - regex: '(Windows 10)' + os_replacement: 'Windows' + os_v1_replacement: '10' + - regex: '(Windows (?:NT 5\.2|NT 5\.1))' os_replacement: 'Windows' os_v1_replacement: 'XP' @@ -1006,10 +1010,6 @@ os_parsers: os_replacement: 'Windows' os_v1_replacement: '10' - - regex: '(Windows 10)' - os_replacement: 'Windows' - os_v1_replacement: '10' - - regex: '(Windows NT 5\.0)' os_replacement: 'Windows' os_v1_replacement: '2000' diff --git a/tests/test_os.yaml b/tests/test_os.yaml index f7bb923a..61727a09 100644 --- a/tests/test_os.yaml +++ b/tests/test_os.yaml @@ -798,6 +798,13 @@ test_cases: patch: patch_minor: + - user_agent_string: 'PAN GlobalProtect/5.0.0-87 (Microsoft Windows 10 Pro , 64-bit) Mozilla/5.0 (Windows NT 6.2; Win64; x64; Trident/7.0; rv:11.0) like Gecko' + family: 'Windows' + major: '10' + minor: + patch: + patch_minor: + - user_agent_string: 'Mozilla/5.0 (Windows NT 6.3; WOW64; Trident/7.0; rv:11.0) like Gecko' family: 'Windows' major: '8'