From: Christopher Faulet <cfaulet@haproxy.com>
Date: Wed, 3 Sep 2025 12:45:07 +0000 (+0200)
Subject: MINOR: server: Parse sni and pool-conn-name expressions in a dedicated function
X-Git-Tag: v3.0.12~15
X-Git-Url: http://git.haproxy.org/?a=commitdiff_plain;h=262a7bfccc0c9731af7a5d652b457eb4dbf20fa7;p=haproxy-3.0.git

MINOR: server: Parse sni and pool-conn-name expressions in a dedicated function

This change is mandatory to fix an issue. The parsing of sni and
pool-conn-name expressions (from string to expression) is now handled in a
dedicated function. This will avoid to duplicate the same code at different
places.

(cherry picked from commit 086a248645c8edca681adba50b34d9970e455a98)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
(cherry picked from commit 79a6520cea23728ebcb138612bec1d077fd64cca)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
(cherry picked from commit c2a750108a2a1f0fe78e484bc103416ba879051a)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
---

diff --git a/src/server.c b/src/server.c
index c7fa089..9daca06 100644
--- a/src/server.c
+++ b/src/server.c
@@ -3147,6 +3147,38 @@ static inline void _srv_parse_set_id_from_prefix(struct server *srv,
 	srv->id = strdup(trash.area);
 }
 
+/* Parse the sni and pool-conn-name expressions. Returns 0 on success and non-zero on
+ * error. */
+static inline int _srv_parse_exprs(struct server *srv, struct proxy *px, char **errmsg)
+{
+	int ret = 0;
+
+	/* Use sni as fallback if pool_conn_name isn't set */
+	if (!srv->pool_conn_name && srv->sni_expr) {
+		srv->pool_conn_name = strdup(srv->sni_expr);
+		if (!srv->pool_conn_name) {
+			memprintf(errmsg, "cannot duplicate sni expression (out of memory)");
+			ret = ERR_ALERT | ERR_FATAL;
+			goto out;
+		}
+	}
+
+	if (srv->sni_expr) {
+		ret = parse_srv_expr(srv->sni_expr, &srv->ssl_ctx.sni, px, errmsg);
+		if (ret)
+			goto out;
+	}
+
+	if (srv->pool_conn_name) {
+		ret = parse_srv_expr(srv->pool_conn_name, &srv->pool_conn_name_expr, px, errmsg);
+		if (ret)
+			goto out;
+	}
+
+  out:
+	return ret;
+}
+
 /* Initialize as much as possible servers from <srv> server template.
  * Note that a server template is a special server with
  * a few different parameters than a server which has
@@ -3180,24 +3212,8 @@ static int _srv_parse_tmpl_init(struct server *srv, struct proxy *px)
 		srv_settings_cpy(newsrv, srv, 1);
 		srv_prepare_for_resolution(newsrv, srv->hostname);
 
-		/* Use sni as fallback if pool_conn_name isn't set */
-		if (!newsrv->pool_conn_name && newsrv->sni_expr) {
-			newsrv->pool_conn_name = strdup(newsrv->sni_expr);
-			if (!newsrv->pool_conn_name)
-				goto err;
-		}
-
-		if (newsrv->pool_conn_name) {
-			newsrv->pool_conn_name_expr = _parse_srv_expr(srv->pool_conn_name, &px->conf.args, NULL, 0, NULL);
-			if (!newsrv->pool_conn_name_expr)
-				goto err;
-		}
-
-		if (newsrv->sni_expr) {
-			newsrv->ssl_ctx.sni = _parse_srv_expr(srv->sni_expr, &px->conf.args, NULL, 0, NULL);
-			if (!newsrv->ssl_ctx.sni)
-				goto err;
-		}
+	        if (_srv_parse_exprs(newsrv, px, NULL))
+			goto err;
 
 		/* append to list of servers available to receive an hostname */
 		if (newsrv->srvrq)
@@ -3613,27 +3629,9 @@ static int _srv_parse_finalize(char **args, int cur_arg,
 		return ERR_ALERT | ERR_FATAL;
 	}
 
-	if ((ret = parse_srv_expr(srv->sni_expr, &srv->ssl_ctx.sni, px, &errmsg))) {
-		if (errmsg) {
-			ha_alert("error detected while parsing sni expression : %s.\n", errmsg);
-			free(errmsg);
-		}
-		return ret;
-	}
-
-	/* Use sni as fallback if pool_conn_name isn't set */
-	if (!srv->pool_conn_name && srv->sni_expr) {
-		srv->pool_conn_name = strdup(srv->sni_expr);
-		if (!srv->pool_conn_name) {
-			ha_alert("out of memory\n");
-			return ERR_ALERT | ERR_FATAL;
-		}
-	}
-
-	if ((ret = parse_srv_expr(srv->pool_conn_name, &srv->pool_conn_name_expr,
-	                          px, &errmsg))) {
+	if ((ret = _srv_parse_exprs(srv, px, &errmsg))) {
 		if (errmsg) {
-			ha_alert("error detected while parsing pool-conn-name expression : %s.\n", errmsg);
+			ha_alert("error detected while parsing sni or pool-conn-name expressions : %s.\n", errmsg);
 			free(errmsg);
 		}
 		return ret;