RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 00:37:35 +00:00
Code Issues Activity Actions

WebServer: Prefer LibFileSystem over DeprecatedFile

Browse source
This commit is contained in:
Ben Wiederhake 2023-05-20 00:34:51 +02:00 • committed by Andreas Kling
parent fecaf27b3a
commit e795641d99
2 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Userland/Services/WebServer/Client.cpp
View file

@ -14,7 +14,6 @@
#include <AK/StringBuilder.h>
#include <AK/URL.h>
#include <LibCore/DateTime.h>
#include <LibCore/DeprecatedFile.h>
#include <LibCore/DirIterator.h>
#include <LibCore/File.h>
#include <LibCore/MappedFile.h>
@ -144,13 +143,12 @@ ErrorOr<bool> Client::handle_request(HTTP::HttpRequest const& request)
real_path = index_html_path;
}
auto file = Core::DeprecatedFile::construct(real_path.bytes_as_string_view());
if (!file->open(Core::OpenMode::ReadOnly)) {
if (!FileSystem::exists(real_path.bytes_as_string_view())) {
TRY(send_error_response(404, request));
return false;
}
if (file->is_device()) {
if (FileSystem::is_device(real_path.bytes_as_string_view())) {
TRY(send_error_response(403, request));
return false;
}

5
Userland/Services/WebServer/main.cpp
View file

@ -8,7 +8,6 @@
#include <AK/String.h>
#include <LibCore/ArgsParser.h>
#include <LibCore/DeprecatedFile.h>
#include <LibCore/EventLoop.h>
#include <LibCore/MappedFile.h>
#include <LibCore/System.h>
@ -57,7 +56,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
return 1;
}
auto real_document_root_path = Core::DeprecatedFile::real_path_for(document_root_path);
auto real_document_root_path = TRY(FileSystem::real_path(document_root_path));
if (!FileSystem::exists(real_document_root_path)) {
warnln("Root path does not exist: '{}'", document_root_path);
return 1;
@ -69,7 +68,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
if (!username.is_empty() && !password.is_empty())
credentials = HTTP::HttpRequest::BasicAuthenticationCredentials { username, password };
WebServer::Configuration configuration(real_document_root_path, credentials);
WebServer::Configuration configuration(real_document_root_path.to_deprecated_string(), credentials);
Core::EventLoop loop;