mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
feat: migrate webRequest module to NetworkService (#19979)
* feat: associate InProgressRequest with requests (#19648) * feat: migrate webRequest module to NetworkService (Part 4) (#19679) * chore: use gin in WebRequest * Add stubs for APIs * feat: migrate webRequest module to NetworkService (Part 5) (#19714) * Pass WebRequest to ProxyingURLLoaderFactory * Call WebRequestAPI in InProgressRequest * Store the listeners * Pass the request and response * Add stub to handle the events * Use extensions::WebRequestInfo * Make sure webRequest is managed by Session * chore: make creation of WebRequestNS more clear * fix: check WebContents for service workers * feat: migrate webRequest module to NetworkService (Part 6) (#19752) * Implement OnBeforeSendHeaders * Pass the request * Handle simple listeners * Handle response listeners * Read responses from listener * feat: migrate webRequest module to NetworkService (Part 7) (#19820) * fix: gin treats Function as Dictionary when doing convertions * fix: check if listener exists * fix: listener callback should be executed in next tick * feat: make InProgressRequest work * test: re-enable protocol test that relies on webRequest * chore: merge conditions * feat: migrate webRequest module to NetworkService (Part 8) (#19841) * fix: fill uploadData property * fix: requestHeaders in onBeforeSendHeaders * fix: responseHeaders in onHeadersReceived * fix: header keys should not be lowercased * fix: gin::Dictionary::Get succeeds even though key does not exist... * fix: throw for invalid filters * test: re-enable api-web-request-spec * chore: do not use deprecated base::Value API * feat: migrate webRequest module to NetworkService (Part 9) (#19976) * no need to get WebContents for URLLoaderFactory * consult embedder for network_factory created in net module * set disable_web_security to false * re-enable webRequest tests in net module
This commit is contained in:
Robo
@@ -244,8 +244,10 @@ Session::Session(v8::Isolate* isolate, AtomBrowserContext* browser_context)
|
||||
Session::~Session() {
|
||||
content::BrowserContext::GetDownloadManager(browser_context())
|
||||
->RemoveObserver(this);
|
||||
// TODO(zcbenz): Now since URLRequestContextGetter is gone, is this still
|
||||
// needed?
|
||||
// Refs https://github.com/electron/electron/pull/12305.
|
||||
DestroyGlobalHandle(isolate(), cookies_);
|
||||
DestroyGlobalHandle(isolate(), web_request_);
|
||||
DestroyGlobalHandle(isolate(), protocol_);
|
||||
DestroyGlobalHandle(isolate(), net_log_);
|
||||
g_sessions.erase(weak_map_id());
|
||||
|
||||
@@ -101,12 +101,14 @@ class Session : public mate::TrackableObject<Session>,
|
||||
download::DownloadItem* item) override;
|
||||
|
||||
private:
|
||||
// Cached object.
|
||||
// Cached mate::Wrappable objects.
|
||||
v8::Global<v8::Value> cookies_;
|
||||
v8::Global<v8::Value> protocol_;
|
||||
v8::Global<v8::Value> web_request_;
|
||||
v8::Global<v8::Value> net_log_;
|
||||
|
||||
// Cached object.
|
||||
v8::Global<v8::Value> web_request_;
|
||||
|
||||
// The client id to enable the network throttler.
|
||||
base::UnguessableToken network_emulation_token_;
|
||||
|
||||
|
||||
@@ -10,7 +10,9 @@
|
||||
#include "mojo/public/cpp/system/string_data_source.h"
|
||||
#include "native_mate/dictionary.h"
|
||||
#include "native_mate/object_template_builder.h"
|
||||
#include "services/network/public/cpp/wrapper_shared_url_loader_factory.h"
|
||||
#include "shell/browser/api/atom_api_session.h"
|
||||
#include "shell/browser/atom_browser_client.h"
|
||||
#include "shell/browser/atom_browser_context.h"
|
||||
#include "shell/common/native_mate_converters/gurl_converter.h"
|
||||
#include "shell/common/native_mate_converters/net_converter.h"
|
||||
@@ -178,9 +180,35 @@ URLRequestNS::URLRequestNS(mate::Arguments* args) : weak_factory_(this) {
|
||||
}
|
||||
|
||||
auto* browser_context = session->browser_context();
|
||||
auto* storage_partition =
|
||||
content::BrowserContext::GetDefaultStoragePartition(browser_context);
|
||||
|
||||
network::mojom::URLLoaderFactoryPtr network_factory;
|
||||
mojo::PendingReceiver<network::mojom::URLLoaderFactory> factory_request =
|
||||
mojo::MakeRequest(&network_factory);
|
||||
|
||||
// Consult the embedder.
|
||||
network::mojom::TrustedURLLoaderHeaderClientPtrInfo header_client;
|
||||
static_cast<content::ContentBrowserClient*>(AtomBrowserClient::Get())
|
||||
->WillCreateURLLoaderFactory(browser_context, nullptr, -1,
|
||||
true /* is_navigation */,
|
||||
false /* is_download */, url::Origin(),
|
||||
&factory_request, &header_client, nullptr);
|
||||
|
||||
network::mojom::URLLoaderFactoryParamsPtr params =
|
||||
network::mojom::URLLoaderFactoryParams::New();
|
||||
params->header_client = std::move(header_client);
|
||||
params->process_id = network::mojom::kBrowserProcessId;
|
||||
params->is_corb_enabled = false;
|
||||
// The tests of net module would fail if this setting is true, it seems that
|
||||
// the non-NetworkService implementation always has web security enabled.
|
||||
params->disable_web_security = false;
|
||||
|
||||
storage_partition->GetNetworkContext()->CreateURLLoaderFactory(
|
||||
std::move(factory_request), std::move(params));
|
||||
url_loader_factory_ =
|
||||
content::BrowserContext::GetDefaultStoragePartition(browser_context)
|
||||
->GetURLLoaderFactoryForBrowserProcess();
|
||||
base::MakeRefCounted<network::WrapperSharedURLLoaderFactory>(
|
||||
std::move(network_factory));
|
||||
|
||||
InitWith(args->isolate(), args->GetThis());
|
||||
}
|
||||
|
||||
@@ -4,33 +4,506 @@
|
||||
|
||||
#include "shell/browser/api/atom_api_web_request_ns.h"
|
||||
|
||||
#include <memory>
|
||||
#include <string>
|
||||
#include <utility>
|
||||
|
||||
#include "base/stl_util.h"
|
||||
#include "base/values.h"
|
||||
#include "gin/converter.h"
|
||||
#include "gin/dictionary.h"
|
||||
#include "gin/object_template_builder.h"
|
||||
#include "shell/browser/api/atom_api_session.h"
|
||||
#include "shell/browser/api/atom_api_web_contents.h"
|
||||
#include "shell/browser/atom_browser_context.h"
|
||||
#include "shell/common/gin_converters/callback_converter_gin_adapter.h"
|
||||
#include "shell/common/gin_converters/gurl_converter_gin_adapter.h"
|
||||
#include "shell/common/gin_converters/net_converter_gin_adapter.h"
|
||||
#include "shell/common/gin_converters/std_converter.h"
|
||||
#include "shell/common/gin_converters/value_converter_gin_adapter.h"
|
||||
|
||||
namespace gin {
|
||||
|
||||
template <>
|
||||
struct Converter<URLPattern> {
|
||||
static bool FromV8(v8::Isolate* isolate,
|
||||
v8::Local<v8::Value> val,
|
||||
URLPattern* out) {
|
||||
std::string pattern;
|
||||
if (!ConvertFromV8(isolate, val, &pattern))
|
||||
return false;
|
||||
*out = URLPattern(URLPattern::SCHEME_ALL);
|
||||
return out->Parse(pattern) == URLPattern::ParseResult::kSuccess;
|
||||
}
|
||||
};
|
||||
|
||||
template <>
|
||||
struct Converter<content::ResourceType> {
|
||||
static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
|
||||
content::ResourceType type) {
|
||||
const char* result;
|
||||
switch (type) {
|
||||
case content::ResourceType::kMainFrame:
|
||||
result = "mainFrame";
|
||||
break;
|
||||
case content::ResourceType::kSubFrame:
|
||||
result = "subFrame";
|
||||
break;
|
||||
case content::ResourceType::kStylesheet:
|
||||
result = "stylesheet";
|
||||
break;
|
||||
case content::ResourceType::kScript:
|
||||
result = "script";
|
||||
break;
|
||||
case content::ResourceType::kImage:
|
||||
result = "image";
|
||||
break;
|
||||
case content::ResourceType::kObject:
|
||||
result = "object";
|
||||
break;
|
||||
case content::ResourceType::kXhr:
|
||||
result = "xhr";
|
||||
break;
|
||||
default:
|
||||
result = "other";
|
||||
}
|
||||
return StringToV8(isolate, result);
|
||||
}
|
||||
};
|
||||
|
||||
} // namespace gin
|
||||
|
||||
namespace electron {
|
||||
|
||||
namespace api {
|
||||
|
||||
namespace {
|
||||
|
||||
const char* kUserDataKey = "WebRequestNS";
|
||||
|
||||
// BrowserContext <=> WebRequestNS relationship.
|
||||
struct UserData : public base::SupportsUserData::Data {
|
||||
explicit UserData(WebRequestNS* data) : data(data) {}
|
||||
WebRequestNS* data;
|
||||
};
|
||||
|
||||
// Test whether the URL of |request| matches |patterns|.
|
||||
bool MatchesFilterCondition(extensions::WebRequestInfo* info,
|
||||
const std::set<URLPattern>& patterns) {
|
||||
if (patterns.empty())
|
||||
return true;
|
||||
|
||||
for (const auto& pattern : patterns) {
|
||||
if (pattern.MatchesURL(info->url))
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
// Convert HttpResponseHeaders to V8.
|
||||
//
|
||||
// Note that while we already have converters for HttpResponseHeaders, we can
|
||||
// not use it because it lowercases the header keys, while the webRequest has
|
||||
// to pass the original keys.
|
||||
v8::Local<v8::Value> HttpResponseHeadersToV8(
|
||||
net::HttpResponseHeaders* headers) {
|
||||
base::DictionaryValue response_headers;
|
||||
if (headers) {
|
||||
size_t iter = 0;
|
||||
std::string key;
|
||||
std::string value;
|
||||
while (headers->EnumerateHeaderLines(&iter, &key, &value)) {
|
||||
base::Value* values = response_headers.FindListKey(key);
|
||||
if (!values)
|
||||
values = response_headers.SetKey(key, base::ListValue());
|
||||
values->GetList().emplace_back(value);
|
||||
}
|
||||
}
|
||||
return gin::ConvertToV8(v8::Isolate::GetCurrent(), response_headers);
|
||||
}
|
||||
|
||||
// Overloaded by multiple types to fill the |details| object.
|
||||
void ToDictionary(gin::Dictionary* details, extensions::WebRequestInfo* info) {
|
||||
details->Set("id", info->id);
|
||||
details->Set("url", info->url);
|
||||
details->Set("method", info->method);
|
||||
details->Set("timestamp", base::Time::Now().ToDoubleT() * 1000);
|
||||
if (!info->response_ip.empty())
|
||||
details->Set("ip", info->response_ip);
|
||||
if (info->type.has_value())
|
||||
details->Set("resourceType", info->type.value());
|
||||
else
|
||||
details->Set("resourceType", base::StringPiece("other"));
|
||||
if (info->response_headers) {
|
||||
details->Set("fromCache", info->response_from_cache);
|
||||
details->Set("statusLine", info->response_headers->GetStatusLine());
|
||||
details->Set("statusCode", info->response_headers->response_code());
|
||||
details->Set("responseHeaders",
|
||||
HttpResponseHeadersToV8(info->response_headers.get()));
|
||||
}
|
||||
|
||||
auto* web_contents = content::WebContents::FromRenderFrameHost(
|
||||
content::RenderFrameHost::FromID(info->render_process_id,
|
||||
info->frame_id));
|
||||
int32_t id = api::WebContents::GetIDFromWrappedClass(web_contents);
|
||||
// id must be greater than zero.
|
||||
if (id > 0)
|
||||
details->Set("webContentsId", id);
|
||||
}
|
||||
|
||||
void ToDictionary(gin::Dictionary* details,
|
||||
const network::ResourceRequest& request) {
|
||||
details->Set("referrer", request.referrer);
|
||||
if (request.request_body)
|
||||
details->Set("uploadData", *request.request_body);
|
||||
}
|
||||
|
||||
void ToDictionary(gin::Dictionary* details,
|
||||
const net::HttpRequestHeaders& headers) {
|
||||
details->Set("requestHeaders", headers);
|
||||
}
|
||||
|
||||
void ToDictionary(gin::Dictionary* details, const GURL& location) {
|
||||
details->Set("redirectURL", location);
|
||||
}
|
||||
|
||||
void ToDictionary(gin::Dictionary* details, int net_error) {
|
||||
details->Set("error", net::ErrorToString(net_error));
|
||||
}
|
||||
|
||||
// Helper function to fill |details| with arbitrary |args|.
|
||||
template <typename Arg>
|
||||
void FillDetails(gin::Dictionary* details, Arg arg) {
|
||||
ToDictionary(details, arg);
|
||||
}
|
||||
|
||||
template <typename Arg, typename... Args>
|
||||
void FillDetails(gin::Dictionary* details, Arg arg, Args... args) {
|
||||
ToDictionary(details, arg);
|
||||
FillDetails(details, args...);
|
||||
}
|
||||
|
||||
// Fill the native types with the result from the response object.
|
||||
void ReadFromResponse(v8::Isolate* isolate,
|
||||
gin::Dictionary* response,
|
||||
GURL* new_location) {
|
||||
response->Get("redirectURL", new_location);
|
||||
}
|
||||
|
||||
void ReadFromResponse(v8::Isolate* isolate,
|
||||
gin::Dictionary* response,
|
||||
net::HttpRequestHeaders* headers) {
|
||||
headers->Clear();
|
||||
response->Get("requestHeaders", headers);
|
||||
}
|
||||
|
||||
void ReadFromResponse(v8::Isolate* isolate,
|
||||
gin::Dictionary* response,
|
||||
const std::pair<scoped_refptr<net::HttpResponseHeaders>*,
|
||||
const std::string>& headers) {
|
||||
std::string status_line;
|
||||
if (!response->Get("statusLine", &status_line))
|
||||
status_line = headers.second;
|
||||
v8::Local<v8::Value> value;
|
||||
if (response->Get("responseHeaders", &value) && value->IsObject()) {
|
||||
*headers.first = new net::HttpResponseHeaders("");
|
||||
(*headers.first)->ReplaceStatusLine(status_line);
|
||||
mate::Converter<net::HttpResponseHeaders*>::FromV8(isolate, value,
|
||||
(*headers.first).get());
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
gin::WrapperInfo WebRequestNS::kWrapperInfo = {gin::kEmbedderNativeGin};
|
||||
|
||||
WebRequestNS::SimpleListenerInfo::SimpleListenerInfo(
|
||||
std::set<URLPattern> patterns_,
|
||||
SimpleListener listener_)
|
||||
: url_patterns(std::move(patterns_)), listener(listener_) {}
|
||||
WebRequestNS::SimpleListenerInfo::SimpleListenerInfo() = default;
|
||||
WebRequestNS::SimpleListenerInfo::~SimpleListenerInfo() = default;
|
||||
|
||||
WebRequestNS::ResponseListenerInfo::ResponseListenerInfo(
|
||||
std::set<URLPattern> patterns_,
|
||||
ResponseListener listener_)
|
||||
: url_patterns(std::move(patterns_)), listener(listener_) {}
|
||||
WebRequestNS::ResponseListenerInfo::ResponseListenerInfo() = default;
|
||||
WebRequestNS::ResponseListenerInfo::~ResponseListenerInfo() = default;
|
||||
|
||||
WebRequestNS::WebRequestNS(v8::Isolate* isolate,
|
||||
AtomBrowserContext* browser_context) {
|
||||
Init(isolate);
|
||||
AttachAsUserData(browser_context);
|
||||
content::BrowserContext* browser_context)
|
||||
: browser_context_(browser_context) {
|
||||
browser_context_->SetUserData(kUserDataKey, std::make_unique<UserData>(this));
|
||||
}
|
||||
|
||||
WebRequestNS::~WebRequestNS() = default;
|
||||
WebRequestNS::~WebRequestNS() {
|
||||
browser_context_->RemoveUserData(kUserDataKey);
|
||||
}
|
||||
|
||||
gin::ObjectTemplateBuilder WebRequestNS::GetObjectTemplateBuilder(
|
||||
v8::Isolate* isolate) {
|
||||
return gin::Wrappable<WebRequestNS>::GetObjectTemplateBuilder(isolate)
|
||||
.SetMethod("onBeforeRequest",
|
||||
&WebRequestNS::SetResponseListener<kOnBeforeRequest>)
|
||||
.SetMethod("onBeforeSendHeaders",
|
||||
&WebRequestNS::SetResponseListener<kOnBeforeSendHeaders>)
|
||||
.SetMethod("onHeadersReceived",
|
||||
&WebRequestNS::SetResponseListener<kOnHeadersReceived>)
|
||||
.SetMethod("onSendHeaders",
|
||||
&WebRequestNS::SetSimpleListener<kOnSendHeaders>)
|
||||
.SetMethod("onBeforeRedirect",
|
||||
&WebRequestNS::SetSimpleListener<kOnBeforeRedirect>)
|
||||
.SetMethod("onResponseStarted",
|
||||
&WebRequestNS::SetSimpleListener<kOnResponseStarted>)
|
||||
.SetMethod("onErrorOccurred",
|
||||
&WebRequestNS::SetSimpleListener<kOnErrorOccurred>)
|
||||
.SetMethod("onCompleted", &WebRequestNS::SetSimpleListener<kOnCompleted>);
|
||||
}
|
||||
|
||||
const char* WebRequestNS::GetTypeName() {
|
||||
return "WebRequest";
|
||||
}
|
||||
|
||||
bool WebRequestNS::HasListener() const {
|
||||
return !(simple_listeners_.empty() && response_listeners_.empty());
|
||||
}
|
||||
|
||||
int WebRequestNS::OnBeforeRequest(extensions::WebRequestInfo* info,
|
||||
const network::ResourceRequest& request,
|
||||
net::CompletionOnceCallback callback,
|
||||
GURL* new_url) {
|
||||
return HandleResponseEvent(kOnBeforeRequest, info, std::move(callback),
|
||||
new_url, request);
|
||||
}
|
||||
|
||||
int WebRequestNS::OnBeforeSendHeaders(extensions::WebRequestInfo* info,
|
||||
const network::ResourceRequest& request,
|
||||
BeforeSendHeadersCallback callback,
|
||||
net::HttpRequestHeaders* headers) {
|
||||
return HandleResponseEvent(
|
||||
kOnBeforeSendHeaders, info,
|
||||
base::BindOnce(std::move(callback), std::set<std::string>(),
|
||||
std::set<std::string>()),
|
||||
headers, request, *headers);
|
||||
}
|
||||
|
||||
int WebRequestNS::OnHeadersReceived(
|
||||
extensions::WebRequestInfo* info,
|
||||
const network::ResourceRequest& request,
|
||||
net::CompletionOnceCallback callback,
|
||||
const net::HttpResponseHeaders* original_response_headers,
|
||||
scoped_refptr<net::HttpResponseHeaders>* override_response_headers,
|
||||
GURL* allowed_unsafe_redirect_url) {
|
||||
return HandleResponseEvent(
|
||||
kOnHeadersReceived, info, std::move(callback),
|
||||
std::make_pair(override_response_headers,
|
||||
original_response_headers->GetStatusLine()),
|
||||
request);
|
||||
}
|
||||
|
||||
void WebRequestNS::OnSendHeaders(extensions::WebRequestInfo* info,
|
||||
const network::ResourceRequest& request,
|
||||
const net::HttpRequestHeaders& headers) {
|
||||
HandleSimpleEvent(kOnSendHeaders, info, request, headers);
|
||||
}
|
||||
|
||||
void WebRequestNS::OnBeforeRedirect(extensions::WebRequestInfo* info,
|
||||
const network::ResourceRequest& request,
|
||||
const GURL& new_location) {
|
||||
HandleSimpleEvent(kOnBeforeRedirect, info, request, new_location);
|
||||
}
|
||||
|
||||
void WebRequestNS::OnResponseStarted(extensions::WebRequestInfo* info,
|
||||
const network::ResourceRequest& request) {
|
||||
HandleSimpleEvent(kOnResponseStarted, info, request);
|
||||
}
|
||||
|
||||
void WebRequestNS::OnErrorOccurred(extensions::WebRequestInfo* info,
|
||||
const network::ResourceRequest& request,
|
||||
int net_error) {
|
||||
callbacks_.erase(info->id);
|
||||
|
||||
HandleSimpleEvent(kOnErrorOccurred, info, request, net_error);
|
||||
}
|
||||
|
||||
void WebRequestNS::OnCompleted(extensions::WebRequestInfo* info,
|
||||
const network::ResourceRequest& request,
|
||||
int net_error) {
|
||||
callbacks_.erase(info->id);
|
||||
|
||||
HandleSimpleEvent(kOnCompleted, info, request, net_error);
|
||||
}
|
||||
|
||||
template <WebRequestNS::SimpleEvent event>
|
||||
void WebRequestNS::SetSimpleListener(gin::Arguments* args) {
|
||||
SetListener<SimpleListener>(event, &simple_listeners_, args);
|
||||
}
|
||||
|
||||
template <WebRequestNS::ResponseEvent event>
|
||||
void WebRequestNS::SetResponseListener(gin::Arguments* args) {
|
||||
SetListener<ResponseListener>(event, &response_listeners_, args);
|
||||
}
|
||||
|
||||
template <typename Listener, typename Listeners, typename Event>
|
||||
void WebRequestNS::SetListener(Event event,
|
||||
Listeners* listeners,
|
||||
gin::Arguments* args) {
|
||||
v8::Local<v8::Value> arg;
|
||||
|
||||
// { urls }.
|
||||
std::set<std::string> filter_patterns;
|
||||
gin::Dictionary dict(args->isolate());
|
||||
if (args->GetNext(&arg) && !arg->IsFunction()) {
|
||||
// Note that gin treats Function as Dictionary when doing convertions, so we
|
||||
// have to explicitly check if the argument is Function before trying to
|
||||
// convert it to Dictionary.
|
||||
if (gin::ConvertFromV8(args->isolate(), arg, &dict)) {
|
||||
if (!dict.Get("urls", &filter_patterns)) {
|
||||
args->ThrowTypeError("Parameter 'filter' must have property 'urls'.");
|
||||
return;
|
||||
}
|
||||
args->GetNext(&arg);
|
||||
}
|
||||
}
|
||||
|
||||
std::set<URLPattern> patterns;
|
||||
for (const std::string& filter_pattern : filter_patterns) {
|
||||
URLPattern pattern(URLPattern::SCHEME_ALL);
|
||||
const URLPattern::ParseResult result = pattern.Parse(filter_pattern);
|
||||
if (result == URLPattern::ParseResult::kSuccess) {
|
||||
patterns.insert(pattern);
|
||||
} else {
|
||||
const char* error_type = URLPattern::GetParseResultString(result);
|
||||
args->ThrowTypeError("Invalid url pattern " + filter_pattern + ": " +
|
||||
error_type);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
// Function or null.
|
||||
Listener listener;
|
||||
if (arg.IsEmpty() ||
|
||||
!(gin::ConvertFromV8(args->isolate(), arg, &listener) || arg->IsNull())) {
|
||||
args->ThrowTypeError("Must pass null or a Function");
|
||||
return;
|
||||
}
|
||||
|
||||
if (listener.is_null())
|
||||
listeners->erase(event);
|
||||
else
|
||||
(*listeners)[event] = {std::move(patterns), std::move(listener)};
|
||||
}
|
||||
|
||||
template <typename... Args>
|
||||
void WebRequestNS::HandleSimpleEvent(SimpleEvent event,
|
||||
extensions::WebRequestInfo* request_info,
|
||||
Args... args) {
|
||||
if (!base::Contains(simple_listeners_, event))
|
||||
return;
|
||||
|
||||
const auto& info = simple_listeners_[event];
|
||||
if (!MatchesFilterCondition(request_info, info.url_patterns))
|
||||
return;
|
||||
|
||||
v8::Isolate* isolate = v8::Isolate::GetCurrent();
|
||||
v8::HandleScope handle_scope(isolate);
|
||||
gin::Dictionary details(isolate, v8::Object::New(isolate));
|
||||
FillDetails(&details, request_info, args...);
|
||||
info.listener.Run(gin::ConvertToV8(isolate, details));
|
||||
}
|
||||
|
||||
template <typename Out, typename... Args>
|
||||
int WebRequestNS::HandleResponseEvent(ResponseEvent event,
|
||||
extensions::WebRequestInfo* request_info,
|
||||
net::CompletionOnceCallback callback,
|
||||
Out out,
|
||||
Args... args) {
|
||||
if (!base::Contains(response_listeners_, event))
|
||||
return net::OK;
|
||||
|
||||
const auto& info = response_listeners_[event];
|
||||
if (!MatchesFilterCondition(request_info, info.url_patterns))
|
||||
return net::OK;
|
||||
|
||||
callbacks_[request_info->id] = std::move(callback);
|
||||
|
||||
v8::Isolate* isolate = v8::Isolate::GetCurrent();
|
||||
v8::HandleScope handle_scope(isolate);
|
||||
gin::Dictionary details(isolate, v8::Object::New(isolate));
|
||||
FillDetails(&details, request_info, args...);
|
||||
|
||||
ResponseCallback response =
|
||||
base::BindOnce(&WebRequestNS::OnListenerResult<Out>,
|
||||
base::Unretained(this), request_info->id, out);
|
||||
info.listener.Run(gin::ConvertToV8(isolate, details), std::move(response));
|
||||
return net::ERR_IO_PENDING;
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
void WebRequestNS::OnListenerResult(uint64_t id,
|
||||
T out,
|
||||
v8::Local<v8::Value> response) {
|
||||
if (!base::Contains(callbacks_, id))
|
||||
return;
|
||||
|
||||
int result = net::OK;
|
||||
if (response->IsObject()) {
|
||||
v8::Isolate* isolate = v8::Isolate::GetCurrent();
|
||||
gin::Dictionary dict(isolate, response.As<v8::Object>());
|
||||
|
||||
bool cancel = false;
|
||||
dict.Get("cancel", &cancel);
|
||||
if (cancel)
|
||||
result = net::ERR_BLOCKED_BY_CLIENT;
|
||||
else
|
||||
ReadFromResponse(isolate, &dict, out);
|
||||
}
|
||||
|
||||
// The ProxyingURLLoaderFactory expects the callback to be executed
|
||||
// asynchronously, because it used to work on IO thread before NetworkService.
|
||||
base::SequencedTaskRunnerHandle::Get()->PostTask(
|
||||
FROM_HERE, base::BindOnce(std::move(callbacks_[id]), result));
|
||||
callbacks_.erase(id);
|
||||
}
|
||||
|
||||
// static
|
||||
mate::Handle<WebRequestNS> WebRequestNS::Create(
|
||||
gin::Handle<WebRequestNS> WebRequestNS::FromOrCreate(
|
||||
v8::Isolate* isolate,
|
||||
AtomBrowserContext* browser_context) {
|
||||
return mate::CreateHandle(isolate,
|
||||
new WebRequestNS(isolate, browser_context));
|
||||
content::BrowserContext* browser_context) {
|
||||
gin::Handle<WebRequestNS> handle = From(isolate, browser_context);
|
||||
if (handle.IsEmpty()) {
|
||||
// Make sure the |Session| object has the |webRequest| property created.
|
||||
v8::Local<v8::Value> web_request =
|
||||
Session::CreateFrom(isolate,
|
||||
static_cast<AtomBrowserContext*>(browser_context))
|
||||
->WebRequest(isolate);
|
||||
gin::ConvertFromV8(isolate, web_request, &handle);
|
||||
}
|
||||
DCHECK(!handle.IsEmpty());
|
||||
return handle;
|
||||
}
|
||||
|
||||
// static
|
||||
void WebRequestNS::BuildPrototype(v8::Isolate* isolate,
|
||||
v8::Local<v8::FunctionTemplate> prototype) {
|
||||
prototype->SetClassName(mate::StringToV8(isolate, "WebRequest"));
|
||||
mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate());
|
||||
gin::Handle<WebRequestNS> WebRequestNS::Create(
|
||||
v8::Isolate* isolate,
|
||||
content::BrowserContext* browser_context) {
|
||||
DCHECK(From(isolate, browser_context).IsEmpty())
|
||||
<< "WebRequestNS already created";
|
||||
return gin::CreateHandle(isolate, new WebRequestNS(isolate, browser_context));
|
||||
}
|
||||
|
||||
// static
|
||||
gin::Handle<WebRequestNS> WebRequestNS::From(
|
||||
v8::Isolate* isolate,
|
||||
content::BrowserContext* browser_context) {
|
||||
if (!browser_context)
|
||||
return gin::Handle<WebRequestNS>();
|
||||
auto* user_data =
|
||||
static_cast<UserData*>(browser_context->GetUserData(kUserDataKey));
|
||||
if (!user_data)
|
||||
return gin::Handle<WebRequestNS>();
|
||||
return gin::CreateHandle(isolate, user_data->data);
|
||||
}
|
||||
|
||||
} // namespace api
|
||||
|
||||
@@ -5,27 +5,152 @@
|
||||
#ifndef SHELL_BROWSER_API_ATOM_API_WEB_REQUEST_NS_H_
|
||||
#define SHELL_BROWSER_API_ATOM_API_WEB_REQUEST_NS_H_
|
||||
|
||||
#include <map>
|
||||
#include <set>
|
||||
|
||||
#include "base/values.h"
|
||||
#include "extensions/common/url_pattern.h"
|
||||
#include "gin/arguments.h"
|
||||
#include "gin/handle.h"
|
||||
#include "gin/wrappable.h"
|
||||
#include "native_mate/dictionary.h"
|
||||
#include "native_mate/handle.h"
|
||||
#include "shell/browser/api/trackable_object.h"
|
||||
#include "shell/browser/net/proxying_url_loader_factory.h"
|
||||
|
||||
namespace content {
|
||||
class BrowserContext;
|
||||
}
|
||||
|
||||
namespace electron {
|
||||
|
||||
class AtomBrowserContext;
|
||||
|
||||
namespace api {
|
||||
|
||||
class WebRequestNS : public mate::TrackableObject<WebRequestNS> {
|
||||
class WebRequestNS : public gin::Wrappable<WebRequestNS>, public WebRequestAPI {
|
||||
public:
|
||||
static mate::Handle<WebRequestNS> Create(v8::Isolate* isolate,
|
||||
AtomBrowserContext* browser_context);
|
||||
static gin::WrapperInfo kWrapperInfo;
|
||||
|
||||
static void BuildPrototype(v8::Isolate* isolate,
|
||||
v8::Local<v8::FunctionTemplate> prototype);
|
||||
// Return the WebRequest object attached to |browser_context|, create if there
|
||||
// is no one.
|
||||
// Note that the lifetime of WebRequest object is managed by Session, instead
|
||||
// of the caller.
|
||||
static gin::Handle<WebRequestNS> FromOrCreate(
|
||||
v8::Isolate* isolate,
|
||||
content::BrowserContext* browser_context);
|
||||
|
||||
// Return a new WebRequest object, this should only be called by Session.
|
||||
static gin::Handle<WebRequestNS> Create(
|
||||
v8::Isolate* isolate,
|
||||
content::BrowserContext* browser_context);
|
||||
|
||||
// Find the WebRequest object attached to |browser_context|.
|
||||
static gin::Handle<WebRequestNS> From(
|
||||
v8::Isolate* isolate,
|
||||
content::BrowserContext* browser_context);
|
||||
|
||||
// gin::Wrappable:
|
||||
gin::ObjectTemplateBuilder GetObjectTemplateBuilder(
|
||||
v8::Isolate* isolate) override;
|
||||
const char* GetTypeName() override;
|
||||
|
||||
private:
|
||||
WebRequestNS(v8::Isolate* isolate, AtomBrowserContext* browser_context);
|
||||
WebRequestNS(v8::Isolate* isolate, content::BrowserContext* browser_context);
|
||||
~WebRequestNS() override;
|
||||
|
||||
// WebRequestAPI:
|
||||
bool HasListener() const override;
|
||||
int OnBeforeRequest(extensions::WebRequestInfo* info,
|
||||
const network::ResourceRequest& request,
|
||||
net::CompletionOnceCallback callback,
|
||||
GURL* new_url) override;
|
||||
int OnBeforeSendHeaders(extensions::WebRequestInfo* info,
|
||||
const network::ResourceRequest& request,
|
||||
BeforeSendHeadersCallback callback,
|
||||
net::HttpRequestHeaders* headers) override;
|
||||
int OnHeadersReceived(
|
||||
extensions::WebRequestInfo* info,
|
||||
const network::ResourceRequest& request,
|
||||
net::CompletionOnceCallback callback,
|
||||
const net::HttpResponseHeaders* original_response_headers,
|
||||
scoped_refptr<net::HttpResponseHeaders>* override_response_headers,
|
||||
GURL* allowed_unsafe_redirect_url) override;
|
||||
void OnSendHeaders(extensions::WebRequestInfo* info,
|
||||
const network::ResourceRequest& request,
|
||||
const net::HttpRequestHeaders& headers) override;
|
||||
void OnBeforeRedirect(extensions::WebRequestInfo* info,
|
||||
const network::ResourceRequest& request,
|
||||
const GURL& new_location) override;
|
||||
void OnResponseStarted(extensions::WebRequestInfo* info,
|
||||
const network::ResourceRequest& request) override;
|
||||
void OnErrorOccurred(extensions::WebRequestInfo* info,
|
||||
const network::ResourceRequest& request,
|
||||
int net_error) override;
|
||||
void OnCompleted(extensions::WebRequestInfo* info,
|
||||
const network::ResourceRequest& request,
|
||||
int net_error) override;
|
||||
|
||||
enum SimpleEvent {
|
||||
kOnSendHeaders,
|
||||
kOnBeforeRedirect,
|
||||
kOnResponseStarted,
|
||||
kOnCompleted,
|
||||
kOnErrorOccurred,
|
||||
};
|
||||
enum ResponseEvent {
|
||||
kOnBeforeRequest,
|
||||
kOnBeforeSendHeaders,
|
||||
kOnHeadersReceived,
|
||||
};
|
||||
|
||||
using SimpleListener = base::RepeatingCallback<void(v8::Local<v8::Value>)>;
|
||||
using ResponseCallback = base::OnceCallback<void(v8::Local<v8::Value>)>;
|
||||
using ResponseListener =
|
||||
base::RepeatingCallback<void(v8::Local<v8::Value>, ResponseCallback)>;
|
||||
|
||||
template <SimpleEvent event>
|
||||
void SetSimpleListener(gin::Arguments* args);
|
||||
template <ResponseEvent event>
|
||||
void SetResponseListener(gin::Arguments* args);
|
||||
template <typename Listener, typename Listeners, typename Event>
|
||||
void SetListener(Event event, Listeners* listeners, gin::Arguments* args);
|
||||
|
||||
template <typename... Args>
|
||||
void HandleSimpleEvent(SimpleEvent event,
|
||||
extensions::WebRequestInfo* info,
|
||||
Args... args);
|
||||
template <typename Out, typename... Args>
|
||||
int HandleResponseEvent(ResponseEvent event,
|
||||
extensions::WebRequestInfo* info,
|
||||
net::CompletionOnceCallback callback,
|
||||
Out out,
|
||||
Args... args);
|
||||
|
||||
template <typename T>
|
||||
void OnListenerResult(uint64_t id, T out, v8::Local<v8::Value> response);
|
||||
|
||||
struct SimpleListenerInfo {
|
||||
std::set<URLPattern> url_patterns;
|
||||
SimpleListener listener;
|
||||
|
||||
SimpleListenerInfo(std::set<URLPattern>, SimpleListener);
|
||||
SimpleListenerInfo();
|
||||
~SimpleListenerInfo();
|
||||
};
|
||||
|
||||
struct ResponseListenerInfo {
|
||||
std::set<URLPattern> url_patterns;
|
||||
ResponseListener listener;
|
||||
|
||||
ResponseListenerInfo(std::set<URLPattern>, ResponseListener);
|
||||
ResponseListenerInfo();
|
||||
~ResponseListenerInfo();
|
||||
};
|
||||
|
||||
std::map<SimpleEvent, SimpleListenerInfo> simple_listeners_;
|
||||
std::map<ResponseEvent, ResponseListenerInfo> response_listeners_;
|
||||
std::map<uint64_t, net::CompletionOnceCallback> callbacks_;
|
||||
|
||||
// Weak-ref, it manages us.
|
||||
content::BrowserContext* browser_context_;
|
||||
};
|
||||
|
||||
} // namespace api
|
||||
|
||||
Reference in New Issue
Block a user