November 2018 - tor-commits - lists.torproject.org

[tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
by nickm＠torproject.org 27 Nov '18

27 Nov '18

commit 3153c272630510ee56c6797d75b7bf94d1681abc Merge: fc591870b feb41b7c3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 26 17:27:36 2018 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 changes/bug28096 | 13 +++++++ src/lib/osinfo/uname.c | 95 ++++++++++++++++++++++++++++++++++---------------- 2 files changed, 77 insertions(+), 31 deletions(-)

1 0

[tor/release-0.3.5] Merge branch 'bug28096-029-squashed' into bug28096-035-squashed
by nickm＠torproject.org 27 Nov '18

27 Nov '18

commit 44ced9b750a65d867dc5dd2cbbcf7e42a46ae90d Merge: d598d834f 2fbc58cf0 Author: teor <teor(a)torproject.org> Date: Thu Nov 15 12:23:29 2018 +1000 Merge branch 'bug28096-029-squashed' into bug28096-035-squashed Move the get_uname() changes from src/common/compat.c to src/lib/osinfo/uname.c changes/bug28096 | 13 +++++++ src/lib/osinfo/uname.c | 95 ++++++++++++++++++++++++++++++++++---------------- 2 files changed, 77 insertions(+), 31 deletions(-) diff --cc src/lib/osinfo/uname.c index 9d1923695,000000000..7111ae31d mode 100644,000000..100644 --- a/src/lib/osinfo/uname.c +++ b/src/lib/osinfo/uname.c @@@ -1,116 -1,0 +1,149 @@@ +/* Copyright (c) 2003-2004, Roger Dingledine + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2018, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * \file uname.c + * \brief Look up a description of the operating system. + **/ + +#include "orconfig.h" +#include "lib/osinfo/uname.h" + +#include "lib/string/compat_string.h" +#include "lib/string/printf.h" + +#ifdef HAVE_UNAME +#include <sys/utsname.h> +#endif +#ifdef _WIN32 +#include <windows.h> +#endif +#include <string.h> + +/** Hold the result of our call to uname. */ +static char uname_result[256]; +/** True iff uname_result is set. */ +static int uname_result_is_set = 0; + +/** Return a pointer to a description of our platform. + */ +MOCK_IMPL(const char *, +get_uname,(void)) +{ +#ifdef HAVE_UNAME + struct utsname u; +#endif + if (!uname_result_is_set) { +#ifdef HAVE_UNAME + if (uname(&u) != -1) { + /* (Linux says 0 is success, Solaris says 1 is success) */ + strlcpy(uname_result, u.sysname, sizeof(uname_result)); + } else +#endif /* defined(HAVE_UNAME) */ + { +#ifdef _WIN32 + OSVERSIONINFOEX info; + int i; ++ int is_client = 0; ++ int is_server = 0; + const char *plat = NULL; + static struct { - unsigned major; unsigned minor; const char *version; ++ unsigned major; unsigned minor; ++ const char *client_version; const char *server_version; + } win_version_table[] = { - { 6, 2, "Windows 8" }, - { 6, 1, "Windows 7" }, - { 6, 0, "Windows Vista" }, - { 5, 2, "Windows Server 2003" }, - { 5, 1, "Windows XP" }, - { 5, 0, "Windows 2000" }, - /* { 4, 0, "Windows NT 4.0" }, */ - { 4, 90, "Windows Me" }, - { 4, 10, "Windows 98" }, - /* { 4, 0, "Windows 95" } */ - { 3, 51, "Windows NT 3.51" }, - { 0, 0, NULL } ++ /* This table must be sorted in descending order. ++ * Sources: ++ * https://en.wikipedia.org/wiki/List_of_Microsoft_Windows_versions ++ * https://docs.microsoft.com/en-us/windows/desktop/api/winnt/ ++ * ns-winnt-_osversioninfoexa#remarks ++ */ ++ /* Windows Server 2019 is indistinguishable from Windows Server 2016 ++ * using GetVersionEx(). ++ { 10, 0, NULL, "Windows Server 2019" }, */ ++ { 10, 0, "Windows 10", "Windows Server 2016" }, ++ { 6, 3, "Windows 8.1", "Windows Server 2012 R2" }, ++ { 6, 2, "Windows 8", "Windows Server 2012" }, ++ { 6, 1, "Windows 7", "Windows Server 2008 R2" }, ++ { 6, 0, "Windows Vista", "Windows Server 2008" }, ++ { 5, 2, "Windows XP Professional", "Windows Server 2003" }, ++ /* Windows XP did not have a server version, but we need something here */ ++ { 5, 1, "Windows XP", "Windows XP Server" }, ++ { 5, 0, "Windows 2000 Professional", "Windows 2000 Server" }, ++ /* Earlier versions are not supported by GetVersionEx(). */ ++ { 0, 0, NULL, NULL } + }; + memset(&info, 0, sizeof(info)); + info.dwOSVersionInfoSize = sizeof(info); + if (! GetVersionEx((LPOSVERSIONINFO)&info)) { + strlcpy(uname_result, "Bizarre version of Windows where GetVersionEx" + " doesn't work.", sizeof(uname_result)); + uname_result_is_set = 1; + return uname_result; + } - if (info.dwMajorVersion == 4 && info.dwMinorVersion == 0) { - if (info.dwPlatformId == VER_PLATFORM_WIN32_NT) - plat = "Windows NT 4.0"; - else - plat = "Windows 95"; ++#ifdef VER_NT_SERVER ++ if (info.wProductType == VER_NT_SERVER || ++ info.wProductType == VER_NT_DOMAIN_CONTROLLER) { ++ is_server = 1; + } else { - for (i=0; win_version_table[i].major>0; ++i) { - if (win_version_table[i].major == info.dwMajorVersion && - win_version_table[i].minor == info.dwMinorVersion) { - plat = win_version_table[i].version; - break; ++ is_client = 1; ++ } ++#endif /* defined(VER_NT_SERVER) */ ++ /* Search the version table for a matching version */ ++ for (i=0; win_version_table[i].major>0; ++i) { ++ if (win_version_table[i].major == info.dwMajorVersion && ++ win_version_table[i].minor == info.dwMinorVersion) { ++ if (is_server) { ++ plat = win_version_table[i].server_version; ++ } else { ++ /* Use client versions for clients, and when we don't know if it ++ * is a client or a server. */ ++ plat = win_version_table[i].client_version; + } ++ break; + } + } + if (plat) { + strlcpy(uname_result, plat, sizeof(uname_result)); + } else { - if (info.dwMajorVersion > 6 || - (info.dwMajorVersion==6 && info.dwMinorVersion>2)) ++ if (info.dwMajorVersion > win_version_table[0].major || ++ (info.dwMajorVersion == win_version_table[0].major && ++ info.dwMinorVersion > win_version_table[0].minor)) + tor_snprintf(uname_result, sizeof(uname_result), + "Very recent version of Windows [major=%d,minor=%d]", + (int)info.dwMajorVersion,(int)info.dwMinorVersion); + else + tor_snprintf(uname_result, sizeof(uname_result), + "Unrecognized version of Windows [major=%d,minor=%d]", + (int)info.dwMajorVersion,(int)info.dwMinorVersion); + } - #ifdef VER_NT_SERVER - if (info.wProductType == VER_NT_SERVER || - info.wProductType == VER_NT_DOMAIN_CONTROLLER) { - strlcat(uname_result, " [server]", sizeof(uname_result)); - } - #endif /* defined(VER_NT_SERVER) */ ++ /* Now append extra information to the name. ++ * ++ * Microsoft's API documentation says that on Windows 8.1 and later, ++ * GetVersionEx returns Windows 8 (6.2) for applications without an ++ * app compatibility manifest (including tor's default build). ++ * ++ * But in our testing, we have seen the actual Windows version on ++ * Windows Server 2012 R2, even without a manifest. */ ++ if (info.dwMajorVersion > 6 || ++ (info.dwMajorVersion == 6 && info.dwMinorVersion >= 2)) { ++ /* When GetVersionEx() returns Windows 8, the actual OS may be any ++ * later version. */ ++ strlcat(uname_result, " [or later]", sizeof(uname_result)); ++ } ++ /* When we don't know if the OS is a client or server version, we use ++ * the client version, and this qualifier. */ ++ if (!is_server && !is_client) { ++ strlcat(uname_result, " [client or server]", sizeof(uname_result)); ++ } +#else /* !(defined(_WIN32)) */ + /* LCOV_EXCL_START -- can't provoke uname failure */ + strlcpy(uname_result, "Unknown platform", sizeof(uname_result)); + /* LCOV_EXCL_STOP */ +#endif /* defined(_WIN32) */ + } + uname_result_is_set = 1; + } + return uname_result; +}

1 0

[tor/maint-0.3.5] Windows: fix uname on recent Windows versions
by nickm＠torproject.org 27 Nov '18

27 Nov '18

commit 2fbc58cf07fd7367ddaf81b82868b5f37d7883ae Author: teor <teor(a)torproject.org> Date: Mon Oct 22 14:02:43 2018 +1000 Windows: fix uname on recent Windows versions Correctly identify Windows 8.1, Windows 10, and Windows Server 2008 and later from their NT versions. On recent Windows versions, the GetVersionEx() function may report an earlier Windows version than the running OS. To avoid user confusion, add "[or later]" to Tor's version string on affected versions of Windows. Remove Windows versions that were never supported by the GetVersionEx() function. Stop duplicating the latest Windows version in get_uname(). Fixes bug 28096; bugfix on 0.2.2.34; reported by Keifer Bly. --- changes/bug28096 | 13 ++++++++ src/common/compat.c | 95 ++++++++++++++++++++++++++++++++++++----------------- 2 files changed, 77 insertions(+), 31 deletions(-) diff --git a/changes/bug28096 b/changes/bug28096 new file mode 100644 index 000000000..6847df979 --- /dev/null +++ b/changes/bug28096 @@ -0,0 +1,13 @@ + o Minor bugfixes (Windows): + - Correctly identify Windows 8.1, Windows 10, and Windows Server 2008 + and later from their NT versions. + Fixes bug 28096; bugfix on 0.2.2.34; reported by Keifer Bly. + - On recent Windows versions, the GetVersionEx() function may report + an earlier Windows version than the running OS. To avoid user + confusion, add "[or later]" to Tor's version string on affected + versions of Windows. + Fixes bug 28096; bugfix on 0.2.2.34; reported by Keifer Bly. + - Remove Windows versions that were never supported by the + GetVersionEx() function. Stop duplicating the latest Windows + version in get_uname(). + Fixes bug 28096; bugfix on 0.2.2.34; reported by Keifer Bly. diff --git a/src/common/compat.c b/src/common/compat.c index 4ac443c13..975875112 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -2689,22 +2689,33 @@ MOCK_IMPL(const char *, get_uname, (void)) #ifdef _WIN32 OSVERSIONINFOEX info; int i; + int is_client = 0; + int is_server = 0; const char *plat = NULL; static struct { - unsigned major; unsigned minor; const char *version; + unsigned major; unsigned minor; + const char *client_version; const char *server_version; } win_version_table[] = { - { 6, 2, "Windows 8" }, - { 6, 1, "Windows 7" }, - { 6, 0, "Windows Vista" }, - { 5, 2, "Windows Server 2003" }, - { 5, 1, "Windows XP" }, - { 5, 0, "Windows 2000" }, - /* { 4, 0, "Windows NT 4.0" }, */ - { 4, 90, "Windows Me" }, - { 4, 10, "Windows 98" }, - /* { 4, 0, "Windows 95" } */ - { 3, 51, "Windows NT 3.51" }, - { 0, 0, NULL } + /* This table must be sorted in descending order. + * Sources: + * https://en.wikipedia.org/wiki/List_of_Microsoft_Windows_versions + * https://docs.microsoft.com/en-us/windows/desktop/api/winnt/ + * ns-winnt-_osversioninfoexa#remarks + */ + /* Windows Server 2019 is indistinguishable from Windows Server 2016 + * using GetVersionEx(). + { 10, 0, NULL, "Windows Server 2019" }, */ + { 10, 0, "Windows 10", "Windows Server 2016" }, + { 6, 3, "Windows 8.1", "Windows Server 2012 R2" }, + { 6, 2, "Windows 8", "Windows Server 2012" }, + { 6, 1, "Windows 7", "Windows Server 2008 R2" }, + { 6, 0, "Windows Vista", "Windows Server 2008" }, + { 5, 2, "Windows XP Professional", "Windows Server 2003" }, + /* Windows XP did not have a server version, but we need something here */ + { 5, 1, "Windows XP", "Windows XP Server" }, + { 5, 0, "Windows 2000 Professional", "Windows 2000 Server" }, + /* Earlier versions are not supported by GetVersionEx(). */ + { 0, 0, NULL, NULL } }; memset(&info, 0, sizeof(info)); info.dwOSVersionInfoSize = sizeof(info); @@ -2714,25 +2725,34 @@ MOCK_IMPL(const char *, get_uname, (void)) uname_result_is_set = 1; return uname_result; } - if (info.dwMajorVersion == 4 && info.dwMinorVersion == 0) { - if (info.dwPlatformId == VER_PLATFORM_WIN32_NT) - plat = "Windows NT 4.0"; - else - plat = "Windows 95"; +#ifdef VER_NT_SERVER + if (info.wProductType == VER_NT_SERVER || + info.wProductType == VER_NT_DOMAIN_CONTROLLER) { + is_server = 1; } else { - for (i=0; win_version_table[i].major>0; ++i) { - if (win_version_table[i].major == info.dwMajorVersion && - win_version_table[i].minor == info.dwMinorVersion) { - plat = win_version_table[i].version; - break; + is_client = 1; + } +#endif + /* Search the version table for a matching version */ + for (i=0; win_version_table[i].major>0; ++i) { + if (win_version_table[i].major == info.dwMajorVersion && + win_version_table[i].minor == info.dwMinorVersion) { + if (is_server) { + plat = win_version_table[i].server_version; + } else { + /* Use client versions for clients, and when we don't know if it + * is a client or a server. */ + plat = win_version_table[i].client_version; } + break; } } if (plat) { strlcpy(uname_result, plat, sizeof(uname_result)); } else { - if (info.dwMajorVersion > 6 || - (info.dwMajorVersion==6 && info.dwMinorVersion>2)) + if (info.dwMajorVersion > win_version_table[0].major || + (info.dwMajorVersion == win_version_table[0].major && + info.dwMinorVersion > win_version_table[0].minor)) tor_snprintf(uname_result, sizeof(uname_result), "Very recent version of Windows [major=%d,minor=%d]", (int)info.dwMajorVersion,(int)info.dwMinorVersion); @@ -2741,12 +2761,25 @@ MOCK_IMPL(const char *, get_uname, (void)) "Unrecognized version of Windows [major=%d,minor=%d]", (int)info.dwMajorVersion,(int)info.dwMinorVersion); } -#ifdef VER_NT_SERVER - if (info.wProductType == VER_NT_SERVER || - info.wProductType == VER_NT_DOMAIN_CONTROLLER) { - strlcat(uname_result, " [server]", sizeof(uname_result)); - } -#endif + /* Now append extra information to the name. + * + * Microsoft's API documentation says that on Windows 8.1 and later, + * GetVersionEx returns Windows 8 (6.2) for applications without an + * app compatibility manifest (including tor's default build). + * + * But in our testing, we have seen the actual Windows version on + * Windows Server 2012 R2, even without a manifest. */ + if (info.dwMajorVersion > 6 || + (info.dwMajorVersion == 6 && info.dwMinorVersion >= 2)) { + /* When GetVersionEx() returns Windows 8, the actual OS may be any + * later version. */ + strlcat(uname_result, " [or later]", sizeof(uname_result)); + } + /* When we don't know if the OS is a client or server version, we use + * the client version, and this qualifier. */ + if (!is_server && !is_client) { + strlcat(uname_result, " [client or server]", sizeof(uname_result)); + } #else /* LCOV_EXCL_START -- can't provoke uname failure */ strlcpy(uname_result, "Unknown platform", sizeof(uname_result));

1 0

[tor/master] Merge branch 'bug28096-029-squashed' into bug28096-035-squashed
by nickm＠torproject.org 27 Nov '18

27 Nov '18

commit 44ced9b750a65d867dc5dd2cbbcf7e42a46ae90d Merge: d598d834f 2fbc58cf0 Author: teor <teor(a)torproject.org> Date: Thu Nov 15 12:23:29 2018 +1000 Merge branch 'bug28096-029-squashed' into bug28096-035-squashed Move the get_uname() changes from src/common/compat.c to src/lib/osinfo/uname.c changes/bug28096 | 13 +++++++ src/lib/osinfo/uname.c | 95 ++++++++++++++++++++++++++++++++++---------------- 2 files changed, 77 insertions(+), 31 deletions(-) diff --cc src/lib/osinfo/uname.c index 9d1923695,000000000..7111ae31d mode 100644,000000..100644 --- a/src/lib/osinfo/uname.c +++ b/src/lib/osinfo/uname.c @@@ -1,116 -1,0 +1,149 @@@ +/* Copyright (c) 2003-2004, Roger Dingledine + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2018, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * \file uname.c + * \brief Look up a description of the operating system. + **/ + +#include "orconfig.h" +#include "lib/osinfo/uname.h" + +#include "lib/string/compat_string.h" +#include "lib/string/printf.h" + +#ifdef HAVE_UNAME +#include <sys/utsname.h> +#endif +#ifdef _WIN32 +#include <windows.h> +#endif +#include <string.h> + +/** Hold the result of our call to uname. */ +static char uname_result[256]; +/** True iff uname_result is set. */ +static int uname_result_is_set = 0; + +/** Return a pointer to a description of our platform. + */ +MOCK_IMPL(const char *, +get_uname,(void)) +{ +#ifdef HAVE_UNAME + struct utsname u; +#endif + if (!uname_result_is_set) { +#ifdef HAVE_UNAME + if (uname(&u) != -1) { + /* (Linux says 0 is success, Solaris says 1 is success) */ + strlcpy(uname_result, u.sysname, sizeof(uname_result)); + } else +#endif /* defined(HAVE_UNAME) */ + { +#ifdef _WIN32 + OSVERSIONINFOEX info; + int i; ++ int is_client = 0; ++ int is_server = 0; + const char *plat = NULL; + static struct { - unsigned major; unsigned minor; const char *version; ++ unsigned major; unsigned minor; ++ const char *client_version; const char *server_version; + } win_version_table[] = { - { 6, 2, "Windows 8" }, - { 6, 1, "Windows 7" }, - { 6, 0, "Windows Vista" }, - { 5, 2, "Windows Server 2003" }, - { 5, 1, "Windows XP" }, - { 5, 0, "Windows 2000" }, - /* { 4, 0, "Windows NT 4.0" }, */ - { 4, 90, "Windows Me" }, - { 4, 10, "Windows 98" }, - /* { 4, 0, "Windows 95" } */ - { 3, 51, "Windows NT 3.51" }, - { 0, 0, NULL } ++ /* This table must be sorted in descending order. ++ * Sources: ++ * https://en.wikipedia.org/wiki/List_of_Microsoft_Windows_versions ++ * https://docs.microsoft.com/en-us/windows/desktop/api/winnt/ ++ * ns-winnt-_osversioninfoexa#remarks ++ */ ++ /* Windows Server 2019 is indistinguishable from Windows Server 2016 ++ * using GetVersionEx(). ++ { 10, 0, NULL, "Windows Server 2019" }, */ ++ { 10, 0, "Windows 10", "Windows Server 2016" }, ++ { 6, 3, "Windows 8.1", "Windows Server 2012 R2" }, ++ { 6, 2, "Windows 8", "Windows Server 2012" }, ++ { 6, 1, "Windows 7", "Windows Server 2008 R2" }, ++ { 6, 0, "Windows Vista", "Windows Server 2008" }, ++ { 5, 2, "Windows XP Professional", "Windows Server 2003" }, ++ /* Windows XP did not have a server version, but we need something here */ ++ { 5, 1, "Windows XP", "Windows XP Server" }, ++ { 5, 0, "Windows 2000 Professional", "Windows 2000 Server" }, ++ /* Earlier versions are not supported by GetVersionEx(). */ ++ { 0, 0, NULL, NULL } + }; + memset(&info, 0, sizeof(info)); + info.dwOSVersionInfoSize = sizeof(info); + if (! GetVersionEx((LPOSVERSIONINFO)&info)) { + strlcpy(uname_result, "Bizarre version of Windows where GetVersionEx" + " doesn't work.", sizeof(uname_result)); + uname_result_is_set = 1; + return uname_result; + } - if (info.dwMajorVersion == 4 && info.dwMinorVersion == 0) { - if (info.dwPlatformId == VER_PLATFORM_WIN32_NT) - plat = "Windows NT 4.0"; - else - plat = "Windows 95"; ++#ifdef VER_NT_SERVER ++ if (info.wProductType == VER_NT_SERVER || ++ info.wProductType == VER_NT_DOMAIN_CONTROLLER) { ++ is_server = 1; + } else { - for (i=0; win_version_table[i].major>0; ++i) { - if (win_version_table[i].major == info.dwMajorVersion && - win_version_table[i].minor == info.dwMinorVersion) { - plat = win_version_table[i].version; - break; ++ is_client = 1; ++ } ++#endif /* defined(VER_NT_SERVER) */ ++ /* Search the version table for a matching version */ ++ for (i=0; win_version_table[i].major>0; ++i) { ++ if (win_version_table[i].major == info.dwMajorVersion && ++ win_version_table[i].minor == info.dwMinorVersion) { ++ if (is_server) { ++ plat = win_version_table[i].server_version; ++ } else { ++ /* Use client versions for clients, and when we don't know if it ++ * is a client or a server. */ ++ plat = win_version_table[i].client_version; + } ++ break; + } + } + if (plat) { + strlcpy(uname_result, plat, sizeof(uname_result)); + } else { - if (info.dwMajorVersion > 6 || - (info.dwMajorVersion==6 && info.dwMinorVersion>2)) ++ if (info.dwMajorVersion > win_version_table[0].major || ++ (info.dwMajorVersion == win_version_table[0].major && ++ info.dwMinorVersion > win_version_table[0].minor)) + tor_snprintf(uname_result, sizeof(uname_result), + "Very recent version of Windows [major=%d,minor=%d]", + (int)info.dwMajorVersion,(int)info.dwMinorVersion); + else + tor_snprintf(uname_result, sizeof(uname_result), + "Unrecognized version of Windows [major=%d,minor=%d]", + (int)info.dwMajorVersion,(int)info.dwMinorVersion); + } - #ifdef VER_NT_SERVER - if (info.wProductType == VER_NT_SERVER || - info.wProductType == VER_NT_DOMAIN_CONTROLLER) { - strlcat(uname_result, " [server]", sizeof(uname_result)); - } - #endif /* defined(VER_NT_SERVER) */ ++ /* Now append extra information to the name. ++ * ++ * Microsoft's API documentation says that on Windows 8.1 and later, ++ * GetVersionEx returns Windows 8 (6.2) for applications without an ++ * app compatibility manifest (including tor's default build). ++ * ++ * But in our testing, we have seen the actual Windows version on ++ * Windows Server 2012 R2, even without a manifest. */ ++ if (info.dwMajorVersion > 6 || ++ (info.dwMajorVersion == 6 && info.dwMinorVersion >= 2)) { ++ /* When GetVersionEx() returns Windows 8, the actual OS may be any ++ * later version. */ ++ strlcat(uname_result, " [or later]", sizeof(uname_result)); ++ } ++ /* When we don't know if the OS is a client or server version, we use ++ * the client version, and this qualifier. */ ++ if (!is_server && !is_client) { ++ strlcat(uname_result, " [client or server]", sizeof(uname_result)); ++ } +#else /* !(defined(_WIN32)) */ + /* LCOV_EXCL_START -- can't provoke uname failure */ + strlcpy(uname_result, "Unknown platform", sizeof(uname_result)); + /* LCOV_EXCL_STOP */ +#endif /* defined(_WIN32) */ + } + uname_result_is_set = 1; + } + return uname_result; +}

1 0

[tor/maint-0.3.5] Merge branch 'bug28096-029-squashed' into bug28096-035-squashed
by nickm＠torproject.org 27 Nov '18

27 Nov '18

commit 44ced9b750a65d867dc5dd2cbbcf7e42a46ae90d Merge: d598d834f 2fbc58cf0 Author: teor <teor(a)torproject.org> Date: Thu Nov 15 12:23:29 2018 +1000 Merge branch 'bug28096-029-squashed' into bug28096-035-squashed Move the get_uname() changes from src/common/compat.c to src/lib/osinfo/uname.c changes/bug28096 | 13 +++++++ src/lib/osinfo/uname.c | 95 ++++++++++++++++++++++++++++++++++---------------- 2 files changed, 77 insertions(+), 31 deletions(-) diff --cc src/lib/osinfo/uname.c index 9d1923695,000000000..7111ae31d mode 100644,000000..100644 --- a/src/lib/osinfo/uname.c +++ b/src/lib/osinfo/uname.c @@@ -1,116 -1,0 +1,149 @@@ +/* Copyright (c) 2003-2004, Roger Dingledine + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2018, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * \file uname.c + * \brief Look up a description of the operating system. + **/ + +#include "orconfig.h" +#include "lib/osinfo/uname.h" + +#include "lib/string/compat_string.h" +#include "lib/string/printf.h" + +#ifdef HAVE_UNAME +#include <sys/utsname.h> +#endif +#ifdef _WIN32 +#include <windows.h> +#endif +#include <string.h> + +/** Hold the result of our call to uname. */ +static char uname_result[256]; +/** True iff uname_result is set. */ +static int uname_result_is_set = 0; + +/** Return a pointer to a description of our platform. + */ +MOCK_IMPL(const char *, +get_uname,(void)) +{ +#ifdef HAVE_UNAME + struct utsname u; +#endif + if (!uname_result_is_set) { +#ifdef HAVE_UNAME + if (uname(&u) != -1) { + /* (Linux says 0 is success, Solaris says 1 is success) */ + strlcpy(uname_result, u.sysname, sizeof(uname_result)); + } else +#endif /* defined(HAVE_UNAME) */ + { +#ifdef _WIN32 + OSVERSIONINFOEX info; + int i; ++ int is_client = 0; ++ int is_server = 0; + const char *plat = NULL; + static struct { - unsigned major; unsigned minor; const char *version; ++ unsigned major; unsigned minor; ++ const char *client_version; const char *server_version; + } win_version_table[] = { - { 6, 2, "Windows 8" }, - { 6, 1, "Windows 7" }, - { 6, 0, "Windows Vista" }, - { 5, 2, "Windows Server 2003" }, - { 5, 1, "Windows XP" }, - { 5, 0, "Windows 2000" }, - /* { 4, 0, "Windows NT 4.0" }, */ - { 4, 90, "Windows Me" }, - { 4, 10, "Windows 98" }, - /* { 4, 0, "Windows 95" } */ - { 3, 51, "Windows NT 3.51" }, - { 0, 0, NULL } ++ /* This table must be sorted in descending order. ++ * Sources: ++ * https://en.wikipedia.org/wiki/List_of_Microsoft_Windows_versions ++ * https://docs.microsoft.com/en-us/windows/desktop/api/winnt/ ++ * ns-winnt-_osversioninfoexa#remarks ++ */ ++ /* Windows Server 2019 is indistinguishable from Windows Server 2016 ++ * using GetVersionEx(). ++ { 10, 0, NULL, "Windows Server 2019" }, */ ++ { 10, 0, "Windows 10", "Windows Server 2016" }, ++ { 6, 3, "Windows 8.1", "Windows Server 2012 R2" }, ++ { 6, 2, "Windows 8", "Windows Server 2012" }, ++ { 6, 1, "Windows 7", "Windows Server 2008 R2" }, ++ { 6, 0, "Windows Vista", "Windows Server 2008" }, ++ { 5, 2, "Windows XP Professional", "Windows Server 2003" }, ++ /* Windows XP did not have a server version, but we need something here */ ++ { 5, 1, "Windows XP", "Windows XP Server" }, ++ { 5, 0, "Windows 2000 Professional", "Windows 2000 Server" }, ++ /* Earlier versions are not supported by GetVersionEx(). */ ++ { 0, 0, NULL, NULL } + }; + memset(&info, 0, sizeof(info)); + info.dwOSVersionInfoSize = sizeof(info); + if (! GetVersionEx((LPOSVERSIONINFO)&info)) { + strlcpy(uname_result, "Bizarre version of Windows where GetVersionEx" + " doesn't work.", sizeof(uname_result)); + uname_result_is_set = 1; + return uname_result; + } - if (info.dwMajorVersion == 4 && info.dwMinorVersion == 0) { - if (info.dwPlatformId == VER_PLATFORM_WIN32_NT) - plat = "Windows NT 4.0"; - else - plat = "Windows 95"; ++#ifdef VER_NT_SERVER ++ if (info.wProductType == VER_NT_SERVER || ++ info.wProductType == VER_NT_DOMAIN_CONTROLLER) { ++ is_server = 1; + } else { - for (i=0; win_version_table[i].major>0; ++i) { - if (win_version_table[i].major == info.dwMajorVersion && - win_version_table[i].minor == info.dwMinorVersion) { - plat = win_version_table[i].version; - break; ++ is_client = 1; ++ } ++#endif /* defined(VER_NT_SERVER) */ ++ /* Search the version table for a matching version */ ++ for (i=0; win_version_table[i].major>0; ++i) { ++ if (win_version_table[i].major == info.dwMajorVersion && ++ win_version_table[i].minor == info.dwMinorVersion) { ++ if (is_server) { ++ plat = win_version_table[i].server_version; ++ } else { ++ /* Use client versions for clients, and when we don't know if it ++ * is a client or a server. */ ++ plat = win_version_table[i].client_version; + } ++ break; + } + } + if (plat) { + strlcpy(uname_result, plat, sizeof(uname_result)); + } else { - if (info.dwMajorVersion > 6 || - (info.dwMajorVersion==6 && info.dwMinorVersion>2)) ++ if (info.dwMajorVersion > win_version_table[0].major || ++ (info.dwMajorVersion == win_version_table[0].major && ++ info.dwMinorVersion > win_version_table[0].minor)) + tor_snprintf(uname_result, sizeof(uname_result), + "Very recent version of Windows [major=%d,minor=%d]", + (int)info.dwMajorVersion,(int)info.dwMinorVersion); + else + tor_snprintf(uname_result, sizeof(uname_result), + "Unrecognized version of Windows [major=%d,minor=%d]", + (int)info.dwMajorVersion,(int)info.dwMinorVersion); + } - #ifdef VER_NT_SERVER - if (info.wProductType == VER_NT_SERVER || - info.wProductType == VER_NT_DOMAIN_CONTROLLER) { - strlcat(uname_result, " [server]", sizeof(uname_result)); - } - #endif /* defined(VER_NT_SERVER) */ ++ /* Now append extra information to the name. ++ * ++ * Microsoft's API documentation says that on Windows 8.1 and later, ++ * GetVersionEx returns Windows 8 (6.2) for applications without an ++ * app compatibility manifest (including tor's default build). ++ * ++ * But in our testing, we have seen the actual Windows version on ++ * Windows Server 2012 R2, even without a manifest. */ ++ if (info.dwMajorVersion > 6 || ++ (info.dwMajorVersion == 6 && info.dwMinorVersion >= 2)) { ++ /* When GetVersionEx() returns Windows 8, the actual OS may be any ++ * later version. */ ++ strlcat(uname_result, " [or later]", sizeof(uname_result)); ++ } ++ /* When we don't know if the OS is a client or server version, we use ++ * the client version, and this qualifier. */ ++ if (!is_server && !is_client) { ++ strlcat(uname_result, " [client or server]", sizeof(uname_result)); ++ } +#else /* !(defined(_WIN32)) */ + /* LCOV_EXCL_START -- can't provoke uname failure */ + strlcpy(uname_result, "Unknown platform", sizeof(uname_result)); + /* LCOV_EXCL_STOP */ +#endif /* defined(_WIN32) */ + } + uname_result_is_set = 1; + } + return uname_result; +}

1 0

[tor/maint-0.3.5] Merge remote-tracking branch 'teor/bug28096-035-squashed' into maint-0.3.5
by nickm＠torproject.org 27 Nov '18

27 Nov '18

commit feb41b7c3078d6df7e93a056853badc847773d9a Merge: 056ffdec4 44ced9b75 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 26 17:24:41 2018 -0500 Merge remote-tracking branch 'teor/bug28096-035-squashed' into maint-0.3.5 changes/bug28096 | 13 +++++++ src/lib/osinfo/uname.c | 95 ++++++++++++++++++++++++++++++++++---------------- 2 files changed, 77 insertions(+), 31 deletions(-)

1 0

[tor/master] Windows: fix uname on recent Windows versions
by nickm＠torproject.org 27 Nov '18

27 Nov '18

commit 2fbc58cf07fd7367ddaf81b82868b5f37d7883ae Author: teor <teor(a)torproject.org> Date: Mon Oct 22 14:02:43 2018 +1000 Windows: fix uname on recent Windows versions Correctly identify Windows 8.1, Windows 10, and Windows Server 2008 and later from their NT versions. On recent Windows versions, the GetVersionEx() function may report an earlier Windows version than the running OS. To avoid user confusion, add "[or later]" to Tor's version string on affected versions of Windows. Remove Windows versions that were never supported by the GetVersionEx() function. Stop duplicating the latest Windows version in get_uname(). Fixes bug 28096; bugfix on 0.2.2.34; reported by Keifer Bly. --- changes/bug28096 | 13 ++++++++ src/common/compat.c | 95 ++++++++++++++++++++++++++++++++++++----------------- 2 files changed, 77 insertions(+), 31 deletions(-) diff --git a/changes/bug28096 b/changes/bug28096 new file mode 100644 index 000000000..6847df979 --- /dev/null +++ b/changes/bug28096 @@ -0,0 +1,13 @@ + o Minor bugfixes (Windows): + - Correctly identify Windows 8.1, Windows 10, and Windows Server 2008 + and later from their NT versions. + Fixes bug 28096; bugfix on 0.2.2.34; reported by Keifer Bly. + - On recent Windows versions, the GetVersionEx() function may report + an earlier Windows version than the running OS. To avoid user + confusion, add "[or later]" to Tor's version string on affected + versions of Windows. + Fixes bug 28096; bugfix on 0.2.2.34; reported by Keifer Bly. + - Remove Windows versions that were never supported by the + GetVersionEx() function. Stop duplicating the latest Windows + version in get_uname(). + Fixes bug 28096; bugfix on 0.2.2.34; reported by Keifer Bly. diff --git a/src/common/compat.c b/src/common/compat.c index 4ac443c13..975875112 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -2689,22 +2689,33 @@ MOCK_IMPL(const char *, get_uname, (void)) #ifdef _WIN32 OSVERSIONINFOEX info; int i; + int is_client = 0; + int is_server = 0; const char *plat = NULL; static struct { - unsigned major; unsigned minor; const char *version; + unsigned major; unsigned minor; + const char *client_version; const char *server_version; } win_version_table[] = { - { 6, 2, "Windows 8" }, - { 6, 1, "Windows 7" }, - { 6, 0, "Windows Vista" }, - { 5, 2, "Windows Server 2003" }, - { 5, 1, "Windows XP" }, - { 5, 0, "Windows 2000" }, - /* { 4, 0, "Windows NT 4.0" }, */ - { 4, 90, "Windows Me" }, - { 4, 10, "Windows 98" }, - /* { 4, 0, "Windows 95" } */ - { 3, 51, "Windows NT 3.51" }, - { 0, 0, NULL } + /* This table must be sorted in descending order. + * Sources: + * https://en.wikipedia.org/wiki/List_of_Microsoft_Windows_versions + * https://docs.microsoft.com/en-us/windows/desktop/api/winnt/ + * ns-winnt-_osversioninfoexa#remarks + */ + /* Windows Server 2019 is indistinguishable from Windows Server 2016 + * using GetVersionEx(). + { 10, 0, NULL, "Windows Server 2019" }, */ + { 10, 0, "Windows 10", "Windows Server 2016" }, + { 6, 3, "Windows 8.1", "Windows Server 2012 R2" }, + { 6, 2, "Windows 8", "Windows Server 2012" }, + { 6, 1, "Windows 7", "Windows Server 2008 R2" }, + { 6, 0, "Windows Vista", "Windows Server 2008" }, + { 5, 2, "Windows XP Professional", "Windows Server 2003" }, + /* Windows XP did not have a server version, but we need something here */ + { 5, 1, "Windows XP", "Windows XP Server" }, + { 5, 0, "Windows 2000 Professional", "Windows 2000 Server" }, + /* Earlier versions are not supported by GetVersionEx(). */ + { 0, 0, NULL, NULL } }; memset(&info, 0, sizeof(info)); info.dwOSVersionInfoSize = sizeof(info); @@ -2714,25 +2725,34 @@ MOCK_IMPL(const char *, get_uname, (void)) uname_result_is_set = 1; return uname_result; } - if (info.dwMajorVersion == 4 && info.dwMinorVersion == 0) { - if (info.dwPlatformId == VER_PLATFORM_WIN32_NT) - plat = "Windows NT 4.0"; - else - plat = "Windows 95"; +#ifdef VER_NT_SERVER + if (info.wProductType == VER_NT_SERVER || + info.wProductType == VER_NT_DOMAIN_CONTROLLER) { + is_server = 1; } else { - for (i=0; win_version_table[i].major>0; ++i) { - if (win_version_table[i].major == info.dwMajorVersion && - win_version_table[i].minor == info.dwMinorVersion) { - plat = win_version_table[i].version; - break; + is_client = 1; + } +#endif + /* Search the version table for a matching version */ + for (i=0; win_version_table[i].major>0; ++i) { + if (win_version_table[i].major == info.dwMajorVersion && + win_version_table[i].minor == info.dwMinorVersion) { + if (is_server) { + plat = win_version_table[i].server_version; + } else { + /* Use client versions for clients, and when we don't know if it + * is a client or a server. */ + plat = win_version_table[i].client_version; } + break; } } if (plat) { strlcpy(uname_result, plat, sizeof(uname_result)); } else { - if (info.dwMajorVersion > 6 || - (info.dwMajorVersion==6 && info.dwMinorVersion>2)) + if (info.dwMajorVersion > win_version_table[0].major || + (info.dwMajorVersion == win_version_table[0].major && + info.dwMinorVersion > win_version_table[0].minor)) tor_snprintf(uname_result, sizeof(uname_result), "Very recent version of Windows [major=%d,minor=%d]", (int)info.dwMajorVersion,(int)info.dwMinorVersion); @@ -2741,12 +2761,25 @@ MOCK_IMPL(const char *, get_uname, (void)) "Unrecognized version of Windows [major=%d,minor=%d]", (int)info.dwMajorVersion,(int)info.dwMinorVersion); } -#ifdef VER_NT_SERVER - if (info.wProductType == VER_NT_SERVER || - info.wProductType == VER_NT_DOMAIN_CONTROLLER) { - strlcat(uname_result, " [server]", sizeof(uname_result)); - } -#endif + /* Now append extra information to the name. + * + * Microsoft's API documentation says that on Windows 8.1 and later, + * GetVersionEx returns Windows 8 (6.2) for applications without an + * app compatibility manifest (including tor's default build). + * + * But in our testing, we have seen the actual Windows version on + * Windows Server 2012 R2, even without a manifest. */ + if (info.dwMajorVersion > 6 || + (info.dwMajorVersion == 6 && info.dwMinorVersion >= 2)) { + /* When GetVersionEx() returns Windows 8, the actual OS may be any + * later version. */ + strlcat(uname_result, " [or later]", sizeof(uname_result)); + } + /* When we don't know if the OS is a client or server version, we use + * the client version, and this qualifier. */ + if (!is_server && !is_client) { + strlcat(uname_result, " [client or server]", sizeof(uname_result)); + } #else /* LCOV_EXCL_START -- can't provoke uname failure */ strlcpy(uname_result, "Unknown platform", sizeof(uname_result));

1 0

[tor/master] Merge branch 'maint-0.3.5'
by nickm＠torproject.org 27 Nov '18

27 Nov '18

commit 8a15d0f69b6490eb525cdd889b3a905ad0db5e39 Merge: c292e505f feb41b7c3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 26 17:25:28 2018 -0500 Merge branch 'maint-0.3.5' changes/bug28096 | 13 +++++++ src/lib/osinfo/uname.c | 95 ++++++++++++++++++++++++++++++++++---------------- 2 files changed, 77 insertions(+), 31 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'teor/bug28096-035-squashed' into maint-0.3.5
by nickm＠torproject.org 27 Nov '18

27 Nov '18

commit feb41b7c3078d6df7e93a056853badc847773d9a Merge: 056ffdec4 44ced9b75 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 26 17:24:41 2018 -0500 Merge remote-tracking branch 'teor/bug28096-035-squashed' into maint-0.3.5 changes/bug28096 | 13 +++++++ src/lib/osinfo/uname.c | 95 ++++++++++++++++++++++++++++++++++---------------- 2 files changed, 77 insertions(+), 31 deletions(-)

1 0

[tor/master] Create a temporary directory for tor's DataDirectory in test_rebind.
by nickm＠torproject.org 27 Nov '18

27 Nov '18

commit 997a8b0ca7a4f4eafa2cd09582c4bcc0507e2fa6 Author: Taylor R Campbell <campbell+tor(a)mumble.net> Date: Thu Nov 22 00:53:57 2018 +0000 Create a temporary directory for tor's DataDirectory in test_rebind. Fixes #28562. While here, put the argument count test and usage message _before_ we attempt to read from sys.argv. --- src/test/test_rebind.py | 10 +++++++--- src/test/test_rebind.sh | 15 ++++++++++++++- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/src/test/test_rebind.py b/src/test/test_rebind.py index c63341a68..2f366b271 100644 --- a/src/test/test_rebind.py +++ b/src/test/test_rebind.py @@ -67,12 +67,19 @@ socks_port = pick_random_port() assert control_port != 0 assert socks_port != 0 +if len(sys.argv) < 3: + fail('Usage: %s <path-to-tor> <data-dir>' % sys.argv[0]) + if not os.path.exists(sys.argv[1]): fail('ERROR: cannot find tor at %s' % sys.argv[1]) +if not os.path.exists(sys.argv[2]): + fail('ERROR: cannot find datadir at %s' % sys.argv[2]) tor_path = sys.argv[1] +data_dir = sys.argv[2] tor_process = subprocess.Popen([tor_path, + '-DataDirectory', data_dir, '-ControlPort', '127.0.0.1:{}'.format(control_port), '-SOCKSPort', '127.0.0.1:{}'.format(socks_port), '-FetchServerDescriptors', '0'], @@ -82,9 +89,6 @@ tor_process = subprocess.Popen([tor_path, if tor_process == None: fail('ERROR: running tor failed') -if len(sys.argv) < 2: - fail('Usage: %s <path-to-tor>' % sys.argv[0]) - wait_for_log('Opened Control listener on') try_connecting_to_socksport() diff --git a/src/test/test_rebind.sh b/src/test/test_rebind.sh index 76eb9f2e4..498072de3 100755 --- a/src/test/test_rebind.sh +++ b/src/test/test_rebind.sh @@ -14,6 +14,19 @@ fi exitcode=0 -"${PYTHON:-python}" "${abs_top_srcdir:-.}/src/test/test_rebind.py" "${TESTING_TOR_BINARY}" || exitcode=1 +tmpdir= +clean () { test -n "$tmpdir" && test -d "$tmpdir" && rm -rf "$tmpdir" || :; } +trap clean EXIT HUP INT TERM + +tmpdir="`mktemp -d -t tor_rebind_test.XXXXXX`" +if [ -z "$tmpdir" ]; then + echo >&2 mktemp failed + exit 2 +elif [ ! -d "$tmpdir" ]; then + echo >&2 mktemp failed to make a directory + exit 3 +fi + +"${PYTHON:-python}" "${abs_top_srcdir:-.}/src/test/test_rebind.py" "${TESTING_TOR_BINARY}" "$tmpdir" || exitcode=1 exit ${exitcode}

1 0