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>
172 lines
5.1 KiB
C++
172 lines
5.1 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 <utility>
|
|
|
|
#include "third_party/abseil-cpp/absl/types/optional.h"
|
|
|
|
#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->TaskForPid(pid);
|
|
if (task == MACH_PORT_NULL && pid == getpid())
|
|
task = mach_task_self();
|
|
return task;
|
|
}
|
|
|
|
absl::optional<mach_task_basic_info_data_t> GetTaskInfo(mach_port_t task) {
|
|
if (task == MACH_PORT_NULL)
|
|
return absl::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) ? absl::make_optional(info) : absl::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 defined(MAS_BUILD)
|
|
return true;
|
|
#else
|
|
return sandbox_check(process.Pid(), nullptr, 0) != 0;
|
|
#endif
|
|
}
|
|
|
|
#endif // BUILDFLAG(IS_MAC)
|
|
|
|
} // namespace electron
|