fergalmoran/ladybird
1
0
Fork 0
mirror of https://github.com/fergalmoran/ladybird.git synced 2025-12-26 03:09:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Everywhere: Remove some use of the URL constructors

Browse Source 
These make it too easy to construct an invalid URL, which makes it
difficult to remove the valid state of URL - which this API relies
on.
This commit is contained in:
Shannon Booth
2025-02-16 14:45:52 +13:00
committed by Tim Flynn
parent 2823ac92d0
commit d62cf0a807
11 changed files with 341 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Libraries/LibWeb/WebDriver/Proxy.cpp
View File

@@ -5,6 +5,7 @@
*/
#include <AK/JsonValue.h>
#include <LibURL/Parser.h>
#include <LibURL/URL.h>
#include <LibWeb/WebDriver/Proxy.h>
@@ -45,7 +46,7 @@ static ErrorOr<void, Error> validate_proxy_item(StringView key, JsonValue const&
if (key == "proxyAutoconfigUrl"sv) {
if (!value.is_string())
return Error::from_code(ErrorCode::InvalidArgument, "Proxy configuration item 'proxyAutoconfigUrl' must be a string"sv);
if (URL::URL url { value.as_string() }; !url.is_valid())
if (auto url = URL::Parser::basic_parse(value.as_string()); !url.has_value())
return Error::from_code(ErrorCode::InvalidArgument, "Proxy configuration item 'proxyAutoconfigUrl' must be a valid URL"sv);
return {};
}
@@ -53,7 +54,7 @@ static ErrorOr<void, Error> validate_proxy_item(StringView key, JsonValue const&
if (key == "ftpProxy"sv) {
if (!value.is_string())
return Error::from_code(ErrorCode::InvalidArgument, "Proxy configuration item 'ftpProxy' must be a string"sv);
if (URL::URL url { value.as_string() }; !url.is_valid() || url.scheme() != "ftp"sv)
if (auto url = URL::Parser::basic_parse(value.as_string()); !url.has_value() || url->scheme() != "ftp"sv)
return Error::from_code(ErrorCode::InvalidArgument, "Proxy configuration item 'ftpProxy' must be a valid FTP URL"sv);
return {};
}
@@ -61,7 +62,7 @@ static ErrorOr<void, Error> validate_proxy_item(StringView key, JsonValue const&
if (key == "httpProxy"sv) {
if (!value.is_string())
return Error::from_code(ErrorCode::InvalidArgument, "Proxy configuration item 'httpProxy' must be a string"sv);
if (URL::URL url { value.as_string() }; !url.is_valid() || url.scheme() != "http"sv)
if (auto url = URL::Parser::basic_parse(value.as_string()); !url.has_value() || url->scheme() != "http"sv)
return Error::from_code(ErrorCode::InvalidArgument, "Proxy configuration item 'httpProxy' must be a valid HTTP URL"sv);
return {};
}
@@ -82,7 +83,7 @@ static ErrorOr<void, Error> validate_proxy_item(StringView key, JsonValue const&
if (key == "sslProxy"sv) {
if (!value.is_string())
return Error::from_code(ErrorCode::InvalidArgument, "Proxy configuration item 'sslProxy' must be a string"sv);
if (URL::URL url { value.as_string() }; !url.is_valid() || url.scheme() != "https"sv)
if (auto url = URL::Parser::basic_parse(value.as_string()); !url.has_value() || url->scheme() != "https"sv)
return Error::from_code(ErrorCode::InvalidArgument, "Proxy configuration item 'sslProxy' must be a valid HTTPS URL"sv);
return {};
}
@@ -90,7 +91,7 @@ static ErrorOr<void, Error> validate_proxy_item(StringView key, JsonValue const&
if (key == "socksProxy"sv) {
if (!value.is_string())
return Error::from_code(ErrorCode::InvalidArgument, "Proxy configuration item 'proxyAutoconfigUrl' must be a string"sv);
if (URL::URL url { value.as_string() }; !url.is_valid())
if (auto url = URL::Parser::basic_parse(value.as_string()); !url.has_value())
return Error::from_code(ErrorCode::InvalidArgument, "Proxy configuration item 'proxyAutoconfigUrl' must be a valid URL"sv);
return {};
}