tlshd: Match ingress certificates with defined TLS session tags

TLS session tags are defined in /etc/tlshd/tags.d. Each tag one or
more filter expressions that match against fields in the x.509
certificate presented by a client peer.

When a handshake is successful, tlshd parses the peer's certificate
and applies the filters to the fields in the certificate. When the
tag's set of filters all match, the tag's name is added to the tag
list for the session.

A subsequent patch will pass the list to the kernel upon handshake
completion.

Suggested-by: Benjamin Coddington <[email protected]>
Signed-off-by: Chuck Lever <[email protected]>

Author: chucklever

configure.ac

@@ -82,6 +82,10 @@ AC_CHECK_LIB([gnutls], [gnutls_get_system_config_file],
 AC_CHECK_LIB([gnutls], [gnutls_psk_allocate_client_credentials2],
              [AC_DEFINE([HAVE_GNUTLS_PSK_ALLOCATE_CREDENTIALS2], [1],
                         [Define to 1 if you have the gnutls_psk_allocate_client_credentials2 function.])])
+AC_CHECK_LIB([glib-2.0], [g_pattern_spec_match],
+             [AC_DEFINE([HAVE_GLIB_G_PATTERN_SPEC_MATCH], [1],
+                        [Define to 1 if you have the g_pattern_spec_match function.])])
+
 AC_SUBST([AM_CPPFLAGS])
 
 AC_CONFIG_FILES([Makefile src/Makefile src/tlshd/Makefile src/tlshd/etc/Makefile systemd/Makefile])

src/tlshd/server.c

@@ -313,6 +313,8 @@ static void tlshd_tls13_server_x509_handshake(struct tlshd_handshake_parms *parm
 		}
 	}
 
+	tlsdh_tags_x509_match_session(session);
+
 	gnutls_deinit(session);
 
 out_free_certs:

src/tlshd/tags.c

@@ -1006,3 +1006,238 @@ void tlshd_tags_shutdown(void)
 				    NULL);
 	g_ptr_array_free(tlshd_tags_filter_all, TRUE);
 }
