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>
236 lines
7.9 KiB
C++
236 lines
7.9 KiB
C++
// Copyright (c) 2018 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/electron_api_net_log.h"
|
|
|
|
#include <string>
|
|
#include <utility>
|
|
|
|
#include "base/command_line.h"
|
|
#include "base/task/thread_pool.h"
|
|
#include "chrome/browser/browser_process.h"
|
|
#include "components/net_log/chrome_net_log.h"
|
|
#include "content/public/browser/storage_partition.h"
|
|
#include "electron/electron_version.h"
|
|
#include "gin/object_template_builder.h"
|
|
#include "shell/browser/electron_browser_context.h"
|
|
#include "shell/browser/net/system_network_context_manager.h"
|
|
#include "shell/common/gin_converters/file_path_converter.h"
|
|
#include "shell/common/gin_helper/dictionary.h"
|
|
#include "shell/common/node_includes.h"
|
|
|
|
namespace gin {
|
|
|
|
template <>
|
|
struct Converter<net::NetLogCaptureMode> {
|
|
static bool FromV8(v8::Isolate* isolate,
|
|
v8::Local<v8::Value> val,
|
|
net::NetLogCaptureMode* out) {
|
|
std::string type;
|
|
if (!ConvertFromV8(isolate, val, &type))
|
|
return false;
|
|
if (type == "default")
|
|
*out = net::NetLogCaptureMode::kDefault;
|
|
else if (type == "includeSensitive")
|
|
*out = net::NetLogCaptureMode::kIncludeSensitive;
|
|
else if (type == "everything")
|
|
*out = net::NetLogCaptureMode::kEverything;
|
|
else
|
|
return false;
|
|
return true;
|
|
}
|
|
};
|
|
|
|
} // namespace gin
|
|
|
|
namespace electron {
|
|
|
|
namespace {
|
|
|
|
scoped_refptr<base::SequencedTaskRunner> CreateFileTaskRunner() {
|
|
// The tasks posted to this sequenced task runner do synchronous File I/O for
|
|
// checking paths and setting permissions on files.
|
|
//
|
|
// These operations can be skipped on shutdown since FileNetLogObserver's API
|
|
// doesn't require things to have completed until notified of completion.
|
|
return base::ThreadPool::CreateSequencedTaskRunner(
|
|
{base::MayBlock(), base::TaskPriority::USER_VISIBLE,
|
|
base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN});
|
|
}
|
|
|
|
base::File OpenFileForWriting(base::FilePath path) {
|
|
return base::File(path,
|
|
base::File::FLAG_CREATE_ALWAYS | base::File::FLAG_WRITE);
|
|
}
|
|
|
|
void ResolvePromiseWithNetError(gin_helper::Promise<void> promise,
|
|
int32_t error) {
|
|
if (error == net::OK) {
|
|
promise.Resolve();
|
|
} else {
|
|
promise.RejectWithErrorMessage(net::ErrorToString(error));
|
|
}
|
|
}
|
|
|
|
} // namespace
|
|
|
|
namespace api {
|
|
|
|
gin::WrapperInfo NetLog::kWrapperInfo = {gin::kEmbedderNativeGin};
|
|
|
|
NetLog::NetLog(v8::Isolate* isolate, ElectronBrowserContext* browser_context)
|
|
: browser_context_(browser_context) {
|
|
file_task_runner_ = CreateFileTaskRunner();
|
|
}
|
|
|
|
NetLog::~NetLog() = default;
|
|
|
|
v8::Local<v8::Promise> NetLog::StartLogging(base::FilePath log_path,
|
|
gin::Arguments* args) {
|
|
if (log_path.empty()) {
|
|
args->ThrowTypeError("The first parameter must be a valid string");
|
|
return v8::Local<v8::Promise>();
|
|
}
|
|
|
|
net::NetLogCaptureMode capture_mode = net::NetLogCaptureMode::kDefault;
|
|
uint64_t max_file_size = network::mojom::NetLogExporter::kUnlimitedFileSize;
|
|
|
|
gin_helper::Dictionary dict;
|
|
if (args->GetNext(&dict)) {
|
|
v8::Local<v8::Value> capture_mode_v8;
|
|
if (dict.Get("captureMode", &capture_mode_v8)) {
|
|
if (!gin::ConvertFromV8(args->isolate(), capture_mode_v8,
|
|
&capture_mode)) {
|
|
args->ThrowTypeError("Invalid value for captureMode");
|
|
return v8::Local<v8::Promise>();
|
|
}
|
|
}
|
|
v8::Local<v8::Value> max_file_size_v8;
|
|
if (dict.Get("maxFileSize", &max_file_size_v8)) {
|
|
if (!gin::ConvertFromV8(args->isolate(), max_file_size_v8,
|
|
&max_file_size)) {
|
|
args->ThrowTypeError("Invalid value for maxFileSize");
|
|
return v8::Local<v8::Promise>();
|
|
}
|
|
}
|
|
}
|
|
|
|
if (net_log_exporter_) {
|
|
args->ThrowTypeError("There is already a net log running");
|
|
return v8::Local<v8::Promise>();
|
|
}
|
|
|
|
pending_start_promise_ =
|
|
absl::make_optional<gin_helper::Promise<void>>(args->isolate());
|
|
v8::Local<v8::Promise> handle = pending_start_promise_->GetHandle();
|
|
|
|
auto command_line_string =
|
|
base::CommandLine::ForCurrentProcess()->GetCommandLineString();
|
|
auto channel_string = std::string("Electron " ELECTRON_VERSION);
|
|
base::Value custom_constants =
|
|
base::Value::FromUniquePtrValue(net_log::GetPlatformConstantsForNetLog(
|
|
command_line_string, channel_string));
|
|
|
|
auto* network_context =
|
|
browser_context_->GetDefaultStoragePartition()->GetNetworkContext();
|
|
|
|
network_context->CreateNetLogExporter(mojo::MakeRequest(&net_log_exporter_));
|
|
net_log_exporter_.set_connection_error_handler(base::BindOnce(
|
|
&NetLog::OnConnectionError, weak_ptr_factory_.GetWeakPtr()));
|
|
|
|
base::PostTaskAndReplyWithResult(
|
|
file_task_runner_.get(), FROM_HERE,
|
|
base::BindOnce(OpenFileForWriting, log_path),
|
|
base::BindOnce(&NetLog::StartNetLogAfterCreateFile,
|
|
weak_ptr_factory_.GetWeakPtr(), capture_mode,
|
|
max_file_size, std::move(custom_constants)));
|
|
|
|
return handle;
|
|
}
|
|
|
|
void NetLog::StartNetLogAfterCreateFile(net::NetLogCaptureMode capture_mode,
|
|
uint64_t max_file_size,
|
|
base::Value custom_constants,
|
|
base::File output_file) {
|
|
if (!net_log_exporter_) {
|
|
// Theoretically the mojo pipe could have been closed by the time we get
|
|
// here via the connection error handler. If so, the promise has already
|
|
// been resolved.
|
|
return;
|
|
}
|
|
DCHECK(pending_start_promise_);
|
|
if (!output_file.IsValid()) {
|
|
std::move(*pending_start_promise_)
|
|
.RejectWithErrorMessage(
|
|
base::File::ErrorToString(output_file.error_details()));
|
|
net_log_exporter_.reset();
|
|
return;
|
|
}
|
|
net_log_exporter_->Start(
|
|
std::move(output_file), std::move(custom_constants), capture_mode,
|
|
max_file_size,
|
|
base::BindOnce(&NetLog::NetLogStarted, base::Unretained(this)));
|
|
}
|
|
|
|
void NetLog::NetLogStarted(int32_t error) {
|
|
DCHECK(pending_start_promise_);
|
|
ResolvePromiseWithNetError(std::move(*pending_start_promise_), error);
|
|
}
|
|
|
|
void NetLog::OnConnectionError() {
|
|
net_log_exporter_.reset();
|
|
if (pending_start_promise_) {
|
|
std::move(*pending_start_promise_)
|
|
.RejectWithErrorMessage("Failed to start net log exporter");
|
|
}
|
|
}
|
|
|
|
bool NetLog::IsCurrentlyLogging() const {
|
|
return !!net_log_exporter_;
|
|
}
|
|
|
|
v8::Local<v8::Promise> NetLog::StopLogging(gin::Arguments* args) {
|
|
gin_helper::Promise<void> promise(args->isolate());
|
|
v8::Local<v8::Promise> handle = promise.GetHandle();
|
|
|
|
if (net_log_exporter_) {
|
|
// Move the net_log_exporter_ into the callback to ensure that the mojo
|
|
// pointer lives long enough to resolve the promise. Moving it into the
|
|
// callback will cause the instance variable to become empty.
|
|
net_log_exporter_->Stop(
|
|
base::Value(base::Value::Type::DICTIONARY),
|
|
base::BindOnce(
|
|
[](network::mojom::NetLogExporterPtr,
|
|
gin_helper::Promise<void> promise, int32_t error) {
|
|
ResolvePromiseWithNetError(std::move(promise), error);
|
|
},
|
|
std::move(net_log_exporter_), std::move(promise)));
|
|
} else {
|
|
promise.RejectWithErrorMessage("No net log in progress");
|
|
}
|
|
|
|
return handle;
|
|
}
|
|
|
|
gin::ObjectTemplateBuilder NetLog::GetObjectTemplateBuilder(
|
|
v8::Isolate* isolate) {
|
|
return gin::Wrappable<NetLog>::GetObjectTemplateBuilder(isolate)
|
|
.SetProperty("currentlyLogging", &NetLog::IsCurrentlyLogging)
|
|
.SetMethod("startLogging", &NetLog::StartLogging)
|
|
.SetMethod("stopLogging", &NetLog::StopLogging);
|
|
}
|
|
|
|
const char* NetLog::GetTypeName() {
|
|
return "NetLog";
|
|
}
|
|
|
|
// static
|
|
gin::Handle<NetLog> NetLog::Create(v8::Isolate* isolate,
|
|
ElectronBrowserContext* browser_context) {
|
|
return gin::CreateHandle(isolate, new NetLog(isolate, browser_context));
|
|
}
|
|
|
|
} // namespace api
|
|
|
|
} // namespace electron
|