mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-07 15:47:01 +02:00
Code Issues Projects Releases Wiki Activity

REORG: h1: merge types+proto into common/h1.h

Browse Source 
These two files are self-contained and do not depend on other
layers, so let's remerge them together for easier manipulation.
This commit is contained in:
Willy Tarreau 2018-12-11 13:44:24 +01:00
parent 30925659ef
commit afba57ae80
8 changed files with 117 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
include/proto/h1.h → include/common/h1.h
View File

@ -1,5 +1,5 @@
/* /*
* include/proto/h1.h * include/common/h1.h
* This file contains HTTP/1 protocol definitions. * This file contains HTTP/1 protocol definitions.
* *
* Copyright (C) 2000-2017 Willy Tarreau - w@1wt.eu * Copyright (C) 2000-2017 Willy Tarreau - w@1wt.eu
@ -19,16 +19,122 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef _PROTO_H1_H #ifndef _COMMON_H1_H
#define _PROTO_H1_H #define _COMMON_H1_H
#include <common/buffer.h> #include <common/buffer.h>
#include <common/compiler.h> #include <common/compiler.h>
#include <common/config.h> #include <common/config.h>
#include <common/http.h> #include <common/http.h>
#include <common/http-hdr.h> #include <common/http-hdr.h>
#include <common/ist.h>
#include <common/standard.h> #include <common/standard.h>
#include <types/h1.h>
/* Possible states while parsing HTTP/1 messages (request|response) */
enum h1m_state {
H1_MSG_RQBEFORE = 0, // request: leading LF, before start line
H1_MSG_RQBEFORE_CR = 1, // request: leading CRLF, before start line
/* these ones define a request start line */
H1_MSG_RQMETH = 2, // parsing the Method
H1_MSG_RQMETH_SP = 3, // space(s) after the Method
H1_MSG_RQURI = 4, // parsing the Request URI
H1_MSG_RQURI_SP = 5, // space(s) after the Request URI
H1_MSG_RQVER = 6, // parsing the Request Version
H1_MSG_RQLINE_END = 7, // end of request line (CR or LF)
H1_MSG_RPBEFORE = 8, // response: leading LF, before start line
H1_MSG_RPBEFORE_CR = 9, // response: leading CRLF, before start line
/* these ones define a response start line */
H1_MSG_RPVER = 10, // parsing the Response Version
H1_MSG_RPVER_SP = 11, // space(s) after the Response Version
H1_MSG_RPCODE = 12, // response code
H1_MSG_RPCODE_SP = 13, // space(s) after the response code
H1_MSG_RPREASON = 14, // response reason
H1_MSG_RPLINE_END = 15, // end of response line (CR or LF)
/* common header processing */
H1_MSG_HDR_FIRST = 16, // waiting for first header or last CRLF (no LWS possible)
H1_MSG_HDR_NAME = 17, // parsing header name
H1_MSG_HDR_COL = 18, // parsing header colon
H1_MSG_HDR_L1_SP = 19, // parsing header LWS (SP|HT) before value
H1_MSG_HDR_L1_LF = 20, // parsing header LWS (LF) before value
H1_MSG_HDR_L1_LWS = 21, // checking whether it's a new header or an LWS
H1_MSG_HDR_VAL = 22, // parsing header value
H1_MSG_HDR_L2_LF = 23, // parsing header LWS (LF) inside/after value
H1_MSG_HDR_L2_LWS = 24, // checking whether it's a new header or an LWS
H1_MSG_LAST_LF = 25, // parsing last LF, last state for headers
/* Body processing. */
H1_MSG_CHUNK_SIZE = 26, // parsing the chunk size (RFC7230 #4.1)
H1_MSG_DATA = 27, // skipping data chunk / content-length data
H1_MSG_CHUNK_CRLF = 28, // skipping CRLF after data chunk
H1_MSG_TRAILERS = 29, // trailers (post-data entity headers)
/* we enter this state when we've received the end of the current message */
H1_MSG_DONE = 30, // message end received, waiting for resync or close
H1_MSG_TUNNEL = 31, // tunneled data after DONE
} __attribute__((packed));
/* HTTP/1 message flags (32 bit), for use in h1m->flags only */
#define H1_MF_NONE 0x00000000
#define H1_MF_CLEN 0x00000001 // content-length present
#define H1_MF_CHNK 0x00000002 // chunk present, exclusive with c-l
#define H1_MF_RESP 0x00000004 // this message is the response message
#define H1_MF_TOLOWER 0x00000008 // turn the header names to lower case
#define H1_MF_VER_11 0x00000010 // message indicates version 1.1 or above
#define H1_MF_CONN_CLO 0x00000020 // message contains "connection: close"
#define H1_MF_CONN_KAL 0x00000040 // message contains "connection: keep-alive"
#define H1_MF_CONN_UPG 0x00000080 // message contains "connection: upgrade"
#define H1_MF_XFER_LEN 0x00000100 // message xfer size can be determined
#define H1_MF_XFER_ENC 0x00000200 // transfer-encoding is present
#define H1_MF_NO_PHDR 0x00000400 // don't add pseudo-headers in the header list
/* Note: for a connection to be persistent, we need this for the request :
* - one of CLEN or CHNK
* - version 1.0 and KAL and not CLO
* - or version 1.1 and not CLO
* For the response it's the same except that UPG must not appear either.
* So in short, for a request it's (CLEN|CHNK) > 0 && !CLO && (VER_11 || KAL)
* and for a response it's (CLEN|CHNK) > 0 && !(CLO|UPG) && (VER_11 || KAL)
*/
/* basic HTTP/1 message state for use in parsers. The err_pos field is special,
* it is pre-set to a negative value (-1 or -2), and once non-negative it contains
* the relative position in the message of the first parse error. -2 is used to tell
* the parser that we want to block the invalid message. -1 is used to only perform
* a silent capture.
*/
struct h1m {
enum h1m_state state; // H1 message state (H1_MSG_*)
/* 24 bits available here */
uint32_t flags; // H1 message flags (H1_MF_*)
uint64_t curr_len; // content-length or last chunk length
uint64_t body_len; // total known size of the body length
uint32_t next; // next byte to parse, relative to buffer's head
int err_pos; // position in the byte stream of the first error (H1 or H2)
int err_state; // state where the first error was met (H1 or H2)
};
/* basic H1 start line, describes either the request and the response */
union h1_sl { /* useful start line pointers, relative to ->sol */
struct {
struct ist m; /* METHOD */
struct ist u; /* URI */
struct ist v; /* VERSION */
enum http_meth_t meth; /* method */
} rq; /* request line : field, length */
struct {
struct ist v; /* VERSION */
struct ist c; /* CODE */
struct ist r; /* REASON */
uint16_t status; /* status code */
} st; /* status line : field, length */
};
int h1_headers_to_hdr_list(char *start, const char *stop, int h1_headers_to_hdr_list(char *start, const char *stop,
struct http_hdr *hdr, unsigned int hdr_num, struct http_hdr *hdr, unsigned int hdr_num,
@ -244,4 +350,4 @@ static inline struct h1m *h1m_init_res(struct h1m *h1m)
return h1m; return h1m;
} }
#endif /* _PROTO_H1_H */ #endif /* _COMMON_H1_H */

