mirror of
https://git.haproxy.org/git/haproxy.git/
synced 2025-08-06 23:27:04 +02:00
6810c41f8e
log format expressions are broadly used within the code: once they are parsed from input string, they are converted to a linked list of logformat nodes. We're starting to face some limitations because we're simply storing the converted expression as a generic logformat_node list. The first issue we're facing is that storing logformat expressions that way doesn't allow us to add metadata alongside the list, which is part of the prerequites for implementing log-profiles. Another issue with storing logformat expressions as generic lists of logformat_node elements is that it's starting to become really hard to tell when we rely on logformat expressions or not in the code given that there isn't always a comment near the list declaration or manipulation to indicate that it's relying on logformat expressions under the hood, so this adds some complexity for code maintenance. This patch looks quite impressive due to changes in a lot of header and source files (since logformat expressions are broadly used), but it does a simple thing: it defines the lf_expr structure which itself holds a generic list of logformat nodes, and then declares some helpers to manipulate lf_expr elements and fixes the code so that we now exclusively manipulate logformat_node lists as lf_expr elements outside of log.c. For now, lf_expr struct only contains the list of logformat nodes (no additional metadata), but now that we have dedicated type and helpers, doing so in the future won't be problematic at all and won't require extensive code changes.
97 lines
3.7 KiB
C
97 lines
3.7 KiB
C
/*
|
|
* include/haproxy/http_htx-t.h
|
|
* This file defines everything related to HTTP manipulation using the internal
|
|
* representation.
|
|
*
|
|
* Copyright (C) 2018 HAProxy Technologies, Christopher Faulet <cfaulet@haproxy.com>
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation, version 2.1
|
|
* exclusively.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#ifndef _HAPROXY_HTTP_HTX_T_H
|
|
#define _HAPROXY_HTTP_HTX_T_H
|
|
|
|
#include <import/ebistree.h>
|
|
#include <import/ist.h>
|
|
|
|
#include <haproxy/buf-t.h>
|
|
#include <haproxy/http-t.h>
|
|
#include <haproxy/log-t.h>
|
|
#include <haproxy/htx-t.h>
|
|
|
|
/* Context used to find/remove an HTTP header. */
|
|
struct http_hdr_ctx {
|
|
struct htx_blk *blk;
|
|
struct ist value;
|
|
uint16_t lws_before;
|
|
uint16_t lws_after;
|
|
};
|
|
|
|
|
|
/* Structure used to build the header list of an HTTP reply */
|
|
struct http_reply_hdr {
|
|
struct ist name; /* the header name */
|
|
struct lf_expr value; /* the log-format string value */
|
|
struct list list; /* header linked list */
|
|
};
|
|
|
|
#define HTTP_REPLY_EMPTY 0x00 /* the reply has no payload */
|
|
#define HTTP_REPLY_ERRMSG 0x01 /* the reply is an error message (may be NULL) */
|
|
#define HTTP_REPLY_ERRFILES 0x02 /* the reply references an http-errors section */
|
|
#define HTTP_REPLY_RAW 0x03 /* the reply use a raw payload */
|
|
#define HTTP_REPLY_LOGFMT 0x04 /* the reply use a log-format payload */
|
|
#define HTTP_REPLY_INDIRECT 0x05 /* the reply references another http-reply (may be NULL) */
|
|
|
|
/* Uses by HAProxy to generate internal responses */
|
|
struct http_reply {
|
|
unsigned char type; /* HTTP_REPLY_* */
|
|
int status; /* The response status code */
|
|
char *ctype; /* The response content-type, may be NULL */
|
|
struct list hdrs; /* A list of http_reply_hdr */
|
|
union {
|
|
struct lf_expr fmt; /* A log-format string (type = HTTP_REPLY_LOGFMT) */
|
|
struct buffer obj; /* A raw string (type = HTTP_REPLY_RAW) */
|
|
struct buffer *errmsg; /* The error message to use as response (type = HTTP_REPLY_ERRMSG).
|
|
* may be NULL, if so rely on the proxy error messages */
|
|
struct http_reply *reply; /* The HTTP reply to use as response (type = HTTP_REPLY_INDIRECT) */
|
|
char *http_errors; /* The http-errors section to use (type = HTTP_REPLY_ERRFILES).
|
|
* Should be resolved during post-check */
|
|
} body;
|
|
struct list list; /* next http_reply in the global list.
|
|
* Only used for replies defined in a proxy section */
|
|
};
|
|
|
|
/* A custom HTTP error message load from a row file and converted in HTX. The
|
|
* node key is the file path.
|
|
*/
|
|
struct http_error_msg {
|
|
struct buffer msg;
|
|
struct ebpt_node node;
|
|
};
|
|
|
|
/* http-errors section and parameters. */
|
|
struct http_errors {
|
|
char *id; /* unique identifier */
|
|
struct {
|
|
char *file; /* file where the section appears */
|
|
int line; /* line where the section appears */
|
|
} conf; /* config information */
|
|
|
|
struct http_reply *replies[HTTP_ERR_SIZE]; /* HTTP replies for known errors */
|
|
struct list list; /* http-errors list */
|
|
};
|
|
|
|
#endif /* _HAPROXY_HTTP_HTX_T_H */
|