commit 067a82bba14171b34036e8f1e2705d33055dbd04
author Frédéric Lécaille <flecaille@haproxy.com> Fri Nov 19 17:02:20 2021 +0100
committer Frédéric Lécaille <flecaille@haproxy.com> Tue Nov 30 11:47:46 2021 +0100
tree f91c244da1111a33021e4b5234cbd3c65fac2c7d
parent 3cc1e3d5ca9b0429f4f1e6618c4fbabac0cfb38b

MINOR: quic: Set "no_application_protocol" alert

We set this TLS error when no application protocol could be negotiated
via the TLS callback concerned. It is converted as a QUIC CRYPTO_ERROR
error (0x178).

include/haproxy/xprt_quic-t.h

diff --git a/include/haproxy/xprt_quic-t.h b/include/haproxy/xprt_quic-t.h
index 91188c3..7ac87e7 100644
--- a/include/haproxy/xprt_quic-t.h
+++ b/include/haproxy/xprt_quic-t.h
@@ -618,7 +618,8 @@
 #define QUIC_FL_PKTNS_ACK_REQUIRED_BIT 0
 #define QUIC_FL_PKTNS_ACK_REQUIRED  (1UL << QUIC_FL_PKTNS_ACK_REQUIRED_BIT)
 
-#define QUIC_FL_CONN_ANTI_AMPLIFICATION_REACHED (1UL << 1)
+#define QUIC_FL_CONN_ANTI_AMPLIFICATION_REACHED (1U << 1)
+#define QUIC_FL_CONN_IMMEDIATE_CLOSE            (1U << 31)
 struct quic_conn {
 	uint32_t version;
 	/* QUIC transport parameters TLS extension */

include/haproxy/xprt_quic.h

diff --git a/include/haproxy/xprt_quic.h b/include/haproxy/xprt_quic.h
index 018b304..14f1de2 100644
--- a/include/haproxy/xprt_quic.h
+++ b/include/haproxy/xprt_quic.h
@@ -1104,7 +1104,9 @@
 		pool_free(pool_head_quic_tx_packet, pkt);
 }
 
+void quic_set_tls_alert(struct quic_conn *qc, int alert);
 ssize_t quic_lstnr_dgram_read(struct buffer *buf, size_t len, void *owner,
                               struct sockaddr_storage *saddr);
+
 #endif /* USE_QUIC */
 #endif /* _HAPROXY_XPRT_QUIC_H */

src/ssl_sock.c

diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index e3e3abf..ffbfa50 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -1977,6 +1977,12 @@
 
 	if (SSL_select_next_proto((unsigned char**) out, outlen, (const unsigned char *)conf->alpn_str,
 	                          conf->alpn_len, server, server_len) != OPENSSL_NPN_NEGOTIATED) {
+#ifdef USE_QUIC
+		struct connection *conn = SSL_get_ex_data(s, ssl_app_data_index);
+
+		if (conn->qc)
+			quic_set_tls_alert(conn->qc, SSL_AD_NO_APPLICATION_PROTOCOL);
+#endif
 		return SSL_TLSEXT_ERR_NOACK;
 	}
 	return SSL_TLSEXT_ERR_OK;

src/xprt_quic.c

diff --git a/src/xprt_quic.c b/src/xprt_quic.c
index d2b8aae..6e21cdb 100644
--- a/src/xprt_quic.c
+++ b/src/xprt_quic.c
@@ -885,6 +885,14 @@
 }
 
 
+/* Set <alert> TLS alert as QUIC CRYPTO_ERROR error */
+void quic_set_tls_alert(struct quic_conn *qc, int alert)
+{
+	HA_ATOMIC_STORE(&qc->err, QC_ERR_CRYPTO_ERROR | alert);
+	HA_ATOMIC_OR(&qc->flags, QUIC_FL_CONN_IMMEDIATE_CLOSE);
+	TRACE_PROTO("Alert set", QUIC_EV_CONN_SSLDATA, qc->conn);
+}
+
 /* ->add_handshake_data QUIC TLS callback used by the QUIC TLS stack when it
  * wants to provide the QUIC layer with CRYPTO data.
  * Returns 1 if succeeded, 0 if not.
@@ -937,7 +945,7 @@
 	struct connection *conn = SSL_get_ex_data(ssl, ssl_app_data_index);
 
 	TRACE_DEVEL("SSL alert", QUIC_EV_CONN_SSLALERT, conn, &alert, &level);
-	HA_ATOMIC_STORE(&conn->qc->err, QC_ERR_CRYPTO_ERROR | alert);
+	quic_set_tls_alert(conn->qc, alert);
 	return 1;
 }
 
@@ -1694,7 +1702,8 @@
 		/* TODO RFC9001 8.1. Protocol Negotiation
 		 * must return no_application_protocol TLS alert
 		 */
-		ABORT_NOW();
+		TRACE_PROTO("No matching ALPN", QUIC_EV_CONN_SSLDATA, ctx->conn);
+		goto err;
 	}
 
  out: