ollien
/
cs-3516-assignment-1
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make directories 404

master
Nick Krichevsky 2018-09-10 20:18:00 -04:00
parent 4c1ee7ed2c
commit a9706cc6ac
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
server/request_handling.c
View File

@ -106,29 +106,32 @@ void free_request_line_items(struct request_line *parsed_line) {
* *
* @return -1 For an I/O error, 0 if successful. * @return -1 For an I/O error, 0 if successful.
*/ */
int get_file_from_uri(const char *uri, struct requested_file *req_file) { enum file_result get_file_from_uri(const char *uri, struct requested_file *req_file) {
const char *resource = uri; const char *resource = uri;
if (strcmp(uri, "/") == 0) { if (strcmp(uri, "/") == 0) {
resource = "TMDG.html"; resource = "TMDG.html";
} else if (*uri == '/') { } else if (*uri == '/') {
// If our uri starts with a slash, we can ignore it. // If our uri starts with a slash, we can ignore it.
uri++; resource++;
} }
struct stat file_stat; struct stat file_stat;
int stat_result = stat(resource, &file_stat); int stat_result = stat(resource, &file_stat);
if (stat_result == -1) { if (stat_result == -1) {
return -1; return RESULT_IO_ERROR;
}
if (S_ISDIR(file_stat.st_mode)) {
return RESULT_NOT_FILE;
} }
FILE *open_file = fopen(resource, "r"); FILE *open_file = fopen(resource, "r");
if (open_file == NULL) { if (open_file == NULL) {
return -1; return RESULT_IO_ERROR;
} }
rewind(open_file); rewind(open_file);
req_file->size = file_stat.st_size; req_file->size = file_stat.st_size;
req_file->file = open_file; req_file->file = open_file;
return 0; return RESULT_FILE_OK;
} }

4
server/request_handling.h
View File

@ -3,6 +3,8 @@
#include <stdio.h> #include <stdio.h>
enum file_result{RESULT_IO_ERROR, RESULT_NOT_FILE, RESULT_FILE_OK};
struct request_line { struct request_line {
char *http_version; char *http_version;
char *method; char *method;
@ -16,6 +18,6 @@ struct requested_file {
int parse_request_line(const char *line, struct request_line *parsed_line); int parse_request_line(const char *line, struct request_line *parsed_line);
void free_request_line_items(struct request_line *parsed_line); void free_request_line_items(struct request_line *parsed_line);
int get_file_from_uri(const char *uri, struct requested_file *req_file); enum file_result get_file_from_uri(const char *uri, struct requested_file *req_file);
#endif #endif

8
server/socket_server.c
View File

@ -247,11 +247,11 @@ enum socket_result serve_one_request(int sock_fd) {
// Attempt to read the file and return it. // Attempt to read the file and return it.
struct requested_file file = {}; struct requested_file file = {};
int file_result = get_file_from_uri(parsed_request_line.uri, &file); int file_result = get_file_from_uri(parsed_request_line.uri, &file);
if (file_result == -1) { if (file_result != RESULT_FILE_OK) {
int send_result = 0; int send_result = 0;
if (errno == ENOENT) { if (file_result == RESULT_NOT_FILE || (file_result == RESULT_IO_ERROR && errno == ENOENT)) {
send_result = send_headers(404, client_fd, -1); send_result = send_headers(404, client_fd, -1);
} else if (errno == EACCES) { } else if (file_result == RESULT_IO_ERROR && errno == EACCES) {
send_result = send_headers(403, client_fd, -1); send_result = send_headers(403, client_fd, -1);
} else { } else {
free_request_line_items(&parsed_request_line); free_request_line_items(&parsed_request_line);
@ -275,7 +275,7 @@ enum socket_result serve_one_request(int sock_fd) {
} }
free_request_line_items(&parsed_request_line); free_request_line_items(&parsed_request_line);
free_request_items(message); free_request_items(message);
if (file_result != -1) { if (file_result == RESULT_FILE_OK) {
fclose(file.file); fclose(file.file);
} }