RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 02:57:42 +00:00
Code Issues Activity Actions

WebServer: Require document root and credentials as config init params

Browse source 
Now, there is nothing that can react to `set_...()` calls, so
offering this possibility can cause wrong assumptions as to what one
can do as soon as a WebServer instance has launched.

The main program can still decide whether to supply the optional
credentials or not, but this way, the configuration can become a Value
Object that won't change after initial creation.
This commit is contained in:
Thomas Keppler 2022-12-20 16:04:43 +01:00 • committed by Andreas Kling
parent bb91857885
commit 5d305845e3
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -55,7 +55,6 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
}
auto real_document_root_path = Core::File::real_path_for(document_root_path);
if (!Core::File::exists(real_document_root_path)) {
warnln("Root path does not exist: '{}'", document_root_path);
return 1;
@ -63,10 +62,11 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
TRY(Core::System::pledge("stdio accept rpath inet unix"));
WebServer::Configuration configuration(real_document_root_path);
Optional<HTTP::HttpRequest::BasicAuthenticationCredentials> credentials;
if (!username.is_empty() && !password.is_empty())
configuration.set_credentials(HTTP::HttpRequest::BasicAuthenticationCredentials { username, password });
credentials = HTTP::HttpRequest::BasicAuthenticationCredentials { username, password };
WebServer::Configuration configuration(real_document_root_path, credentials);
Core::EventLoop loop;