fumiama/simple-http-server
1
0
Fork 0
mirror of https://github.com/fumiama/simple-http-server.git synced 2026-06-05 00:30:23 +08:00
Code Activity

fix: hostname check

Browse Source
This commit is contained in:
源文雨
2023-03-11 12:36:13 +08:00
parent d910a2b070
commit deed85a87c
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
server.c
View File

@@ -74,8 +74,8 @@ static void unimplemented(int);
/**********************************************************************/ /**********************************************************************/
/* read & discard headers */ /* read & discard headers */
#define discard(client) \ #define discard(client, numchars) \
while((numchars > 0) && strcmp("\n", buf)) numchars = get_line(client, buf, sizeof(buf)) while(numchars > 0 && buf[0] != '\n' && buf[0] != '\r') numchars = get_line(client, buf, sizeof(buf))
#define methodequ(str, method) (*(uint32_t*)(method) == *(uint32_t*)(str)) #define methodequ(str, method) (*(uint32_t*)(method) == *(uint32_t*)(str))
#define skiptext(buf, j, cap) while(!ISspace(buf[j]) && (j < (cap))) j++ #define skiptext(buf, j, cap) while(!ISspace(buf[j]) && (j < (cap))) j++
#define skipspace(buf, j, cap) while(ISspace(buf[j]) && (j < (cap))) j++ #define skipspace(buf, j, cap) while(ISspace(buf[j]) && (j < (cap))) j++
@@ -102,7 +102,7 @@ static void accept_request(void *cli) {
} }
else { else {
unimplemented(client); unimplemented(client);
discard(client); discard(client, numchars);
close(client); close(client);
return; return;
} }
@@ -158,21 +158,27 @@ static void accept_request(void *cli) {
int content_length = 0; int content_length = 0;
int host_chk_passed = !(uintptr_t)hostnameport; int host_chk_passed = !(uintptr_t)hostnameport;
cgi &= ((st.st_mode & S_IXUSR) || (st.st_mode & S_IXGRP) || (st.st_mode & S_IXOTH)); cgi &= ((st.st_mode & S_IXUSR) || (st.st_mode & S_IXGRP) || (st.st_mode & S_IXOTH));
while((numchars > 0) && strcmp("\n", buf)) { while(numchars > 0) {
numchars = get_line(client, buf, sizeof(buf)); numchars = get_line(client, buf, sizeof(buf));
if(buf[0] == '\n' || buf[0] == '\r') {
numchars = 0;
break;
}
if(!content_length && !strncasecmp(buf, "Content-Length: ", 16)) { if(!content_length && !strncasecmp(buf, "Content-Length: ", 16)) {
content_length = atoi(buf + 16); content_length = atoi(buf + 16);
} }
else if(!host_chk_passed && !strncasecmp(buf, "Host: ", 6)) { else if(!host_chk_passed && !strncasecmp(buf, "Host: ", 6)) {
if(strncasecmp(buf+6, hostnameport, strlen(hostnameport))) { if(strncasecmp(buf+6, hostnameport, strlen(hostnameport))) {
forbidden(client);
host_chk_passed = 0; host_chk_passed = 0;
break; break;
} }
host_chk_passed = 1; host_chk_passed = 1;
} }
} }
if(!host_chk_passed) break; if(!host_chk_passed) {
forbidden(client);
break;
}
if(method_type == POST && content_length == -1) bad_request(client); if(method_type == POST && content_length == -1) bad_request(client);
else if(!cgi) serve_file(client, path); else if(!cgi) serve_file(client, path);
else { else {
@@ -184,7 +190,7 @@ static void accept_request(void *cli) {
execute_cgi(client, content_length, &request); execute_cgi(client, content_length, &request);
} }
} while(0); } while(0);
discard(client); discard(client, numchars);
close(client); close(client);
} }