http_header.[ch] convert existing calls to manip request/response headers convert existing calls to manip environment array (often header-related)personal/stbuehler/fix-fdevent
parent
c8159ee5f6
commit
3dd3cde902
@ -0,0 +1,166 @@
|
||||
#include "first.h"
|
||||
|
||||
#include "http_header.h"
|
||||
#include "base.h"
|
||||
#include "array.h"
|
||||
#include "buffer.h"
|
||||
|
||||
|
||||
typedef struct keyvlenvalue {
|
||||
const int key;
|
||||
const char * const value;
|
||||
const size_t vlen;
|
||||
} keyvlenvalue;
|
||||
|
||||
/* Note: must be sorted by length */
|
||||
/* Note: must be kept in sync with http_header.h enum http_header_e */
|
||||
static const keyvlenvalue http_headers[] = {
|
||||
{ HTTP_HEADER_HOST, CONST_STR_LEN("Host") }
|
||||
,{ HTTP_HEADER_DATE, CONST_STR_LEN("Date") }
|
||||
,{ HTTP_HEADER_ETAG, CONST_STR_LEN("ETag") }
|
||||
,{ HTTP_HEADER_VARY, CONST_STR_LEN("Vary") }
|
||||
,{ HTTP_HEADER_RANGE, CONST_STR_LEN("Range") }
|
||||
,{ HTTP_HEADER_COOKIE, CONST_STR_LEN("Cookie") }
|
||||
,{ HTTP_HEADER_EXPECT, CONST_STR_LEN("Expect") }
|
||||
,{ HTTP_HEADER_STATUS, CONST_STR_LEN("Status") }
|
||||
,{ HTTP_HEADER_SERVER, CONST_STR_LEN("Server") }
|
||||
,{ HTTP_HEADER_UPGRADE, CONST_STR_LEN("Upgrade") }
|
||||
,{ HTTP_HEADER_LOCATION, CONST_STR_LEN("Location") }
|
||||
,{ HTTP_HEADER_FORWARDED, CONST_STR_LEN("Forwarded") }
|
||||
,{ HTTP_HEADER_CONNECTION, CONST_STR_LEN("Connection") }
|
||||
,{ HTTP_HEADER_SET_COOKIE, CONST_STR_LEN("Set-Cookie") }
|
||||
,{ HTTP_HEADER_CONTENT_TYPE, CONST_STR_LEN("Content-Type") }
|
||||
,{ HTTP_HEADER_LAST_MODIFIED, CONST_STR_LEN("Last-Modified") }
|
||||
,{ HTTP_HEADER_AUTHORIZATION, CONST_STR_LEN("Authorization") }
|
||||
,{ HTTP_HEADER_IF_NONE_MATCH, CONST_STR_LEN("If-None-Match") }
|
||||
,{ HTTP_HEADER_CACHE_CONTROL, CONST_STR_LEN("Cache-Control") }
|
||||
,{ HTTP_HEADER_CONTENT_LENGTH, CONST_STR_LEN("Content-Length") }
|
||||
,{ HTTP_HEADER_ACCEPT_ENCODING, CONST_STR_LEN("Accept-Encoding") }
|
||||
,{ HTTP_HEADER_X_FORWARDED_FOR, CONST_STR_LEN("X-Forwarded-For") }
|
||||
,{ HTTP_HEADER_CONTENT_ENCODING, CONST_STR_LEN("Content-Encoding") }
|
||||
,{ HTTP_HEADER_CONTENT_LOCATION, CONST_STR_LEN("Content-Location") }
|
||||
,{ HTTP_HEADER_IF_MODIFIED_SINCE, CONST_STR_LEN("If-Modified-Since") }
|
||||
,{ HTTP_HEADER_TRANSFER_ENCODING, CONST_STR_LEN("Transfer-Encoding") }
|
||||
,{ HTTP_HEADER_X_FORWARDED_PROTO, CONST_STR_LEN("X-Forwarded-Proto") }
|
||||
,{ HTTP_HEADER_OTHER, NULL, 0 }
|
||||
};
|
||||
|
||||
enum http_header_e http_header_hkey_get(const char *s, size_t slen) {
|
||||
const struct keyvlenvalue * const kv = http_headers;
|
||||
for (int i = 0; kv[i].vlen && slen >= kv[i].vlen; ++i) {
|
||||
if (slen == kv[i].vlen
|
||||
&& 0 == buffer_caseless_compare(s, slen, kv[i].value, kv[i].vlen))
|
||||
return (enum http_header_e)kv[i].key;
|
||||
}
|
||||
return HTTP_HEADER_OTHER;
|
||||
}
|
||||
|
||||
|
||||
buffer * http_header_response_get(connection *con, enum http_header_e id, const char *k, size_t klen) {
|
||||
data_string * const ds =
|
||||
(id <= HTTP_HEADER_OTHER || (con->response.htags & id))
|
||||
? (data_string *)array_get_element_klen(con->response.headers, k, klen)
|
||||
: NULL;
|
||||
return ds && !buffer_string_is_empty(ds->value) ? ds->value : NULL;
|
||||
}
|
||||
|
||||
void http_header_response_set(connection *con, enum http_header_e id, const char *k, size_t klen, const char *v, size_t vlen) {
|
||||
/* set value, including setting blank value if 0 == vlen
|
||||
* (note: if 0 == vlen, header is still inserted with blank value,
|
||||
* which is used to indicate a "removed" header)
|
||||
*/
|
||||
con->response.htags |= id;
|
||||
array_set_key_value(con->response.headers, k, klen, v, vlen);
|
||||
}
|
||||
|
||||
void http_header_response_append(connection *con, enum http_header_e id, const char *k, size_t klen, const char *v, size_t vlen) {
|
||||
if (vlen) {
|
||||
buffer *vb = (id <= HTTP_HEADER_OTHER || (con->response.htags & id))
|
||||
? http_header_response_get(con, id, k, klen)
|
||||
: NULL;
|
||||
if (NULL == vb) {
|
||||
array_insert_key_value(con->response.headers, k, klen, v, vlen);
|
||||
con->response.htags |= id;
|
||||
}
|
||||
else { /* append value */
|
||||
buffer_append_string_len(vb, CONST_STR_LEN(", "));
|
||||
buffer_append_string_len(vb, v, vlen);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void http_header_response_insert(connection *con, enum http_header_e id, const char *k, size_t klen, const char *v, size_t vlen) {
|
||||
if (vlen) {
|
||||
buffer *vb = (id <= HTTP_HEADER_OTHER || (con->response.htags & id))
|
||||
? http_header_response_get(con, id, k, klen)
|
||||
: NULL;
|
||||
if (NULL == vb) {
|
||||
array_insert_key_value(con->response.headers, k, klen, v, vlen);
|
||||
con->response.htags |= id;
|
||||
}
|
||||
else { /* append value */
|
||||
buffer_append_string_len(vb, CONST_STR_LEN("\r\n"));
|
||||
buffer_append_string_len(vb, k, klen);
|
||||
buffer_append_string_len(vb, CONST_STR_LEN(": "));
|
||||
buffer_append_string_len(vb, v, vlen);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
buffer * http_header_request_get(connection *con, enum http_header_e id, const char *k, size_t klen) {
|
||||
data_string * const ds =
|
||||
(id <= HTTP_HEADER_OTHER || (con->request.htags & id))
|
||||
? (data_string *)array_get_element_klen(con->request.headers, k, klen)
|
||||
: NULL;
|
||||
return ds && !buffer_string_is_empty(ds->value) ? ds->value : NULL;
|
||||
}
|
||||
|
||||
void http_header_request_set(connection *con, enum http_header_e id, const char *k, size_t klen, const char *v, size_t vlen) {
|
||||
/* set value, including setting blank value if 0 == vlen
|
||||
* (note: if 0 == vlen, header is still inserted with blank value,
|
||||
* which is used to indicate a "removed" header)
|
||||
*/
|
||||
con->request.htags |= id;
|
||||
array_set_key_value(con->request.headers, k, klen, v, vlen);
|
||||
}
|
||||
|
||||
void http_header_request_append(connection *con, enum http_header_e id, const char *k, size_t klen, const char *v, size_t vlen) {
|
||||
if (vlen) {
|
||||
buffer *vb = (id <= HTTP_HEADER_OTHER || (con->request.htags & id))
|
||||
? http_header_request_get(con, id, k, klen)
|
||||
: NULL;
|
||||
if (NULL == vb) {
|
||||
array_insert_key_value(con->request.headers, k, klen, v, vlen);
|
||||
con->request.htags |= id;
|
||||
}
|
||||
else { /* append value */
|
||||
buffer_append_string_len(vb, CONST_STR_LEN(", "));
|
||||
buffer_append_string_len(vb, v, vlen);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
buffer * http_header_env_get(connection *con, const char *k, size_t klen) {
|
||||
data_string * const ds =
|
||||
(data_string *)array_get_element_klen(con->environment, k, klen);
|
||||
return ds && !buffer_string_is_empty(ds->value) ? ds->value : NULL;
|
||||
}
|
||||
|
||||
void http_header_env_set(connection *con, const char *k, size_t klen, const char *v, size_t vlen) {
|
||||
array_set_key_value(con->environment, k, klen, v, vlen);
|
||||
}
|
||||
|
||||
void http_header_env_append(connection *con, const char *k, size_t klen, const char *v, size_t vlen) {
|
||||
if (vlen) {
|
||||
buffer * const vb = http_header_env_get(con, k, klen);
|
||||
if (NULL == vb) {
|
||||
array_insert_key_value(con->environment, k, klen, v, vlen);
|
||||
}
|
||||
else { /* append value */
|
||||
buffer_append_string_len(vb, CONST_STR_LEN(", "));
|
||||
buffer_append_string_len(vb, v, vlen);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,57 @@
|
||||
#ifndef INCLUDED_HTTP_HEADER_H
|
||||
#define INCLUDED_HTTP_HEADER_H
|
||||
#include "first.h"
|
||||
|
||||
#include "base_decls.h"
|
||||
#include "buffer.h"
|
||||
|
||||
/* Note: must be kept in sync with http_header.c http_headers[] */
|
||||
/* Note: when adding new items, must replace OTHER in existing code for item */
|
||||
enum http_header_e {
|
||||
HTTP_HEADER_UNSPECIFIED = -1
|
||||
,HTTP_HEADER_OTHER = 0x00000000
|
||||
,HTTP_HEADER_ACCEPT_ENCODING = 0x00000001
|
||||
,HTTP_HEADER_AUTHORIZATION = 0x00000002
|
||||
,HTTP_HEADER_CACHE_CONTROL = 0x00000004
|
||||
,HTTP_HEADER_CONNECTION = 0x00000008
|
||||
,HTTP_HEADER_CONTENT_ENCODING = 0x00000010
|
||||
,HTTP_HEADER_CONTENT_LENGTH = 0x00000020
|
||||
,HTTP_HEADER_CONTENT_LOCATION = 0x00000040
|
||||
,HTTP_HEADER_CONTENT_TYPE = 0x00000080
|
||||
,HTTP_HEADER_COOKIE = 0x00000100
|
||||
,HTTP_HEADER_DATE = 0x00000200
|
||||
,HTTP_HEADER_ETAG = 0x00000400
|
||||
,HTTP_HEADER_EXPECT = 0x00000800
|
||||
,HTTP_HEADER_FORWARDED = 0x00001000
|
||||
,HTTP_HEADER_HOST = 0x00002000
|
||||
,HTTP_HEADER_IF_MODIFIED_SINCE = 0x00004000
|
||||
,HTTP_HEADER_IF_NONE_MATCH = 0x00008000
|
||||
,HTTP_HEADER_LAST_MODIFIED = 0x00010000
|
||||
,HTTP_HEADER_LOCATION = 0x00020000
|
||||
,HTTP_HEADER_RANGE = 0x00040000
|
||||
,HTTP_HEADER_SERVER = 0x00080000
|
||||
,HTTP_HEADER_SET_COOKIE = 0x00100000
|
||||
,HTTP_HEADER_STATUS = 0x00200000
|
||||
,HTTP_HEADER_TRANSFER_ENCODING = 0x00400000
|
||||
,HTTP_HEADER_UPGRADE = 0x00800000
|
||||
,HTTP_HEADER_VARY = 0x01000000
|
||||
,HTTP_HEADER_X_FORWARDED_FOR = 0x02000000
|
||||
,HTTP_HEADER_X_FORWARDED_PROTO = 0x04000000
|
||||
};
|
||||
|
||||
enum http_header_e http_header_hkey_get(const char *s, size_t slen);
|
||||
|
||||
buffer * http_header_response_get(connection *con, enum http_header_e id, const char *k, size_t klen);
|
||||
void http_header_response_set(connection *con, enum http_header_e id, const char *k, size_t klen, const char *v, size_t vlen);
|
||||
void http_header_response_append(connection *con, enum http_header_e id, const char *k, size_t klen, const char *v, size_t vlen);
|
||||
void http_header_response_insert(connection *con, enum http_header_e id, const char *k, size_t klen, const char *v, size_t vlen);
|
||||
|
||||
buffer * http_header_request_get(connection *con, enum http_header_e id, const char *k, size_t klen);
|
||||
void http_header_request_set(connection *con, enum http_header_e id, const char *k, size_t klen, const char *v, size_t vlen);
|
||||
void http_header_request_append(connection *con, enum http_header_e id, const char *k, size_t klen, const char *v, size_t vlen);
|
||||
|
||||
buffer * http_header_env_get(connection *con, const char *k, size_t klen);
|
||||
void http_header_env_set(connection *con, const char *k, size_t klen, const char *v, size_t vlen);
|
||||
void http_header_env_append(connection *con, const char *k, size_t klen, const char *v, size_t vlen);
|
||||
|
||||
#endif
|
||||