From nobody Tue Sep 9 19:08:47 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=1752840399; cv=none; d=zohomail.com; s=zohoarc; b=NckDivIJ9BtBnPg6z5CdfuWXFugs2hLis2cTD27Dzo+OkGLU1LXJw5hRhiVYVfk2EkyMbf65xwsNj70Qnv5X1DirfqY0Ig5fgS3LoYOWiUpWULM+76vrkNZBSnFLnoVuiIJHuNyU8uHAob9T8W8GqXtcy+jlA9q6vD6gfKIdws8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1752840399; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id; bh=A7f9UwuIerCZOJ0+ZlYkGeCjLbIcMKt9GOrsFlJ4iUg=; b=BZ41ojEfhY6i2K30y6PRR1sjlCjNvlUVEL34ZJXyQnslHF6UXFiT8PqbGcdEKbVdCEwQilzaKWGxBPw2/x7leIiEx7iqBtqXLt/6AoBiaXZADTwjK54sVXy10B9fZkJLLapCasYD+MBWxUPAOPEovr314UT8WKdkMHRX/4E9pOc= 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 1752840399105968.4325835931808; Fri, 18 Jul 2025 05:06:39 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 1EDE71397; Fri, 18 Jul 2025 08:06:38 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id C14081289; Fri, 18 Jul 2025 08:05:43 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id C0ED013F7; Fri, 18 Jul 2025 08:05:40 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 470C51289 for ; Fri, 18 Jul 2025 08:05:40 -0400 (EDT) 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-206-YQ97xV_ZMcCzBzQuQ_wh2g-1; Fri, 18 Jul 2025 08:05:38 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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 ADD6F1800C2F for ; Fri, 18 Jul 2025 12:05:37 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.42.28.137]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 7757F30001B1; Fri, 18 Jul 2025 12:05:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752840340; 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=+DR1beaUAuFpm8/730EmygHhFWProNO23Bf+owpm6X4=; b=Q1Wd2J3HnHNr6qYwqUnTxEoT5fBzPoMy5JQ0cAm9Bde/btlQG49xkMIZLShZCQlzNxldUw VGP3JnCoeqy6whZ1vrZ3UNfctSs1p045wcoFaHiJ8kqcKf3MUJ62oYPb2iXqYFDzt2IrYx rAmltG3TIYZ5mKeWdXcoruUKLwltISA= X-MC-Unique: YQ97xV_ZMcCzBzQuQ_wh2g-1 X-Mimecast-MFC-AGG-ID: YQ97xV_ZMcCzBzQuQ_wh2g_1752840337 To: devel@lists.libvirt.org Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH 1/3] qemu: fix order of VNC TLS config entries Date: Fri, 18 Jul 2025 13:05:31 +0100 Message-ID: <20250718120533.2591376-2-berrange@redhat.com> In-Reply-To: <20250718120533.2591376-1-berrange@redhat.com> References: <20250718120533.2591376-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: naeXcoRq_6na6v1ceAGzA0yJYQPlzXeTP7VeJfR0-TU_1752840337 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 3LTVZJ5B46HUNBO6PNYNLH2OY3NGZDJJ X-Message-ID-Hash: 3LTVZJ5B46HUNBO6PNYNLH2OY3NGZDJJ X-MailFrom: berrange@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: 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: 1752840399636116600 Content-Type: text/plain; charset="utf-8" From: Daniel P. Berrang=C3=A9 For TLS config parameters, the 'verify' option always comes before the 'secret_uuid' option, except in the VNC case which has them reversed. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Peter Krempa --- src/qemu/libvirtd_qemu.aug | 2 +- src/qemu/qemu.conf.in | 12 ++++++------ src/qemu/test_libvirtd_qemu.aug.in | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug index e1e479d72c..d36baed6fc 100644 --- a/src/qemu/libvirtd_qemu.aug +++ b/src/qemu/libvirtd_qemu.aug @@ -35,8 +35,8 @@ module Libvirtd_qemu =3D | bool_entry "vnc_auto_unix_socket" | bool_entry "vnc_tls" | str_entry "vnc_tls_x509_cert_dir" - | str_entry "vnc_tls_x509_secret_uuid" | bool_entry "vnc_tls_x509_verify" + | str_entry "vnc_tls_x509_secret_uuid" | str_entry "vnc_password" | bool_entry "vnc_sasl" | str_entry "vnc_sasl_dir" diff --git a/src/qemu/qemu.conf.in b/src/qemu/qemu.conf.in index 6358a45ae2..9bb52b5927 100644 --- a/src/qemu/qemu.conf.in +++ b/src/qemu/qemu.conf.in @@ -101,12 +101,6 @@ #vnc_tls_x509_cert_dir =3D "/etc/pki/libvirt-vnc" =20 =20 -# Uncomment and use the following option to override the default secret -# UUID provided in the default_tls_x509_secret_uuid parameter. -# -#vnc_tls_x509_secret_uuid =3D "00000000-0000-0000-0000-000000000000" - - # The default TLS configuration only uses certificates for the server # allowing the client to verify the server's identity and establish # an encrypted channel. @@ -125,6 +119,12 @@ #vnc_tls_x509_verify =3D 1 =20 =20 +# Uncomment and use the following option to override the default secret +# UUID provided in the default_tls_x509_secret_uuid parameter. +# +#vnc_tls_x509_secret_uuid =3D "00000000-0000-0000-0000-000000000000" + + # The default VNC password. Only 8 bytes are significant for # VNC passwords. This parameter is only used if the per-domain # XML config does not already provide a password. To allow diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qe= mu.aug.in index 88d1a6aca1..e461fcc9df 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -9,8 +9,8 @@ module Test_libvirtd_qemu =3D { "vnc_auto_unix_socket" =3D "1" } { "vnc_tls" =3D "1" } { "vnc_tls_x509_cert_dir" =3D "/etc/pki/libvirt-vnc" } -{ "vnc_tls_x509_secret_uuid" =3D "00000000-0000-0000-0000-000000000000" } { "vnc_tls_x509_verify" =3D "1" } +{ "vnc_tls_x509_secret_uuid" =3D "00000000-0000-0000-0000-000000000000" } { "vnc_password" =3D "XYZ12345" } { "vnc_sasl" =3D "1" } { "vnc_sasl_dir" =3D "/some/directory/sasl2" } --=20 2.50.1