28ada6ea8b
* chore: bump chromium in DEPS to 99.0.4819.0
* chore: update patches
* chore: bump chromium in DEPS to 99.0.4824.0
* chore: update patches
* chore: bump chromium in DEPS to 99.0.4827.0
* chore: update patches
* 3352511: PiP: Add inkdrop and pointer cursor to PiP window buttons
https://chromium-review.googlesource.com/c/chromium/src/+/3352511
* 3309164: webhid: Show FIDO devices in the chooser if allowed
https://chromium-review.googlesource.com/c/chromium/src/+/3309164
* 3297868: hid: Add experimental HIDDevice.forget()
https://chromium-review.googlesource.com/c/chromium/src/+/3297868
* 3362491: [Extensions] Move i18n API to //extensions
https://chromium-review.googlesource.com/c/chromium/src/+/3362491
* MCC Refactor step0: Allow embedders to register associated_interface binders with RenderFrameHostImpl::associated_registry_.
https://chromium-review.googlesource.com/c/chromium/src/+/3281481
* 3352616: [Gtk] Remove libgtk from the link-line
https://chromium-review.googlesource.com/c/chromium/src/+/3352616
* 3249211: Clear-Site-Data support for partitioned cookies
https://chromium-review.googlesource.com/c/chromium/src/+/3249211
* [Extensions][COIL] Use [allow|block]list in //extensions/common
https://chromium-review.googlesource.com/c/chromium/src/+/3372668
* Begin ScopedUserPrefUpdate migration to modern base::Value
https://chromium-review.googlesource.com/c/chromium/src/+/3376154
* [Code Health] Refactor PrefService GetDict + GetList to use base::Value
https://chromium-review.googlesource.com/c/chromium/src/+/3343526
* 3354997: [CodeHealth] Remove deprecated SetDictionary method
https://chromium-review.googlesource.com/c/chromium/src/+/3354997
* 3287323: Add LacrosPrefStore for lacros settings
https://chromium-review.googlesource.com/c/chromium/src/+/3287323
* 3365916: [PA] Clean up remaining lazy commit code
https://chromium-review.googlesource.com/c/chromium/src/+/3365916
* [MPArch] Target the external protocol error at the responsible frame.
https://chromium-review.googlesource.com/c/chromium/src/+/3011560
* Pass origin to RegisterNonNetworkSubresourceURLLoaderFactories
https://chromium-review.googlesource.com/c/chromium/src/+/3350608
* Linux: Send OSCrypt raw encryption key to the Network Service
https://chromium-review.googlesource.com/c/chromium/src/+/3320484
* [PlzServiceWorker] Remove remaining references to PlzServiceWorker.
https://chromium-review.googlesource.com/c/chromium/src/+/3359441
* chore: fixup for lint
* 3327621: Fix tablet mode detection for Win 11.
https://chromium-review.googlesource.com/c/chromium/src/+/3327621
* 3342428: ax_mac: move AXTextMarker conversion utils under ui umbrella
https://chromium-review.googlesource.com/c/chromium/src/+/3342428
* 3353974: Mac: Use base::Feature for overlay features
https://chromium-review.googlesource.com/c/chromium/src/+/3353974
* chore: bump chromium in DEPS to 99.0.4828.0
* chore: update patches
* chore: bump chromium in DEPS to 99.0.4837.0
* chore: update patches
* chore: update patches
* 3379142: Drop FALLTHROUGH macro
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3379142
* 3381749: C++17: Allow use of std::map::try_emplace and std::map::insert_or_assign
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3381749
* chore: bump chromium in DEPS to 99.0.4839.0
* chore: update patches
* chore: bump chromium in DEPS to 99.0.4840.0
* chore: bump chromium in DEPS to 99.0.4844.0
* 3395881: [api] Deprecate Local<v8::Context> v8::Object::CreationContext()
Ref: https://chromium-review.googlesource.com/c/v8/v8/+/3395881
* chore: update patches
* chore: bump chromium in DEPS to 100.0.4845.0
* chore: update patches
* chore: bump chromium in DEPS to 100.0.4847.0
* chore: update patches
* chore: bump chromium in DEPS to 100.0.4849.0
* chore: update patches
* chore: bump chromium in DEPS to 100.0.4851.0
* chore: bump chromium in DEPS to 100.0.4853.0
* update patches
* chore: update patches
* update patches
* 3383599: Fonts Access: Remove prototype that uses a font picker.
https://chromium-review.googlesource.com/c/chromium/src/+/3383599
* 3404768: Remove ALLOW_UNUSED macros
https://chromium-review.googlesource.com/c/chromium/src/+/3404768
* 3374762: Remove ignore_result.h
https://chromium-review.googlesource.com/c/chromium/src/+/3374762
* 3399305: [unseasoned-pdf] Apply proper frame offsets for touch selections
https://chromium-review.googlesource.com/c/chromium/src/+/3399305
* 3402210: [Extensions] Don't trigger unload event for already unloaded extension
https://chromium-review.googlesource.com/c/chromium/src/+/3402210
* 3410912: Combine URLLoaderClient OnReceiveResponse and OnStartLoadingResponseBody.
https://chromium-review.googlesource.com/c/chromium/src/+/3410912
* 3370428: Make the AuthSchemes policy support dynamic refresh
https://chromium-review.googlesource.com/c/chromium/src/+/3370428
* 3407603: Finish ScopedUserPrefUpdate migration to modern base::Value
https://chromium-review.googlesource.com/c/chromium/src/+/3407603
* 3378352: ozone/x11: move code from //ui/p/x11 to //ui/ozone/p/x11
https://chromium-review.googlesource.com/c/chromium/src/+/3378352
* 3370810: Delete chrome/service, AKA the Cloud Print service process.
https://chromium-review.googlesource.com/c/chromium/src/+/3370810
* chore: bump chromium in DEPS to 100.0.4855.0
* chore: update patches
* fixup! 3370810: Delete chrome/service, AKA the Cloud Print service process.
* revert 3348007 to fix windows build
* 3318572: [Code health] Fix gn check errors in //extensions/browser:*
https://chromium-review.googlesource.com/c/chromium/src/+/3318572
* fix printing.patch
* fix iwyu issue
* 3408515: win: Make ShorcutOperation an enum class and modernize names
https://chromium-review.googlesource.com/c/chromium/src/+/3408515
* 3388333: [UIA] Remove dead code accessibility_misc_utils.h/cc
https://chromium-review.googlesource.com/c/chromium/src/+/3388333
* fix windows build? i hope
* patch gn visibility of //ui/ozone/platform/x11
* missing include base/logging.h
* use BUILDFLAG for USE_NSS_CERTS
https://chromium-review.googlesource.com/c/chromium/src/+/3379123
* defined(OS_*) ==> BUILDFLAG(IS_*)
https://bugs.chromium.org/p/chromium/issues/detail?id=1234043
* fixup! 3404768: Remove ALLOW_UNUSED macros
* another attempt to fix windows build
* temporarily disable the custom scheme service worker test
https://github.com/electron/electron/issues/32664
* fix loading mv3 extensions
not sure what cl broke this unfort.
* fixup! 3404768: Remove ALLOW_UNUSED macros
* patch nan
https://chromium-review.googlesource.com/c/v8/v8/+/3395880
* fix node test
* fix nullptr in FindPdfFrame
* patch perfetto to fix build issue on win-ia32
bc44c3c753
* fix build for linux-x64-testing-no-run-as-node
* fix patch
* skip <webview>.capturePage() test
https://github.com/electron/electron/issues/32705
* test: fix failing tests of focus/blur events of WebContents (#32711)
* inherit stdio from app module test child processes
this prevents them from timing out due to full stdout buffers
* test to see if we can get better logs on windows ci
* try again for appveyor log things
* skip contentTracing tests on ia32
* ci: disable gpu compositing
* drop applied patch
* fix merge fail
* Revert "ci: disable gpu compositing"
This reverts commit 0344129fcb19ea3e87e06c1110d751f22eba3fec.
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@github.com>
Co-authored-by: VerteDinde <khammond@slack-corp.com>
Co-authored-by: VerteDinde <vertedinde@electronjs.org>
Co-authored-by: Jeremy Rose <jeremya@chromium.org>
Co-authored-by: Jeremy Rose <nornagon@nornagon.net>
Co-authored-by: Cheng Zhao <zcbenz@gmail.com>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
193 lines
6.4 KiB
C++
193 lines
6.4 KiB
C++
// Copyright (c) 2016 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/browser/relauncher.h"
|
|
|
|
#include <utility>
|
|
|
|
#if BUILDFLAG(IS_WIN)
|
|
#include <windows.h>
|
|
#endif
|
|
|
|
#include "base/files/file_util.h"
|
|
#include "base/logging.h"
|
|
#include "base/path_service.h"
|
|
#include "base/process/launch.h"
|
|
#include "content/public/common/content_paths.h"
|
|
#include "content/public/common/content_switches.h"
|
|
#include "content/public/common/main_function_params.h"
|
|
#include "shell/common/electron_command_line.h"
|
|
|
|
#if BUILDFLAG(IS_POSIX)
|
|
#include "base/posix/eintr_wrapper.h"
|
|
#endif
|
|
|
|
namespace relauncher {
|
|
|
|
namespace internal {
|
|
|
|
#if BUILDFLAG(IS_POSIX)
|
|
const int kRelauncherSyncFD = STDERR_FILENO + 1;
|
|
#endif
|
|
|
|
const CharType* kRelauncherTypeArg = FILE_PATH_LITERAL("--type=relauncher");
|
|
const CharType* kRelauncherArgSeparator = FILE_PATH_LITERAL("---");
|
|
|
|
} // namespace internal
|
|
|
|
bool RelaunchApp(const StringVector& argv) {
|
|
// Use the currently-running application's helper process. The automatic
|
|
// update feature is careful to leave the currently-running version alone,
|
|
// so this is safe even if the relaunch is the result of an update having
|
|
// been applied. In fact, it's safer than using the updated version of the
|
|
// helper process, because there's no guarantee that the updated version's
|
|
// relauncher implementation will be compatible with the running version's.
|
|
base::FilePath child_path;
|
|
if (!base::PathService::Get(content::CHILD_PROCESS_EXE, &child_path)) {
|
|
LOG(ERROR) << "No CHILD_PROCESS_EXE";
|
|
return false;
|
|
}
|
|
|
|
StringVector relauncher_args;
|
|
return RelaunchAppWithHelper(child_path, relauncher_args, argv);
|
|
}
|
|
|
|
bool RelaunchAppWithHelper(const base::FilePath& helper,
|
|
const StringVector& relauncher_args,
|
|
const StringVector& argv) {
|
|
StringVector relaunch_argv;
|
|
relaunch_argv.push_back(helper.value());
|
|
relaunch_argv.push_back(internal::kRelauncherTypeArg);
|
|
// Relauncher process has its own --type=relauncher which
|
|
// is not recognized by the service_manager, explicitly set
|
|
// the sandbox type to avoid CHECK failure in
|
|
// service_manager::SandboxTypeFromCommandLine
|
|
relaunch_argv.push_back(FILE_PATH_LITERAL("--no-sandbox"));
|
|
|
|
relaunch_argv.insert(relaunch_argv.end(), relauncher_args.begin(),
|
|
relauncher_args.end());
|
|
|
|
relaunch_argv.push_back(internal::kRelauncherArgSeparator);
|
|
|
|
relaunch_argv.insert(relaunch_argv.end(), argv.begin(), argv.end());
|
|
|
|
#if BUILDFLAG(IS_POSIX)
|
|
int pipe_fds[2];
|
|
if (HANDLE_EINTR(pipe(pipe_fds)) != 0) {
|
|
PLOG(ERROR) << "pipe";
|
|
return false;
|
|
}
|
|
|
|
// The parent process will only use pipe_read_fd as the read side of the
|
|
// pipe. It can close the write side as soon as the relauncher process has
|
|
// forked off. The relauncher process will only use pipe_write_fd as the
|
|
// write side of the pipe. In that process, the read side will be closed by
|
|
// base::LaunchApp because it won't be present in fd_map, and the write side
|
|
// will be remapped to kRelauncherSyncFD by fd_map.
|
|
base::ScopedFD pipe_read_fd(pipe_fds[0]);
|
|
base::ScopedFD pipe_write_fd(pipe_fds[1]);
|
|
|
|
// Make sure kRelauncherSyncFD is a safe value. base::LaunchProcess will
|
|
// preserve these three FDs in forked processes, so kRelauncherSyncFD should
|
|
// not conflict with them.
|
|
static_assert(internal::kRelauncherSyncFD != STDIN_FILENO &&
|
|
internal::kRelauncherSyncFD != STDOUT_FILENO &&
|
|
internal::kRelauncherSyncFD != STDERR_FILENO,
|
|
"kRelauncherSyncFD must not conflict with stdio fds");
|
|
#endif
|
|
|
|
base::LaunchOptions options;
|
|
#if BUILDFLAG(IS_POSIX)
|
|
options.fds_to_remap.push_back(
|
|
std::make_pair(pipe_write_fd.get(), internal::kRelauncherSyncFD));
|
|
base::Process process = base::LaunchProcess(relaunch_argv, options);
|
|
#elif BUILDFLAG(IS_WIN)
|
|
base::Process process = base::LaunchProcess(
|
|
internal::ArgvToCommandLineString(relaunch_argv), options);
|
|
#endif
|
|
if (!process.IsValid()) {
|
|
LOG(ERROR) << "base::LaunchProcess failed";
|
|
return false;
|
|
}
|
|
|
|
// The relauncher process is now starting up, or has started up. The
|
|
// original parent process continues.
|
|
|
|
#if BUILDFLAG(IS_WIN)
|
|
// Synchronize with the relauncher process.
|
|
StringType name = internal::GetWaitEventName(process.Pid());
|
|
HANDLE wait_event = ::CreateEventW(NULL, TRUE, FALSE, name.c_str());
|
|
if (wait_event != NULL) {
|
|
WaitForSingleObject(wait_event, 1000);
|
|
CloseHandle(wait_event);
|
|
}
|
|
#elif BUILDFLAG(IS_POSIX)
|
|
pipe_write_fd.reset(); // close(pipe_fds[1]);
|
|
|
|
// Synchronize with the relauncher process.
|
|
char read_char;
|
|
int read_result = HANDLE_EINTR(read(pipe_read_fd.get(), &read_char, 1));
|
|
if (read_result != 1) {
|
|
if (read_result < 0) {
|
|
PLOG(ERROR) << "read";
|
|
} else {
|
|
LOG(ERROR) << "read: unexpected result " << read_result;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
// Since a byte has been successfully read from the relauncher process, it's
|
|
// guaranteed to have set up its kqueue monitoring this process for exit.
|
|
// It's safe to exit now.
|
|
#endif
|
|
return true;
|
|
}
|
|
|
|
int RelauncherMain(const content::MainFunctionParams& main_parameters) {
|
|
const StringVector& argv = electron::ElectronCommandLine::argv();
|
|
|
|
if (argv.size() < 4 || argv[1] != internal::kRelauncherTypeArg) {
|
|
LOG(ERROR) << "relauncher process invoked with unexpected arguments";
|
|
return 1;
|
|
}
|
|
|
|
internal::RelauncherSynchronizeWithParent();
|
|
|
|
// Figure out what to execute, what arguments to pass it, and whether to
|
|
// start it in the background.
|
|
bool in_relauncher_args = false;
|
|
StringType relaunch_executable;
|
|
StringVector relauncher_args;
|
|
StringVector launch_argv;
|
|
for (size_t argv_index = 2; argv_index < argv.size(); ++argv_index) {
|
|
const StringType& arg(argv[argv_index]);
|
|
if (!in_relauncher_args) {
|
|
if (arg == internal::kRelauncherArgSeparator) {
|
|
in_relauncher_args = true;
|
|
} else {
|
|
relauncher_args.push_back(arg);
|
|
}
|
|
} else {
|
|
launch_argv.push_back(arg);
|
|
}
|
|
}
|
|
|
|
if (launch_argv.empty()) {
|
|
LOG(ERROR) << "nothing to relaunch";
|
|
return 1;
|
|
}
|
|
|
|
if (internal::LaunchProgram(relauncher_args, launch_argv) != 0) {
|
|
LOG(ERROR) << "failed to launch program";
|
|
return 1;
|
|
}
|
|
|
|
// The application should have relaunched (or is in the process of
|
|
// relaunching). From this point on, only clean-up tasks should occur, and
|
|
// failures are tolerable.
|
|
|
|
return 0;
|
|
}
|
|
|
|
} // namespace relauncher
|