From fbba7a5a149e6633aa217f6009e96ddcf3d1ddb1 Mon Sep 17 00:00:00 2001 From: Chewing_Bever Date: Mon, 12 Feb 2024 13:32:14 +0100 Subject: [PATCH] feat: improve request header api functions --- include/lnm/http/req.h | 40 +++++++++++++++++++--------- src/lnm/http/lnm_http_loop_process.c | 9 +++---- src/lnm/http/lnm_http_loop_steps.c | 10 +++---- src/lnm/http/lnm_http_req.c | 19 ++++++------- 4 files changed, 47 insertions(+), 31 deletions(-) diff --git a/include/lnm/http/req.h b/include/lnm/http/req.h index 146fb81..2abb12d 100644 --- a/include/lnm/http/req.h +++ b/include/lnm/http/req.h @@ -14,7 +14,11 @@ #define LNM_HTTP_MAX_REQ_HEADERS 32 #define LNM_HTTP_MAX_REGEX_GROUPS 4 -typedef struct lnm_http_req_header { +/** + * Internal representation of a header in a request, defined using offsets + * relative to the full buffer. + */ +typedef struct lnm_http_req_iheader { struct { size_t o; size_t len; @@ -23,6 +27,20 @@ typedef struct lnm_http_req_header { size_t o; size_t len; } value; +} lnm_http_req_iheader; + +/** + * Represents an actual header value, with offsets already resolved. + */ +typedef struct lnm_http_req_header { + struct { + const char *s; + size_t len; + } name; + struct { + const char *s; + size_t len; + } value; } lnm_http_req_header; /** @@ -46,7 +64,7 @@ typedef struct lnm_http_req { size_t len; } query; struct { - lnm_http_req_header arr[LNM_HTTP_MAX_REQ_HEADERS]; + lnm_http_req_iheader arr[LNM_HTTP_MAX_REQ_HEADERS]; size_t len; } headers; struct { @@ -82,32 +100,30 @@ lnm_http_parse_err lnm_http_req_parse(lnm_http_req *req, char *buf, size_t len); void lnm_http_req_reset(lnm_http_req *req); /** - * Retrieve a specific header from the request. + * Retrieve a known type header from the request. * * Pointers retrieved from this function should never be used between step * functions; simply request the header again if you need to. * - * @param out where to write pointer to header value - * @param out_len where to store length of out value + * @param out where to store pointer to struct representing header * @param req request to look for header in * @param type type of header to look for */ -lnm_err lnm_http_req_header_get(const char **out, size_t *out_len, - lnm_http_req *req, lnm_http_header type); +lnm_err lnm_http_req_header_get(lnm_http_req_header *out, lnm_http_req *req, + lnm_http_header type); /** - * Retrieve a specific header from the request by specifying its name. + * Retrieve a header from the request using a case-insensitive name. * * Pointers retrieved from this function should never be used between step * functions; simply request the header again if you need to. * - * @param out where to write pointer to header value - * @param out_len where to store length of out value + * @param out where to store pointer to struct representing header * @param req request to look for header in * @param name name of the header; matches case-insensitive */ -lnm_err lnm_http_req_header_get_s(const char **out, size_t *out_len, - lnm_http_req *req, const char *name); +lnm_err lnm_http_req_header_get_s(lnm_http_req_header *out, lnm_http_req *req, + const char *name); /** * Retrieve a named key segment from the matched route. diff --git a/src/lnm/http/lnm_http_loop_process.c b/src/lnm/http/lnm_http_loop_process.c index 4f6871f..ab7d799 100644 --- a/src/lnm/http/lnm_http_loop_process.c +++ b/src/lnm/http/lnm_http_loop_process.c @@ -79,11 +79,10 @@ void lnm_http_loop_process_parse_headers(lnm_http_conn *conn) { lnm_http_loop_ctx *ctx = conn->ctx; lnm_http_req *req = &ctx->req; - const char *value; - size_t value_len; - if (lnm_http_req_header_get(&value, &value_len, req, - lnm_http_header_content_length) == lnm_err_ok) { - req->body.expected_len = lnm_atoi(value, value_len); + lnm_http_req_header header; + if (lnm_http_req_header_get(&header, req, lnm_http_header_content_length) == + lnm_err_ok) { + req->body.expected_len = lnm_atoi(header.value.s, header.value.len); } ctx->state = lnm_http_loop_state_steps; diff --git a/src/lnm/http/lnm_http_loop_steps.c b/src/lnm/http/lnm_http_loop_steps.c index 2552e09..6819986 100644 --- a/src/lnm/http/lnm_http_loop_steps.c +++ b/src/lnm/http/lnm_http_loop_steps.c @@ -30,13 +30,13 @@ lnm_http_step_err lnm_http_loop_step_auth(lnm_http_conn *conn) { // If there's no API key, requests are always authorized bool authorized = ctx->g->api_key == NULL; - const char *value; - size_t value_len; + lnm_http_req_header header; - if (!authorized && lnm_http_req_header_get_s(&value, &value_len, &ctx->req, + if (!authorized && lnm_http_req_header_get_s(&header, &ctx->req, "X-Api-Key") == lnm_err_ok) { - authorized = (value_len == strlen(ctx->g->api_key)) && - (memcmp(value, ctx->g->api_key, value_len) == 0); + authorized = + (header.value.len == strlen(ctx->g->api_key)) && + (memcmp(header.value.s, ctx->g->api_key, header.value.len) == 0); } ctx->res.status = authorized ? ctx->res.status : lnm_http_status_unauthorized; diff --git a/src/lnm/http/lnm_http_req.c b/src/lnm/http/lnm_http_req.c index a612b02..086788e 100644 --- a/src/lnm/http/lnm_http_req.c +++ b/src/lnm/http/lnm_http_req.c @@ -88,23 +88,24 @@ void lnm_http_req_reset(lnm_http_req *req) { memset(req, 0, sizeof(lnm_http_req)); } -lnm_err lnm_http_req_header_get(const char **out, size_t *out_len, - lnm_http_req *req, lnm_http_header type) { - return lnm_http_req_header_get_s(out, out_len, req, - lnm_http_header_names[type]); +lnm_err lnm_http_req_header_get(lnm_http_req_header *out, lnm_http_req *req, + lnm_http_header type) { + return lnm_http_req_header_get_s(out, req, lnm_http_header_names[type]); } -lnm_err lnm_http_req_header_get_s(const char **out, size_t *out_len, - lnm_http_req *req, const char *name) { +lnm_err lnm_http_req_header_get_s(lnm_http_req_header *out, lnm_http_req *req, + const char *name) { size_t name_len = strlen(name); for (size_t i = 0; i < req->headers.len; i++) { - const lnm_http_req_header *header = &req->headers.arr[i]; + const lnm_http_req_iheader *header = &req->headers.arr[i]; if (lnm_strnieq(req->buf.s + header->name.o, header->name.len, name, name_len)) { - *out = req->buf.s + header->value.o; - *out_len = header->value.len; + out->name.s = req->buf.s + header->name.o; + out->name.len = header->name.len; + out->value.s = req->buf.s + header->value.o; + out->value.len = header->value.len; return lnm_err_ok; }