Commit 50171012 authored by Zhuoyu Qian's avatar Zhuoyu Qian Committed by Commit Bot

Rename NetworkUtils namepsace to network_utils

https://google.github.io/styleguide/cppguide.html#Namespace_Names
> Namespace names are all lower-case.

This CL has no behavior changes.

Bug: 889726
Change-Id: Ia80de6b1a257e88fb0cc4805a97e32bf8a9c096f
Reviewed-on: https://chromium-review.googlesource.com/c/1293329
Commit-Queue: Zhuoyu Qian <zhuoyu.qian@samsung.com>
Reviewed-by: default avatarKent Tamura <tkent@chromium.org>
Cr-Commit-Position: refs/heads/master@{#601519}
parent 28963617
...@@ -129,7 +129,7 @@ DocumentInit::InsecureNavigationsToUpgrade() const { ...@@ -129,7 +129,7 @@ DocumentInit::InsecureNavigationsToUpgrade() const {
bool DocumentInit::IsHostedInReservedIPRange() const { bool DocumentInit::IsHostedInReservedIPRange() const {
if (DocumentLoader* loader = MasterDocumentLoader()) { if (DocumentLoader* loader = MasterDocumentLoader()) {
if (!loader->GetResponse().RemoteIPAddress().IsEmpty()) { if (!loader->GetResponse().RemoteIPAddress().IsEmpty()) {
return NetworkUtils::IsReservedIPAddress( return network_utils::IsReservedIPAddress(
loader->GetResponse().RemoteIPAddress()); loader->GetResponse().RemoteIPAddress());
} }
} }
......
...@@ -520,7 +520,7 @@ void FetchManager::Loader::DidReceiveResponse( ...@@ -520,7 +520,7 @@ void FetchManager::Loader::DidReceiveResponse(
break; break;
case FetchResponseType::kOpaqueRedirect: case FetchResponseType::kOpaqueRedirect:
DCHECK( DCHECK(
NetworkUtils::IsRedirectResponseCode(response_http_status_code_)); network_utils::IsRedirectResponseCode(response_http_status_code_));
break; // The code below creates an opaque-redirect filtered response. break; // The code below creates an opaque-redirect filtered response.
case FetchResponseType::kError: case FetchResponseType::kError:
LOG(FATAL) << "When ServiceWorker respond to the request from fetch() " LOG(FATAL) << "When ServiceWorker respond to the request from fetch() "
...@@ -567,11 +567,11 @@ void FetchManager::Loader::DidReceiveResponse( ...@@ -567,11 +567,11 @@ void FetchManager::Loader::DidReceiveResponse(
FetchResponseData* tainted_response = nullptr; FetchResponseData* tainted_response = nullptr;
DCHECK(!(NetworkUtils::IsRedirectResponseCode(response_http_status_code_) && DCHECK(!(network_utils::IsRedirectResponseCode(response_http_status_code_) &&
HasNonEmptyLocationHeader(response_data->HeaderList()) && HasNonEmptyLocationHeader(response_data->HeaderList()) &&
fetch_request_data_->Redirect() != FetchRedirectMode::kManual)); fetch_request_data_->Redirect() != FetchRedirectMode::kManual));
if (NetworkUtils::IsRedirectResponseCode(response_http_status_code_) && if (network_utils::IsRedirectResponseCode(response_http_status_code_) &&
fetch_request_data_->Redirect() == FetchRedirectMode::kManual) { fetch_request_data_->Redirect() == FetchRedirectMode::kManual) {
tainted_response = response_data->CreateOpaqueRedirectFilteredResponse(); tainted_response = response_data->CreateOpaqueRedirectFilteredResponse();
} else { } else {
......
...@@ -352,7 +352,7 @@ Response* Response::redirect(ScriptState* script_state, ...@@ -352,7 +352,7 @@ Response* Response::redirect(ScriptState* script_state,
return nullptr; return nullptr;
} }
if (!NetworkUtils::IsRedirectResponseCode(status)) { if (!network_utils::IsRedirectResponseCode(status)) {
exception_state.ThrowRangeError("Invalid status code"); exception_state.ThrowRangeError("Invalid status code");
return nullptr; return nullptr;
} }
......
...@@ -1001,11 +1001,11 @@ bool LocalFrame::CanNavigate(const Frame& target_frame, ...@@ -1001,11 +1001,11 @@ bool LocalFrame::CanNavigate(const Frame& target_frame,
return true; return true;
} }
String target_domain = NetworkUtils::GetDomainAndRegistry( String target_domain = network_utils::GetDomainAndRegistry(
target_frame.GetSecurityContext()->GetSecurityOrigin()->Domain(), target_frame.GetSecurityContext()->GetSecurityOrigin()->Domain(),
NetworkUtils::kIncludePrivateRegistries); network_utils::kIncludePrivateRegistries);
String destination_domain = NetworkUtils::GetDomainAndRegistry( String destination_domain = network_utils::GetDomainAndRegistry(
destination_url.Host(), NetworkUtils::kIncludePrivateRegistries); destination_url.Host(), network_utils::kIncludePrivateRegistries);
if (!target_domain.IsEmpty() && !destination_domain.IsEmpty() && if (!target_domain.IsEmpty() && !destination_domain.IsEmpty() &&
target_domain == destination_domain) { target_domain == destination_domain) {
return true; return true;
......
...@@ -369,7 +369,7 @@ void InspectorEmulationAgent::WillSendRequest( ...@@ -369,7 +369,7 @@ void InspectorEmulationAgent::WillSendRequest(
request.HttpHeaderField("Accept-Language").IsEmpty()) { request.HttpHeaderField("Accept-Language").IsEmpty()) {
request.SetHTTPHeaderField( request.SetHTTPHeaderField(
"Accept-Language", "Accept-Language",
AtomicString(NetworkUtils::GenerateAcceptLanguageHeader( AtomicString(network_utils::GenerateAcceptLanguageHeader(
accept_language_override_.Get()))); accept_language_override_.Get())));
} }
} }
......
...@@ -720,14 +720,14 @@ void FrameFetchContext::DispatchDidFail(const KURL& url, ...@@ -720,14 +720,14 @@ void FrameFetchContext::DispatchDidFail(const KURL& url,
return; return;
if (DocumentLoader* loader = MasterDocumentLoader()) { if (DocumentLoader* loader = MasterDocumentLoader()) {
if (NetworkUtils::IsCertificateTransparencyRequiredError( if (network_utils::IsCertificateTransparencyRequiredError(
error.ErrorCode())) { error.ErrorCode())) {
loader->GetUseCounter().Count( loader->GetUseCounter().Count(
WebFeature::kCertificateTransparencyRequiredErrorOnResourceLoad, WebFeature::kCertificateTransparencyRequiredErrorOnResourceLoad,
GetFrame()); GetFrame());
} }
if (NetworkUtils::IsLegacySymantecCertError(error.ErrorCode())) { if (network_utils::IsLegacySymantecCertError(error.ErrorCode())) {
loader->GetUseCounter().Count( loader->GetUseCounter().Count(
WebFeature::kDistrustedLegacySymantecSubresource, GetFrame()); WebFeature::kDistrustedLegacySymantecSubresource, GetFrame());
GetLocalFrameClient()->ReportLegacySymantecCert(url, true /* did_fail */); GetLocalFrameClient()->ReportLegacySymantecCert(url, true /* did_fail */);
......
...@@ -727,7 +727,7 @@ bool FrameLoader::PrepareRequestForThisFrame(FrameLoadRequest& request) { ...@@ -727,7 +727,7 @@ bool FrameLoader::PrepareRequestForThisFrame(FrameLoadRequest& request) {
request.OriginDocument()->Url()) && request.OriginDocument()->Url()) &&
(url.ProtocolIs("filesystem") || (url.ProtocolIs("filesystem") ||
(url.ProtocolIsData() && (url.ProtocolIsData() &&
NetworkUtils::IsDataURLMimeTypeSupported(url)))) { network_utils::IsDataURLMimeTypeSupported(url)))) {
frame_->GetDocument()->AddConsoleMessage(ConsoleMessage::Create( frame_->GetDocument()->AddConsoleMessage(ConsoleMessage::Create(
kSecurityMessageSource, kErrorMessageLevel, kSecurityMessageSource, kErrorMessageLevel,
"Not allowed to navigate top frame to " + url.Protocol() + "Not allowed to navigate top frame to " + url.Protocol() +
......
...@@ -679,7 +679,7 @@ void MixedContentChecker::CheckMixedPrivatePublic( ...@@ -679,7 +679,7 @@ void MixedContentChecker::CheckMixedPrivatePublic(
return; return;
// Just count these for the moment, don't block them. // Just count these for the moment, don't block them.
if (NetworkUtils::IsReservedIPAddress(resource_ip_address) && if (network_utils::IsReservedIPAddress(resource_ip_address) &&
frame->GetDocument()->AddressSpace() == mojom::IPAddressSpace::kPublic) { frame->GetDocument()->AddressSpace() == mojom::IPAddressSpace::kPublic) {
UseCounter::Count(frame->GetDocument(), UseCounter::Count(frame->GetDocument(),
WebFeature::kMixedContentPrivateHostnameInPublicHostname); WebFeature::kMixedContentPrivateHostnameInPublicHostname);
......
...@@ -383,7 +383,8 @@ void WorkerFetchContext::DispatchDidFail(const KURL& url, ...@@ -383,7 +383,8 @@ void WorkerFetchContext::DispatchDidFail(const KURL& url,
int64_t encoded_data_length, int64_t encoded_data_length,
bool is_internal_request) { bool is_internal_request) {
probe::didFailLoading(global_scope_, identifier, nullptr, error); probe::didFailLoading(global_scope_, identifier, nullptr, error);
if (NetworkUtils::IsCertificateTransparencyRequiredError(error.ErrorCode())) { if (network_utils::IsCertificateTransparencyRequiredError(
error.ErrorCode())) {
CountUsage(WebFeature::kCertificateTransparencyRequiredErrorOnResourceLoad); CountUsage(WebFeature::kCertificateTransparencyRequiredErrorOnResourceLoad);
} }
} }
......
...@@ -139,10 +139,10 @@ bool MaybeDisallowFetchForDocWrittenScript(FetchParameters& params, ...@@ -139,10 +139,10 @@ bool MaybeDisallowFetchForDocWrittenScript(FetchParameters& params,
// If the hosts didn't match, then see if the domains match. For example, if // If the hosts didn't match, then see if the domains match. For example, if
// a script is served from static.example.com for a document served from // a script is served from static.example.com for a document served from
// www.example.com, we consider that a first party script and allow it. // www.example.com, we consider that a first party script and allow it.
String request_domain = NetworkUtils::GetDomainAndRegistry( String request_domain = network_utils::GetDomainAndRegistry(
request_host, NetworkUtils::kIncludePrivateRegistries); request_host, network_utils::kIncludePrivateRegistries);
String document_domain = NetworkUtils::GetDomainAndRegistry( String document_domain = network_utils::GetDomainAndRegistry(
document_host, NetworkUtils::kIncludePrivateRegistries); document_host, network_utils::kIncludePrivateRegistries);
// getDomainAndRegistry will return the empty string for domains that are // getDomainAndRegistry will return the empty string for domains that are
// already top-level, such as localhost. Thus we only compare domains if we // already top-level, such as localhost. Thus we only compare domains if we
// get non-empty results back from getDomainAndRegistry. // get non-empty results back from getDomainAndRegistry.
......
...@@ -170,7 +170,7 @@ void WorkerClassicScriptLoader::DidReceiveResponse( ...@@ -170,7 +170,7 @@ void WorkerClassicScriptLoader::DidReceiveResponse(
origin_trial_tokens_ = OriginTrialContext::ParseHeaderValue( origin_trial_tokens_ = OriginTrialContext::ParseHeaderValue(
response.HttpHeaderField(HTTPNames::Origin_Trial)); response.HttpHeaderField(HTTPNames::Origin_Trial));
if (NetworkUtils::IsReservedIPAddress(response.RemoteIPAddress())) { if (network_utils::IsReservedIPAddress(response.RemoteIPAddress())) {
response_address_space_ = response_address_space_ =
SecurityOrigin::Create(response_url_)->IsLocalhost() SecurityOrigin::Create(response_url_)->IsLocalhost()
? mojom::IPAddressSpace::kLocal ? mojom::IPAddressSpace::kLocal
......
...@@ -103,7 +103,7 @@ bool ShouldBlockGateWayAttacks(ExecutionContext* execution_context, ...@@ -103,7 +103,7 @@ bool ShouldBlockGateWayAttacks(ExecutionContext* execution_context,
// all this up to //net and //content in order to have any real impact on // all this up to //net and //content in order to have any real impact on
// gateway attacks. That turns out to be a TON of work (crbug.com/378566). // gateway attacks. That turns out to be a TON of work (crbug.com/378566).
mojom::IPAddressSpace target_space = mojom::IPAddressSpace::kPublic; mojom::IPAddressSpace target_space = mojom::IPAddressSpace::kPublic;
if (NetworkUtils::IsReservedIPAddress(request_url.Host())) if (network_utils::IsReservedIPAddress(request_url.Host()))
target_space = mojom::IPAddressSpace::kPrivate; target_space = mojom::IPAddressSpace::kPrivate;
if (SecurityOrigin::Create(request_url)->IsLocalhost()) if (SecurityOrigin::Create(request_url)->IsLocalhost())
target_space = mojom::IPAddressSpace::kLocal; target_space = mojom::IPAddressSpace::kLocal;
......
...@@ -168,7 +168,7 @@ void WebEmbeddedWorkerImpl::StartWorkerContext( ...@@ -168,7 +168,7 @@ void WebEmbeddedWorkerImpl::StartWorkerContext(
// https://crbug.com/590714 // https://crbug.com/590714
KURL script_url = worker_start_data_.script_url; KURL script_url = worker_start_data_.script_url;
worker_start_data_.address_space = mojom::IPAddressSpace::kPublic; worker_start_data_.address_space = mojom::IPAddressSpace::kPublic;
if (NetworkUtils::IsReservedIPAddress(script_url.Host())) if (network_utils::IsReservedIPAddress(script_url.Host()))
worker_start_data_.address_space = mojom::IPAddressSpace::kPrivate; worker_start_data_.address_space = mojom::IPAddressSpace::kPrivate;
if (SecurityOrigin::Create(script_url)->IsLocalhost()) if (SecurityOrigin::Create(script_url)->IsLocalhost())
worker_start_data_.address_space = mojom::IPAddressSpace::kLocal; worker_start_data_.address_space = mojom::IPAddressSpace::kLocal;
......
...@@ -138,7 +138,7 @@ void FetchEvent::OnNavigationPreloadResponse( ...@@ -138,7 +138,7 @@ void FetchEvent::OnNavigationPreloadResponse(
response_data->HeaderList()->Append(header.key, header.value); response_data->HeaderList()->Append(header.key, header.value);
} }
FetchResponseData* tainted_response = FetchResponseData* tainted_response =
NetworkUtils::IsRedirectResponseCode(preload_response_->HttpStatusCode()) network_utils::IsRedirectResponseCode(preload_response_->HttpStatusCode())
? response_data->CreateOpaqueRedirectFilteredResponse() ? response_data->CreateOpaqueRedirectFilteredResponse()
: response_data->CreateBasicFilteredResponse(); : response_data->CreateBasicFilteredResponse();
preload_response_property_->Resolve( preload_response_property_->Resolve(
......
...@@ -539,7 +539,7 @@ Resource* ResourceFetcher::ResourceForStaticData( ...@@ -539,7 +539,7 @@ Resource* ResourceFetcher::ResourceForStaticData(
response.SetExpectedContentLength(data->size()); response.SetExpectedContentLength(data->size());
response.SetTextEncodingName(substitute_data.TextEncoding()); response.SetTextEncodingName(substitute_data.TextEncoding());
} else if (url.ProtocolIsData()) { } else if (url.ProtocolIsData()) {
data = NetworkUtils::ParseDataURLAndPopulateResponse(url, response); data = network_utils::ParseDataURLAndPopulateResponse(url, response);
if (!data) if (!data)
return nullptr; return nullptr;
// |response| is modified by parseDataURLAndPopulateResponse() and is // |response| is modified by parseDataURLAndPopulateResponse() and is
......
...@@ -307,7 +307,7 @@ void ResourceRequest::SetExternalRequestStateFromRequestorAddressSpace( ...@@ -307,7 +307,7 @@ void ResourceRequest::SetExternalRequestStateFromRequestorAddressSpace(
} }
mojom::IPAddressSpace target_space = mojom::IPAddressSpace::kPublic; mojom::IPAddressSpace target_space = mojom::IPAddressSpace::kPublic;
if (NetworkUtils::IsReservedIPAddress(url_.Host())) if (network_utils::IsReservedIPAddress(url_.Host()))
target_space = mojom::IPAddressSpace::kPrivate; target_space = mojom::IPAddressSpace::kPrivate;
if (SecurityOrigin::Create(url_)->IsLocalhost()) if (SecurityOrigin::Create(url_)->IsLocalhost())
target_space = mojom::IPAddressSpace::kLocal; target_space = mojom::IPAddressSpace::kLocal;
......
...@@ -24,14 +24,15 @@ ...@@ -24,14 +24,15 @@
namespace { namespace {
net::registry_controlled_domains::PrivateRegistryFilter net::registry_controlled_domains::PrivateRegistryFilter
getNetPrivateRegistryFilter(blink::NetworkUtils::PrivateRegistryFilter filter) { getNetPrivateRegistryFilter(
blink::network_utils::PrivateRegistryFilter filter) {
switch (filter) { switch (filter) {
case blink::NetworkUtils::kIncludePrivateRegistries: case blink::network_utils::kIncludePrivateRegistries:
return net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES; return net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES;
case blink::NetworkUtils::kExcludePrivateRegistries: case blink::network_utils::kExcludePrivateRegistries:
return net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES; return net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES;
} }
// There are only two NetworkUtils::PrivateRegistryFilter enum entries, so // There are only two network_utils::PrivateRegistryFilter enum entries, so
// we should never reach this point. However, we must have a default return // we should never reach this point. However, we must have a default return
// value to avoid a compiler error. // value to avoid a compiler error.
NOTREACHED(); NOTREACHED();
...@@ -42,7 +43,7 @@ getNetPrivateRegistryFilter(blink::NetworkUtils::PrivateRegistryFilter filter) { ...@@ -42,7 +43,7 @@ getNetPrivateRegistryFilter(blink::NetworkUtils::PrivateRegistryFilter filter) {
namespace blink { namespace blink {
namespace NetworkUtils { namespace network_utils {
bool IsReservedIPAddress(const String& host) { bool IsReservedIPAddress(const String& host) {
net::IPAddress address; net::IPAddress address;
...@@ -132,6 +133,6 @@ String GenerateAcceptLanguageHeader(const String& lang) { ...@@ -132,6 +133,6 @@ String GenerateAcceptLanguageHeader(const String& lang) {
net::HttpUtil::GenerateAcceptLanguageHeader(string)); net::HttpUtil::GenerateAcceptLanguageHeader(string));
} }
} // NetworkUtils } // namespace network_utils
} // namespace blink } // namespace blink
...@@ -14,7 +14,7 @@ class KURL; ...@@ -14,7 +14,7 @@ class KURL;
class SharedBuffer; class SharedBuffer;
class ResourceResponse; class ResourceResponse;
namespace NetworkUtils { namespace network_utils {
enum PrivateRegistryFilter { enum PrivateRegistryFilter {
kIncludePrivateRegistries, kIncludePrivateRegistries,
...@@ -46,7 +46,7 @@ PLATFORM_EXPORT bool IsLegacySymantecCertError(int); ...@@ -46,7 +46,7 @@ PLATFORM_EXPORT bool IsLegacySymantecCertError(int);
PLATFORM_EXPORT String GenerateAcceptLanguageHeader(const String&); PLATFORM_EXPORT String GenerateAcceptLanguageHeader(const String&);
} // NetworkUtils } // namespace network_utils
} // namespace blink } // namespace blink
......
...@@ -12,104 +12,104 @@ namespace blink { ...@@ -12,104 +12,104 @@ namespace blink {
TEST(NetworkUtilsTest, IsReservedIPAddress) { TEST(NetworkUtilsTest, IsReservedIPAddress) {
// Unreserved IPv4 addresses (in various forms). // Unreserved IPv4 addresses (in various forms).
EXPECT_FALSE(NetworkUtils::IsReservedIPAddress("8.8.8.8")); EXPECT_FALSE(network_utils::IsReservedIPAddress("8.8.8.8"));
EXPECT_FALSE(NetworkUtils::IsReservedIPAddress("99.64.0.0")); EXPECT_FALSE(network_utils::IsReservedIPAddress("99.64.0.0"));
EXPECT_FALSE(NetworkUtils::IsReservedIPAddress("212.15.0.0")); EXPECT_FALSE(network_utils::IsReservedIPAddress("212.15.0.0"));
EXPECT_FALSE(NetworkUtils::IsReservedIPAddress("212.15")); EXPECT_FALSE(network_utils::IsReservedIPAddress("212.15"));
EXPECT_FALSE(NetworkUtils::IsReservedIPAddress("212.15.0")); EXPECT_FALSE(network_utils::IsReservedIPAddress("212.15.0"));
EXPECT_FALSE(NetworkUtils::IsReservedIPAddress("3557752832")); EXPECT_FALSE(network_utils::IsReservedIPAddress("3557752832"));
// Reserved IPv4 addresses (in various forms). // Reserved IPv4 addresses (in various forms).
EXPECT_TRUE(NetworkUtils::IsReservedIPAddress("192.168.0.0")); EXPECT_TRUE(network_utils::IsReservedIPAddress("192.168.0.0"));
EXPECT_TRUE(NetworkUtils::IsReservedIPAddress("192.168.0.6")); EXPECT_TRUE(network_utils::IsReservedIPAddress("192.168.0.6"));
EXPECT_TRUE(NetworkUtils::IsReservedIPAddress("10.0.0.5")); EXPECT_TRUE(network_utils::IsReservedIPAddress("10.0.0.5"));
EXPECT_TRUE(NetworkUtils::IsReservedIPAddress("10.0.0")); EXPECT_TRUE(network_utils::IsReservedIPAddress("10.0.0"));
EXPECT_TRUE(NetworkUtils::IsReservedIPAddress("10.0")); EXPECT_TRUE(network_utils::IsReservedIPAddress("10.0"));
EXPECT_TRUE(NetworkUtils::IsReservedIPAddress("3232235526")); EXPECT_TRUE(network_utils::IsReservedIPAddress("3232235526"));
// Unreserved IPv6 addresses. // Unreserved IPv6 addresses.
EXPECT_FALSE(NetworkUtils::IsReservedIPAddress( EXPECT_FALSE(network_utils::IsReservedIPAddress(
"[FFC0:ba98:7654:3210:FEDC:BA98:7654:3210]")); "[FFC0:ba98:7654:3210:FEDC:BA98:7654:3210]"));
EXPECT_FALSE(NetworkUtils::IsReservedIPAddress( EXPECT_FALSE(network_utils::IsReservedIPAddress(
"[2000:ba98:7654:2301:EFCD:BA98:7654:3210]")); "[2000:ba98:7654:2301:EFCD:BA98:7654:3210]"));
// IPv4-mapped to IPv6 // IPv4-mapped to IPv6
EXPECT_FALSE(NetworkUtils::IsReservedIPAddress("[::ffff:8.8.8.8]")); EXPECT_FALSE(network_utils::IsReservedIPAddress("[::ffff:8.8.8.8]"));
// Reserved IPv6 addresses. // Reserved IPv6 addresses.
EXPECT_TRUE(NetworkUtils::IsReservedIPAddress("[::1]")); EXPECT_TRUE(network_utils::IsReservedIPAddress("[::1]"));
EXPECT_TRUE(NetworkUtils::IsReservedIPAddress("[::192.9.5.5]")); EXPECT_TRUE(network_utils::IsReservedIPAddress("[::192.9.5.5]"));
EXPECT_TRUE(NetworkUtils::IsReservedIPAddress("[::ffff:192.168.1.1]")); EXPECT_TRUE(network_utils::IsReservedIPAddress("[::ffff:192.168.1.1]"));
EXPECT_TRUE(NetworkUtils::IsReservedIPAddress("[FEED::BEEF]")); EXPECT_TRUE(network_utils::IsReservedIPAddress("[FEED::BEEF]"));
EXPECT_TRUE(NetworkUtils::IsReservedIPAddress( EXPECT_TRUE(network_utils::IsReservedIPAddress(
"[FEC0:ba98:7654:3210:FEDC:BA98:7654:3210]")); "[FEC0:ba98:7654:3210:FEDC:BA98:7654:3210]"));
// Not IP addresses at all. // Not IP addresses at all.
EXPECT_FALSE(NetworkUtils::IsReservedIPAddress("example.com")); EXPECT_FALSE(network_utils::IsReservedIPAddress("example.com"));
EXPECT_FALSE(NetworkUtils::IsReservedIPAddress("127.0.0.1.example.com")); EXPECT_FALSE(network_utils::IsReservedIPAddress("127.0.0.1.example.com"));
// Moar IPv4 // Moar IPv4
for (int i = 0; i < 256; i++) { for (int i = 0; i < 256; i++) {
net::IPAddress address(i, 0, 0, 1); net::IPAddress address(i, 0, 0, 1);
std::string address_string = address.ToString(); std::string address_string = address.ToString();
if (i == 0 || i == 10 || i == 127 || i > 223) { if (i == 0 || i == 10 || i == 127 || i > 223) {
EXPECT_TRUE(NetworkUtils::IsReservedIPAddress( EXPECT_TRUE(network_utils::IsReservedIPAddress(
String::FromUTF8(address_string.data(), address_string.length()))); String::FromUTF8(address_string.data(), address_string.length())));
} else { } else {
EXPECT_FALSE(NetworkUtils::IsReservedIPAddress( EXPECT_FALSE(network_utils::IsReservedIPAddress(
String::FromUTF8(address_string.data(), address_string.length()))); String::FromUTF8(address_string.data(), address_string.length())));
} }
} }
} }
TEST(NetworkUtilsTest, GetDomainAndRegistry) { TEST(NetworkUtilsTest, GetDomainAndRegistry) {
EXPECT_EQ("", NetworkUtils::GetDomainAndRegistry( EXPECT_EQ("", network_utils::GetDomainAndRegistry(
"", NetworkUtils::kIncludePrivateRegistries)); "", network_utils::kIncludePrivateRegistries));
EXPECT_EQ("", NetworkUtils::GetDomainAndRegistry( EXPECT_EQ("", network_utils::GetDomainAndRegistry(
".", NetworkUtils::kIncludePrivateRegistries)); ".", network_utils::kIncludePrivateRegistries));
EXPECT_EQ("", NetworkUtils::GetDomainAndRegistry( EXPECT_EQ("", network_utils::GetDomainAndRegistry(
"..", NetworkUtils::kIncludePrivateRegistries)); "..", network_utils::kIncludePrivateRegistries));
EXPECT_EQ("", NetworkUtils::GetDomainAndRegistry( EXPECT_EQ("", network_utils::GetDomainAndRegistry(
"com", NetworkUtils::kIncludePrivateRegistries)); "com", network_utils::kIncludePrivateRegistries));
EXPECT_EQ("", NetworkUtils::GetDomainAndRegistry( EXPECT_EQ("", network_utils::GetDomainAndRegistry(
".com", NetworkUtils::kIncludePrivateRegistries)); ".com", network_utils::kIncludePrivateRegistries));
EXPECT_EQ( EXPECT_EQ("", network_utils::GetDomainAndRegistry(
"", NetworkUtils::GetDomainAndRegistry( "www.example.com:8000",
"www.example.com:8000", NetworkUtils::kIncludePrivateRegistries)); network_utils::kIncludePrivateRegistries));
EXPECT_EQ("", NetworkUtils::GetDomainAndRegistry( EXPECT_EQ("", network_utils::GetDomainAndRegistry(
"localhost", NetworkUtils::kIncludePrivateRegistries)); "localhost", network_utils::kIncludePrivateRegistries));
EXPECT_EQ("", NetworkUtils::GetDomainAndRegistry( EXPECT_EQ("", network_utils::GetDomainAndRegistry(
"127.0.0.1", NetworkUtils::kIncludePrivateRegistries)); "127.0.0.1", network_utils::kIncludePrivateRegistries));
EXPECT_EQ("example.com", EXPECT_EQ("example.com",
NetworkUtils::GetDomainAndRegistry( network_utils::GetDomainAndRegistry(
"example.com", NetworkUtils::kIncludePrivateRegistries)); "example.com", network_utils::kIncludePrivateRegistries));
EXPECT_EQ("example.com", EXPECT_EQ("example.com",
NetworkUtils::GetDomainAndRegistry( network_utils::GetDomainAndRegistry(
"www.example.com", NetworkUtils::kIncludePrivateRegistries)); "www.example.com", network_utils::kIncludePrivateRegistries));
EXPECT_EQ("example.com", EXPECT_EQ("example.com", network_utils::GetDomainAndRegistry(
NetworkUtils::GetDomainAndRegistry( "static.example.com",
"static.example.com", NetworkUtils::kIncludePrivateRegistries)); network_utils::kIncludePrivateRegistries));
EXPECT_EQ("example.com", NetworkUtils::GetDomainAndRegistry( EXPECT_EQ("example.com", network_utils::GetDomainAndRegistry(
"multilevel.www.example.com", "multilevel.www.example.com",
NetworkUtils::kIncludePrivateRegistries)); network_utils::kIncludePrivateRegistries));
EXPECT_EQ("example.co.uk", EXPECT_EQ("example.co.uk",
NetworkUtils::GetDomainAndRegistry( network_utils::GetDomainAndRegistry(
"www.example.co.uk", NetworkUtils::kIncludePrivateRegistries)); "www.example.co.uk", network_utils::kIncludePrivateRegistries));
// Verify proper handling of 'private registries'. // Verify proper handling of 'private registries'.
EXPECT_EQ("foo.appspot.com", NetworkUtils::GetDomainAndRegistry( EXPECT_EQ("foo.appspot.com", network_utils::GetDomainAndRegistry(
"www.foo.appspot.com", "www.foo.appspot.com",
NetworkUtils::kIncludePrivateRegistries)); network_utils::kIncludePrivateRegistries));
EXPECT_EQ("appspot.com", NetworkUtils::GetDomainAndRegistry( EXPECT_EQ("appspot.com", network_utils::GetDomainAndRegistry(
"www.foo.appspot.com", "www.foo.appspot.com",
NetworkUtils::kExcludePrivateRegistries)); network_utils::kExcludePrivateRegistries));
// Verify that unknown registries are included. // Verify that unknown registries are included.
EXPECT_EQ("example.notarealregistry", EXPECT_EQ("example.notarealregistry",
NetworkUtils::GetDomainAndRegistry( network_utils::GetDomainAndRegistry(
"www.example.notarealregistry", "www.example.notarealregistry",
NetworkUtils::kIncludePrivateRegistries)); network_utils::kIncludePrivateRegistries));
} }
} // namespace blink } // namespace blink
...@@ -221,6 +221,7 @@ _CONFIG = [ ...@@ -221,6 +221,7 @@ _CONFIG = [
'event_handling_util::.+', 'event_handling_util::.+',
'event_util::.+', 'event_util::.+',
'media_constraints_impl::.+', 'media_constraints_impl::.+',
'network_utils::.+',
'scheduler::.+', 'scheduler::.+',
'touch_action_util::.+', 'touch_action_util::.+',
'vector_math::.+', 'vector_math::.+',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment