From nobody Fri Nov 21 10:11:44 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1762441095; cv=none; d=zohomail.com; s=zohoarc; b=M17hcxoU5LuT6jFK2EQjTYXz2N/FrK2PckjkhPhcaJ1EMv8Kk5Pxga9uGC8GO+rxr+w3Y4OOTKXa/g5RW/UmRnwomAvlf/dUCfeQsTAk7g13U7l1kE1IhnMLANLoidU2YfiR40g83V+E4M6A34Xk81M4yTo5Ek8AP0kQ0afKONg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1762441095; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=RWZsjJPrPxO1Tez6nzN1ZJa9A0bj9Cl0yhG9jW1qHFo=; b=aE2xuqpH9rlmACkxaJvB38V9zfUhDawrecVGq4wIpYYtxdhFqdEXqMKfRv6oiAmXDTy6C68C99X1KlmFBf33rNRLspKPw5VFgz8ZqyhAuwCbRmePE0SXSXrZh3j+H/J4MPg1rR08oKjg5i6sSuTEfq2kwEhJ3Z/JQQGh67VPKaY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1762441095879291.6096382340712; Thu, 6 Nov 2025 06:58:15 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 3E93D44103; Thu, 6 Nov 2025 09:58:15 -0500 (EST) Received: from [172.19.199.29] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 5C96A4415E; Thu, 6 Nov 2025 09:52:33 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id BA618418F9; Thu, 6 Nov 2025 09:51:04 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 29C40418F9 for ; Thu, 6 Nov 2025 09:51:03 -0500 (EST) Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-452-Y7PrB8c-Payp6rvzcGre7Q-1; Thu, 06 Nov 2025 09:50:57 -0500 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C6FA2180034A for ; Thu, 6 Nov 2025 14:50:56 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.42.28.39]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id D56C61800451; Thu, 6 Nov 2025 14:50:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-5.0 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1762440662; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RWZsjJPrPxO1Tez6nzN1ZJa9A0bj9Cl0yhG9jW1qHFo=; b=Fzf96aP7b6Omc7q0fSuhIm6eyMJWdMiavmGPUFydHgUyQ007ofUy4nraTrsUnYcbSqDxSu I/hIBcRiM4KApPuvLa4oS5GxtzQng0/gsnoLf2U28Rgbp8XFYGeaPuk00CzD3jlhTO8zM1 zjBtCzAr2AieuyX2GEUKam0pMSanQdc= X-MC-Unique: Y7PrB8c-Payp6rvzcGre7Q-1 X-Mimecast-MFC-AGG-ID: Y7PrB8c-Payp6rvzcGre7Q_1762440656 To: devel@lists.libvirt.org Subject: [PATCH 03/10] rpc: refactor TLS sanity checking to support many cert files Date: Thu, 6 Nov 2025 14:50:43 +0000 Message-ID: <20251106145050.1851526-4-berrange@redhat.com> In-Reply-To: <20251106145050.1851526-1-berrange@redhat.com> References: <20251106145050.1851526-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: z40hrGnkm0UnxpaqEigwvhte0RxA6OLGlLXa3kHP2TE_1762440656 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-ID-Hash: EX65CXHDMF7ZC2N5H3EH3P2IPKN6SKUY X-Message-ID-Hash: EX65CXHDMF7ZC2N5H3EH3P2IPKN6SKUY X-MailFrom: berrange@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9_via_Devel?= Reply-To: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1762441098501154100 From: Daniel P. Berrang=C3=A9 Future patches will make it possible to load multiple certificate files. This prepares the sanity checking code to support that by taking a NUL terminated array of cert filenames. Signed-off-by: Daniel P. Berrang=C3=A9 --- src/rpc/virnettlscert.c | 35 ++++++++++++++++++++++------------- src/rpc/virnettlscert.h | 2 +- src/rpc/virnettlscontext.c | 6 ++++-- tools/virt-pki-validate.c | 3 ++- 4 files changed, 29 insertions(+), 17 deletions(-) diff --git a/src/rpc/virnettlscert.c b/src/rpc/virnettlscert.c index 3efc4f0716..6f20b2601b 100644 --- a/src/rpc/virnettlscert.c +++ b/src/rpc/virnettlscert.c @@ -440,40 +440,49 @@ int virNetTLSCertLoadListFromFile(const char *certFil= e, #define MAX_CERTS 16 int virNetTLSCertSanityCheck(bool isServer, const char *cacertFile, - const char *certFile) + const char *const *certFiles) { - gnutls_x509_crt_t cert =3D NULL; + gnutls_x509_crt_t *certs =3D NULL; gnutls_x509_crt_t cacerts[MAX_CERTS] =3D { 0 }; size_t ncacerts =3D 0; size_t i; int ret =3D -1; =20 - if ((access(certFile, R_OK) =3D=3D 0) && - !(cert =3D virNetTLSCertLoadFromFile(certFile, isServer))) - goto cleanup; + certs =3D g_new0(gnutls_x509_crt_t, g_strv_length((gchar **)certFiles)= ); + for (i =3D 0; certFiles[i] !=3D NULL; i++) { + if ((access(certFiles[i], R_OK) =3D=3D 0) && + !(certs[i] =3D virNetTLSCertLoadFromFile(certFiles[i], isServe= r))) + goto cleanup; + } if ((access(cacertFile, R_OK) =3D=3D 0) && virNetTLSCertLoadListFromFile(cacertFile, cacerts, MAX_CERTS, &ncacerts) < 0) goto cleanup; =20 - if (cert && - virNetTLSCertCheck(cert, certFile, isServer, false) < 0) - goto cleanup; + for (i =3D 0; certFiles[i] !=3D NULL; i++) { + if (certs[i] && + virNetTLSCertCheck(certs[i], certFiles[i], isServer, false) < = 0) + goto cleanup; + } =20 for (i =3D 0; i < ncacerts; i++) { if (virNetTLSCertCheck(cacerts[i], cacertFile, isServer, true) < 0) goto cleanup; } =20 - if (cert && ncacerts && - virNetTLSCertCheckPair(cert, certFile, cacerts, ncacerts, cacertFi= le, isServer) < 0) - goto cleanup; + for (i =3D 0; certFiles[i] !=3D NULL && ncacerts; i++) { + if (certs[i] && ncacerts && + virNetTLSCertCheckPair(certs[i], certFiles[i], cacerts, ncacer= ts, cacertFile, isServer) < 0) + goto cleanup; + } =20 ret =3D 0; =20 cleanup: - if (cert) - gnutls_x509_crt_deinit(cert); + for (i =3D 0; certFiles[i] !=3D NULL; i++) { + if (certs[i]) + gnutls_x509_crt_deinit(certs[i]); + } for (i =3D 0; i < ncacerts; i++) gnutls_x509_crt_deinit(cacerts[i]); return ret; diff --git a/src/rpc/virnettlscert.h b/src/rpc/virnettlscert.h index a2f591d172..086d8dc7d6 100644 --- a/src/rpc/virnettlscert.h +++ b/src/rpc/virnettlscert.h @@ -28,7 +28,7 @@ =20 int virNetTLSCertSanityCheck(bool isServer, const char *cacertFile, - const char *certFile); + const char *const *certFiles); =20 int virNetTLSCertValidateCA(gnutls_x509_crt_t cert, bool isServer); diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c index f857bb2339..bb9db90dff 100644 --- a/src/rpc/virnettlscontext.c +++ b/src/rpc/virnettlscontext.c @@ -199,6 +199,7 @@ static virNetTLSContext *virNetTLSContextNew(const char= *cacert, { virNetTLSContext *ctxt; int err; + const char *certs[] =3D { cert, NULL }; =20 if (virNetTLSContextInitialize() < 0) return NULL; @@ -224,7 +225,7 @@ static virNetTLSContext *virNetTLSContextNew(const char= *cacert, } =20 if (sanityCheckCert && - virNetTLSCertSanityCheck(isServer, cacert, cert) < 0) + virNetTLSCertSanityCheck(isServer, cacert, certs) < 0) goto error; =20 if (virNetTLSContextLoadCredentials(ctxt, isServer, cacert, cacrl, cer= t, key) < 0) @@ -367,6 +368,7 @@ int virNetTLSContextReloadForServer(virNetTLSContext *c= txt, g_autofree char *cacrl =3D NULL; g_autofree char *cert =3D NULL; g_autofree char *key =3D NULL; + const char *certs[] =3D { cert, NULL }; =20 x509credBak =3D g_steal_pointer(&ctxt->x509cred); =20 @@ -382,7 +384,7 @@ int virNetTLSContextReloadForServer(virNetTLSContext *c= txt, goto error; } =20 - if (virNetTLSCertSanityCheck(true, cacert, cert)) + if (virNetTLSCertSanityCheck(true, cacert, certs)) goto error; =20 if (virNetTLSContextLoadCredentials(ctxt, true, cacert, cacrl, cert, k= ey)) diff --git a/tools/virt-pki-validate.c b/tools/virt-pki-validate.c index e693ffaed6..0df289256e 100644 --- a/tools/virt-pki-validate.c +++ b/tools/virt-pki-validate.c @@ -163,6 +163,7 @@ virPKIValidateIdentity(bool isServer, bool system, cons= t char *path) { g_autofree char *cacert =3D NULL, *cacrl =3D NULL; g_autofree char *cert =3D NULL, *key =3D NULL; + const char *certs[] =3D { cert, NULL }; bool ok =3D true; const char *scope =3D isServer ? "SERVER" : "CLIENT"; =20 @@ -274,7 +275,7 @@ virPKIValidateIdentity(bool isServer, bool system, cons= t char *path) =20 if (virNetTLSCertSanityCheck(isServer, cacert, - cert) < 0) { + certs) < 0) { virValidateFail(VIR_VALIDATE_FAIL, "%s", virGetLastErrorMessage()); ok =3D false; --=20 2.51.1