mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 14:21:25 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: http-ana: Add a txn flag to support soft/strict message rewrites

Browse Source 
the HTTP_MSGF_SOFT_RW flag must now be set on the HTTP transaction to ignore
rewrite errors on a message, from HTTP rules. The mode is called the soft
rewrites. If thes flag is not set, strict rewrites are performed. In this mode,
if a rewrite error occurred, an internal error is reported.

For now, HTTP_MSGF_SOFT_RW is always set and there is no way to switch a
transaction in strict mode.
This commit is contained in:
Christopher Faulet 2019-12-12 16:41:00 +01:00
parent cff0f739e5
commit a00071e2e5
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/types/http_ana.h
View File

@ -87,7 +87,7 @@
#define HTTP_MSGF_XFER_LEN 0x00000004 /* message xfer size can be determined */ #define HTTP_MSGF_XFER_LEN 0x00000004 /* message xfer size can be determined */
#define HTTP_MSGF_VER_11 0x00000008 /* the message is HTTP/1.1 or above */ #define HTTP_MSGF_VER_11 0x00000008 /* the message is HTTP/1.1 or above */
/* unused: 0x00000010 */ #define HTTP_MSGF_SOFT_RW 0x00000010 /* soft header rewrites, no error triggered */
#define HTTP_MSGF_COMPRESSING 0x00000020 /* data compression is in progress */ #define HTTP_MSGF_COMPRESSING 0x00000020 /* data compression is in progress */

14
src/http_ana.c
View File

@ -3066,6 +3066,11 @@ static enum rule_result http_req_get_intercept_rule(struct proxy *px, struct lis
_HA_ATOMIC_ADD(&s->be->be_counters.failed_rewrites, 1); _HA_ATOMIC_ADD(&s->be->be_counters.failed_rewrites, 1);
if (sess->listener->counters) if (sess->listener->counters)
_HA_ATOMIC_ADD(&sess->listener->counters->failed_rewrites, 1); _HA_ATOMIC_ADD(&sess->listener->counters->failed_rewrites, 1);
if (!(txn->req.flags & HTTP_MSGF_SOFT_RW)) {
rule_ret = HTTP_RULE_RES_ERROR;
goto end;
}
} }
free_trash_chunk(replace); free_trash_chunk(replace);
break; break;
@ -3426,6 +3431,11 @@ resume_execution:
_HA_ATOMIC_ADD(&sess->listener->counters->failed_rewrites, 1); _HA_ATOMIC_ADD(&sess->listener->counters->failed_rewrites, 1);
if (objt_server(s->target)) if (objt_server(s->target))
_HA_ATOMIC_ADD(&__objt_server(s->target)->counters.failed_rewrites, 1); _HA_ATOMIC_ADD(&__objt_server(s->target)->counters.failed_rewrites, 1);
if (!(txn->rsp.flags & HTTP_MSGF_SOFT_RW)) {
rule_ret = HTTP_RULE_RES_ERROR;
goto end;
}
} }
free_trash_chunk(replace); free_trash_chunk(replace);
break; break;
@ -5535,13 +5545,13 @@ struct http_txn *http_alloc_txn(struct stream *s)
void http_txn_reset_req(struct http_txn *txn) void http_txn_reset_req(struct http_txn *txn)
{ {
txn->req.flags = 0; txn->req.flags = HTTP_MSGF_SOFT_RW;
txn->req.msg_state = HTTP_MSG_RQBEFORE; /* at the very beginning of the request */ txn->req.msg_state = HTTP_MSG_RQBEFORE; /* at the very beginning of the request */
} }
void http_txn_reset_res(struct http_txn *txn) void http_txn_reset_res(struct http_txn *txn)
{ {
txn->rsp.flags = 0; txn->rsp.flags = HTTP_MSGF_SOFT_RW;
txn->rsp.msg_state = HTTP_MSG_RPBEFORE; /* at the very beginning of the response */ txn->rsp.msg_state = HTTP_MSG_RPBEFORE; /* at the very beginning of the response */
} }