8532e1239e
* chore: bump chromium in DEPS to 92.0.4512.6
* 2887336: [CaptureHandle][#2] Propagate CaptureHandleConfig in browser process
https://chromium-review.googlesource.com/c/chromium/src/+/2887336
* refactor: base::Optional -> absl::optional
* chore: fixup patch indices
* chore: bump chromium in DEPS to 92.0.4514.0
* 2899417: Make build work when enable_pdf is set to false.
https://chromium-review.googlesource.com/c/chromium/src/+/2899417
* 2904731: use BrowserContext instead of Profile in PreconnectManager
https://chromium-review.googlesource.com/c/chromium/src/+/2904731
* 2295749: fix: check IsSecureEventInputEnabled in constructor before setting SetPasswordInputEnabled to true
https://chromium-review.googlesource.com/c/chromium/src/+/2295749
* 2893803: Add a GetWebView to RenderFrame.
https://chromium-review.googlesource.com/c/chromium/src/+/2893803
* 2892345: Implement WebContents::ForEachRenderFrameHost
https://chromium-review.googlesource.com/c/chromium/src/+/2892345
* chore: fixup patch indices
* 2892048: Real instance methods for BrowserContext: remaining 5 methods.
https://chromium-review.googlesource.com/c/chromium/src/+/2892048
* 2902821: [mojo] Don't require full header includes for referenced interfaces
https://chromium-review.googlesource.com/c/chromium/src/+/2902821
* 2496500: Remove last deprecated extension Event ctor.
https://chromium-review.googlesource.com/c/chromium/src/+/2496500
* chore: fixup malformed pepper support patch
* chore: bump chromium in DEPS to 92.0.4515.0
* 2908461: Add CreateEmptyPrintPagesParamsPtr() inside print_view_manager_base.cc.
https://chromium-review.googlesource.com/c/chromium/src/+/2908461
* 2880838: viz: add optional HDRMetadata to TransferableResource
https://chromium-review.googlesource.com/c/chromium/src/+/2880838
* chore: fixup patch indices
* chore: bump chromium in DEPS to 92.0.4515.5
* chore: update patches
* chore: bump chromium in DEPS to 92.0.4515.7
* chore: bump chromium in DEPS to 92.0.4515.9
* chore: bump chromium in DEPS to 93.0.4522.0
* chore: bump chromium in DEPS to 93.0.4523.0
* chore: bump chromium in DEPS to 93.0.4524.0
* chore: update patches
* chore: enable_pak_file_integrity_checks was reverted
* chore: update patches
* refactor: base/optional was replaced with absl::optional
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2910202
* refactor: replace all usages of base::nullopt with absl::nullopt
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2910202
* chore: add missing base::Contains include
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2910202
* refactor: replace all usages of base::make_optional with
absl::make_optional
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2910202
* refactor: replace WorldScriptContext() with GetScriptContextFromWorldId
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2893213
* chore: clean up left over opening namespace
Refs: 95bfe6d08f
* chore: add missing base::Contains include
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2910202
* refactor: replace GetCurrentDisplayIterator with the hard checker
GetCurrentDisplay
This code looks suspicious but if the iterator was invalid before it
will also be invalid now.
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2893191
* refactor: headers are now passed directly in extensions client
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2918906
* refactor: base::DictionaryValue::empty() has been removed
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2912424
* chore: add missing includes for network URLLoaderFactory
Refs: unknown, probably a side effect of header changes
* refactor: make convenience wrapper around AppendArg
There is no converter FromV8 for base::StringPiece (apparently its not
possible). So we now take in an std::string and use the construct for
StringPiece to do implicit conversion.
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2905544
* chore: add patch
* chore: bump chromium in DEPS to 93.0.4525.0
* chore: update patches
* refactor: CanResize has been de-virtualized
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2485774
* chore: update resource integrity patch
* chore: add character encoding idl patch
* chore: bump chromium in DEPS to 93.0.4526.0
* chore: update patches
* chore: bump chromium in DEPS to 93.0.4527.0
* chore: bump chromium in DEPS to 93.0.4528.0
* chore: update patches
* chore: update idl encoding patch
* chore: bump chromium in DEPS to 93.0.4529.0
* chore: update patches
* chore: bump chromium in DEPS to 93.0.4530.0
* chore: update patches
* fix: only SetCanResize after the widget has been initialized
* chore: add patch for vr on windows gn gen
* spec: fix focus related tests on linux due to delay in focus swap
* chore: remove new usages of base::Optional from main
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: Samuel Attard <sattard@slack-corp.com>
Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com>
172 lines
5 KiB
C++
172 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 <utility>
|
|
|
|
#include "third_party/abseil-cpp/absl/types/optional.h"
|
|
|
|
#if defined(OS_WIN)
|
|
#include <windows.h>
|
|
|
|
#include <psapi.h>
|
|
#include "base/win/win_util.h"
|
|
#endif
|
|
|
|
#if defined(OS_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 // defined(OS_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 defined(OS_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 defined(OS_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 defined(OS_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 // defined(OS_MAC)
|
|
|
|
} // namespace electron
|