Ladybird/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-06-11 10:18:15 +09:00
Code Activity

AK: Make URL::m_port an Optional<u16>, Expose raw port getter

Browse source 
Our current way of signalling a missing port with m_port == 0 was
lacking, as 0 is a valid port number in URLs.
This commit is contained in:
Idan Horowitz 2021-09-13 23:12:16 +03:00 • committed by Andreas Kling
parent 1c9c43785d
commit d6cfa34667
Notes: sideshowbarker 2024-07-18 03:59:28 +09:00
15 changed files with 42 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

18
AK/URL.cpp
View file

@ -71,13 +71,13 @@ void URL::set_host(String host)
m_valid = compute_validity(); m_valid = compute_validity();
} }
void URL::set_port(u16 port) void URL::set_port(Optional<u16> port)
{ {
if (port == default_port_for_scheme(m_scheme)) { if (port == default_port_for_scheme(m_scheme)) {
m_port = 0; m_port = {};
return; return;
} }
m_port = port; m_port = move(port);
m_valid = compute_validity(); m_valid = compute_validity();
} }
@ -234,8 +234,8 @@ String URL::serialize(ExcludeFragment exclude_fragment) const
} }
builder.append(m_host); builder.append(m_host);
if (m_port != 0) if (m_port.has_value())
builder.appendff(":{}", m_port); builder.appendff(":{}", *m_port);
} }
if (cannot_be_a_base_url()) { if (cannot_be_a_base_url()) {
@ -278,8 +278,8 @@ String URL::serialize_for_display() const
if (!m_host.is_null()) { if (!m_host.is_null()) {
builder.append("//"); builder.append("//");
builder.append(m_host); builder.append(m_host);
if (m_port != 0) if (m_port.has_value())
builder.appendff(":{}", m_port); builder.appendff(":{}", *m_port);
} }
if (cannot_be_a_base_url()) { if (cannot_be_a_base_url()) {
@ -329,8 +329,8 @@ String URL::serialize_origin() const
builder.append(m_scheme); builder.append(m_scheme);
builder.append("://"sv); builder.append("://"sv);
builder.append(m_host); builder.append(m_host);
if (m_port != 0) if (m_port.has_value())
builder.append(":{}", m_port); builder.append(":{}", *m_port);
return builder.build(); return builder.build();
} }

9
AK/URL.h
View file

@ -56,7 +56,8 @@ public:
Vector<String> const& paths() const { return m_paths; } Vector<String> const& paths() const { return m_paths; }
String const& query() const { return m_query; } String const& query() const { return m_query; }
String const& fragment() const { return m_fragment; } String const& fragment() const { return m_fragment; }
u16 port() const { return m_port ? m_port : default_port_for_scheme(m_scheme); } Optional<u16> port() const { return m_port; }
u16 port_or_default() const { return m_port.value_or(default_port_for_scheme(m_scheme)); }
bool cannot_be_a_base_url() const { return m_cannot_be_a_base_url; } bool cannot_be_a_base_url() const { return m_cannot_be_a_base_url; }
bool cannot_have_a_username_or_password_or_port() const { return m_host.is_null() || m_host.is_empty() || m_cannot_be_a_base_url || m_scheme == "file"sv; } bool cannot_have_a_username_or_password_or_port() const { return m_host.is_null() || m_host.is_empty() || m_cannot_be_a_base_url || m_scheme == "file"sv; }
@ -68,7 +69,7 @@ public:
void set_username(String); void set_username(String);
void set_password(String); void set_password(String);
void set_host(String); void set_host(String);
void set_port(u16); void set_port(Optional<u16>);
void set_paths(Vector<String>); void set_paths(Vector<String>);
void set_query(String); void set_query(String);
void set_fragment(String); void set_fragment(String);
@ -129,8 +130,8 @@ private:
String m_username; String m_username;
String m_password; String m_password;
String m_host; String m_host;
// NOTE: If the port is the default port for the scheme, m_port should be 0. // NOTE: If the port is the default port for the scheme, m_port should be empty.
u16 m_port { 0 }; Optional<u16> m_port;
String m_path; String m_path;
Vector<String> m_paths; Vector<String> m_paths;
String m_query; String m_query;

2
AK/URLParser.cpp
View file

@ -472,7 +472,7 @@ URL URLParser::parse(StringView const& raw_input, URL const* base_url, Optional<
return {}; return {};
} }
if (port.value() == URL::default_port_for_scheme(url->scheme())) if (port.value() == URL::default_port_for_scheme(url->scheme()))
url->m_port = 0; url->m_port = {};
else else
url->m_port = port.value(); url->m_port = port.value();
buffer.clear(); buffer.clear();

24
Tests/AK/TestURL.cpp
View file

@ -21,7 +21,7 @@ TEST_CASE(basic)
EXPECT_EQ(url.is_valid(), true); EXPECT_EQ(url.is_valid(), true);
EXPECT_EQ(url.scheme(), "http"); EXPECT_EQ(url.scheme(), "http");
EXPECT_EQ(url.host(), "www.serenityos.org"); EXPECT_EQ(url.host(), "www.serenityos.org");
EXPECT_EQ(url.port(), 80); EXPECT_EQ(url.port_or_default(), 80);
EXPECT_EQ(url.path(), "/"); EXPECT_EQ(url.path(), "/");
EXPECT(url.query().is_null()); EXPECT(url.query().is_null());
EXPECT(url.fragment().is_null()); EXPECT(url.fragment().is_null());
@ -31,7 +31,7 @@ TEST_CASE(basic)
EXPECT_EQ(url.is_valid(), true); EXPECT_EQ(url.is_valid(), true);
EXPECT_EQ(url.scheme(), "https"); EXPECT_EQ(url.scheme(), "https");
EXPECT_EQ(url.host(), "www.serenityos.org"); EXPECT_EQ(url.host(), "www.serenityos.org");
EXPECT_EQ(url.port(), 443); EXPECT_EQ(url.port_or_default(), 443);
EXPECT_EQ(url.path(), "/index.html"); EXPECT_EQ(url.path(), "/index.html");
EXPECT(url.query().is_null()); EXPECT(url.query().is_null());
EXPECT(url.fragment().is_null()); EXPECT(url.fragment().is_null());
@ -41,7 +41,7 @@ TEST_CASE(basic)
EXPECT_EQ(url.is_valid(), true); EXPECT_EQ(url.is_valid(), true);
EXPECT_EQ(url.scheme(), "https"); EXPECT_EQ(url.scheme(), "https");
EXPECT_EQ(url.host(), "localhost"); EXPECT_EQ(url.host(), "localhost");
EXPECT_EQ(url.port(), 1234); EXPECT_EQ(url.port_or_default(), 1234);
EXPECT_EQ(url.path(), "/~anon/test/page.html"); EXPECT_EQ(url.path(), "/~anon/test/page.html");
EXPECT(url.query().is_null()); EXPECT(url.query().is_null());
EXPECT(url.fragment().is_null()); EXPECT(url.fragment().is_null());
@ -51,7 +51,7 @@ TEST_CASE(basic)
EXPECT_EQ(url.is_valid(), true); EXPECT_EQ(url.is_valid(), true);
EXPECT_EQ(url.scheme(), "http"); EXPECT_EQ(url.scheme(), "http");
EXPECT_EQ(url.host(), "www.serenityos.org"); EXPECT_EQ(url.host(), "www.serenityos.org");
EXPECT_EQ(url.port(), 80); EXPECT_EQ(url.port_or_default(), 80);
EXPECT_EQ(url.path(), "/index.html"); EXPECT_EQ(url.path(), "/index.html");
EXPECT_EQ(url.query(), ""); EXPECT_EQ(url.query(), "");
EXPECT_EQ(url.fragment(), ""); EXPECT_EQ(url.fragment(), "");
@ -61,7 +61,7 @@ TEST_CASE(basic)
EXPECT_EQ(url.is_valid(), true); EXPECT_EQ(url.is_valid(), true);
EXPECT_EQ(url.scheme(), "http"); EXPECT_EQ(url.scheme(), "http");
EXPECT_EQ(url.host(), "www.serenityos.org"); EXPECT_EQ(url.host(), "www.serenityos.org");
EXPECT_EQ(url.port(), 80); EXPECT_EQ(url.port_or_default(), 80);
EXPECT_EQ(url.path(), "/index.html"); EXPECT_EQ(url.path(), "/index.html");
EXPECT_EQ(url.query(), "foo=1&bar=2"); EXPECT_EQ(url.query(), "foo=1&bar=2");
EXPECT(url.fragment().is_null()); EXPECT(url.fragment().is_null());
@ -71,7 +71,7 @@ TEST_CASE(basic)
EXPECT_EQ(url.is_valid(), true); EXPECT_EQ(url.is_valid(), true);
EXPECT_EQ(url.scheme(), "http"); EXPECT_EQ(url.scheme(), "http");
EXPECT_EQ(url.host(), "www.serenityos.org"); EXPECT_EQ(url.host(), "www.serenityos.org");
EXPECT_EQ(url.port(), 80); EXPECT_EQ(url.port_or_default(), 80);
EXPECT_EQ(url.path(), "/index.html"); EXPECT_EQ(url.path(), "/index.html");
EXPECT(url.query().is_null()); EXPECT(url.query().is_null());
EXPECT_EQ(url.fragment(), "fragment"); EXPECT_EQ(url.fragment(), "fragment");
@ -81,7 +81,7 @@ TEST_CASE(basic)
EXPECT_EQ(url.is_valid(), true); EXPECT_EQ(url.is_valid(), true);
EXPECT_EQ(url.scheme(), "http"); EXPECT_EQ(url.scheme(), "http");
EXPECT_EQ(url.host(), "www.serenityos.org"); EXPECT_EQ(url.host(), "www.serenityos.org");
EXPECT_EQ(url.port(), 80); EXPECT_EQ(url.port_or_default(), 80);
EXPECT_EQ(url.path(), "/index.html"); EXPECT_EQ(url.path(), "/index.html");
EXPECT_EQ(url.query(), "foo=1&bar=2&baz=/?"); EXPECT_EQ(url.query(), "foo=1&bar=2&baz=/?");
EXPECT_EQ(url.fragment(), "frag/ment?test#"); EXPECT_EQ(url.fragment(), "frag/ment?test#");
@ -105,7 +105,7 @@ TEST_CASE(some_bad_urls)
TEST_CASE(serialization) TEST_CASE(serialization)
{ {
EXPECT_EQ(URL("http://www.serenityos.org/").serialize(), "http://www.serenityos.org/"); EXPECT_EQ(URL("http://www.serenityos.org/").serialize(), "http://www.serenityos.org/");
EXPECT_EQ(URL("http://www.serenityos.org:0/").serialize(), "http://www.serenityos.org/"); EXPECT_EQ(URL("http://www.serenityos.org:0/").serialize(), "http://www.serenityos.org:0/");
EXPECT_EQ(URL("http://www.serenityos.org:80/").serialize(), "http://www.serenityos.org/"); EXPECT_EQ(URL("http://www.serenityos.org:80/").serialize(), "http://www.serenityos.org/");
EXPECT_EQ(URL("http://www.serenityos.org:81/").serialize(), "http://www.serenityos.org:81/"); EXPECT_EQ(URL("http://www.serenityos.org:81/").serialize(), "http://www.serenityos.org:81/");
EXPECT_EQ(URL("https://www.serenityos.org:443/foo/bar.html?query#fragment").serialize(), "https://www.serenityos.org/foo/bar.html?query#fragment"); EXPECT_EQ(URL("https://www.serenityos.org:443/foo/bar.html?query#fragment").serialize(), "https://www.serenityos.org/foo/bar.html?query#fragment");
@ -117,7 +117,7 @@ TEST_CASE(file_url_with_hostname)
EXPECT(url.is_valid()); EXPECT(url.is_valid());
EXPECT_EQ(url.scheme(), "file"); EXPECT_EQ(url.scheme(), "file");
EXPECT_EQ(url.host(), "courage"); EXPECT_EQ(url.host(), "courage");
EXPECT_EQ(url.port(), 0); EXPECT_EQ(url.port_or_default(), 0);
EXPECT_EQ(url.path(), "/my/file"); EXPECT_EQ(url.path(), "/my/file");
EXPECT_EQ(url.serialize(), "file://courage/my/file"); EXPECT_EQ(url.serialize(), "file://courage/my/file");
EXPECT(url.query().is_null()); EXPECT(url.query().is_null());
@ -200,7 +200,7 @@ TEST_CASE(mailto_url)
EXPECT(url.is_valid()); EXPECT(url.is_valid());
EXPECT_EQ(url.scheme(), "mailto"); EXPECT_EQ(url.scheme(), "mailto");
EXPECT(url.host().is_null()); EXPECT(url.host().is_null());
EXPECT_EQ(url.port(), 0); EXPECT_EQ(url.port_or_default(), 0);
EXPECT_EQ(url.paths().size(), 1u); EXPECT_EQ(url.paths().size(), 1u);
EXPECT_EQ(url.paths()[0], "mail@example.com"); EXPECT_EQ(url.paths()[0], "mail@example.com");
EXPECT(url.query().is_null()); EXPECT(url.query().is_null());
@ -291,7 +291,7 @@ TEST_CASE(trailing_slash_with_complete_url)
TEST_CASE(trailing_port) TEST_CASE(trailing_port)
{ {
URL url("http://example.com:8086"); URL url("http://example.com:8086");
EXPECT_EQ(url.port(), 8086); EXPECT_EQ(url.port_or_default(), 8086);
} }
TEST_CASE(port_overflow) TEST_CASE(port_overflow)
@ -312,7 +312,7 @@ TEST_CASE(create_with_file_scheme)
auto url = URL::create_with_file_scheme("/home/anon/README.md"); auto url = URL::create_with_file_scheme("/home/anon/README.md");
EXPECT(url.is_valid()); EXPECT(url.is_valid());
EXPECT_EQ(url.scheme(), "file"); EXPECT_EQ(url.scheme(), "file");
EXPECT_EQ(url.port(), 0); EXPECT_EQ(url.port_or_default(), 0);
EXPECT_EQ(url.paths().size(), 3u); EXPECT_EQ(url.paths().size(), 3u);
EXPECT_EQ(url.paths()[0], "home"); EXPECT_EQ(url.paths()[0], "home");
EXPECT_EQ(url.paths()[1], "anon"); EXPECT_EQ(url.paths()[1], "anon");

2
Userland/Libraries/LibGemini/GeminiJob.cpp
View file

@ -45,7 +45,7 @@ void GeminiJob::start()
if (on_certificate_requested) if (on_certificate_requested)
on_certificate_requested(*this); on_certificate_requested(*this);
}; };
bool success = ((TLS::TLSv12&)*m_socket).connect(m_request.url().host(), m_request.url().port()); bool success = ((TLS::TLSv12&)*m_socket).connect(m_request.url().host(), m_request.url().port_or_default());
if (!success) { if (!success) {
deferred_invoke([this] { deferred_invoke([this] {
return did_fail(Core::NetworkJob::Error::ConnectionFailed); return did_fail(Core::NetworkJob::Error::ConnectionFailed);

2
Userland/Libraries/LibHTTP/HttpJob.cpp
View file

@ -26,7 +26,7 @@ void HttpJob::start()
did_fail(Core::NetworkJob::Error::ConnectionFailed); did_fail(Core::NetworkJob::Error::ConnectionFailed);
}); });
}; };
bool success = m_socket->connect(m_request.url().host(), m_request.url().port()); bool success = m_socket->connect(m_request.url().host(), m_request.url().port_or_default());
if (!success) { if (!success) {
deferred_invoke([this] { deferred_invoke([this] {
return did_fail(Core::NetworkJob::Error::ConnectionFailed); return did_fail(Core::NetworkJob::Error::ConnectionFailed);

2
Userland/Libraries/LibHTTP/HttpsJob.cpp
View file

@ -46,7 +46,7 @@ void HttpsJob::start()
if (on_certificate_requested) if (on_certificate_requested)
on_certificate_requested(*this); on_certificate_requested(*this);
}; };
bool success = ((TLS::TLSv12&)*m_socket).connect(m_request.url().host(), m_request.url().port()); bool success = ((TLS::TLSv12&)*m_socket).connect(m_request.url().host(), m_request.url().port_or_default());
if (!success) { if (!success) {
deferred_invoke([this] { deferred_invoke([this] {
return did_fail(Core::NetworkJob::Error::ConnectionFailed); return did_fail(Core::NetworkJob::Error::ConnectionFailed);

2
Userland/Libraries/LibWeb/Bindings/LocationObject.cpp
View file

@ -74,7 +74,7 @@ JS_DEFINE_NATIVE_FUNCTION(LocationObject::host_getter)
{ {
auto& window = static_cast<WindowObject&>(global_object); auto& window = static_cast<WindowObject&>(global_object);
auto url = window.impl().associated_document().url(); auto url = window.impl().associated_document().url();
return JS::js_string(vm, String::formatted("{}:{}", url.host(), url.port())); return JS::js_string(vm, String::formatted("{}:{}", url.host(), url.port_or_default()));
} }
JS_DEFINE_NATIVE_FUNCTION(LocationObject::hash_getter) JS_DEFINE_NATIVE_FUNCTION(LocationObject::hash_getter)

2
Userland/Libraries/LibWeb/DOM/Document.cpp
View file

@ -134,7 +134,7 @@ Origin Document::origin() const
{ {
if (!m_url.is_valid()) if (!m_url.is_valid())
return {}; return {};
return { m_url.protocol(), m_url.host(), m_url.port() }; return { m_url.protocol(), m_url.host(), m_url.port_or_default() };
} }
void Document::set_origin(const Origin& origin) void Document::set_origin(const Origin& origin)

2
Userland/Libraries/LibWeb/Loader/FrameLoader.cpp
View file

@ -165,7 +165,7 @@ bool FrameLoader::load(LoadRequest& request, Type type)
AK::URL favicon_url; AK::URL favicon_url;
favicon_url.set_protocol(url.protocol()); favicon_url.set_protocol(url.protocol());
favicon_url.set_host(url.host()); favicon_url.set_host(url.host());
favicon_url.set_port(url.port()); favicon_url.set_port(url.port_or_default());
favicon_url.set_paths({ "favicon.ico" }); favicon_url.set_paths({ "favicon.ico" });
ResourceLoader::the().load( ResourceLoader::the().load(

4
Userland/Libraries/LibWeb/Loader/ResourceLoader.cpp
View file

@ -108,8 +108,8 @@ void ResourceLoader::load(LoadRequest& request, Function<void(ReadonlyBytes, con
dbgln("ResourceLoader: Failed load of: \"{}\", \033[32;1mError: {}\033[0m, Duration: {}ms", url, error_message, load_time_ms); dbgln("ResourceLoader: Failed load of: \"{}\", \033[32;1mError: {}\033[0m, Duration: {}ms", url, error_message, load_time_ms);
}; };
if (is_port_blocked(url.port())) { if (is_port_blocked(url.port_or_default())) {
log_failure(request, String::formatted("The port #{} is blocked", url.port())); log_failure(request, String::formatted("The port #{} is blocked", url.port_or_default()));
return; return;
} }

2
Userland/Libraries/LibWeb/XHR/XMLHttpRequest.cpp
View file

@ -171,7 +171,7 @@ DOM::ExceptionOr<void> XMLHttpRequest::send()
dbgln("XHR send from {} to {}", m_window->associated_document().url(), request_url); dbgln("XHR send from {} to {}", m_window->associated_document().url(), request_url);
// TODO: Add support for preflight requests to support CORS requests // TODO: Add support for preflight requests to support CORS requests
Origin request_url_origin = Origin(request_url.protocol(), request_url.host(), request_url.port()); Origin request_url_origin = Origin(request_url.protocol(), request_url.host(), request_url.port_or_default());
bool should_enforce_same_origin_policy = true; bool should_enforce_same_origin_policy = true;
if (auto* page = m_window->page()) if (auto* page = m_window->page())

2
Userland/Libraries/LibWebSocket/Impl/TCPWebSocketConnectionImpl.cpp
View file

@ -34,7 +34,7 @@ void TCPWebSocketConnectionImpl::connect(ConnectionInfo const& connection)
m_socket->on_connected = [this] { m_socket->on_connected = [this] {
on_connected(); on_connected();
}; };
bool success = m_socket->connect(connection.url().host(), connection.url().port()); bool success = m_socket->connect(connection.url().host(), connection.url().port_or_default());
if (!success) { if (!success) {
deferred_invoke([this] { deferred_invoke([this] {
on_connection_error(); on_connection_error();

2
Userland/Libraries/LibWebSocket/Impl/TLSv12WebSocketConnectionImpl.cpp
View file

@ -42,7 +42,7 @@ void TLSv12WebSocketConnectionImpl::connect(ConnectionInfo const& connection)
m_socket->on_tls_certificate_request = [](auto&) { m_socket->on_tls_certificate_request = [](auto&) {
// FIXME : Once we handle TLS certificate requests, handle it here as well. // FIXME : Once we handle TLS certificate requests, handle it here as well.
}; };
bool success = m_socket->connect(connection.url().host(), connection.url().port()); bool success = m_socket->connect(connection.url().host(), connection.url().port_or_default());
if (!success) { if (!success) {
deferred_invoke([this] { deferred_invoke([this] {
on_connection_error(); on_connection_error();

8
Userland/Libraries/LibWebSocket/WebSocket.cpp
View file

@ -151,10 +151,10 @@ void WebSocket::send_client_handshake()
// 4. Host // 4. Host
auto url = m_connection.url(); auto url = m_connection.url();
builder.appendff("Host: {}", url.host()); builder.appendff("Host: {}", url.host());
if (!m_connection.is_secure() && url.port() != 80) if (!m_connection.is_secure() && url.port_or_default() != 80)
builder.appendff(":{}", url.port()); builder.appendff(":{}", url.port_or_default());
else if (m_connection.is_secure() && url.port() != 443) else if (m_connection.is_secure() && url.port_or_default() != 443)
builder.appendff(":{}", url.port()); builder.appendff(":{}", url.port_or_default());
builder.append("\r\n"); builder.append("\r\n");
// 5. and 6. Connection Upgrade // 5. and 6. Connection Upgrade