8c71e2adc9
* chore: initial prototype of net api from utility process * chore: update url loader to work on both browser and utility processes * chore: add net files to utility process bundle * chore: re-add app ready check but only on main process * chore: replace browser thread dcheck's with sequence checker * refactor: move url loader from browser to common * refactor: move net-client-request.ts from browser to common * docs: add utility process to net api docs * refactor: move net module app ready check to browser only * refactor: switch import from main to common after moving to common * test: add basic net module test for utility process * refactor: switch browser pid with utility pid * refactor: move electron_api_net from browser to common * chore: add fetch to utility net module * chore: add isOnline and online to utility net module * refactor: move net spec helpers into helper file * refactor: break apart net module tests Adds two additional net module test files: `api-net-session-spec.ts` for tests that depend on a session being available (aka depend on running on the main process) and `api-net-custom-protocols-spec.ts` for custom protocol tests. This enables running `api-net-spec.ts` in the utility process. * test: add utility process mocha runner to run net module tests * docs: add utility process to net module classes * refactor: update imports in lib/utility to use electron/utility * chore: check browser context before using in main process Since the browser context supplied to the SimpleURLLoaderWrapper can now be null for use in the UtilityProcess, adding a null check for the main process before use to get a more sensible error if something goes wrong. Co-authored-by: Cheng Zhao <github@zcbenz.com> * chore: remove test debugging * chore: remove unnecessary header include * docs: add utility process net module limitations * test: run net module tests in utility process individually * refactor: clean up prior utility process net tests * chore: add resolveHost to utility process net module * chore: replace resolve host dcheck with sequence checker * test: add net module tests for net.resolveHost * docs: remove utility process limitation for resolveHost --------- Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: Cheng Zhao <github@zcbenz.com>
91 lines
3.2 KiB
C++
91 lines
3.2 KiB
C++
// Copyright (c) 2023 Signal Messenger, LLC
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/browser/net/resolve_host_function.h"
|
|
|
|
#include <utility>
|
|
|
|
#include "base/functional/bind.h"
|
|
#include "base/values.h"
|
|
#include "content/public/browser/browser_context.h"
|
|
#include "content/public/browser/browser_thread.h"
|
|
#include "content/public/browser/storage_partition.h"
|
|
#include "net/base/host_port_pair.h"
|
|
#include "net/base/net_errors.h"
|
|
#include "net/base/network_isolation_key.h"
|
|
#include "net/dns/public/resolve_error_info.h"
|
|
#include "services/network/public/mojom/network_context.mojom.h"
|
|
#include "shell/browser/electron_browser_context.h"
|
|
#include "shell/common/process_util.h"
|
|
#include "shell/services/node/node_service.h"
|
|
#include "url/origin.h"
|
|
|
|
using content::BrowserThread;
|
|
|
|
namespace electron {
|
|
|
|
ResolveHostFunction::ResolveHostFunction(
|
|
ElectronBrowserContext* browser_context,
|
|
std::string host,
|
|
network::mojom::ResolveHostParametersPtr params,
|
|
ResolveHostCallback callback)
|
|
: browser_context_(browser_context),
|
|
host_(std::move(host)),
|
|
params_(std::move(params)),
|
|
callback_(std::move(callback)) {
|
|
DETACH_FROM_SEQUENCE(sequence_checker_);
|
|
}
|
|
|
|
ResolveHostFunction::~ResolveHostFunction() {
|
|
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
|
DCHECK(!receiver_.is_bound());
|
|
}
|
|
|
|
void ResolveHostFunction::Run() {
|
|
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
|
DCHECK(!receiver_.is_bound());
|
|
|
|
// Start the request.
|
|
net::HostPortPair host_port_pair(host_, 0);
|
|
mojo::PendingRemote<network::mojom::ResolveHostClient> resolve_host_client =
|
|
receiver_.BindNewPipeAndPassRemote();
|
|
receiver_.set_disconnect_handler(base::BindOnce(
|
|
&ResolveHostFunction::OnComplete, this, net::ERR_NAME_NOT_RESOLVED,
|
|
net::ResolveErrorInfo(net::ERR_FAILED),
|
|
/*resolved_addresses=*/absl::nullopt,
|
|
/*endpoint_results_with_metadata=*/absl::nullopt));
|
|
if (electron::IsUtilityProcess()) {
|
|
URLLoaderBundle::GetInstance()->GetHostResolver()->ResolveHost(
|
|
network::mojom::HostResolverHost::NewHostPortPair(
|
|
std::move(host_port_pair)),
|
|
net::NetworkAnonymizationKey(), std::move(params_),
|
|
std::move(resolve_host_client));
|
|
} else {
|
|
DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
|
browser_context_->GetDefaultStoragePartition()
|
|
->GetNetworkContext()
|
|
->ResolveHost(network::mojom::HostResolverHost::NewHostPortPair(
|
|
std::move(host_port_pair)),
|
|
net::NetworkAnonymizationKey(), std::move(params_),
|
|
std::move(resolve_host_client));
|
|
}
|
|
}
|
|
|
|
void ResolveHostFunction::OnComplete(
|
|
int result,
|
|
const net::ResolveErrorInfo& resolve_error_info,
|
|
const absl::optional<net::AddressList>& resolved_addresses,
|
|
const absl::optional<net::HostResolverEndpointResults>&
|
|
endpoint_results_with_metadata) {
|
|
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
|
|
|
// Ensure that we outlive the `receiver_.reset()` call.
|
|
scoped_refptr<ResolveHostFunction> self(this);
|
|
|
|
receiver_.reset();
|
|
|
|
std::move(callback_).Run(resolve_error_info.error, resolved_addresses);
|
|
}
|
|
|
|
} // namespace electron
|