mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

fix: allow access to the profile dir in mac network sandbox (nws13n) (#17931)

Browse source
This commit is contained in:
Robo 2019-04-23 17:31:36 -07:00 • committed by Cheng Zhao
parent e1e055a837
commit 9b779657fb
2 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
atom/browser/atom_browser_client.cc
View file

@ -19,6 +19,7 @@
#include "atom/browser/atom_browser_context.h" #include "atom/browser/atom_browser_context.h"
#include "atom/browser/atom_browser_main_parts.h" #include "atom/browser/atom_browser_main_parts.h"
#include "atom/browser/atom_navigation_throttle.h" #include "atom/browser/atom_navigation_throttle.h"
#include "atom/browser/atom_paths.h"
#include "atom/browser/atom_quota_permission_context.h" #include "atom/browser/atom_quota_permission_context.h"
#include "atom/browser/atom_resource_dispatcher_host_delegate.h" #include "atom/browser/atom_resource_dispatcher_host_delegate.h"
#include "atom/browser/atom_speech_recognition_manager_delegate.h" #include "atom/browser/atom_speech_recognition_manager_delegate.h"
@ -902,6 +903,15 @@ void AtomBrowserClient::OnNetworkServiceCreated(
network_service); network_service);
} }
std::vector<base::FilePath>
AtomBrowserClient::GetNetworkContextsParentDirectory() {
base::FilePath user_data_dir;
base::PathService::Get(DIR_USER_DATA, &user_data_dir);
DCHECK(!user_data_dir.empty());
return {user_data_dir};
}
bool AtomBrowserClient::ShouldBypassCORB(int render_process_id) const { bool AtomBrowserClient::ShouldBypassCORB(int render_process_id) const {
// This is called on the network thread. // This is called on the network thread.
base::AutoLock auto_lock(process_preferences_lock_); base::AutoLock auto_lock(process_preferences_lock_);

1
atom/browser/atom_browser_client.h
View file

@ -154,6 +154,7 @@ class AtomBrowserClient : public content::ContentBrowserClient,
GetSystemSharedURLLoaderFactory() override; GetSystemSharedURLLoaderFactory() override;
void OnNetworkServiceCreated( void OnNetworkServiceCreated(
network::mojom::NetworkService* network_service) override; network::mojom::NetworkService* network_service) override;
std::vector<base::FilePath> GetNetworkContextsParentDirectory() override;
bool ShouldBypassCORB(int render_process_id) const override; bool ShouldBypassCORB(int render_process_id) const override;
std::string GetProduct() const override; std::string GetProduct() const override;
std::string GetUserAgent() const override; std::string GetUserAgent() const override;