Zander671/cse-130-http-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Stuff for now

Browse Source
This commit is contained in:
Alexander Rosenberg
2026-05-26 00:59:38 -07:00
parent cf8ddf14bf
commit ace7e4b05e
2 changed files with 62 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
http.c
+17 -26
View File
@@ -5,11 +5,10 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
static const char* EMPTY_STRING = ""; static const char *EMPTY_STRING = "";
HTTPHeaderList* http_header_list_push(HTTPHeaderList* list, const char* key, const char* value) HTTPHeaderList *http_header_list_push(HTTPHeaderList *list, const char *key, const char *value) {
{ HTTPHeaderList *new = malloc(sizeof(HTTPHeaderList));
HTTPHeaderList* new = malloc(sizeof(HTTPHeaderList));
if (!new) { if (!new) {
return NULL; return NULL;
} }
@@ -32,10 +31,9 @@ HTTPHeaderList* http_header_list_push(HTTPHeaderList* list, const char* key, con
return new; return new;
} }
void free_http_header_list(HTTPHeaderList* list) void free_http_header_list(HTTPHeaderList *list) {
{
while (list) { while (list) {
HTTPHeaderList* next = list->next; HTTPHeaderList *next = list->next;
free(list->key); free(list->key);
free(list->value); free(list->value);
free(list); free(list);
@@ -43,8 +41,7 @@ void free_http_header_list(HTTPHeaderList* list)
} }
} }
const char* http_header_list_search(HTTPHeaderList* list, const char* key, const char* def) const char *http_header_list_search(HTTPHeaderList *list, const char *key, const char *def) {
{
while (list) { while (list) {
if (strcmp(list->key, key) == 0) { if (strcmp(list->key, key) == 0) {
return list->value; return list->value;
@@ -68,8 +65,7 @@ const char* http_header_list_search(HTTPHeaderList* list, const char* key, const
// if an error occured, req->uri is not allocated // if an error occured, req->uri is not allocated
static HTTPRequestParseResult parse_method_uri_line( static HTTPRequestParseResult parse_method_uri_line(
FILE* stream, size_t* restrict bytes_read, HTTPRequest* restrict req) FILE *stream, size_t *restrict bytes_read, HTTPRequest *restrict req) {
{
// allow for some leeway in passing incorrect methods // allow for some leeway in passing incorrect methods
char method[MAX_METHOD_LENGTH + 1]; char method[MAX_METHOD_LENGTH + 1];
char uri[MAX_URI_LENGTH + 1]; char uri[MAX_URI_LENGTH + 1];
@@ -113,9 +109,8 @@ static HTTPRequestParseResult parse_method_uri_line(
// return true if there are more headers and no error occurred, false otherwise // return true if there are more headers and no error occurred, false otherwise
// this will *not* free LIST if an error occurs // this will *not* free LIST if an error occurs
static bool next_header(FILE* stream, size_t* restrict bytes_read, static bool next_header(FILE *stream, size_t *restrict bytes_read,
HTTPRequestParseResult* restrict res, HTTPHeaderList* restrict* restrict list) HTTPRequestParseResult *restrict res, HTTPHeaderList *restrict *restrict list) {
{
char c = fgetc(stream); char c = fgetc(stream);
RETURN_IF_READ_ERROR(stream); RETURN_IF_READ_ERROR(stream);
if (c == '\r') { if (c == '\r') {
@@ -159,8 +154,7 @@ static bool next_header(FILE* stream, size_t* restrict bytes_read,
return true; return true;
} }
HTTPRequestParseResult parse_http_request(FILE* stream, HTTPRequest* restrict out) HTTPRequestParseResult parse_http_request(FILE *stream, HTTPRequest *restrict out) {
{
out->uri = EMPTY_STRING; out->uri = EMPTY_STRING;
out->path = EMPTY_STRING; out->path = EMPTY_STRING;
out->method = EMPTY_STRING; out->method = EMPTY_STRING;
@@ -180,22 +174,20 @@ HTTPRequestParseResult parse_http_request(FILE* stream, HTTPRequest* restrict ou
return res; return res;
} }
void free_http_request(HTTPRequest* restrict req) void free_http_request(HTTPRequest *restrict req) {
{
if (req->method != EMPTY_STRING) { if (req->method != EMPTY_STRING) {
free((char*)req->method); free((char *) req->method);
} }
if (req->uri != EMPTY_STRING) { if (req->uri != EMPTY_STRING) {
free((char*)req->uri); free((char *) req->uri);
} }
free_http_header_list(req->headers); free_http_header_list(req->headers);
} }
const char* status_code_to_message(int status, size_t* restrict length) const char *status_code_to_message(int status, size_t *restrict length) {
{
static const struct { static const struct {
int code; int code;
const char* msg; const char *msg;
size_t size; size_t size;
} CODES[] = { } CODES[] = {
#define P(s, m) { s, m, sizeof(m) - 1 } #define P(s, m) { s, m, sizeof(m) - 1 }
@@ -221,13 +213,12 @@ const char* status_code_to_message(int status, size_t* restrict length)
return NULL; return NULL;
} }
void format_http_response(FILE* stream, HTTPResponse* restrict resp) void format_http_response(FILE *stream, HTTPResponse *restrict resp) {
{
assert(status_code_to_message(resp->status, NULL)); assert(status_code_to_message(resp->status, NULL));
dprintf(fileno(stream), "HTTP/1.1 %d %s\r\n", resp->status, dprintf(fileno(stream), "HTTP/1.1 %d %s\r\n", resp->status,
status_code_to_message(resp->status, NULL)); status_code_to_message(resp->status, NULL));
dprintf(fileno(stream), "Content-Length: %zu\r\n", resp->body_length); dprintf(fileno(stream), "Content-Length: %zu\r\n", resp->body_length);
for (HTTPHeaderList* h = resp->headers; h; h = h->next) { for (HTTPHeaderList *h = resp->headers; h; h = h->next) {
write(fileno(stream), h->key, h->key_length); write(fileno(stream), h->key, h->key_length);
write(fileno(stream), ": ", 2); write(fileno(stream), ": ", 2);
write(fileno(stream), h->value, h->value_length); write(fileno(stream), h->value, h->value_length);
main.c
+33 -56
View File
@@ -30,7 +30,7 @@ typedef struct {
bool help_flag; bool help_flag;
uint32_t port; uint32_t port;
size_t parallelism; size_t parallelism;
const char* address; const char *address;
} GlobalFlags; } GlobalFlags;
static const GlobalFlags DEFAULT_FLAGS = { static const GlobalFlags DEFAULT_FLAGS = {
@@ -42,8 +42,7 @@ static const GlobalFlags DEFAULT_FLAGS = {
}; };
// Return false on failure, true on success // Return false on failure, true on success
static bool parse_uint(const char* str, uintmax_t min, uintmax_t max, uintmax_t* output) static bool parse_uint(const char *str, uintmax_t min, uintmax_t max, uintmax_t *output) {
{
if (isspace(*str) || *str == '+' || *str == '-') { if (isspace(*str) || *str == '+' || *str == '-') {
#ifdef BAD_ERROR_REPORTING_FOR_AUTOGRADER #ifdef BAD_ERROR_REPORTING_FOR_AUTOGRADER
fprintf(stderr, "Invalid Port\n"); fprintf(stderr, "Invalid Port\n");
@@ -53,7 +52,7 @@ static bool parse_uint(const char* str, uintmax_t min, uintmax_t max, uintmax_t*
return false; return false;
} }
errno = 0; errno = 0;
char* endptr; char *endptr;
uintmax_t conv = strtoumax(str, &endptr, 10); uintmax_t conv = strtoumax(str, &endptr, 10);
if (!*str || *endptr) { if (!*str || *endptr) {
#ifdef BAD_ERROR_REPORTING_FOR_AUTOGRADER #ifdef BAD_ERROR_REPORTING_FOR_AUTOGRADER
@@ -74,14 +73,13 @@ static bool parse_uint(const char* str, uintmax_t min, uintmax_t max, uintmax_t*
return true; return true;
} }
static void parse_cli_options(int argc, const char** argv, GlobalFlags* flags) static void parse_cli_options(int argc, const char **argv, GlobalFlags *flags) {
{
#define MAX_PARALLELISM SIZE_MAX #define MAX_PARALLELISM SIZE_MAX
#define MAX_PORT 65535 #define MAX_PORT 65535
opterr = false; opterr = false;
int c; int c;
char pretty_flag[8]; char pretty_flag[8];
while ((c = getopt(argc, (char* const*)argv, ":ha:p:")) >= 0) { while ((c = getopt(argc, (char *const *) argv, ":ha:p:")) >= 0) {
if (isprint(c)) { if (isprint(c)) {
snprintf(pretty_flag, sizeof(pretty_flag), "%c", optopt); snprintf(pretty_flag, sizeof(pretty_flag), "%c", optopt);
} else { } else {
@@ -93,9 +91,7 @@ static void parse_cli_options(int argc, const char** argv, GlobalFlags* flags)
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
} }
switch (c) { switch (c) {
case 'h': case 'h': flags->help_flag = true; return;
flags->help_flag = true;
return;
case 'p': { case 'p': {
uintmax_t conv; uintmax_t conv;
if (!parse_uint(optarg, 1, MAX_PARALLELISM, &conv)) { if (!parse_uint(optarg, 1, MAX_PARALLELISM, &conv)) {
@@ -103,9 +99,7 @@ static void parse_cli_options(int argc, const char** argv, GlobalFlags* flags)
} }
flags->parallelism = conv; flags->parallelism = conv;
} break; } break;
case 'a': case 'a': flags->address = optarg; break;
flags->address = optarg;
break;
case ':': case ':':
flags->opt_error = true; flags->opt_error = true;
log_error("flag requires argument: '%s'", pretty_flag); log_error("flag requires argument: '%s'", pretty_flag);
@@ -132,8 +126,7 @@ static void parse_cli_options(int argc, const char** argv, GlobalFlags* flags)
} }
} }
static void print_help(FILE* file) static void print_help(FILE *file) {
{
fprintf(file, "usage: httpserver [-h] [-a ADDRESS] [-p PARALLELISM] <PORT>\n"); fprintf(file, "usage: httpserver [-h] [-a ADDRESS] [-p PARALLELISM] <PORT>\n");
fprintf(file, " -h print this message, then exit\n"); fprintf(file, " -h print this message, then exit\n");
fprintf(file, " -p use PARALLELISM threads for processing requests (default: 1)\n"); fprintf(file, " -p use PARALLELISM threads for processing requests (default: 1)\n");
@@ -144,16 +137,14 @@ static const int WORKER_BLOCKED_SIGNALS[] = { SIGTERM, SIGINT, SIGHUP };
static const size_t N_WORKER_BLOCKED_SIGNALS = sizeof(WORKER_BLOCKED_SIGNALS) / sizeof(int); static const size_t N_WORKER_BLOCKED_SIGNALS = sizeof(WORKER_BLOCKED_SIGNALS) / sizeof(int);
static bool shutdown_flag = false; static bool shutdown_flag = false;
static void signal_handler(int signal) static void signal_handler(int signal) {
{
if (shutdown_flag) { if (shutdown_flag) {
_exit(signal == SIGTERM ? 0 : EXIT_FAILURE); _exit(signal == SIGTERM ? 0 : EXIT_FAILURE);
} }
shutdown_flag = true; shutdown_flag = true;
} }
static void setup_signals() static void setup_signals() {
{
struct sigaction pipe_act = { struct sigaction pipe_act = {
.sa_flags = 0, .sa_flags = 0,
.sa_handler = SIG_IGN, .sa_handler = SIG_IGN,
@@ -176,27 +167,20 @@ static void setup_signals()
} }
} }
static int parse_result_to_status(HTTPRequestParseResult res) static int parse_result_to_status(HTTPRequestParseResult res) {
{
switch (res) { switch (res) {
case HRPR_OK: case HRPR_OK: return 200;
return 200;
case HRPR_NO_MEM: case HRPR_NO_MEM:
case HRPR_READ_FAILED: case HRPR_READ_FAILED: return 500;
return 500; case HRPR_BAD_VERSION: return 505;
case HRPR_BAD_VERSION: case HRPR_BAD_FORMAT: return 400;
return 505; default: abort();
case HRPR_BAD_FORMAT:
return 400;
default:
abort();
} }
} }
static void send_simple_response(FILE* stream, int status) static void send_simple_response(FILE *stream, int status) {
{
size_t status_msg_len; size_t status_msg_len;
const char* status_msg = status_code_to_message(status, &status_msg_len); const char *status_msg = status_code_to_message(status, &status_msg_len);
HTTPResponse resp = { HTTPResponse resp = {
.status = status, .status = status,
.headers = NULL, .headers = NULL,
@@ -207,20 +191,18 @@ static void send_simple_response(FILE* stream, int status)
write(fileno(stream), "\n", 1); write(fileno(stream), "\n", 1);
} }
static void write_audit_log_entry(HTTPRequest* restrict req, int status) static void write_audit_log_entry(HTTPRequest *restrict req, int status) {
{
fprintf(stderr, "%s,%s,%d,%s\n", req->method, req->uri, status, fprintf(stderr, "%s,%s,%d,%s\n", req->method, req->uri, status,
http_header_list_search(req->headers, "Request-ID", "0")); http_header_list_search(req->headers, "Request-ID", "0"));
} }
static pthread_mutex_t file_access_mutex = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t file_access_mutex = PTHREAD_MUTEX_INITIALIZER;
static void handle_get_request(FILE* conn, HTTPRequest* restrict req) static void handle_get_request(FILE *conn, HTTPRequest *restrict req) {
{
int status = 200; int status = 200;
struct stat statbuf; struct stat statbuf;
pthread_mutex_lock(&file_access_mutex); pthread_mutex_lock(&file_access_mutex);
FILE* file_handle = fopen(req->path, "r"); FILE *file_handle = fopen(req->path, "r");
if (!file_handle) { if (!file_handle) {
if (errno == ENOENT) { if (errno == ENOENT) {
status = 404; status = 404;
@@ -262,15 +244,14 @@ static void handle_get_request(FILE* conn, HTTPRequest* restrict req)
fclose(file_handle); fclose(file_handle);
} }
static ssize_t get_content_length(HTTPRequest* restrict req) static ssize_t get_content_length(HTTPRequest *restrict req) {
{ const char *text = http_header_list_search(req->headers, "Content-Length", NULL);
const char* text = http_header_list_search(req->headers, "Content-Length", NULL);
if (!text) { if (!text) {
return 0; return 0;
} else if (isspace(*text) || *text == '-' || *text == '+') { } else if (isspace(*text) || *text == '-' || *text == '+') {
return -1; return -1;
} }
char* endptr; char *endptr;
uintmax_t conv = strtoumax(text, &endptr, 10); uintmax_t conv = strtoumax(text, &endptr, 10);
if (*endptr || (conv == UINTMAX_MAX && errno == ERANGE) || conv > SIZE_MAX) { if (*endptr || (conv == UINTMAX_MAX && errno == ERANGE) || conv > SIZE_MAX) {
return -1; return -1;
@@ -278,8 +259,7 @@ static ssize_t get_content_length(HTTPRequest* restrict req)
return conv; return conv;
} }
static void handle_put_request(FILE* conn, HTTPRequest* restrict req) static void handle_put_request(FILE *conn, HTTPRequest *restrict req) {
{
ssize_t content_length = get_content_length(req); ssize_t content_length = get_content_length(req);
if (content_length < 0) { if (content_length < 0) {
write_audit_log_entry(req, 400); write_audit_log_entry(req, 400);
@@ -297,7 +277,7 @@ static void handle_put_request(FILE* conn, HTTPRequest* restrict req)
char read_buff[4096]; char read_buff[4096];
while (content_length) { while (content_length) {
ssize_t read_size = fread(read_buff, 1, ssize_t read_size = fread(read_buff, 1,
(size_t)content_length < sizeof(read_buff) ? (size_t)content_length (size_t) content_length < sizeof(read_buff) ? (size_t) content_length
: sizeof(read_buff), : sizeof(read_buff),
conn); conn);
if (ferror(conn) || write(temp_fd, read_buff, read_size) < 0) { if (ferror(conn) || write(temp_fd, read_buff, read_size) < 0) {
@@ -340,9 +320,8 @@ write_status_and_unlock:
} }
} }
static void handle_connection(void* arg) static void handle_connection(void *arg) {
{ FILE *conn = arg;
FILE* conn = arg;
HTTPRequest req; HTTPRequest req;
HTTPRequestParseResult res = parse_http_request(conn, &req); HTTPRequestParseResult res = parse_http_request(conn, &req);
if (res != HRPR_OK) { if (res != HRPR_OK) {
@@ -365,13 +344,11 @@ static void handle_connection(void* arg)
fclose(conn); fclose(conn);
} }
static void fclose_free_func(void* file) static void fclose_free_func(void *file) {
{
fclose(file); fclose(file);
} }
int main(int argc, const char** argv) int main(int argc, const char **argv) {
{
setenv("POSIXLY_CORRECT", "1", true); setenv("POSIXLY_CORRECT", "1", true);
GlobalFlags flags = DEFAULT_FLAGS; GlobalFlags flags = DEFAULT_FLAGS;
parse_cli_options(argc, argv, &flags); parse_cli_options(argc, argv, &flags);
@@ -386,11 +363,11 @@ int main(int argc, const char** argv)
for (size_t i = 0; i < N_WORKER_BLOCKED_SIGNALS; ++i) { for (size_t i = 0; i < N_WORKER_BLOCKED_SIGNALS; ++i) {
sigaddset(&worker_block_set, WORKER_BLOCKED_SIGNALS[i]); sigaddset(&worker_block_set, WORKER_BLOCKED_SIGNALS[i]);
} }
Server* server = make_server(flags.address, flags.port); Server *server = make_server(flags.address, flags.port);
if (!server) { if (!server) {
return EXIT_FAILURE; return EXIT_FAILURE;
} }
ThreadPool* pool = make_thread_pool(flags.parallelism, worker_block_set); ThreadPool *pool = make_thread_pool(flags.parallelism, worker_block_set);
if (!pool) { if (!pool) {
destroy_server(server); destroy_server(server);
return EXIT_FAILURE; return EXIT_FAILURE;
@@ -406,7 +383,7 @@ int main(int argc, const char** argv)
} else if (conn_fd < 0) { } else if (conn_fd < 0) {
continue; continue;
} }
FILE* conn = fdopen(conn_fd, "r+"); FILE *conn = fdopen(conn_fd, "r+");
if (!conn) { if (!conn) {
close(conn_fd); close(conn_fd);
continue; continue;