RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-14 07:44:59 +00:00
Code Issues Activity Actions

Ladybird+Userland: Use ByteString for candidate server paths

Browse source 
We've adopted a stance that paths should be ByteStrings rather than
UTF-8 strings, so apply that to the Ladybird helpers.
This commit is contained in:
Andrew Kaster 2024-02-21 18:27:05 -07:00 • committed by Andrew Kaster
parent 1e0dd9aa8c
commit 0a55749a39
10 changed files with 30 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Ladybird/HelperProcess.cpp
View file

@ -8,7 +8,7 @@
ErrorOr<NonnullRefPtr<WebView::WebContentClient>> launch_web_content_process( ErrorOr<NonnullRefPtr<WebView::WebContentClient>> launch_web_content_process(
WebView::ViewImplementation& view, WebView::ViewImplementation& view,
ReadonlySpan<String> candidate_web_content_paths, ReadonlySpan<ByteString> candidate_web_content_paths,
Ladybird::WebContentOptions const& web_content_options) Ladybird::WebContentOptions const& web_content_options)
{ {
int socket_fds[2] {}; int socket_fds[2] {};
@ -43,7 +43,7 @@ ErrorOr<NonnullRefPtr<WebView::WebContentClient>> launch_web_content_process(
"valgrind"sv, "valgrind"sv,
"--tool=callgrind"sv, "--tool=callgrind"sv,
"--instr-atstart=no"sv, "--instr-atstart=no"sv,
path.bytes_as_string_view(), path.view(),
"--command-line"sv, "--command-line"sv,
web_content_options.command_line, web_content_options.command_line,
"--executable-path"sv, "--executable-path"sv,
@ -97,7 +97,7 @@ ErrorOr<NonnullRefPtr<WebView::WebContentClient>> launch_web_content_process(
} }
template<typename Client> template<typename Client>
ErrorOr<NonnullRefPtr<Client>> launch_generic_server_process(ReadonlySpan<String> candidate_server_paths, StringView serenity_resource_root, Vector<ByteString> const& certificates, StringView server_name) ErrorOr<NonnullRefPtr<Client>> launch_generic_server_process(ReadonlySpan<ByteString> candidate_server_paths, StringView serenity_resource_root, Vector<ByteString> const& certificates, StringView server_name)
{ {
int socket_fds[2] {}; int socket_fds[2] {};
TRY(Core::System::socketpair(AF_LOCAL, SOCK_STREAM, 0, socket_fds)); TRY(Core::System::socketpair(AF_LOCAL, SOCK_STREAM, 0, socket_fds));
@ -127,7 +127,7 @@ ErrorOr<NonnullRefPtr<Client>> launch_generic_server_process(ReadonlySpan<String
continue; continue;
auto arguments = Vector<StringView, 5> { auto arguments = Vector<StringView, 5> {
path.bytes_as_string_view(), path.view(),
"--fd-passing-socket"sv, "--fd-passing-socket"sv,
fd_passing_socket_string, fd_passing_socket_string,
}; };
@ -163,22 +163,22 @@ ErrorOr<NonnullRefPtr<Client>> launch_generic_server_process(ReadonlySpan<String
return new_client; return new_client;
} }
ErrorOr<NonnullRefPtr<ImageDecoderClient::Client>> launch_image_decoder_process(ReadonlySpan<String> candidate_image_decoder_paths) ErrorOr<NonnullRefPtr<ImageDecoderClient::Client>> launch_image_decoder_process(ReadonlySpan<ByteString> candidate_image_decoder_paths)
{ {
return launch_generic_server_process<ImageDecoderClient::Client>(candidate_image_decoder_paths, ""sv, {}, "ImageDecoder"sv); return launch_generic_server_process<ImageDecoderClient::Client>(candidate_image_decoder_paths, ""sv, {}, "ImageDecoder"sv);
} }
ErrorOr<NonnullRefPtr<Web::HTML::WebWorkerClient>> launch_web_worker_process(ReadonlySpan<String> candidate_web_worker_paths, Vector<ByteString> const& certificates) ErrorOr<NonnullRefPtr<Web::HTML::WebWorkerClient>> launch_web_worker_process(ReadonlySpan<ByteString> candidate_web_worker_paths, Vector<ByteString> const& certificates)
{ {
return launch_generic_server_process<Web::HTML::WebWorkerClient>(candidate_web_worker_paths, ""sv, certificates, "WebWorker"sv); return launch_generic_server_process<Web::HTML::WebWorkerClient>(candidate_web_worker_paths, ""sv, certificates, "WebWorker"sv);
} }
ErrorOr<NonnullRefPtr<Protocol::RequestClient>> launch_request_server_process(ReadonlySpan<String> candidate_request_server_paths, StringView serenity_resource_root, Vector<ByteString> const& certificates) ErrorOr<NonnullRefPtr<Protocol::RequestClient>> launch_request_server_process(ReadonlySpan<ByteString> candidate_request_server_paths, StringView serenity_resource_root, Vector<ByteString> const& certificates)
{ {
return launch_generic_server_process<Protocol::RequestClient>(candidate_request_server_paths, serenity_resource_root, certificates, "RequestServer"sv); return launch_generic_server_process<Protocol::RequestClient>(candidate_request_server_paths, serenity_resource_root, certificates, "RequestServer"sv);
} }
ErrorOr<NonnullRefPtr<Protocol::WebSocketClient>> launch_web_socket_process(ReadonlySpan<String> candidate_web_socket_paths, StringView serenity_resource_root, Vector<ByteString> const& certificates) ErrorOr<NonnullRefPtr<Protocol::WebSocketClient>> launch_web_socket_process(ReadonlySpan<ByteString> candidate_web_socket_paths, StringView serenity_resource_root, Vector<ByteString> const& certificates)
{ {
return launch_generic_server_process<Protocol::WebSocketClient>(candidate_web_socket_paths, serenity_resource_root, certificates, "WebSocket"sv); return launch_generic_server_process<Protocol::WebSocketClient>(candidate_web_socket_paths, serenity_resource_root, certificates, "WebSocket"sv);
} }

10
Ladybird/HelperProcess.h
View file

@ -19,10 +19,10 @@
ErrorOr<NonnullRefPtr<WebView::WebContentClient>> launch_web_content_process( ErrorOr<NonnullRefPtr<WebView::WebContentClient>> launch_web_content_process(
WebView::ViewImplementation& view, WebView::ViewImplementation& view,
ReadonlySpan<String> candidate_web_content_paths, ReadonlySpan<ByteString> candidate_web_content_paths,
Ladybird::WebContentOptions const&); Ladybird::WebContentOptions const&);
ErrorOr<NonnullRefPtr<ImageDecoderClient::Client>> launch_image_decoder_process(ReadonlySpan<String> candidate_image_decoder_paths); ErrorOr<NonnullRefPtr<ImageDecoderClient::Client>> launch_image_decoder_process(ReadonlySpan<ByteString> candidate_image_decoder_paths);
ErrorOr<NonnullRefPtr<Web::HTML::WebWorkerClient>> launch_web_worker_process(ReadonlySpan<String> candidate_web_worker_paths, Vector<ByteString> const& certificates); ErrorOr<NonnullRefPtr<Web::HTML::WebWorkerClient>> launch_web_worker_process(ReadonlySpan<ByteString> candidate_web_worker_paths, Vector<ByteString> const& certificates);
ErrorOr<NonnullRefPtr<Protocol::RequestClient>> launch_request_server_process(ReadonlySpan<String> candidate_request_server_paths, StringView serenity_resource_root, Vector<ByteString> const& certificates); ErrorOr<NonnullRefPtr<Protocol::RequestClient>> launch_request_server_process(ReadonlySpan<ByteString> candidate_request_server_paths, StringView serenity_resource_root, Vector<ByteString> const& certificates);
ErrorOr<NonnullRefPtr<Protocol::WebSocketClient>> launch_web_socket_process(ReadonlySpan<String> candidate_web_socket_paths, StringView serenity_resource_root, Vector<ByteString> const& certificates); ErrorOr<NonnullRefPtr<Protocol::WebSocketClient>> launch_web_socket_process(ReadonlySpan<ByteString> candidate_web_socket_paths, StringView serenity_resource_root, Vector<ByteString> const& certificates);

15
Ladybird/Utilities.cpp
View file

@ -14,11 +14,10 @@
ByteString s_serenity_resource_root; ByteString s_serenity_resource_root;
ErrorOr<String> application_directory() ErrorOr<ByteString> application_directory()
{ {
auto current_executable_path = TRY(Core::System::current_executable_path()); auto current_executable_path = TRY(Core::System::current_executable_path());
auto dirname = LexicalPath::dirname(current_executable_path); return LexicalPath::dirname(current_executable_path);
return String::from_byte_string(dirname);
} }
void platform_init() void platform_init()
@ -33,7 +32,7 @@ void platform_init()
auto home_lagom = ByteString::formatted("{}/.lagom", home); auto home_lagom = ByteString::formatted("{}/.lagom", home);
if (FileSystem::is_directory(home_lagom)) if (FileSystem::is_directory(home_lagom))
return home_lagom; return home_lagom;
auto app_dir = application_directory().release_value_but_fixme_should_propagate_errors().to_byte_string(); auto app_dir = MUST(application_directory());
#ifdef AK_OS_MACOS #ifdef AK_OS_MACOS
return LexicalPath(app_dir).parent().append("Resources"sv).string(); return LexicalPath(app_dir).parent().append("Resources"sv).string();
#else #else
@ -44,13 +43,13 @@ void platform_init()
Core::ResourceImplementation::install(make<Core::ResourceImplementationFile>(MUST(String::formatted("{}/res", s_serenity_resource_root)))); Core::ResourceImplementation::install(make<Core::ResourceImplementationFile>(MUST(String::formatted("{}/res", s_serenity_resource_root))));
} }
ErrorOr<Vector<String>> get_paths_for_helper_process(StringView process_name) ErrorOr<Vector<ByteString>> get_paths_for_helper_process(StringView process_name)
{ {
auto application_path = TRY(application_directory()); auto application_path = TRY(application_directory());
Vector<String> paths; Vector<ByteString> paths;
TRY(paths.try_append(TRY(String::formatted("{}/{}", application_path, process_name)))); TRY(paths.try_append(ByteString::formatted("{}/{}", application_path, process_name)));
TRY(paths.try_append(TRY(String::formatted("./{}", process_name)))); TRY(paths.try_append(ByteString::formatted("./{}", process_name)));
// NOTE: Add platform-specific paths here // NOTE: Add platform-specific paths here
return paths; return paths;
} }

4
Ladybird/Utilities.h
View file

@ -13,7 +13,7 @@
#include <AK/Vector.h> #include <AK/Vector.h>
void platform_init(); void platform_init();
ErrorOr<String> application_directory(); ErrorOr<ByteString> application_directory();
ErrorOr<Vector<String>> get_paths_for_helper_process(StringView process_name); ErrorOr<Vector<ByteString>> get_paths_for_helper_process(StringView process_name);
extern ByteString s_serenity_resource_root; extern ByteString s_serenity_resource_root;

2
Ladybird/WebDriver/main.cpp
View file

@ -24,7 +24,7 @@ static ErrorOr<pid_t> launch_process(StringView application, ReadonlySpan<char c
ErrorOr<pid_t> result = -1; ErrorOr<pid_t> result = -1;
for (auto const& path : paths) { for (auto const& path : paths) {
auto path_view = path.bytes_as_string_view(); auto path_view = path.view();
result = Core::Process::spawn(path_view, arguments, {}, Core::Process::KeepAsChild::Yes); result = Core::Process::spawn(path_view, arguments, {}, Core::Process::KeepAsChild::Yes);
if (!result.is_error()) if (!result.is_error())
break; break;

6
Userland/Libraries/LibSQL/SQLClient.cpp
View file

@ -52,7 +52,7 @@ static ErrorOr<int> create_database_socket(ByteString const& socket_path)
return socket_fd; return socket_fd;
} }
static ErrorOr<void> launch_server(ByteString const& socket_path, ByteString const& pid_path, Vector<String> candidate_server_paths) static ErrorOr<void> launch_server(ByteString const& socket_path, ByteString const& pid_path, Vector<ByteString> candidate_server_paths)
{ {
auto server_fd_or_error = create_database_socket(socket_path); auto server_fd_or_error = create_database_socket(socket_path);
if (server_fd_or_error.is_error()) { if (server_fd_or_error.is_error()) {
@ -87,7 +87,7 @@ static ErrorOr<void> launch_server(ByteString const& socket_path, ByteString con
ErrorOr<void> result; ErrorOr<void> result;
for (auto const& server_path : candidate_server_paths) { for (auto const& server_path : candidate_server_paths) {
auto arguments = Array { auto arguments = Array {
server_path.bytes_as_string_view(), server_path.view(),
"--pid-file"sv, "--pid-file"sv,
pid_path, pid_path,
}; };
@ -147,7 +147,7 @@ static ErrorOr<bool> should_launch_server(ByteString const& pid_path)
return false; return false;
} }
ErrorOr<NonnullRefPtr<SQLClient>> SQLClient::launch_server_and_create_client(Vector<String> candidate_server_paths) ErrorOr<NonnullRefPtr<SQLClient>> SQLClient::launch_server_and_create_client(Vector<ByteString> candidate_server_paths)
{ {
auto runtime_directory = TRY(Core::StandardPaths::runtime_directory()); auto runtime_directory = TRY(Core::StandardPaths::runtime_directory());
auto socket_path = ByteString::formatted("{}/SQLServer.socket", runtime_directory); auto socket_path = ByteString::formatted("{}/SQLServer.socket", runtime_directory);

2
Userland/Libraries/LibSQL/SQLClient.h
View file

@ -55,7 +55,7 @@ class SQLClient
public: public:
#if !defined(AK_OS_SERENITY) #if !defined(AK_OS_SERENITY)
static ErrorOr<NonnullRefPtr<SQLClient>> launch_server_and_create_client(Vector<String> candidate_server_paths); static ErrorOr<NonnullRefPtr<SQLClient>> launch_server_and_create_client(Vector<ByteString> candidate_server_paths);
#endif #endif
virtual ~SQLClient() = default; virtual ~SQLClient() = default;

2
Userland/Libraries/LibWebView/Database.cpp
View file

@ -19,7 +19,7 @@ ErrorOr<NonnullRefPtr<Database>> Database::create()
#if !defined(AK_OS_SERENITY) #if !defined(AK_OS_SERENITY)
ErrorOr<NonnullRefPtr<Database>> Database::create(Vector<String> candidate_sql_server_paths) ErrorOr<NonnullRefPtr<Database>> Database::create(Vector<ByteString> candidate_sql_server_paths)
{ {
auto sql_client = TRY(SQL::SQLClient::launch_server_and_create_client(move(candidate_sql_server_paths))); auto sql_client = TRY(SQL::SQLClient::launch_server_and_create_client(move(candidate_sql_server_paths)));
return create(move(sql_client)); return create(move(sql_client));

2
Userland/Libraries/LibWebView/Database.h
View file

@ -30,7 +30,7 @@ class Database : public RefCounted<Database> {
public: public:
static ErrorOr<NonnullRefPtr<Database>> create(); static ErrorOr<NonnullRefPtr<Database>> create();
#if !defined(AK_OS_SERENITY) #if !defined(AK_OS_SERENITY)
static ErrorOr<NonnullRefPtr<Database>> create(Vector<String> candidate_sql_server_paths); static ErrorOr<NonnullRefPtr<Database>> create(Vector<ByteString> candidate_sql_server_paths);
#endif #endif
ErrorOr<SQL::StatementID> prepare_statement(StringView statement); ErrorOr<SQL::StatementID> prepare_statement(StringView statement);

2
Userland/Utilities/sql.cpp
View file

@ -360,7 +360,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto sql_client = TRY(SQL::SQLClient::try_create()); auto sql_client = TRY(SQL::SQLClient::try_create());
#else #else
VERIFY(!sql_server_path.is_empty()); VERIFY(!sql_server_path.is_empty());
auto sql_client = TRY(SQL::SQLClient::launch_server_and_create_client({ TRY(String::from_utf8(sql_server_path)) })); auto sql_client = TRY(SQL::SQLClient::launch_server_and_create_client({ sql_server_path }));
#endif #endif
SQLRepl repl(loop, database_name, move(sql_client)); SQLRepl repl(loop, database_name, move(sql_client));