RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-02-03 20:13:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MEDIUM: stick: completely remove the unused flag from the store entries

Browse Source 
The store[] array in the session holds a flag which probably aimed to
differenciate store entries learned from the request from those learned
from the response, and allowing responses to overwrite only the request
ones (eg: have a server set a response cookie which overwrites the request
one).

But this flag is set when a response data is stored, and is never cleared.
So in practice, haproxy always runs with this flag set, meaning that
responses prevent themselves from overriding the request data.

It is desirable anyway to keep the ability not to override data, because
the override is performed only based on the table and not on the key, so
that would mean that it would be impossible to retrieve two different
keys to store into a same table. For example, if a client sets a cookie
and a server another one, both need to be updated in the table in the
proper order. This is especially true when multiple keys may be tracked
on each side into the same table (eg: list of IP addresses in a header).

So the correct fix which also maintains the current behaviour consists in
simply removing this flag and never try to optimize for the overwrite case.

This fix also has the benefit of significantly reducing the session size,
by 64 bytes due to alignment issues caused by this flag!

The bug has been there forever (since 1.4-dev7), so a backport to 1.4
would be appropriate.
This commit is contained in:
Willy Tarreau 2013-12-06 23:05:21 +01:00
parent fbe0edf057
commit 37e340ce4b
2 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/types/session.h
View File

@ -144,7 +144,6 @@ struct session {
struct { struct {
struct stksess *ts; struct stksess *ts;
struct stktable *table; struct stktable *table;
int flags;
} store[8]; /* tracked stickiness values to store */ } store[8]; /* tracked stickiness values to store */
int store_count; int store_count;

19
src/session.c
View File

@ -1459,18 +1459,6 @@ static int process_store_rules(struct session *s, struct channel *rep, int an_bi
list_for_each_entry(rule, &px->storersp_rules, list) { list_for_each_entry(rule, &px->storersp_rules, list) {
int ret = 1 ; int ret = 1 ;
int storereqidx = -1;
for (i = 0; i < s->store_count; i++) {
if (rule->table.t == s->store[i].table) {
if (!(s->store[i].flags))
storereqidx = i;
break;
}
}
if ((i != s->store_count) && (storereqidx == -1))
continue;
if (rule->cond) { if (rule->cond) {
ret = acl_exec_cond(rule->cond, px, s, &s->txn, SMP_OPT_DIR_RES|SMP_OPT_FINAL); ret = acl_exec_cond(rule->cond, px, s, &s->txn, SMP_OPT_DIR_RES|SMP_OPT_FINAL);
@ -1486,17 +1474,12 @@ static int process_store_rules(struct session *s, struct channel *rep, int an_bi
if (!key) if (!key)
continue; continue;
if (storereqidx != -1) { if (s->store_count < (sizeof(s->store) / sizeof(s->store[0]))) {
stksess_setkey(s->store[storereqidx].table, s->store[storereqidx].ts, key);
s->store[storereqidx].flags = 1;
}
else if (s->store_count < (sizeof(s->store) / sizeof(s->store[0]))) {
struct stksess *ts; struct stksess *ts;
ts = stksess_new(rule->table.t, key); ts = stksess_new(rule->table.t, key);
if (ts) { if (ts) {
s->store[s->store_count].table = rule->table.t; s->store[s->store_count].table = rule->table.t;
s->store[s->store_count].flags = 1;
s->store[s->store_count++].ts = ts; s->store[s->store_count++].ts = ts;
} }
} }