stephenseo/c_simple_http
1
0
Fork 0
Code Issues Pull requests Projects Releases 5 Packages Wiki Activity Actions

Properly handle 404 when checking static-dir
All checks were successful
Run Unit Tests / build-and-run-unit-tests (push) Successful in 2m0s
Details

Browse source
This commit is contained in:
Stephen Seo 2024-10-30 15:52:27 +09:00
parent d999ec059e
commit c77f8cdb96
3 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main.c
View file

@ -450,6 +450,8 @@ int main(int argc, char **argv) {
response_code = C_SIMPLE_HTTP_Response_500_Internal_Server_Error; response_code = C_SIMPLE_HTTP_Response_500_Internal_Server_Error;
} else if (file_info.result == STATIC_FILE_RESULT_InvalidParameter) { } else if (file_info.result == STATIC_FILE_RESULT_InvalidParameter) {
response_code = C_SIMPLE_HTTP_Response_400_Bad_Request; response_code = C_SIMPLE_HTTP_Response_400_Bad_Request;
} else if (file_info.result == STATIC_FILE_RESULT_404NotFound) {
response_code = C_SIMPLE_HTTP_Response_404_Not_Found;
} else { } else {
response_code = C_SIMPLE_HTTP_Response_500_Internal_Server_Error; response_code = C_SIMPLE_HTTP_Response_500_Internal_Server_Error;
} }

15
src/static.c
View file

@ -56,7 +56,7 @@ void internal_cleanup_prev_cwd(char **path) {
if (path && *path) { if (path && *path) {
int ret = chdir(*path); int ret = chdir(*path);
if (ret != 0) { if (ret != 0) {
fprintf(stderr, "WARNING: chdir back to cwd failed! (errno %d)\n", errno); fprintf(stderr, "WARNING chdir back to cwd failed! (errno %d)\n", errno);
} }
free(*path); free(*path);
*path = NULL; *path = NULL;
@ -151,7 +151,7 @@ C_SIMPLE_HTTP_StaticFileInfo c_simple_http_get_file(
int ret = chdir(static_dir); int ret = chdir(static_dir);
if (ret != 0) { if (ret != 0) {
fprintf(stderr, fprintf(stderr,
"ERROR: Failed to chdir into \"%s\"! (errno %d)\n", "ERROR Failed to chdir into \"%s\"! (errno %d)\n",
static_dir, static_dir,
errno); errno);
file_info.result = STATIC_FILE_RESULT_InternalError; file_info.result = STATIC_FILE_RESULT_InternalError;
@ -168,7 +168,7 @@ C_SIMPLE_HTTP_StaticFileInfo c_simple_http_get_file(
} }
} }
if (path[idx] == 0) { if (path[idx] == 0) {
fprintf(stderr, "ERROR: Received invalid path \"%s\"!\n", path); fprintf(stderr, "ERROR Received invalid path \"%s\"!\n", path);
file_info.result = STATIC_FILE_RESULT_InvalidParameter; file_info.result = STATIC_FILE_RESULT_InvalidParameter;
return file_info; return file_info;
} }
@ -176,15 +176,16 @@ C_SIMPLE_HTTP_StaticFileInfo c_simple_http_get_file(
fd = fopen(path + idx, "rb"); fd = fopen(path + idx, "rb");
if (fd == NULL) { if (fd == NULL) {
fprintf(stderr, "ERROR: Failed to open path \"%s\"!\n", path + idx); fprintf(
file_info.result = STATIC_FILE_RESULT_FileError; stderr, "WARNING Failed to open path \"%s\" in static dir!\n", path + idx);
file_info.result = STATIC_FILE_RESULT_404NotFound;
return file_info; return file_info;
} }
fseek(fd, 0, SEEK_END); fseek(fd, 0, SEEK_END);
long long_ret = ftell(fd); long long_ret = ftell(fd);
if (long_ret < 0) { if (long_ret < 0) {
fprintf(stderr, "ERROR: Failed to seek in path fd \"%s\"!\n", path); fprintf(stderr, "ERROR Failed to seek in path fd \"%s\"!\n", path);
file_info.result = STATIC_FILE_RESULT_FileError; file_info.result = STATIC_FILE_RESULT_FileError;
return file_info; return file_info;
} }
@ -193,7 +194,7 @@ C_SIMPLE_HTTP_StaticFileInfo c_simple_http_get_file(
file_info.buf = malloc(file_info.buf_size); file_info.buf = malloc(file_info.buf_size);
size_t size_t_ret = fread(file_info.buf, 1, file_info.buf_size, fd); size_t size_t_ret = fread(file_info.buf, 1, file_info.buf_size, fd);
if (size_t_ret != file_info.buf_size) { if (size_t_ret != file_info.buf_size) {
fprintf(stderr, "ERROR: Failed to read path fd \"%s\"!\n", path); fprintf(stderr, "ERROR Failed to read path fd \"%s\"!\n", path);
free(file_info.buf); free(file_info.buf);
file_info.buf_size = 0; file_info.buf_size = 0;
file_info.result = STATIC_FILE_RESULT_FileError; file_info.result = STATIC_FILE_RESULT_FileError;

3
src/static.h
View file

@ -25,7 +25,8 @@ typedef enum C_SIMPLE_HTTP_StaticFileResult {
STATIC_FILE_RESULT_FileError, STATIC_FILE_RESULT_FileError,
STATIC_FILE_RESULT_InvalidParameter, STATIC_FILE_RESULT_InvalidParameter,
STATIC_FILE_RESULT_NoXDGMimeAvailable, STATIC_FILE_RESULT_NoXDGMimeAvailable,
STATIC_FILE_RESULT_InternalError STATIC_FILE_RESULT_InternalError,
STATIC_FILE_RESULT_404NotFound
} C_SIMPLE_HTTP_StaticFileResult; } C_SIMPLE_HTTP_StaticFileResult;
typedef struct C_SIMPLE_HTTP_StaticFileInfo { typedef struct C_SIMPLE_HTTP_StaticFileInfo {