133
include/types/h1.h
View File

@ -1,133 +0,0 @@
/*
* include/types/h1.h
* This file contains HTTP/1 protocol definitions.
*
* Copyright (C) 2000-2017 Willy Tarreau - w@1wt.eu
*
* 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 _TYPES_H1_H
#define _TYPES_H1_H
#include <common/http.h>
#include <common/ist.h>
/* Possible states while parsing HTTP/1 messages (request|response) */
enum h1m_state {
H1_MSG_RQBEFORE = 0, // request: leading LF, before start line
H1_MSG_RQBEFORE_CR = 1, // request: leading CRLF, before start line
/* these ones define a request start line */
H1_MSG_RQMETH = 2, // parsing the Method
H1_MSG_RQMETH_SP = 3, // space(s) after the Method
H1_MSG_RQURI = 4, // parsing the Request URI
H1_MSG_RQURI_SP = 5, // space(s) after the Request URI
H1_MSG_RQVER = 6, // parsing the Request Version
H1_MSG_RQLINE_END = 7, // end of request line (CR or LF)
H1_MSG_RPBEFORE = 8, // response: leading LF, before start line
H1_MSG_RPBEFORE_CR = 9, // response: leading CRLF, before start line
/* these ones define a response start line */
H1_MSG_RPVER = 10, // parsing the Response Version
H1_MSG_RPVER_SP = 11, // space(s) after the Response Version
H1_MSG_RPCODE = 12, // response code
H1_MSG_RPCODE_SP = 13, // space(s) after the response code
H1_MSG_RPREASON = 14, // response reason
H1_MSG_RPLINE_END = 15, // end of response line (CR or LF)
/* common header processing */
H1_MSG_HDR_FIRST = 16, // waiting for first header or last CRLF (no LWS possible)
H1_MSG_HDR_NAME = 17, // parsing header name
H1_MSG_HDR_COL = 18, // parsing header colon
H1_MSG_HDR_L1_SP = 19, // parsing header LWS (SP|HT) before value
H1_MSG_HDR_L1_LF = 20, // parsing header LWS (LF) before value
H1_MSG_HDR_L1_LWS = 21, // checking whether it's a new header or an LWS
H1_MSG_HDR_VAL = 22, // parsing header value
H1_MSG_HDR_L2_LF = 23, // parsing header LWS (LF) inside/after value
H1_MSG_HDR_L2_LWS = 24, // checking whether it's a new header or an LWS
H1_MSG_LAST_LF = 25, // parsing last LF, last state for headers
/* Body processing. */
H1_MSG_CHUNK_SIZE = 26, // parsing the chunk size (RFC7230 #4.1)
H1_MSG_DATA = 27, // skipping data chunk / content-length data
H1_MSG_CHUNK_CRLF = 28, // skipping CRLF after data chunk
H1_MSG_TRAILERS = 29, // trailers (post-data entity headers)
/* we enter this state when we've received the end of the current message */
H1_MSG_DONE = 30, // message end received, waiting for resync or close
H1_MSG_TUNNEL = 31, // tunneled data after DONE
} __attribute__((packed));
/* HTTP/1 message flags (32 bit), for use in h1m->flags only */
#define H1_MF_NONE 0x00000000
#define H1_MF_CLEN 0x00000001 // content-length present
#define H1_MF_CHNK 0x00000002 // chunk present, exclusive with c-l
#define H1_MF_RESP 0x00000004 // this message is the response message
#define H1_MF_TOLOWER 0x00000008 // turn the header names to lower case
#define H1_MF_VER_11 0x00000010 // message indicates version 1.1 or above
#define H1_MF_CONN_CLO 0x00000020 // message contains "connection: close"
#define H1_MF_CONN_KAL 0x00000040 // message contains "connection: keep-alive"
#define H1_MF_CONN_UPG 0x00000080 // message contains "connection: upgrade"
#define H1_MF_XFER_LEN 0x00000100 // message xfer size can be determined
#define H1_MF_XFER_ENC 0x00000200 // transfer-encoding is present
#define H1_MF_NO_PHDR 0x00000400 // don't add pseudo-headers in the header list
/* Note: for a connection to be persistent, we need this for the request :
* - one of CLEN or CHNK
* - version 1.0 and KAL and not CLO
* - or version 1.1 and not CLO
* For the response it's the same except that UPG must not appear either.
* So in short, for a request it's (CLEN|CHNK) > 0 && !CLO && (VER_11 || KAL)
* and for a response it's (CLEN|CHNK) > 0 && !(CLO|UPG) && (VER_11 || KAL)
*/
/* basic HTTP/1 message state for use in parsers. The err_pos field is special,
* it is pre-set to a negative value (-1 or -2), and once non-negative it contains
* the relative position in the message of the first parse error. -2 is used to tell
* the parser that we want to block the invalid message. -1 is used to only perform
* a silent capture.
*/
struct h1m {
enum h1m_state state; // H1 message state (H1_MSG_*)
/* 24 bits available here */
uint32_t flags; // H1 message flags (H1_MF_*)
uint64_t curr_len; // content-length or last chunk length
uint64_t body_len; // total known size of the body length
uint32_t next; // next byte to parse, relative to buffer's head
int err_pos; // position in the byte stream of the first error (H1 or H2)
int err_state; // state where the first error was met (H1 or H2)
};
/* basic H1 start line, describes either the request and the response */
union h1_sl { /* useful start line pointers, relative to ->sol */
struct {
struct ist m; /* METHOD */
struct ist u; /* URI */
struct ist v; /* VERSION */
enum http_meth_t meth; /* method */
} rq; /* request line : field, length */
struct {
struct ist v; /* VERSION */
struct ist c; /* CODE */
struct ist r; /* REASON */
uint16_t status; /* status code */
} st; /* status line : field, length */
};
#endif /* _TYPES_H1_H */

2
src/h1.c
View File

@ -12,10 +12,10 @@
#include <ctype.h> #include <ctype.h>
#include <common/config.h> #include <common/config.h>
#include <common/h1.h>
#include <common/http-hdr.h> #include <common/http-hdr.h>
#include <proto/channel.h> #include <proto/channel.h>
#include <proto/h1.h>
#include <proto/hdr_idx.h> #include <proto/hdr_idx.h>
/* Parse the Content-Length header field of an HTTP/1 request. The function /* Parse the Content-Length header field of an HTTP/1 request. The function

2
src/http_fetch.c
View File

@ -21,6 +21,7 @@
#include <common/compat.h> #include <common/compat.h>
#include <common/config.h> #include <common/config.h>
#include <common/debug.h> #include <common/debug.h>
#include <common/h1.h>
#include <common/http.h> #include <common/http.h>
#include <common/htx.h> #include <common/htx.h>
#include <common/initcall.h> #include <common/initcall.h>
@ -32,7 +33,6 @@
#include <proto/arg.h> #include <proto/arg.h>
#include <proto/auth.h> #include <proto/auth.h>
#include <proto/h1.h>
#include <proto/hdr_idx.h> #include <proto/hdr_idx.h>
#include <proto/http_fetch.h> #include <proto/http_fetch.h>
#include <proto/http_htx.h> #include <proto/http_htx.h>

2
src/http_htx.c
View File

@ -12,10 +12,10 @@
#include <common/config.h> #include <common/config.h>
#include <common/cfgparse.h> #include <common/cfgparse.h>
#include <common/h1.h>
#include <common/http.h> #include <common/http.h>
#include <common/htx.h> #include <common/htx.h>
#include <proto/h1.h>
#include <proto/http_htx.h> #include <proto/http_htx.h>
struct buffer htx_err_chunks[HTTP_ERR_SIZE]; struct buffer htx_err_chunks[HTTP_ERR_SIZE];

2
src/mux_h1.c
View File

@ -11,6 +11,7 @@
*/ */
#include <common/cfgparse.h> #include <common/cfgparse.h>
#include <common/config.h> #include <common/config.h>
#include <common/h1.h>
#include <common/htx.h> #include <common/htx.h>
#include <common/initcall.h> #include <common/initcall.h>
@ -19,7 +20,6 @@
#include <types/session.h> #include <types/session.h>
#include <proto/connection.h> #include <proto/connection.h>
#include <proto/h1.h>
#include <proto/http_htx.h> #include <proto/http_htx.h>
#include <proto/log.h> #include <proto/log.h>
#include <proto/stream.h> #include <proto/stream.h>

2
src/mux_h2.c
View File

@ -12,6 +12,7 @@
#include <common/cfgparse.h> #include <common/cfgparse.h>
#include <common/config.h> #include <common/config.h>
#include <common/h1.h>
#include <common/h2.h> #include <common/h2.h>
#include <common/hpack-dec.h> #include <common/hpack-dec.h>
#include <common/hpack-enc.h> #include <common/hpack-enc.h>
@ -20,7 +21,6 @@
#include <common/initcall.h> #include <common/initcall.h>
#include <common/net_helper.h> #include <common/net_helper.h>
#include <proto/connection.h> #include <proto/connection.h>
#include <proto/h1.h>
#include <proto/http_htx.h> #include <proto/http_htx.h>
#include <proto/stream.h> #include <proto/stream.h>
#include <types/session.h> #include <types/session.h>

2
src/proto_http.c
View File

@ -29,6 +29,7 @@
#include <common/compat.h> #include <common/compat.h>
#include <common/config.h> #include <common/config.h>
#include <common/debug.h> #include <common/debug.h>
#include <common/h1.h>
#include <common/memory.h> #include <common/memory.h>
#include <common/mini-clist.h> #include <common/mini-clist.h>
#include <common/standard.h> #include <common/standard.h>
@ -57,7 +58,6 @@
#include <proto/fd.h> #include <proto/fd.h>
#include <proto/filters.h> #include <proto/filters.h>
#include <proto/frontend.h> #include <proto/frontend.h>
#include <proto/h1.h>
#include <proto/log.h> #include <proto/log.h>
#include <proto/hdr_idx.h> #include <proto/hdr_idx.h>
#include <proto/hlua.h> #include <proto/hlua.h>