mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 18:37:34 +00:00
Browser+LibWeb+WebContent: Allow Browser to load local files
To achieve this goal: - The Browser unveils "/tmp/portal/filesystemaccess" - Pass the page through LoadRequest => ResourceLoader - ResourceLoader requests a file to the FileSystemAccessServer via IPC - OutOfProcessWebView handles it and sends a file descriptor back to the Page.
This commit is contained in:
parent
1ba9c821fb
commit
662711fa26
21 changed files with 165 additions and 14 deletions
|
@ -274,6 +274,7 @@ set(SOURCES
|
|||
Layout/TextNode.cpp
|
||||
Layout/TreeBuilder.cpp
|
||||
Loader/ContentFilter.cpp
|
||||
Loader/FileRequest.cpp
|
||||
Loader/FrameLoader.cpp
|
||||
Loader/ImageLoader.cpp
|
||||
Loader/ImageResource.cpp
|
||||
|
|
21
Userland/Libraries/LibWeb/Loader/FileRequest.cpp
Normal file
21
Userland/Libraries/LibWeb/Loader/FileRequest.cpp
Normal file
|
@ -0,0 +1,21 @@
|
|||
/*
|
||||
* Copyright (c) 2022, Lucas Chollet <lucas.chollet@free.fr>
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
||||
#include "FileRequest.h"
|
||||
|
||||
namespace Web {
|
||||
|
||||
FileRequest::FileRequest(String path)
|
||||
: m_path(move(path))
|
||||
{
|
||||
}
|
||||
|
||||
String FileRequest::path() const
|
||||
{
|
||||
return m_path;
|
||||
}
|
||||
|
||||
}
|
28
Userland/Libraries/LibWeb/Loader/FileRequest.h
Normal file
28
Userland/Libraries/LibWeb/Loader/FileRequest.h
Normal file
|
@ -0,0 +1,28 @@
|
|||
/*
|
||||
* Copyright (c) 2022, Lucas Chollet <lucas.chollet@free.fr>
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <AK/Error.h>
|
||||
#include <AK/Function.h>
|
||||
#include <AK/RefCounted.h>
|
||||
#include <AK/String.h>
|
||||
|
||||
namespace Web {
|
||||
|
||||
class FileRequest : public RefCounted<FileRequest> {
|
||||
public:
|
||||
explicit FileRequest(String path);
|
||||
|
||||
String path() const;
|
||||
|
||||
Function<void(ErrorOr<i32>)> on_file_request_finish;
|
||||
|
||||
private:
|
||||
String m_path {};
|
||||
};
|
||||
|
||||
}
|
|
@ -19,6 +19,7 @@ LoadRequest LoadRequest::create_for_url_on_page(const AK::URL& url, Page* page)
|
|||
String cookie = page->client().page_did_request_cookie(url, Cookie::Source::Http);
|
||||
if (!cookie.is_empty())
|
||||
request.set_header("Cookie", cookie);
|
||||
request.set_page(*page);
|
||||
}
|
||||
|
||||
return request;
|
||||
|
|
|
@ -12,6 +12,7 @@
|
|||
#include <AK/URL.h>
|
||||
#include <LibCore/ElapsedTimer.h>
|
||||
#include <LibWeb/Forward.h>
|
||||
#include <LibWeb/Page/Page.h>
|
||||
|
||||
namespace Web {
|
||||
|
||||
|
@ -37,6 +38,9 @@ public:
|
|||
void start_timer() { m_load_timer.start(); };
|
||||
Time load_time() const { return m_load_timer.elapsed_time(); }
|
||||
|
||||
Optional<Page&>& page() { return m_page; };
|
||||
void set_page(Page& page) { m_page = page; }
|
||||
|
||||
unsigned hash() const
|
||||
{
|
||||
auto body_hash = string_hash((char const*)m_body.data(), m_body.size());
|
||||
|
@ -70,6 +74,7 @@ private:
|
|||
HashMap<String, String> m_headers;
|
||||
ByteBuffer m_body;
|
||||
Core::ElapsedTimer m_load_timer;
|
||||
Optional<Page&> m_page;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
@ -213,21 +213,51 @@ void ResourceLoader::load(LoadRequest& request, Function<void(ReadonlyBytes, Has
|
|||
}
|
||||
|
||||
if (url.protocol() == "file") {
|
||||
auto file_result = Core::File::open(url.path(), Core::OpenMode::ReadOnly);
|
||||
if (file_result.is_error()) {
|
||||
auto& error = file_result.error();
|
||||
log_failure(request, error);
|
||||
if (error_callback)
|
||||
error_callback(String::formatted("{}", error), error.code());
|
||||
return;
|
||||
}
|
||||
if (request.page().has_value())
|
||||
m_page = request.page().value();
|
||||
|
||||
auto file = file_result.release_value();
|
||||
auto data = file->read_all();
|
||||
log_success(request);
|
||||
deferred_invoke([data = move(data), success_callback = move(success_callback)] {
|
||||
VERIFY(m_page.has_value());
|
||||
auto file_ref = make_ref_counted<FileRequest>(url.path());
|
||||
file_ref->on_file_request_finish = [this, success_callback = move(success_callback), error_callback = move(error_callback), log_success, log_failure, request, file_ref](ErrorOr<i32> file_or_error) {
|
||||
--m_pending_loads;
|
||||
if (on_load_counter_change)
|
||||
on_load_counter_change();
|
||||
|
||||
if (file_or_error.is_error()) {
|
||||
log_failure(request, file_or_error.error());
|
||||
if (error_callback)
|
||||
error_callback(String::formatted("{}", file_or_error.error()), file_or_error.error().code());
|
||||
return;
|
||||
}
|
||||
|
||||
auto const fd = file_or_error.value();
|
||||
|
||||
auto maybe_file = Core::Stream::File::adopt_fd(fd, Core::Stream::OpenMode::Read);
|
||||
if (maybe_file.is_error()) {
|
||||
log_failure(request, maybe_file.error());
|
||||
if (error_callback)
|
||||
error_callback(String::formatted("{}", maybe_file.error()), maybe_file.error().code());
|
||||
return;
|
||||
}
|
||||
|
||||
auto file = maybe_file.release_value();
|
||||
auto maybe_data = file->read_all();
|
||||
if (maybe_data.is_error()) {
|
||||
log_failure(request, maybe_data.error());
|
||||
if (error_callback)
|
||||
error_callback(String::formatted("{}", maybe_data.error()), maybe_data.error().code());
|
||||
return;
|
||||
}
|
||||
auto data = maybe_data.release_value();
|
||||
log_success(request);
|
||||
success_callback(data, {}, {});
|
||||
});
|
||||
};
|
||||
m_page->client().request_file(file_ref);
|
||||
|
||||
++m_pending_loads;
|
||||
if (on_load_counter_change)
|
||||
on_load_counter_change();
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
@ -14,6 +14,7 @@
|
|||
#include <LibCore/Object.h>
|
||||
#include <LibCore/Proxy.h>
|
||||
#include <LibWeb/Loader/Resource.h>
|
||||
#include <LibWeb/Page/Page.h>
|
||||
|
||||
namespace Web {
|
||||
|
||||
|
@ -98,6 +99,7 @@ private:
|
|||
HashTable<NonnullRefPtr<ResourceLoaderConnectorRequest>> m_active_requests;
|
||||
NonnullRefPtr<ResourceLoaderConnector> m_connector;
|
||||
String m_user_agent;
|
||||
Optional<Page&> m_page {};
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
@ -18,6 +18,7 @@
|
|||
#include <LibGfx/StandardCursor.h>
|
||||
#include <LibWeb/CSS/PreferredColorScheme.h>
|
||||
#include <LibWeb/Forward.h>
|
||||
#include <LibWeb/Loader/FileRequest.h>
|
||||
|
||||
namespace Web {
|
||||
|
||||
|
@ -111,6 +112,8 @@ public:
|
|||
virtual void page_did_set_cookie(const AK::URL&, Cookie::ParsedCookie const&, Cookie::Source) { }
|
||||
virtual void page_did_update_resource_count(i32) { }
|
||||
|
||||
virtual void request_file(NonnullRefPtr<FileRequest>&) = 0;
|
||||
|
||||
protected:
|
||||
virtual ~PageClient() = default;
|
||||
};
|
||||
|
|
|
@ -16,6 +16,6 @@ set(GENERATED_SOURCES
|
|||
)
|
||||
|
||||
serenity_lib(LibWebView webview)
|
||||
target_link_libraries(LibWebView LibGfx LibGUI LibImageDecoderClient LibIPC LibProtocol LibWeb)
|
||||
target_link_libraries(LibWebView LibFileSystemAccessClient LibGfx LibGUI LibImageDecoderClient LibIPC LibProtocol LibWeb)
|
||||
|
||||
add_subdirectory(DumpLayoutTree)
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
#include "OutOfProcessWebView.h"
|
||||
#include "WebContentClient.h"
|
||||
#include <AK/String.h>
|
||||
#include <LibFileSystemAccessClient/Client.h>
|
||||
#include <LibGUI/Application.h>
|
||||
#include <LibGUI/Desktop.h>
|
||||
#include <LibGUI/InputBox.h>
|
||||
|
@ -400,6 +401,15 @@ void OutOfProcessWebView::notify_server_did_update_resource_count(i32 count_wait
|
|||
on_resource_status_change(count_waiting);
|
||||
}
|
||||
|
||||
void OutOfProcessWebView::notify_server_did_request_file(Badge<WebContentClient>, String const& path, i32 request_id)
|
||||
{
|
||||
auto file = FileSystemAccessClient::Client::the().try_request_file_read_only_approved(window(), path);
|
||||
if (file.is_error())
|
||||
client().async_handle_file_return(file.error().code(), {}, request_id);
|
||||
else
|
||||
client().async_handle_file_return(0, IPC::File(file.value()->leak_fd()), request_id);
|
||||
}
|
||||
|
||||
void OutOfProcessWebView::did_scroll()
|
||||
{
|
||||
client().async_set_viewport_rect(visible_content_rect());
|
||||
|
|
|
@ -112,6 +112,7 @@ public:
|
|||
String notify_server_did_request_cookie(Badge<WebContentClient>, const AK::URL& url, Web::Cookie::Source source);
|
||||
void notify_server_did_set_cookie(Badge<WebContentClient>, const AK::URL& url, Web::Cookie::ParsedCookie const& cookie, Web::Cookie::Source source);
|
||||
void notify_server_did_update_resource_count(i32 count_waiting);
|
||||
void notify_server_did_request_file(Badge<WebContentClient>, String const& path, i32);
|
||||
|
||||
private:
|
||||
OutOfProcessWebView();
|
||||
|
|
|
@ -200,4 +200,9 @@ void WebContentClient::did_update_resource_count(i32 count_waiting)
|
|||
m_view.notify_server_did_update_resource_count(count_waiting);
|
||||
}
|
||||
|
||||
void WebContentClient::did_request_file(String const& path, i32 request_id)
|
||||
{
|
||||
m_view.notify_server_did_request_file({}, path, request_id);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -61,6 +61,7 @@ private:
|
|||
virtual Messages::WebContentClient::DidRequestCookieResponse did_request_cookie(AK::URL const&, u8) override;
|
||||
virtual void did_set_cookie(AK::URL const&, Web::Cookie::ParsedCookie const&, u8) override;
|
||||
virtual void did_update_resource_count(i32 count_waiting) override;
|
||||
virtual void did_request_file(String const& path, i32) override;
|
||||
|
||||
OutOfProcessWebView& m_view;
|
||||
};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue