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

WebServer: Allow the user to specify the base directory

Browse source 
This commit makes the WebServer accept a base path to serve.
This makes taking files out of the system significantly more simple
(depending on whom you ask).
This commit is contained in:
AnotherTest 2020-07-11 11:33:22 +04:30 • committed by Andreas Kling
parent 7b5ffe67cf
commit 684b04e02a
3 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Services/WebServer/Client.cpp
View file

@ -38,9 +38,10 @@
namespace WebServer { namespace WebServer {
Client::Client(NonnullRefPtr<Core::TCPSocket> socket, Core::Object* parent) Client::Client(NonnullRefPtr<Core::TCPSocket> socket, const String& root, Core::Object* parent)
: Core::Object(parent) : Core::Object(parent)
, m_socket(socket) , m_socket(socket)
, m_root_path(root)
{ {
} }
@ -86,7 +87,8 @@ void Client::handle_request(ByteBuffer raw_request)
dbg() << "Canonical requested path: '" << requested_path << "'"; dbg() << "Canonical requested path: '" << requested_path << "'";
StringBuilder path_builder; StringBuilder path_builder;
path_builder.append("/www/"); path_builder.append(m_root_path);
path_builder.append('/');
path_builder.append(requested_path); path_builder.append(requested_path);
auto real_path = path_builder.to_string(); auto real_path = path_builder.to_string();

4
Services/WebServer/Client.h
View file

@ -34,11 +34,12 @@ namespace WebServer {
class Client final : public Core::Object { class Client final : public Core::Object {
C_OBJECT(Client); C_OBJECT(Client);
public: public:
void start(); void start();
private: private:
Client(NonnullRefPtr<Core::TCPSocket>, Core::Object* parent); Client(NonnullRefPtr<Core::TCPSocket>, const String&, Core::Object* parent);
void handle_request(ByteBuffer); void handle_request(ByteBuffer);
void send_response(StringView, const HTTP::HttpRequest&); void send_response(StringView, const HTTP::HttpRequest&);
@ -49,6 +50,7 @@ private:
void handle_directory_listing(const String& requested_path, const String& real_path, const HTTP::HttpRequest&); void handle_directory_listing(const String& requested_path, const String& real_path, const HTTP::HttpRequest&);
NonnullRefPtr<Core::TCPSocket> m_socket; NonnullRefPtr<Core::TCPSocket> m_socket;
String m_root_path;
}; };
} }

16
Services/WebServer/main.cpp
View file

@ -27,6 +27,7 @@
#include "Client.h" #include "Client.h"
#include <LibCore/ArgsParser.h> #include <LibCore/ArgsParser.h>
#include <LibCore/EventLoop.h> #include <LibCore/EventLoop.h>
#include <LibCore/File.h>
#include <LibCore/TCPServer.h> #include <LibCore/TCPServer.h>
#include <stdio.h> #include <stdio.h>
#include <unistd.h> #include <unistd.h>
@ -34,11 +35,13 @@
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
u16 default_port = 8000; u16 default_port = 8000;
const char* root_path = "/www";
int port = default_port; int port = default_port;
Core::ArgsParser args_parser; Core::ArgsParser args_parser;
args_parser.add_positional_argument(port, "Port to listen on", "port", Core::ArgsParser::Required::No); args_parser.add_option(port, "Port to listen on", "port", 'p', "port");
args_parser.add_positional_argument(root_path, "Path to serve the contents of", "path", Core::ArgsParser::Required::No);
args_parser.parse(argc, argv); args_parser.parse(argc, argv);
if ((u16)port != port) { if ((u16)port != port) {
@ -46,6 +49,13 @@ int main(int argc, char** argv)
port = default_port; port = default_port;
} }
auto real_root_path = Core::File::real_path_for(root_path);
if (!Core::File::exists(real_root_path)) {
fprintf(stderr, "Root path does not exist: '%s'\n", root_path);
return 1;
}
if (pledge("stdio accept rpath inet unix cpath fattr", nullptr) < 0) { if (pledge("stdio accept rpath inet unix cpath fattr", nullptr) < 0) {
perror("pledge"); perror("pledge");
return 1; return 1;
@ -58,14 +68,14 @@ int main(int argc, char** argv)
server->on_ready_to_accept = [&] { server->on_ready_to_accept = [&] {
auto client_socket = server->accept(); auto client_socket = server->accept();
ASSERT(client_socket); ASSERT(client_socket);
auto client = WebServer::Client::construct(client_socket.release_nonnull(), server); auto client = WebServer::Client::construct(client_socket.release_nonnull(), real_root_path, server);
client->start(); client->start();
}; };
server->listen({}, port); server->listen({}, port);
printf("Listening on 0.0.0.0:%d\n", port); printf("Listening on 0.0.0.0:%d\n", port);
if (unveil("/www", "r") < 0) { if (unveil(real_root_path.characters(), "r") < 0) {
perror("unveil"); perror("unveil");
return 1; return 1;
} }