+
+static bool tlshd_tags_x509_match_subject(struct tlshd_tags_filter *filter,
+					  gnutls_x509_crt_t *cert)
+{
+	gnutls_datum_t dn;
+	int ret;
+
+	ret = gnutls_x509_crt_get_dn3(*cert, &dn, 0);
+	if (ret != GNUTLS_E_SUCCESS) {
+		tlshd_log_gnutls_error(ret);
+		return false;
+	}
+
+	/* XXX: Do we need to consult filter->fi_match_type here ? */
+
+#ifdef HAVE_GLIB_G_PATTERN_SPEC_MATCH
+	if (!g_pattern_spec_match(filter->fi_pattern, dn.size,
+			     (const gchar *)dn.data, NULL)) {
+#else
+	if (!g_pattern_match(filter->fi_pattern, dn.size,
+			     (const gchar *)dn.data, NULL)) {
+#endif
+		tlshd_log_debug("Filter '%s' did not match subject '%s'",
+				filter->fi_name, dn.data);
+		gnutls_free(dn.data);
+		return false;
+	}
+	tlshd_log_debug("Filter '%s' matched subject '%s'",
+			filter->fi_name, dn.data);
+	gnutls_free(dn.data);
+	return true;
+}
+
+static bool tlshd_tags_x509_match_issuer(struct tlshd_tags_filter *filter,
+					 gnutls_x509_crt_t *cert)
+{
+	gnutls_datum_t dn;
+	int ret;
+
+	ret = gnutls_x509_crt_get_issuer_dn3(*cert, &dn, 0);
+	if (ret != GNUTLS_E_SUCCESS) {
+		tlshd_log_gnutls_error(ret);
+		return false;
+	}
+
+	/* XXX: Do we need to consult filter->fi_match_type here ? */
+
+#ifdef HAVE_GLIB_G_PATTERN_SPEC_MATCH
+	if (!g_pattern_spec_match(filter->fi_pattern, dn.size,
+			     (const gchar *)dn.data, NULL)) {
+#else
+	if (!g_pattern_match(filter->fi_pattern, dn.size,
+			     (const gchar *)dn.data, NULL)) {
+#endif
+		tlshd_log_debug("Filter '%s' did not match issuer '%s'",
+				filter->fi_name, dn.data);
+		gnutls_free(dn.data);
+		return false;
+	}
+	tlshd_log_debug("Filter '%s' matched issuer '%s'",
+			filter->fi_name, dn.data);
+	gnutls_free(dn.data);
+	return true;
+}
+
+static bool tlshd_tags_x509_match_serial(struct tlshd_tags_filter *filter,
+					 gnutls_x509_crt_t *cert)
+{
+	unsigned char raw[40];
+	char *c, buf[100];
+	size_t i, size;
+	int ret;
+
+	size = sizeof(raw);
+	ret = gnutls_x509_crt_get_serial(*cert, raw, &size);
+	if (ret != GNUTLS_E_SUCCESS) {
+		tlshd_log_gnutls_error(ret);
+		return false;
+	}
+
+	c = buf;
+	for (i = 0; i < size; i++) {
+		sprintf(c, "%.2x", raw[i]);
+		c += 2;
+	}
+	*c = '\0';
+
+	/* XXX: Do we need to consult filter->fi_match_type here ? */
+
+#ifdef HAVE_GLIB_G_PATTERN_SPEC_MATCH
+	if (!g_pattern_spec_match(filter->fi_pattern, strlen(buf), buf, NULL)) {
+#else
+	if (!g_pattern_match(filter->fi_pattern, strlen(buf), buf, NULL)) {
+#endif
+		tlshd_log_debug("Filter '%s' did not match serial '%s'",
+				filter->fi_name, buf);
+		return false;
+	}
+	tlshd_log_debug("Filter '%s' matched serial '%s'",
+			filter->fi_name, buf);
+	return true;
+}
+
+static bool tlshd_tags_x509_match_san(struct tlshd_tags_filter *filter,
+				      gnutls_x509_crt_t *cert)
+{
+	char buf[256];	/* XXX: Dynamically-allocate this buffer */
+	unsigned int i;
+	size_t size;
+	int ret;
+
+	tlshd_log_debug("SAN filter: '%s'", filter->fi_name);
+
+	for (ret = 0, i = 0; ret >= 0; i++) {
+		size = sizeof(buf);
+		ret = gnutls_x509_crt_get_subject_alt_name(*cert, i, buf,
+							   &size, NULL);
+		if (ret == GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE)
+			break;
+
+		switch (ret) {
+		case GNUTLS_SAN_DNSNAME:
+			tlshd_log_debug("DNS: %s", buf);
+			break;
+		case GNUTLS_SAN_RFC822NAME:
+			tlshd_log_debug("RFC822: %s", buf);
+			break;
+		case GNUTLS_SAN_URI:
+			tlshd_log_debug("URI: %s", buf);
+			break;
+		case GNUTLS_SAN_IPADDRESS:
+			tlshd_log_debug("IP: %s", buf);
+			break;
+		case GNUTLS_SAN_OTHERNAME:
+			tlshd_log_debug("Other: %s", buf);
+			break;
+		case GNUTLS_SAN_DN:
+			tlshd_log_debug("DN: %s", buf);
+			break;
+		case GNUTLS_SAN_REGISTERED_ID:
+			tlshd_log_debug("Registered ID: %s", buf);
+			break;
+		case GNUTLS_SAN_OTHERNAME_XMPP:
+			tlshd_log_debug("Other XMPP: %s", buf);
+			break;
+		case GNUTLS_SAN_OTHERNAME_KRB5PRINCIPAL:
+			tlshd_log_debug("Other Krb5: %s", buf);
+			break;
+		case GNUTLS_SAN_OTHERNAME_MSUSERPRINCIPAL:
+			tlshd_log_debug("Other MS User principal: %s", buf);
+			break;
+
+		default:
+			if (ret < 0) {
+				tlshd_log_gnutls_error(ret);
+				break;
+			}
+		}
+	}
+
+	return false;
+}
+
+struct tlshd_tags_match_args {
+	struct tlshd_tags_tag		*ma_tag;
+	gnutls_x509_crt_t		*ma_cert;
+	bool				ma_matched;
+};
+
+static void tlshd_tags_x509_match_filters_cb(gpointer data, gpointer user_data)
+{
+	struct tlshd_tags_filter *filter = (struct tlshd_tags_filter *)data;
+	struct tlshd_tags_match_args *args = (struct tlshd_tags_match_args *)user_data;
+
+	/* A previous filter failed to match, no need to check any further */
+	if (!args->ma_matched)
+		return;
+
+	if (strcmp(filter->fi_field, "subject") == 0)
+		args->ma_matched = tlshd_tags_x509_match_subject(filter, args->ma_cert);
+	else if (strcmp(filter->fi_field, "issuer") == 0)
+		args->ma_matched = tlshd_tags_x509_match_issuer(filter, args->ma_cert);
+	else if (strcmp(filter->fi_field, "serial") == 0)
+		args->ma_matched = tlshd_tags_x509_match_serial(filter, args->ma_cert);
+	else if (strcmp(filter->fi_field, "san") == 0)
+		args->ma_matched = tlshd_tags_x509_match_san(filter, args->ma_cert);
+}
+
+static void tlshd_tags_x509_match_cb(gpointer data, gpointer user_data)
+{
+	struct tlshd_tags_match_args args = {
+		.ma_tag		= (struct tlshd_tags_tag *)data,
+		.ma_cert	= (gnutls_x509_crt_t *)user_data,
+		.ma_matched	= true,
+	};
+
+	g_ptr_array_foreach(args.ma_tag->ta_filters,
+			    tlshd_tags_x509_match_filters_cb, (gpointer)&args);
+	args.ma_tag->ta_matched = args.ma_matched;
+}
+
+/**
+ * tlshd_tags_x509_match_session - match certificate against configured tags
+ * @session: session with incoming x.509 certificates
+ *
+ * Side-effect: The tt_matched boolean is set in each tag in the
+ * global tag list that is matched. When this function is called
+ * in a child process, the parent's tag list is not changed (the
+ * parent's tag list is copied-on-write after the child forks).
+ */
+void tlsdh_tags_x509_match_session(gnutls_session_t session)
+{
+	const gnutls_datum_t *cert_list;
+	unsigned int num_certs = 0;
+	gnutls_x509_crt_t peercert;
+
+	if (!tlshd_tags_tag_all)
+		return;
+	if (gnutls_certificate_type_get(session) != GNUTLS_CRT_X509)
+		return;
+	cert_list = gnutls_certificate_get_peers(session, &num_certs);
+	if (num_certs == 0)
+		return;
+
+	/*
+	 * The first certificate in the returned list is the peer's
+	 * certificate. That is the only one that is checked against
+	 * our tags list.
+	 */
+	gnutls_x509_crt_init(&peercert);
+	gnutls_x509_crt_import(peercert, &cert_list[0], GNUTLS_X509_FMT_DER);
+	g_ptr_array_foreach(tlshd_tags_tag_all,
+			    tlshd_tags_x509_match_cb, (gpointer)&peercert);
+	gnutls_x509_crt_deinit(peercert);
+}

src/tlshd/tlshd.h

@@ -121,6 +121,7 @@ extern void tlshd_quic_serverhello_handshake(struct tlshd_handshake_parms *parms
 
 /* tags.c */
 extern void tlshd_tags_read_configuration(const char *tagsdir);
+extern void tlsdh_tags_x509_match_session(gnutls_session_t session);
 extern void tlshd_tags_shutdown(void);
 
 #ifdef HAVE_GNUTLS_QUIC