From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id 2F2363953D3A for ; Fri, 30 Jul 2021 17:14:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 2F2363953D3A Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-35-j9-4rGtUMKGQISpM3lmonw-1; Fri, 30 Jul 2021 13:13:59 -0400 X-MC-Unique: j9-4rGtUMKGQISpM3lmonw-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 240451853026; Fri, 30 Jul 2021 17:13:58 +0000 (UTC) Received: from localhost (unknown [10.33.36.118]) by smtp.corp.redhat.com (Postfix) with ESMTP id C352D5D6AB; Fri, 30 Jul 2021 17:13:57 +0000 (UTC) Date: Fri, 30 Jul 2021 18:13:56 +0100 From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Use secure_getenv for filesystem::temp_directory_path() [PR65018] Message-ID: MIME-Version: 1.0 X-Clacks-Overhead: GNU Terry Pratchett X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/mixed; boundary="i2YwD9grelLDl0Hu" Content-Disposition: inline X-Spam-Status: No, score=-14.2 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libstdc++@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++ mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Jul 2021 17:14:11 -0000 --i2YwD9grelLDl0Hu Content-Type: text/plain; charset=us-ascii Content-Disposition: inline This adds a configure check for the GNU extension secure_getenv and then uses it for looking up TMPDIR and similar variables. Signed-off-by: Jonathan Wakely libstdc++-v3/ChangeLog: PR libstdc++/65018 * configure.ac: Check for secure_getenv. * config.h.in: Regenerate. * configure: Regenerate. * src/filesystem/ops-common.h (get_temp_directory_from_env): New helper function to obtain path from the environment. * src/c++17/fs_ops.cc (fs::temp_directory_path): Use new helper. * src/filesystem/ops.cc (fs::temp_directory_path): Likewise. * testsuite/27_io/filesystem/operations/temp_directory_path.cc: Print messages if test cannot be run. * testsuite/experimental/filesystem/operations/temp_directory_path.cc: Likewise. Fix incorrect condition. Use "TMP" to work with Windows as well as POSIX. Tested powerpc64le-linux. Committed to trunk. --i2YwD9grelLDl0Hu Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch.txt" commit 3dbd4d94bf380f3efa8bba9b203ce7d4c8f47fbb Author: Jonathan Wakely Date: Fri Jul 30 13:56:14 2021 libstdc++: Use secure_getenv for filesystem::temp_directory_path() [PR65018] This adds a configure check for the GNU extension secure_getenv and then uses it for looking up TMPDIR and similar variables. Signed-off-by: Jonathan Wakely libstdc++-v3/ChangeLog: PR libstdc++/65018 * configure.ac: Check for secure_getenv. * config.h.in: Regenerate. * configure: Regenerate. * src/filesystem/ops-common.h (get_temp_directory_from_env): New helper function to obtain path from the environment. * src/c++17/fs_ops.cc (fs::temp_directory_path): Use new helper. * src/filesystem/ops.cc (fs::temp_directory_path): Likewise. * testsuite/27_io/filesystem/operations/temp_directory_path.cc: Print messages if test cannot be run. * testsuite/experimental/filesystem/operations/temp_directory_path.cc: Likewise. Fix incorrect condition. Use "TMP" to work with Windows as well as POSIX. diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac index a816ff79d16..9d70ae7b1d0 100644 --- a/libstdc++-v3/configure.ac +++ b/libstdc++-v3/configure.ac @@ -273,6 +273,7 @@ if $GLIBCXX_IS_NATIVE; then AC_CHECK_FUNCS(__cxa_thread_atexit_impl __cxa_thread_atexit) AC_CHECK_FUNCS(aligned_alloc posix_memalign memalign _aligned_malloc) AC_CHECK_FUNCS(_wfopen) + AC_CHECK_FUNCS(secure_getenv) # C11 functions for C++17 library AC_CHECK_FUNCS(timespec_get) diff --git a/libstdc++-v3/src/c++17/fs_ops.cc b/libstdc++-v3/src/c++17/fs_ops.cc index ceaf0291d64..db2250e4841 100644 --- a/libstdc++-v3/src/c++17/fs_ops.cc +++ b/libstdc++-v3/src/c++17/fs_ops.cc @@ -1591,7 +1591,8 @@ fs::symlink_status(const fs::path& p) return result; } -fs::path fs::temp_directory_path() +fs::path +fs::temp_directory_path() { error_code ec; path tmp = temp_directory_path(ec); @@ -1600,32 +1601,10 @@ fs::path fs::temp_directory_path() return tmp; } -fs::path fs::temp_directory_path(error_code& ec) +fs::path +fs::temp_directory_path(error_code& ec) { - path p; -#ifdef _GLIBCXX_FILESYSTEM_IS_WINDOWS - unsigned len = 1024; - std::wstring buf; - do - { - buf.resize(len); - len = GetTempPathW(buf.size(), buf.data()); - } while (len > buf.size()); - - if (len == 0) - { - ec.assign((int)GetLastError(), std::system_category()); - return p; - } - buf.resize(len); - p = std::move(buf); -#else - const char* tmpdir = nullptr; - const char* env[] = { "TMPDIR", "TMP", "TEMP", "TEMPDIR", nullptr }; - for (auto e = env; tmpdir == nullptr && *e != nullptr; ++e) - tmpdir = ::getenv(*e); - p = tmpdir ? tmpdir : "/tmp"; -#endif + path p = fs::get_temp_directory_from_env(); auto st = status(p, ec); if (ec) p.clear(); diff --git a/libstdc++-v3/src/filesystem/ops-common.h b/libstdc++-v3/src/filesystem/ops-common.h index 43311e6c38f..b8bbf446883 100644 --- a/libstdc++-v3/src/filesystem/ops-common.h +++ b/libstdc++-v3/src/filesystem/ops-common.h @@ -568,6 +568,46 @@ _GLIBCXX_BEGIN_NAMESPACE_FILESYSTEM #endif // _GLIBCXX_HAVE_SYS_STAT_H + // Find OS-specific name of temporary directory from the environment, + // Caller must check that the path is an accessible directory. +#ifdef _GLIBCXX_FILESYSTEM_IS_WINDOWS + inline wstring + get_temp_directory_from_env() + { + unsigned len = 1024; + std::wstring buf; + do + { + buf.resize(len); + len = GetTempPathW(buf.size(), buf.data()); + } while (len > buf.size()); + + if (len == 0) + { + ec.assign((int)GetLastError(), std::system_category()); + return p; + } + buf.resize(len); + return buf; + } +#else + inline const char* + get_temp_directory_from_env() noexcept + { + for (auto env : { "TMPDIR", "TMP", "TEMP", "TEMPDIR" }) + { +#if _GLIBCXX_HAVE_SECURE_GETENV + auto tmpdir = ::secure_getenv(env); +#else + auto tmpdir = ::getenv(env); +#endif + if (tmpdir) + return tmpdir; + } + return "/tmp"; + } +#endif + _GLIBCXX_END_NAMESPACE_FILESYSTEM _GLIBCXX_END_NAMESPACE_VERSION diff --git a/libstdc++-v3/src/filesystem/ops.cc b/libstdc++-v3/src/filesystem/ops.cc index 7c5b164fb7f..3494cbd19f9 100644 --- a/libstdc++-v3/src/filesystem/ops.cc +++ b/libstdc++-v3/src/filesystem/ops.cc @@ -1289,7 +1289,8 @@ fs::system_complete(const path& p, error_code& ec) #endif } -fs::path fs::temp_directory_path() +fs::path +fs::temp_directory_path() { error_code ec; path tmp = temp_directory_path(ec); @@ -1298,31 +1299,10 @@ fs::path fs::temp_directory_path() return tmp; } -fs::path fs::temp_directory_path(error_code& ec) +fs::path +fs::temp_directory_path(error_code& ec) { - path p; -#ifdef _GLIBCXX_FILESYSTEM_IS_WINDOWS - unsigned len = 1024; - std::wstring buf; - do - { - buf.resize(len); - len = GetTempPathW(buf.size(), buf.data()); - } while (len > buf.size()); - - if (len == 0) - { - ec.assign((int)GetLastError(), std::system_category()); - return p; - } - buf.resize(len); - p = std::move(buf); -#else - const char* tmpdir = nullptr; - const char* env[] = { "TMPDIR", "TMP", "TEMP", "TEMPDIR", nullptr }; - for (auto e = env; tmpdir == nullptr && *e != nullptr; ++e) - tmpdir = ::getenv(*e); - p = tmpdir ? tmpdir : "/tmp"; + path p = fs::get_temp_directory_from_env(); auto st = status(p, ec); if (ec) p.clear(); @@ -1331,7 +1311,5 @@ fs::path fs::temp_directory_path(error_code& ec) p.clear(); ec = std::make_error_code(std::errc::not_a_directory); } -#endif return p; } - diff --git a/libstdc++-v3/testsuite/27_io/filesystem/operations/temp_directory_path.cc b/libstdc++-v3/testsuite/27_io/filesystem/operations/temp_directory_path.cc index ff84a0a4531..58d58418122 100644 --- a/libstdc++-v3/testsuite/27_io/filesystem/operations/temp_directory_path.cc +++ b/libstdc++-v3/testsuite/27_io/filesystem/operations/temp_directory_path.cc @@ -20,6 +20,7 @@ #include #include +#include #include #include @@ -58,7 +59,10 @@ test01() clean_env(); if (!fs::exists("/tmp")) + { + puts("/tmp doesn't exist, not testing it for temp_directory_path"); return; // just give up + } std::error_code ec = make_error_code(std::errc::invalid_argument); fs::path p1 = fs::temp_directory_path(ec); @@ -75,7 +79,10 @@ test02() clean_env(); if (!set_env("TMP", __gnu_test::nonexistent_path().string())) + { + puts("Cannot set environment variables, not testing temp_directory_path"); return; // just give up + } std::error_code ec; fs::path p = fs::temp_directory_path(ec); diff --git a/libstdc++-v3/testsuite/experimental/filesystem/operations/temp_directory_path.cc b/libstdc++-v3/testsuite/experimental/filesystem/operations/temp_directory_path.cc index 3e0833f597b..d6d251ee2f6 100644 --- a/libstdc++-v3/testsuite/experimental/filesystem/operations/temp_directory_path.cc +++ b/libstdc++-v3/testsuite/experimental/filesystem/operations/temp_directory_path.cc @@ -21,6 +21,7 @@ #include #include +#include #include #include @@ -59,7 +60,10 @@ test01() clean_env(); if (!fs::exists("/tmp")) + { + puts("/tmp doesn't exist, not testing it for temp_directory_path"); return; // just give up + } std::error_code ec = make_error_code(std::errc::invalid_argument); fs::path p1 = fs::temp_directory_path(ec); @@ -75,8 +79,11 @@ test02() { clean_env(); - if (set_env("TMPDIR", __gnu_test::nonexistent_path().string())) + if (!set_env("TMP", __gnu_test::nonexistent_path().string())) + { + puts("Cannot set environment variables, not testing temp_directory_path"); return; // just give up + } std::error_code ec; fs::path p = fs::temp_directory_path(ec); --i2YwD9grelLDl0Hu--