guillm/httpd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fatigué

Browse source
This commit is contained in:
Guillem George 2026-01-05 20:23:10 +01:00
parent 286730b70d
commit f0127b00a3
4 changed files with 49 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

19
httpd/src/config/config.c
View file

@ -5,8 +5,8 @@
#include <stdlib.h>
#include <string.h>
#include "../utils/string/string.h"
#include "bits/getopt_ext.h"
// #include "../utils/string/string.h"
// #include "bits/getopt_ext.h"
#define ARG_VALID 0
#define ARG_INVALID 1
@ -180,6 +180,19 @@ static void print_arg_error(int err, char **argv, struct option options[],
}
}
// static void apply_default_values(struct config *cfg)
// {
// // Default file
// if (cfg->servers->default_file == NULL)
// {
// char *default_df = DEFAULT_DF;
// cfg->servers->default_file =
// malloc((strlen(default_df) + 1) * sizeof(char));
// // TODO handle error
// strcpy(cfg->servers->default_file, default_df);
// }
// }
// == Main functions
struct config *parse_configuration(int argc, char *argv[])
@ -227,6 +240,8 @@ struct config *parse_configuration(int argc, char *argv[])
}
}
// apply_default_values(config);
// Check config validity
if (check_config(config) != 0)
{

3
httpd/src/config/config.h
View file

@ -6,6 +6,9 @@
#include <stdbool.h>
// Default values
#define DEFAULT_DF "index.html"
/*
** @brief Enum daemon
** NO_OPTION if the '--daemon' option is not given

21
httpd/src/http/http.c
View file

@ -184,7 +184,9 @@ static void check_req(struct http_request *req, struct http_response *resp)
!= 0)
resp->status_code = 400;
else if (string_compare_strictly_n_str(req->protocol, "HTTP/1.1",
strlen("HTTP/1.1") != 0))
strlen("HTTP/1.1"))
!= 0)
resp->status_code = 505;
// printf("%s %d\n", req->protocol->data, resp->status_code);
@ -220,7 +222,10 @@ void handle_request(int client_fd, char *client_ip)
// Parse request
struct http_request *req = parse_request(str);
if (req == NULL)
{
free(str);
return;
}
char *method = get_http_method(req->method);
char *target = string_to_charptr(req->target);
print_log_request(method, target, client_ip);
@ -230,12 +235,20 @@ void handle_request(int client_fd, char *client_ip)
// Generate response
struct http_response *resp = generate_response(req);
if (resp == NULL)
{
free(str);
free(req);
return;
}
// Format response to string
struct string *res = format_response(resp);
if (res == NULL)
{
free(str);
free(req);
return;
}
// Send response
ssize_t nsent;
@ -288,7 +301,10 @@ struct http_request *parse_request(struct string *req)
size_t i = 0;
ssize_t nread = parse_reqline(res, req);
if (nread <= 0)
{
free(res);
return NULL;
}
// Split path and query
split_target(res);
@ -298,7 +314,10 @@ struct http_request *parse_request(struct string *req)
// Headers
nread = parse_headers(res, req, i);
if (nread <= 0)
{
free(res);
return NULL;
}
return res;
}

18
httpd/tests/test_suite.py
View file

@ -12,7 +12,7 @@ executable = "./httpd"
def spawn_httpd(stdout_filename, args=[]):
with open(stdout_filename,"w") as f:
httpd_proc = sp.Popen([executable,"--pid_file","/tmp/HTTPd.pid","--ip",host,"--port", port, "--root_dir","./test_root_dir/","--server_name","httpd"] if args == [] else [executable] + args, stdout=f,stderr=sp.PIPE,bufsize=0)
httpd_proc = sp.Popen([executable,"--pid_file","/tmp/HTTPd.pid","--ip",host,"--port", port, "--root_dir","test_root_dir/","--server_name","httpd"] if args == [] else [executable] + args, stdout=f,stderr=sp.PIPE,bufsize=0)
time.sleep(0.2)
return httpd_proc
@ -21,7 +21,7 @@ def kill_httpd(proc):
#proc.send_signal(sp.SIGINT)
proc.kill()
@pytest.mark.timeout(2)
# @pytest.mark.timeout(2)
def test_bad_config():
proc = spawn_httpd("out.log", ["hello","world"])
proc.wait(1)
@ -30,7 +30,7 @@ def test_bad_config():
finally:
kill_httpd(proc)
@pytest.mark.timeout(2)
# @pytest.mark.timeout(2)
def test_get_index():
proc = spawn_httpd("out.log")
req = requests.get(f"http://{host}:{port}/index.html")
@ -41,7 +41,7 @@ def test_get_index():
finally:
kill_httpd(proc)
@pytest.mark.timeout(2)
# @pytest.mark.timeout(2)
def test_get_default():
proc = spawn_httpd("out.log")
req = requests.get(f"http://{host}:{port}/")
@ -52,13 +52,13 @@ def test_get_default():
finally:
kill_httpd(proc)
@pytest.mark.timeout(2)
# @pytest.mark.timeout(2)
def test_no_file():
proc = spawn_httpd("out.log")
req = requests.get(f"http://{host}:{port}/notindex.html")
assert req.status_code == 404
@pytest.mark.timeout(2)
# @pytest.mark.timeout(2)
def test_bad_request():
proc = spawn_httpd("out.log")
sock = socket.socket(socket.AF_INET,socket.SOCK_STREAM)
@ -76,7 +76,7 @@ def test_bad_request():
finally:
kill_httpd(proc)
@pytest.mark.timeout(2)
# @pytest.mark.timeout(2)
def test_invalid_method():
proc = spawn_httpd("out.log")
sock = socket.socket(socket.AF_INET,socket.SOCK_STREAM)
@ -95,7 +95,7 @@ def test_invalid_method():
kill_httpd(proc)
@pytest.mark.timeout(2)
# @pytest.mark.timeout(2)
def test_invalid_version():
proc = spawn_httpd("out.log")
sock = socket.socket(socket.AF_INET,socket.SOCK_STREAM)
@ -113,7 +113,7 @@ def test_invalid_version():
finally:
kill_httpd(proc)
@pytest.mark.timeout(2)
# @pytest.mark.timeout(2)
def test_bad_request():
proc = spawn_httpd("out.log")
sock = socket.socket(socket.AF_INET,socket.SOCK_STREAM)