mirror of
https://git.freebsd.org/ports.git
synced 2025-05-21 03:23:10 -04:00
90 lines
3.5 KiB
C++
90 lines
3.5 KiB
C++
--- chrome/browser/download/download_prefs.cc.orig 2024-06-17 12:56:06 UTC
|
|
+++ chrome/browser/download/download_prefs.cc
|
|
@@ -11,6 +11,7 @@
|
|
#include <vector>
|
|
|
|
#include "base/check.h"
|
|
+#include "base/command_line.h"
|
|
#include "base/feature_list.h"
|
|
#include "base/files/file_util.h"
|
|
#include "base/functional/bind.h"
|
|
@@ -64,6 +65,10 @@
|
|
#include "chrome/browser/flags/android/chrome_feature_list.h"
|
|
#endif
|
|
|
|
+#if BUILDFLAG(IS_BSD)
|
|
+#include "sandbox/policy/sandbox.h"
|
|
+#endif
|
|
+
|
|
using content::BrowserContext;
|
|
using content::BrowserThread;
|
|
using content::DownloadManager;
|
|
@@ -74,7 +79,7 @@ namespace {
|
|
// Consider downloads 'dangerous' if they go to the home directory on Linux and
|
|
// to the desktop on any platform.
|
|
bool DownloadPathIsDangerous(const base::FilePath& download_path) {
|
|
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
|
base::FilePath home_dir = base::GetHomeDir();
|
|
if (download_path == home_dir) {
|
|
return true;
|
|
@@ -180,7 +185,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi
|
|
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
|
|
|
|
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
|
|
- BUILDFLAG(IS_MAC)
|
|
+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
|
|
should_open_pdf_in_system_reader_ =
|
|
prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader);
|
|
#endif
|
|
@@ -304,7 +309,7 @@ void DownloadPrefs::RegisterProfilePrefs(
|
|
registry->RegisterFilePathPref(prefs::kSaveFileDefaultDirectory,
|
|
default_download_path);
|
|
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
|
|
- BUILDFLAG(IS_MAC)
|
|
+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
|
|
registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false);
|
|
#endif
|
|
#if BUILDFLAG(IS_ANDROID)
|
|
@@ -469,7 +474,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens
|
|
}
|
|
|
|
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
|
|
- BUILDFLAG(IS_MAC)
|
|
+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
|
|
void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) {
|
|
if (should_open_pdf_in_system_reader_ == should_open)
|
|
return;
|
|
@@ -501,7 +506,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons
|
|
|
|
void DownloadPrefs::ResetAutoOpenByUser() {
|
|
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
|
|
- BUILDFLAG(IS_MAC)
|
|
+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
|
|
SetShouldOpenPdfInSystemReader(false);
|
|
#endif
|
|
auto_open_by_user_.clear();
|
|
@@ -538,7 +543,7 @@ void DownloadPrefs::SaveAutoOpenState() {
|
|
bool DownloadPrefs::CanPlatformEnableAutoOpenForPdf() const {
|
|
#if BUILDFLAG(IS_CHROMEOS)
|
|
return false; // There is no UI for auto-open on ChromeOS.
|
|
-#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
|
|
+#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
|
|
return ShouldOpenPdfInSystemReader();
|
|
#else
|
|
return false;
|
|
@@ -690,7 +695,14 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa
|
|
#else
|
|
// If the stored download directory is an absolute path, we presume it's
|
|
// correct; there's not really much more validation we can do here.
|
|
+#if BUILDFLAG(IS_OPENBSD)
|
|
+ // If unveil(2) is used, force the file dialog directory to something we
|
|
+ // know is available.
|
|
+ auto* sandbox = sandbox::policy::SandboxLinux::GetInstance();
|
|
+ if (!sandbox->unveil_initialized() && path.IsAbsolute())
|
|
+#else
|
|
if (path.IsAbsolute())
|
|
+#endif
|
|
return path;
|
|
|
|
// When the default download directory is *not* an absolute path, we use the
|