mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

feat: allow setting capture mode and max file size in netLog API (#19215)

Browse source
This commit is contained in:
Jeremy Apthorp 2019-07-25 16:06:39 -07:00 • committed by GitHub
parent 8028c57b42
commit 477661d0e4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 102 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

59
shell/browser/api/atom_api_net_log.cc
View file

@ -11,6 +11,7 @@
#include "components/net_log/chrome_net_log.h"
#include "content/public/browser/storage_partition.h"
#include "electron/electron_version.h"
#include "native_mate/converter.h"
#include "native_mate/dictionary.h"
#include "native_mate/handle.h"
#include "net/url_request/url_request_context_getter.h"
@ -20,6 +21,30 @@
#include "shell/common/native_mate_converters/file_path_converter.h"
#include "shell/common/node_includes.h"
namespace mate {
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 mate
namespace electron {
namespace {
@ -60,13 +85,36 @@ NetLog::NetLog(v8::Isolate* isolate, AtomBrowserContext* browser_context)
NetLog::~NetLog() = default;
v8::Local<v8::Promise> NetLog::StartLogging(mate::Arguments* args) {
base::FilePath log_path;
if (!args->GetNext(&log_path) || log_path.empty()) {
v8::Local<v8::Promise> NetLog::StartLogging(base::FilePath log_path,
mate::Arguments* args) {
if (log_path.empty()) {
args->ThrowError("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;
mate::Dictionary dict;
if (args->GetNext(&dict)) {
v8::Local<v8::Value> capture_mode_v8;
if (dict.Get("captureMode", &capture_mode_v8)) {
if (!mate::ConvertFromV8(args->isolate(), capture_mode_v8,
&capture_mode)) {
args->ThrowError("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 (!mate::ConvertFromV8(args->isolate(), max_file_size_v8,
&max_file_size)) {
args->ThrowError("Invalid value for maxFileSize");
return v8::Local<v8::Promise>();
}
}
}
if (net_log_exporter_) {
args->ThrowError("There is already a net log running");
return v8::Local<v8::Promise>();
@ -90,11 +138,6 @@ v8::Local<v8::Promise> NetLog::StartLogging(mate::Arguments* args) {
net_log_exporter_.set_connection_error_handler(
base::BindOnce(&NetLog::OnConnectionError, base::Unretained(this)));
// TODO(deepak1556): Provide more flexibility to this module
// by allowing customizations on the capturing options.
auto capture_mode = net::NetLogCaptureMode::kDefault;
auto max_file_size = network::mojom::NetLogExporter::kUnlimitedFileSize;
base::PostTaskAndReplyWithResult(
file_task_runner_.get(), FROM_HERE,
base::BindOnce(OpenFileForWriting, log_path),