diff options
| author | haven@chromium.org <haven@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-11 14:45:35 +0000 |
|---|---|---|
| committer | haven@chromium.org <haven@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-11 14:45:35 +0000 |
| commit | fa01e47350050ca5be93589414a21d4dc5579107 (patch) | |
| tree | 82f43d07d7ccba3bbd5ff275a6f6d92e8d72bc51 /content/browser/child_process_launcher.cc | |
| parent | bfd21809b814c4773725497791b841499af9e0b5 (diff) | |
| download | chromium_src-fa01e47350050ca5be93589414a21d4dc5579107.zip chromium_src-fa01e47350050ca5be93589414a21d4dc5579107.tar.gz chromium_src-fa01e47350050ca5be93589414a21d4dc5579107.tar.bz2 | |
Creates a way to launch the utility process with elevated privileges on Windows systems for the rare operations that require administrator access.
IPCs to the utility process will be filtered when it is running elevated.
BUG=331881
Review URL: https://codereview.chromium.org/98603007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@250409 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/child_process_launcher.cc')
| -rw-r--r-- | content/browser/child_process_launcher.cc | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/content/browser/child_process_launcher.cc b/content/browser/child_process_launcher.cc index 3a16211..7dfad56 100644 --- a/content/browser/child_process_launcher.cc +++ b/content/browser/child_process_launcher.cc @@ -73,6 +73,7 @@ class ChildProcessLauncher::Context void Launch( #if defined(OS_WIN) SandboxedProcessLauncherDelegate* delegate, + bool launch_elevated, #elif defined(OS_ANDROID) int ipcfd, #elif defined(OS_POSIX) @@ -102,6 +103,7 @@ class ChildProcessLauncher::Context child_process_id, #if defined(OS_WIN) delegate, + launch_elevated, #elif defined(OS_ANDROID) ipcfd, #elif defined(OS_POSIX) @@ -185,6 +187,7 @@ class ChildProcessLauncher::Context int child_process_id, #if defined(OS_WIN) SandboxedProcessLauncherDelegate* delegate, + bool launch_elevated, #elif defined(OS_ANDROID) int ipcfd, #elif defined(OS_POSIX) @@ -197,8 +200,15 @@ class ChildProcessLauncher::Context base::TimeTicks begin_launch_time = base::TimeTicks::Now(); #if defined(OS_WIN) - scoped_ptr<SandboxedProcessLauncherDelegate> delegate_deleter(delegate); - base::ProcessHandle handle = StartSandboxedProcess(delegate, cmd_line); + base::ProcessHandle handle = base::kNullProcessHandle; + if (launch_elevated) { + base::LaunchOptions options; + options.start_hidden = true; + base::LaunchElevatedProcess(*cmd_line, options, &handle); + } else { + scoped_ptr<SandboxedProcessLauncherDelegate> delegate_deleter(delegate); + handle = StartSandboxedProcess(delegate, cmd_line); + } #elif defined(OS_POSIX) std::string process_type = cmd_line->GetSwitchValueASCII(switches::kProcessType); @@ -335,7 +345,11 @@ class ChildProcessLauncher::Context zygote_ = zygote; #endif if (client_) { - client_->OnProcessLaunched(); + if (handle) { + client_->OnProcessLaunched(); + } else { + client_->OnProcessLaunchFailed(); + } } else { Terminate(); } @@ -418,6 +432,7 @@ class ChildProcessLauncher::Context ChildProcessLauncher::ChildProcessLauncher( #if defined(OS_WIN) SandboxedProcessLauncherDelegate* delegate, + bool launch_elevated, #elif defined(OS_POSIX) bool use_zygote, const base::EnvironmentMap& environ, @@ -430,6 +445,7 @@ ChildProcessLauncher::ChildProcessLauncher( context_->Launch( #if defined(OS_WIN) delegate, + launch_elevated, #elif defined(OS_ANDROID) ipcfd, #elif defined(OS_POSIX) |