0dad99561b
* chore: bump chromium in DEPS to 123.0.6273.0 * chore: update patches * chore: bump chromium in DEPS to 123.0.6274.0 * chore: update patches * chore: bump chromium in DEPS to 123.0.6276.0 * chore: update patches * WIP: 5239586: Change View::Layout() to take a PassKey. https://chromium-review.googlesource.com/c/chromium/src/+/5239586 * WIP: 5239586: Change View::Layout() to take a PassKey. https://chromium-review.googlesource.com/c/chromium/src/+/5239586 * chore: bump chromium in DEPS to 123.0.6278.0 * chore: bump chromium in DEPS to 123.0.6280.0 * chore: update patches * chore: use net::CanonicalCookie::SecureAttribute() renamed from IsSecure() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5245913 * refactor: handle multiple requested device ids Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5132210 * refactor: trigger View layouts async with View::InvalidateLayout() Upstream has introduced a PassKey to restrict who can call Layout() directly. I've opted for calling `InvalidateLayout()` which is the approach that upstream recommends. If for some reason this approach doesn't work for us, we could use `DeprecatedLayoutImmediately()` as a stopgap. Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5239586 Xref: https://chromium.googlesource.com/chromium/src/+/main/ui/views/view.h#809 Xref: https://chromium.googlesource.com/chromium/src/+/main/docs/ui/learn/bestpractices/layout.md?pli=1#don_t-invoke-layout_directly * chore: bump chromium in DEPS to 123.0.6282.0 * chore: bump chromium in DEPS to 123.0.6284.0 * chore: update patches * refactor: remove use of blink::MainThreadIsolate() pt 1/3 Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5249640 * refactor: remove use of blink::MainThreadIsolate() pt 2/3 Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5249640 * refactor: remove use of blink::MainThreadIsolate() pt 3/3 Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5249640 * chore: update enum name to ui::AXMode::kPDFPrinting Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5270301 * chore: rebuild filenames.libcxx.gni * chore: sync with upstream rename of PortProvider.TaskForHandle() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5259103 * chore: bump chromium in DEPS to 123.0.6286.0 * chore: bump chromium in DEPS to 123.0.6288.0 * WebPreferences: Initialize in declaration. Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5277099 * chore: update webview_fullscreen.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5053508 Simple update to fix patch shear * chore: update feat_configure_launch_options_for_service_process.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5254861 Simple update to fix patch shear * chore: add IWC::Delegate::RecordResize() stub to fix FTBFS https://chromium-review.googlesource.com/c/chromium/src/+/5268963 * chore: add FormControlType::kButtonPopover to the FormControlType converter Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5230929 * chore: e patches all * chore: node script/gen-libc++-filenames.js * chore: bump chromium in DEPS to 123.0.6290.0 * chore: bump chromium in DEPS to 123.0.6291.0 * chore: bump chromium in DEPS to 123.0.6292.0 * chore: bump chromium in DEPS to 123.0.6294.0 * chore: update fix_aspect_ratio_with_max_size.patch Xref: fix_aspect_ratio_with_max_size.patch note: simple absl::optional -> std::optional conversion * chore: update feat_filter_out_non-shareable_windows_in_the_current_application_in.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5272337 * chore: update add_maximized_parameter_to_linuxui_getwindowframeprovider.patch No manual changes; just adjusting line patch offsets Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5258688 * chore: update feat_configure_launch_options_for_service_process.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5281322 * chore: update fix_select_The_first_menu_item_when_opened_via_keyboard.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5279376 note: simple absl::optional -> std::optional conversion * chore: update feat_allow_code_cache_in_custom_schemes.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5268792 * chore: script/export_all_patches.py * chore: bump chromium in DEPS to 123.0.6296.0 * chore: update patches * fixup! chore: update feat_allow_code_cache_in_custom_schemes.patch * fix: restore MessagePort close event * spec: fix CORB testing Refs https://chromium-review.googlesource.com/c/chromium/src/+/5231506 * fix: use sync layout when content view changes * fixup! chore: update feat_configure_launch_options_for_service_process.patch * Add remote-cocoa support for context menus. Refs https://chromium-review.googlesource.com/c/chromium/src/+/5259806 * Rename //net/base/mac directory to //net/base/apple (1/n) Refs https://chromium-review.googlesource.com/c/chromium/src/+/5211389 * fixup! Add remote-cocoa support for context menus. * [Clipboard] Don't add meta charset tag for async write() method on Mac. Refs https://chromium-review.googlesource.com/c/chromium/src/+/5187335 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: clavin <clavin@electronjs.org> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: deepak1556 <hop2deep@gmail.com>
171 lines
5 KiB
C++
171 lines
5 KiB
C++
// Copyright (c) 2019 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/browser/api/process_metric.h"
|
|
|
|
#include <memory>
|
|
#include <optional>
|
|
#include <utility>
|
|
|
|
#if BUILDFLAG(IS_WIN)
|
|
#include <windows.h>
|
|
|
|
#include <psapi.h>
|
|
#include "base/win/win_util.h"
|
|
#endif
|
|
|
|
#if BUILDFLAG(IS_MAC)
|
|
#include <mach/mach.h>
|
|
#include "base/process/port_provider_mac.h"
|
|
#include "content/public/browser/browser_child_process_host.h"
|
|
|
|
extern "C" int sandbox_check(pid_t pid, const char* operation, int type, ...);
|
|
|
|
namespace {
|
|
|
|
mach_port_t TaskForPid(pid_t pid) {
|
|
mach_port_t task = MACH_PORT_NULL;
|
|
if (auto* port_provider = content::BrowserChildProcessHost::GetPortProvider())
|
|
task = port_provider->TaskForHandle(pid);
|
|
if (task == MACH_PORT_NULL && pid == getpid())
|
|
task = mach_task_self();
|
|
return task;
|
|
}
|
|
|
|
std::optional<mach_task_basic_info_data_t> GetTaskInfo(mach_port_t task) {
|
|
if (task == MACH_PORT_NULL)
|
|
return std::nullopt;
|
|
mach_task_basic_info_data_t info = {};
|
|
mach_msg_type_number_t count = MACH_TASK_BASIC_INFO_COUNT;
|
|
kern_return_t kr = task_info(task, MACH_TASK_BASIC_INFO,
|
|
reinterpret_cast<task_info_t>(&info), &count);
|
|
return (kr == KERN_SUCCESS) ? std::make_optional(info) : std::nullopt;
|
|
}
|
|
|
|
} // namespace
|
|
|
|
#endif // BUILDFLAG(IS_MAC)
|
|
|
|
namespace electron {
|
|
|
|
ProcessMetric::ProcessMetric(int type,
|
|
base::ProcessHandle handle,
|
|
std::unique_ptr<base::ProcessMetrics> metrics,
|
|
const std::string& service_name,
|
|
const std::string& name) {
|
|
this->type = type;
|
|
this->metrics = std::move(metrics);
|
|
this->service_name = service_name;
|
|
this->name = name;
|
|
|
|
#if BUILDFLAG(IS_WIN)
|
|
HANDLE duplicate_handle = INVALID_HANDLE_VALUE;
|
|
::DuplicateHandle(::GetCurrentProcess(), handle, ::GetCurrentProcess(),
|
|
&duplicate_handle, 0, false, DUPLICATE_SAME_ACCESS);
|
|
this->process = base::Process(duplicate_handle);
|
|
#else
|
|
this->process = base::Process(handle);
|
|
#endif
|
|
}
|
|
|
|
ProcessMetric::~ProcessMetric() = default;
|
|
|
|
#if BUILDFLAG(IS_WIN)
|
|
|
|
ProcessMemoryInfo ProcessMetric::GetMemoryInfo() const {
|
|
ProcessMemoryInfo result;
|
|
|
|
PROCESS_MEMORY_COUNTERS_EX info = {};
|
|
if (::GetProcessMemoryInfo(process.Handle(),
|
|
reinterpret_cast<PROCESS_MEMORY_COUNTERS*>(&info),
|
|
sizeof(info))) {
|
|
result.working_set_size = info.WorkingSetSize;
|
|
result.peak_working_set_size = info.PeakWorkingSetSize;
|
|
result.private_bytes = info.PrivateUsage;
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
ProcessIntegrityLevel ProcessMetric::GetIntegrityLevel() const {
|
|
HANDLE token = nullptr;
|
|
if (!::OpenProcessToken(process.Handle(), TOKEN_QUERY, &token)) {
|
|
return ProcessIntegrityLevel::kUnknown;
|
|
}
|
|
|
|
base::win::ScopedHandle token_scoped(token);
|
|
|
|
DWORD token_info_length = 0;
|
|
if (::GetTokenInformation(token, TokenIntegrityLevel, nullptr, 0,
|
|
&token_info_length) ||
|
|
::GetLastError() != ERROR_INSUFFICIENT_BUFFER) {
|
|
return ProcessIntegrityLevel::kUnknown;
|
|
}
|
|
|
|
auto token_label_bytes = std::make_unique<char[]>(token_info_length);
|
|
auto* token_label =
|
|
reinterpret_cast<TOKEN_MANDATORY_LABEL*>(token_label_bytes.get());
|
|
if (!::GetTokenInformation(token, TokenIntegrityLevel, token_label,
|
|
token_info_length, &token_info_length)) {
|
|
return ProcessIntegrityLevel::kUnknown;
|
|
}
|
|
|
|
DWORD integrity_level = *::GetSidSubAuthority(
|
|
token_label->Label.Sid,
|
|
static_cast<DWORD>(*::GetSidSubAuthorityCount(token_label->Label.Sid) -
|
|
1));
|
|
|
|
if (integrity_level >= SECURITY_MANDATORY_UNTRUSTED_RID &&
|
|
integrity_level < SECURITY_MANDATORY_LOW_RID) {
|
|
return ProcessIntegrityLevel::kUntrusted;
|
|
}
|
|
|
|
if (integrity_level >= SECURITY_MANDATORY_LOW_RID &&
|
|
integrity_level < SECURITY_MANDATORY_MEDIUM_RID) {
|
|
return ProcessIntegrityLevel::kLow;
|
|
}
|
|
|
|
if (integrity_level >= SECURITY_MANDATORY_MEDIUM_RID &&
|
|
integrity_level < SECURITY_MANDATORY_HIGH_RID) {
|
|
return ProcessIntegrityLevel::kMedium;
|
|
}
|
|
|
|
if (integrity_level >= SECURITY_MANDATORY_HIGH_RID &&
|
|
integrity_level < SECURITY_MANDATORY_SYSTEM_RID) {
|
|
return ProcessIntegrityLevel::kHigh;
|
|
}
|
|
|
|
return ProcessIntegrityLevel::kUnknown;
|
|
}
|
|
|
|
// static
|
|
bool ProcessMetric::IsSandboxed(ProcessIntegrityLevel integrity_level) {
|
|
return integrity_level > ProcessIntegrityLevel::kUnknown &&
|
|
integrity_level < ProcessIntegrityLevel::kMedium;
|
|
}
|
|
|
|
#elif BUILDFLAG(IS_MAC)
|
|
|
|
ProcessMemoryInfo ProcessMetric::GetMemoryInfo() const {
|
|
ProcessMemoryInfo result;
|
|
|
|
if (auto info = GetTaskInfo(TaskForPid(process.Pid()))) {
|
|
result.working_set_size = info->resident_size;
|
|
result.peak_working_set_size = info->resident_size_max;
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
bool ProcessMetric::IsSandboxed() const {
|
|
#if IS_MAS_BUILD()
|
|
return true;
|
|
#else
|
|
return sandbox_check(process.Pid(), nullptr, 0) != 0;
|
|
#endif
|
|
}
|
|
|
|
#endif // BUILDFLAG(IS_MAC)
|
|
|
|
} // namespace electron
|