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

BUG/MINOR: ssl-samples: Fix ssl_bc_* samples when called from a health-check

Browse Source 
For all ssl_bc_* sample fetches, the test on the keyword when called from a
health-check is inverted. We must be sure the 5th charater is a 'b' to
retrieve a connection.

This patch must be backported as far as 2.2.
This commit is contained in:
Christopher Faulet 2021-04-14 15:49:41 +02:00
parent 242f8ce060
commit 4bef8d1d46
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/ssl_sample.c
View File

@ -743,7 +743,7 @@ smp_fetch_ssl_fc(const struct arg *args, struct sample *smp, const char *kw, voi
struct connection *conn; struct connection *conn;
if (obj_type(smp->sess->origin) == OBJ_TYPE_CHECK) if (obj_type(smp->sess->origin) == OBJ_TYPE_CHECK)
conn = (kw[4] != 'b') ? cs_conn(__objt_check(smp->sess->origin)->cs) : NULL; conn = (kw[4] == 'b') ? cs_conn(__objt_check(smp->sess->origin)->cs) : NULL;
else else
conn = (kw[4] != 'b') ? objt_conn(smp->sess->origin) : conn = (kw[4] != 'b') ? objt_conn(smp->sess->origin) :
smp->strm ? cs_conn(objt_cs(smp->strm->si[1].end)) : NULL; smp->strm ? cs_conn(objt_cs(smp->strm->si[1].end)) : NULL;
@ -780,7 +780,7 @@ smp_fetch_ssl_fc_is_resumed(const struct arg *args, struct sample *smp, const ch
SSL *ssl; SSL *ssl;
if (obj_type(smp->sess->origin) == OBJ_TYPE_CHECK) if (obj_type(smp->sess->origin) == OBJ_TYPE_CHECK)
conn = (kw[4] != 'b') ? cs_conn(__objt_check(smp->sess->origin)->cs) : NULL; conn = (kw[4] == 'b') ? cs_conn(__objt_check(smp->sess->origin)->cs) : NULL;
else else
conn = (kw[4] != 'b') ? objt_conn(smp->sess->origin) : conn = (kw[4] != 'b') ? objt_conn(smp->sess->origin) :
smp->strm ? cs_conn(objt_cs(smp->strm->si[1].end)) : NULL; smp->strm ? cs_conn(objt_cs(smp->strm->si[1].end)) : NULL;
@ -803,7 +803,7 @@ smp_fetch_ssl_fc_cipher(const struct arg *args, struct sample *smp, const char *
SSL *ssl; SSL *ssl;
if (obj_type(smp->sess->origin) == OBJ_TYPE_CHECK) if (obj_type(smp->sess->origin) == OBJ_TYPE_CHECK)
conn = (kw[4] != 'b') ? cs_conn(__objt_check(smp->sess->origin)->cs) : NULL; conn = (kw[4] == 'b') ? cs_conn(__objt_check(smp->sess->origin)->cs) : NULL;
else else
conn = (kw[4] != 'b') ? objt_conn(smp->sess->origin) : conn = (kw[4] != 'b') ? objt_conn(smp->sess->origin) :
smp->strm ? cs_conn(objt_cs(smp->strm->si[1].end)) : NULL; smp->strm ? cs_conn(objt_cs(smp->strm->si[1].end)) : NULL;
@ -837,7 +837,7 @@ smp_fetch_ssl_fc_alg_keysize(const struct arg *args, struct sample *smp, const c
int sint; int sint;
if (obj_type(smp->sess->origin) == OBJ_TYPE_CHECK) if (obj_type(smp->sess->origin) == OBJ_TYPE_CHECK)
conn = (kw[4] != 'b') ? cs_conn(__objt_check(smp->sess->origin)->cs) : NULL; conn = (kw[4] == 'b') ? cs_conn(__objt_check(smp->sess->origin)->cs) : NULL;
else else
conn = (kw[4] != 'b') ? objt_conn(smp->sess->origin) : conn = (kw[4] != 'b') ? objt_conn(smp->sess->origin) :
smp->strm ? cs_conn(objt_cs(smp->strm->si[1].end)) : NULL; smp->strm ? cs_conn(objt_cs(smp->strm->si[1].end)) : NULL;
@ -868,7 +868,7 @@ smp_fetch_ssl_fc_use_keysize(const struct arg *args, struct sample *smp, const c
SSL *ssl; SSL *ssl;
if (obj_type(smp->sess->origin) == OBJ_TYPE_CHECK) if (obj_type(smp->sess->origin) == OBJ_TYPE_CHECK)
conn = (kw[4] != 'b') ? cs_conn(__objt_check(smp->sess->origin)->cs) : NULL; conn = (kw[4] == 'b') ? cs_conn(__objt_check(smp->sess->origin)->cs) : NULL;
else else
conn = (kw[4] != 'b') ? objt_conn(smp->sess->origin) : conn = (kw[4] != 'b') ? objt_conn(smp->sess->origin) :
smp->strm ? cs_conn(objt_cs(smp->strm->si[1].end)) : NULL; smp->strm ? cs_conn(objt_cs(smp->strm->si[1].end)) : NULL;
@ -900,7 +900,7 @@ smp_fetch_ssl_fc_npn(const struct arg *args, struct sample *smp, const char *kw,
smp->data.type = SMP_T_STR; smp->data.type = SMP_T_STR;
if (obj_type(smp->sess->origin) == OBJ_TYPE_CHECK) if (obj_type(smp->sess->origin) == OBJ_TYPE_CHECK)
conn = (kw[4] != 'b') ? cs_conn(__objt_check(smp->sess->origin)->cs) : NULL; conn = (kw[4] == 'b') ? cs_conn(__objt_check(smp->sess->origin)->cs) : NULL;
else else
conn = (kw[4] != 'b') ? objt_conn(smp->sess->origin) : conn = (kw[4] != 'b') ? objt_conn(smp->sess->origin) :
smp->strm ? cs_conn(objt_cs(smp->strm->si[1].end)) : NULL; smp->strm ? cs_conn(objt_cs(smp->strm->si[1].end)) : NULL;
@ -935,7 +935,7 @@ smp_fetch_ssl_fc_alpn(const struct arg *args, struct sample *smp, const char *kw
smp->data.type = SMP_T_STR; smp->data.type = SMP_T_STR;
if (obj_type(smp->sess->origin) == OBJ_TYPE_CHECK) if (obj_type(smp->sess->origin) == OBJ_TYPE_CHECK)
conn = (kw[4] != 'b') ? cs_conn(__objt_check(smp->sess->origin)->cs) : NULL; conn = (kw[4] == 'b') ? cs_conn(__objt_check(smp->sess->origin)->cs) : NULL;
else else
conn = (kw[4] != 'b') ? objt_conn(smp->sess->origin) : conn = (kw[4] != 'b') ? objt_conn(smp->sess->origin) :
smp->strm ? cs_conn(objt_cs(smp->strm->si[1].end)) : NULL; smp->strm ? cs_conn(objt_cs(smp->strm->si[1].end)) : NULL;
@ -968,7 +968,7 @@ smp_fetch_ssl_fc_protocol(const struct arg *args, struct sample *smp, const char
SSL *ssl; SSL *ssl;
if (obj_type(smp->sess->origin) == OBJ_TYPE_CHECK) if (obj_type(smp->sess->origin) == OBJ_TYPE_CHECK)
conn = (kw[4] != 'b') ? cs_conn(__objt_check(smp->sess->origin)->cs) : NULL; conn = (kw[4] == 'b') ? cs_conn(__objt_check(smp->sess->origin)->cs) : NULL;
else else
conn = (kw[4] != 'b') ? objt_conn(smp->sess->origin) : conn = (kw[4] != 'b') ? objt_conn(smp->sess->origin) :
smp->strm ? cs_conn(objt_cs(smp->strm->si[1].end)) : NULL; smp->strm ? cs_conn(objt_cs(smp->strm->si[1].end)) : NULL;
@ -1006,7 +1006,7 @@ smp_fetch_ssl_fc_session_id(const struct arg *args, struct sample *smp, const ch
smp->data.type = SMP_T_BIN; smp->data.type = SMP_T_BIN;
if (obj_type(smp->sess->origin) == OBJ_TYPE_CHECK) if (obj_type(smp->sess->origin) == OBJ_TYPE_CHECK)
conn = (kw[4] != 'b') ? cs_conn(__objt_check(smp->sess->origin)->cs) : NULL; conn = (kw[4] == 'b') ? cs_conn(__objt_check(smp->sess->origin)->cs) : NULL;
else else
conn = (kw[4] != 'b') ? objt_conn(smp->sess->origin) : conn = (kw[4] != 'b') ? objt_conn(smp->sess->origin) :
smp->strm ? cs_conn(objt_cs(smp->strm->si[1].end)) : NULL; smp->strm ? cs_conn(objt_cs(smp->strm->si[1].end)) : NULL;
@ -1038,7 +1038,7 @@ smp_fetch_ssl_fc_random(const struct arg *args, struct sample *smp, const char *
SSL *ssl; SSL *ssl;
if (obj_type(smp->sess->origin) == OBJ_TYPE_CHECK) if (obj_type(smp->sess->origin) == OBJ_TYPE_CHECK)
conn = (kw[4] != 'b') ? cs_conn(__objt_check(smp->sess->origin)->cs) : NULL; conn = (kw[4] == 'b') ? cs_conn(__objt_check(smp->sess->origin)->cs) : NULL;
else else
conn = (kw[4] != 'b') ? objt_conn(smp->sess->origin) : conn = (kw[4] != 'b') ? objt_conn(smp->sess->origin) :
smp->strm ? cs_conn(objt_cs(smp->strm->si[1].end)) : NULL; smp->strm ? cs_conn(objt_cs(smp->strm->si[1].end)) : NULL;
@ -1075,7 +1075,7 @@ smp_fetch_ssl_fc_session_key(const struct arg *args, struct sample *smp, const c
SSL *ssl; SSL *ssl;
if (obj_type(smp->sess->origin) == OBJ_TYPE_CHECK) if (obj_type(smp->sess->origin) == OBJ_TYPE_CHECK)
conn = (kw[4] != 'b') ? cs_conn(__objt_check(smp->sess->origin)->cs) : NULL; conn = (kw[4] == 'b') ? cs_conn(__objt_check(smp->sess->origin)->cs) : NULL;
else else
conn = (kw[4] != 'b') ? objt_conn(smp->sess->origin) : conn = (kw[4] != 'b') ? objt_conn(smp->sess->origin) :
smp->strm ? cs_conn(objt_cs(smp->strm->si[1].end)) : NULL; smp->strm ? cs_conn(objt_cs(smp->strm->si[1].end)) : NULL;
@ -1293,7 +1293,7 @@ smp_fetch_ssl_fc_unique_id(const struct arg *args, struct sample *smp, const cha
SSL *ssl; SSL *ssl;
if (obj_type(smp->sess->origin) == OBJ_TYPE_CHECK) if (obj_type(smp->sess->origin) == OBJ_TYPE_CHECK)
conn = (kw[4] != 'b') ? cs_conn(__objt_check(smp->sess->origin)->cs) : NULL; conn = (kw[4] == 'b') ? cs_conn(__objt_check(smp->sess->origin)->cs) : NULL;
else else
conn = (kw[4] != 'b') ? objt_conn(smp->sess->origin) : conn = (kw[4] != 'b') ? objt_conn(smp->sess->origin) :
smp->strm ? cs_conn(objt_cs(smp->strm->si[1].end)) : NULL; smp->strm ? cs_conn(objt_cs(smp->strm->si[1].end)) : NULL;