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

MINOR: checks: Add the alpn option for tcp-check connect rules

Browse Source 
This option defines which protocols to advertise with ALPN on the SSL conection
opened by a tcp-check connect rule.
This commit is contained in:
Christopher Faulet 2020-03-30 13:16:44 +02:00
parent 085426aea9
commit 9857232c9f
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/configuration.txt
View File

@ -9830,6 +9830,11 @@ tcp-check connect [params*]
sni <sni> specifies the SNI to use to do health checks over SSL. sni <sni> specifies the SNI to use to do health checks over SSL.
alpn <alpn> defines which protocols to advertise with ALPN. The protocol
list consists in a comma-delimited list of protocol names,
for instance: "http/1.1,http/1.0" (without quotes).
If it is not set, the server ALPN is used.
linger cleanly close the connection instead of using a single RST. linger cleanly close the connection instead of using a single RST.
Examples: Examples:

25
src/checks.c
View File

@ -2920,6 +2920,9 @@ static enum tcpcheck_eval_ret tcpcheck_eval_connect(struct check *check, struct
if (status == SF_ERR_NONE) { if (status == SF_ERR_NONE) {
if (connect->sni) if (connect->sni)
ssl_sock_set_servername(conn, connect->sni); ssl_sock_set_servername(conn, connect->sni);
if (connect->alpn)
ssl_sock_set_alpn(conn, (unsigned char *)connect->alpn,
connect->alpn_len);
} }
#endif #endif
if ((connect->options & TCPCHK_OPT_SOCKS4) && (s->flags & SRV_F_SOCKS4_PROXY)) { if ((connect->options & TCPCHK_OPT_SOCKS4) && (s->flags & SRV_F_SOCKS4_PROXY)) {
@ -3455,6 +3458,7 @@ static void free_tcpcheck(struct tcpcheck_rule *rule, int in_pool)
break; break;
case TCPCHK_ACT_CONNECT: case TCPCHK_ACT_CONNECT:
free(rule->connect.sni); free(rule->connect.sni);
free(rule->connect.alpn);
break; break;
case TCPCHK_ACT_COMMENT: case TCPCHK_ACT_COMMENT:
break; break;
@ -4077,9 +4081,10 @@ static struct tcpcheck_rule *parse_tcpcheck_connect(char **args, int cur_arg, st
char **errmsg) char **errmsg)
{ {
struct tcpcheck_rule *chk = NULL; struct tcpcheck_rule *chk = NULL;
char *comment = NULL, *sni = NULL; char *comment = NULL, *sni = NULL, *alpn = NULL;
unsigned short conn_opts = 0; unsigned short conn_opts = 0;
long port = 0; long port = 0;
int alpn_len = 0;
list_for_each_entry(chk, rules, list) { list_for_each_entry(chk, rules, list) {
if (chk->action != TCPCHK_ACT_COMMENT && chk->action != TCPCHK_ACT_ACTION_KW) if (chk->action != TCPCHK_ACT_COMMENT && chk->action != TCPCHK_ACT_ACTION_KW)
@ -4143,12 +4148,25 @@ static struct tcpcheck_rule *parse_tcpcheck_connect(char **args, int cur_arg, st
goto error; goto error;
} }
} }
else if (strcmp(args[cur_arg], "alpn") == 0) {
#ifdef TLSEXT_TYPE_application_layer_protocol_negotiation
free(alpn);
if (ssl_sock_parse_alpn(args[cur_arg + 1], &alpn, &alpn_len, errmsg)) {
memprintf(errmsg, "'%s' : %s", args[cur_arg], *errmsg);
goto error;
}
cur_arg++;
#else
memprintf(errmsg, "'%s' : library does not support TLS ALPN extension.", args[cur_arg]);
goto error;
#endif
}
#endif /* USE_OPENSSL */ #endif /* USE_OPENSSL */
else { else {
memprintf(errmsg, "expects 'comment', 'port', 'send-proxy'" memprintf(errmsg, "expects 'comment', 'port', 'send-proxy'"
#ifdef USE_OPENSSL #ifdef USE_OPENSSL
", 'ssl', 'sni'" ", 'ssl', 'sni', 'alpn'"
#endif /* USE_OPENSSL */ #endif /* USE_OPENSSL */
" or 'via-socks4', 'linger' but got '%s' as argument.", " or 'via-socks4', 'linger' but got '%s' as argument.",
args[cur_arg]); args[cur_arg]);
@ -4167,9 +4185,12 @@ static struct tcpcheck_rule *parse_tcpcheck_connect(char **args, int cur_arg, st
chk->connect.port = port; chk->connect.port = port;
chk->connect.options = conn_opts; chk->connect.options = conn_opts;
chk->connect.sni = sni; chk->connect.sni = sni;
chk->connect.alpn = alpn;
chk->connect.alpn_len= alpn_len;
return chk; return chk;
error: error:
free(alpn);
free(sni); free(sni);
free(comment); free(comment);
return NULL; return NULL;