lorenz.stechauner/sesimos
1
1
Fork 0
Code Issues Pull Requests Projects Releases Activity

Added http header strict and not strict mode

Browse Source
This commit is contained in:
Lorenz Stechauner
2020-12-16 18:35:11 +01:00
parent 14b4f71af7
commit 80ed6dea3e
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/client.c
View File

@ -79,9 +79,9 @@ int client_request_handler(sock *client, int req_num) {
goto respond; goto respond;
} }
hdr_connection = http_get_header_field(&req.hdr, "Connection"); hdr_connection = http_get_header_field(&req.hdr, "Connection", HTTP_NOT_STRICT);
client_keep_alive = hdr_connection != NULL && strncmp(hdr_connection, "keep-alive", 10) == 0; client_keep_alive = hdr_connection != NULL && strncmp(hdr_connection, "keep-alive", 10) == 0;
host = http_get_header_field(&req.hdr, "Host"); host = http_get_header_field(&req.hdr, "Host", HTTP_NOT_STRICT);
if (host == NULL || strchr(host, '/') != NULL) { if (host == NULL || strchr(host, '/') != NULL) {
res.status = http_get_status(400); res.status = http_get_status(400);
sprintf(err_msg, "The client provided no or an invalid Host header field."); sprintf(err_msg, "The client provided no or an invalid Host header field.");

12
src/http.c
View File

@ -9,14 +9,14 @@
#include "utils.h" #include "utils.h"
void http_to_camel_case(char *str) { void http_to_camel_case(char *str, int strict) {
char last = '-'; char last = '-';
char ch; char ch;
for (int i = 0; i < strlen(str); i++) { for (int i = 0; i < strlen(str); i++) {
ch = str[i]; ch = str[i];
if (last == '-' && ch >= 'a' && ch <= 'z') { if (last == '-' && ch >= 'a' && ch <= 'z') {
str[i] = (char) ((int) ch & 0x5F); str[i] = (char) ((int) ch & 0x5F);
} else if (last != '-' && ch >= 'A' && ch <= 'Z') { } else if (last != '-' && ch >= 'A' && ch <= 'Z' && strict == HTTP_STRICT) {
str[i] = (char) ((int) ch | 0x20); str[i] = (char) ((int) ch | 0x20);
} }
last = str[i]; last = str[i];
@ -132,7 +132,7 @@ int http_receive_request(sock *client, http_req *req) {
len = pos1 - ptr; len = pos1 - ptr;
req->hdr.fields[req->hdr.field_num][0] = malloc(len + 1); req->hdr.fields[req->hdr.field_num][0] = malloc(len + 1);
sprintf(req->hdr.fields[req->hdr.field_num][0], "%.*s", (int) len, ptr); sprintf(req->hdr.fields[req->hdr.field_num][0], "%.*s", (int) len, ptr);
http_to_camel_case(req->hdr.fields[req->hdr.field_num][0]); http_to_camel_case(req->hdr.fields[req->hdr.field_num][0], HTTP_NOT_STRICT);
pos1++; pos1++;
pos2 = pos0 - 1; pos2 = pos0 - 1;
@ -153,11 +153,11 @@ int http_receive_request(sock *client, http_req *req) {
} }
} }
char *http_get_header_field(http_hdr *hdr, const char *field_name) { char *http_get_header_field(http_hdr *hdr, const char *field_name, int strict) {
size_t len = strlen(field_name); size_t len = strlen(field_name);
char *_field_name = malloc(len + 1); char *_field_name = malloc(len + 1);
strcpy(_field_name, field_name); strcpy(_field_name, field_name);
http_to_camel_case(_field_name); http_to_camel_case(_field_name, strict);
for (int i = 0; i < hdr->field_num; i++) { for (int i = 0; i < hdr->field_num; i++) {
if (strncmp(hdr->fields[i][0], _field_name, len) == 0) { if (strncmp(hdr->fields[i][0], _field_name, len) == 0) {
free(_field_name); free(_field_name);
@ -175,7 +175,7 @@ void http_add_header_field(http_hdr *hdr, const char *field_name, const char *fi
char *_field_value = malloc(len_value + 1); char *_field_value = malloc(len_value + 1);
strcpy(_field_name, field_name); strcpy(_field_name, field_name);
strcpy(_field_value, field_value); strcpy(_field_value, field_value);
http_to_camel_case(_field_name); http_to_camel_case(_field_name, HTTP_NOT_STRICT);
hdr->fields[hdr->field_num][0] = _field_name; hdr->fields[hdr->field_num][0] = _field_name;
hdr->fields[hdr->field_num][1] = _field_value; hdr->fields[hdr->field_num][1] = _field_value;
hdr->field_num++; hdr->field_num++;

7
src/http.h
View File

@ -8,6 +8,9 @@
#ifndef NECRONDA_SERVER_HTTP_H #ifndef NECRONDA_SERVER_HTTP_H
#define NECRONDA_SERVER_HTTP_H #define NECRONDA_SERVER_HTTP_H
#define HTTP_STRICT 1
#define HTTP_NOT_STRICT 0
typedef struct { typedef struct {
unsigned short code; unsigned short code;
char type[16]; char type[16];
@ -151,7 +154,7 @@ const char *http_error_icon =
"eTonQXJpYWwnLHNhbnMtc2VyaWYiPjooPC90ZXh0Pjwvc3ZnPgo=\"/>\n"; "eTonQXJpYWwnLHNhbnMtc2VyaWYiPjooPC90ZXh0Pjwvc3ZnPgo=\"/>\n";
void http_to_camel_case(char *str); void http_to_camel_case(char *str, int strict);
void http_free_hdr(http_hdr *hdr); void http_free_hdr(http_hdr *hdr);
@ -161,7 +164,7 @@ void http_free_res(http_res *res);
int http_receive_request(sock *client, http_req *req); int http_receive_request(sock *client, http_req *req);
char *http_get_header_field(http_hdr *hdr, const char *field_name); char *http_get_header_field(http_hdr *hdr, const char *field_name, int strict);
void http_add_header_field(http_hdr *hdr, const char *field_name, const char *field_value); void http_add_header_field(http_hdr *hdr, const char *field_name, const char *field_value);