From nobody Thu May 9 04:03:34 2024 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1707832466149540.0755898788183; Tue, 13 Feb 2024 05:54:26 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 224361B68; Tue, 13 Feb 2024 08:54:25 -0500 (EST) Received: from lists.libvirt.org.85.43.8.in-addr.arpa (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id CFD3F1A84; Tue, 13 Feb 2024 08:52:01 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 2445319D5; Tue, 13 Feb 2024 08:51:52 -0500 (EST) 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 772B81775 for ; Tue, 13 Feb 2024 08:51:51 -0500 (EST) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-578-_C6tlY3UOjq81VkOsicOYQ-1; Tue, 13 Feb 2024 08:51:49 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6AE803C11C6B for ; Tue, 13 Feb 2024 13:51:49 +0000 (UTC) Received: from maggie.brq.redhat.com (unknown [10.43.3.102]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1208CC185C0 for ; Tue, 13 Feb 2024 13:51:48 +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=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: _C6tlY3UOjq81VkOsicOYQ-1 From: Michal Privoznik To: devel@lists.libvirt.org Subject: [PATCH 1/4] viraccessdriverpolkit: Add missing vtpm case Date: Tue, 13 Feb 2024 14:51:27 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: YDNJWVNBUKB26HTIFSQ4KJUTN5DZADPV X-Message-ID-Hash: YDNJWVNBUKB26HTIFSQ4KJUTN5DZADPV X-MailFrom: mprivozn@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: Content-Type: text/plain; charset="utf-8"; x-default="true" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1707832467269100001 When adding vtpm virSecret usage type (in v5.6.0-rc1~61) we forgot to update polkit access check. This limited user's ability to match secrets in their rules. Add missing case into switch in virAccessDriverPolkitCheckSecret(). Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko --- src/access/viraccessdriverpolkit.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/access/viraccessdriverpolkit.c b/src/access/viraccessdrive= rpolkit.c index c7ff81ee86..b78049583c 100644 --- a/src/access/viraccessdriverpolkit.c +++ b/src/access/viraccessdriverpolkit.c @@ -390,6 +390,19 @@ virAccessDriverPolkitCheckSecret(virAccessManager *man= ager, virAccessPermSecretTypeToString(p= erm), attrs); } break; + case VIR_SECRET_USAGE_TYPE_VTPM: { + const char *attrs[] =3D { + "connect_driver", driverName, + "secret_uuid", uuidstr, + "secret_usage_name", secret->usage_id, + NULL, + }; + + return virAccessDriverPolkitCheck(manager, + "secret", + virAccessPermSecretTypeToString(p= erm), + attrs); + } break; } } =20 --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Thu May 9 04:03:34 2024 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1707832637858148.56350499291386; Tue, 13 Feb 2024 05:57:17 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 9135D1A8E; Tue, 13 Feb 2024 08:57:16 -0500 (EST) Received: from lists.libvirt.org.85.43.8.in-addr.arpa (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 70F9A1A52; Tue, 13 Feb 2024 08:52:22 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 51A3D18F7; Tue, 13 Feb 2024 08:51:53 -0500 (EST) 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 9D6DF19D5 for ; Tue, 13 Feb 2024 08:51:52 -0500 (EST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-692-1wJZxBbuMOq72svJu7HYBQ-1; Tue, 13 Feb 2024 08:51:50 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 059FA86794A for ; Tue, 13 Feb 2024 13:51:50 +0000 (UTC) Received: from maggie.brq.redhat.com (unknown [10.43.3.102]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9FA8EC185C1 for ; Tue, 13 Feb 2024 13:51:49 +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=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: 1wJZxBbuMOq72svJu7HYBQ-1 From: Michal Privoznik To: devel@lists.libvirt.org Subject: [PATCH 2/4] secret_conf: Simplify calling of virSecretDefParseUsage() Date: Tue, 13 Feb 2024 14:51:28 +0100 Message-ID: <4438bfe3fa8da8d937f5a65b86c63cb786186d6c.1707832214.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: 2KLKBOQYG2ZJ2BJBMWM4UQCLLRFKCBYH X-Message-ID-Hash: 2KLKBOQYG2ZJ2BJBMWM4UQCLLRFKCBYH X-MailFrom: mprivozn@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: Content-Type: text/plain; charset="utf-8"; x-default="true" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1707832639800100001 The virSecretDefParseUsage() function is called conditionally. Call it unconditionally and keep pointer to the node as it'll come handy soon. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko --- src/conf/secret_conf.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/src/conf/secret_conf.c b/src/conf/secret_conf.c index 7463185eb1..d8ce772d3b 100644 --- a/src/conf/secret_conf.c +++ b/src/conf/secret_conf.c @@ -49,10 +49,17 @@ static int virSecretDefParseUsage(xmlXPathContextPtr ctxt, virSecretDef *def) { + xmlNodePtr node =3D NULL; + VIR_XPATH_NODE_AUTORESTORE(ctxt) g_autofree char *type_str =3D NULL; int type; =20 - type_str =3D virXPathString("string(./usage/@type)", ctxt); + if (!(node =3D virXPathNode("./usage", ctxt))) + return 0; + + ctxt->node =3D node; + + type_str =3D virXMLPropString(node, "type"); if (type_str =3D=3D NULL) { virReportError(VIR_ERR_XML_ERROR, "%s", _("unknown secret usage type")); @@ -70,7 +77,7 @@ virSecretDefParseUsage(xmlXPathContextPtr ctxt, break; =20 case VIR_SECRET_USAGE_TYPE_VOLUME: - def->usage_id =3D virXPathString("string(./usage/volume)", ctxt); + def->usage_id =3D virXPathString("string(./volume)", ctxt); if (!def->usage_id) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("volume usage specified, but volume path is m= issing")); @@ -79,7 +86,7 @@ virSecretDefParseUsage(xmlXPathContextPtr ctxt, break; =20 case VIR_SECRET_USAGE_TYPE_CEPH: - def->usage_id =3D virXPathString("string(./usage/name)", ctxt); + def->usage_id =3D virXPathString("string(./name)", ctxt); if (!def->usage_id) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Ceph usage specified, but name is missing")); @@ -88,7 +95,7 @@ virSecretDefParseUsage(xmlXPathContextPtr ctxt, break; =20 case VIR_SECRET_USAGE_TYPE_ISCSI: - def->usage_id =3D virXPathString("string(./usage/target)", ctxt); + def->usage_id =3D virXPathString("string(./target)", ctxt); if (!def->usage_id) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("iSCSI usage specified, but target is missing= ")); @@ -97,7 +104,7 @@ virSecretDefParseUsage(xmlXPathContextPtr ctxt, break; =20 case VIR_SECRET_USAGE_TYPE_TLS: - def->usage_id =3D virXPathString("string(./usage/name)", ctxt); + def->usage_id =3D virXPathString("string(./name)", ctxt); if (!def->usage_id) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("TLS usage specified, but name is missing")); @@ -106,7 +113,7 @@ virSecretDefParseUsage(xmlXPathContextPtr ctxt, break; =20 case VIR_SECRET_USAGE_TYPE_VTPM: - def->usage_id =3D virXPathString("string(./usage/name)", ctxt); + def->usage_id =3D virXPathString("string(./name)", ctxt); if (!def->usage_id) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("vTPM usage specified, but name is missing")); @@ -166,8 +173,8 @@ virSecretParseXML(xmlXPathContext *ctxt) } =20 def->description =3D virXPathString("string(./description)", ctxt); - if (virXPathNode("./usage", ctxt) !=3D NULL - && virSecretDefParseUsage(ctxt, def) < 0) + + if (virSecretDefParseUsage(ctxt, def) < 0) return NULL; =20 return g_steal_pointer(&def); --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Thu May 9 04:03:34 2024 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 170783255020549.72311754564464; Tue, 13 Feb 2024 05:55:50 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 14CE01AD6; Tue, 13 Feb 2024 08:55:49 -0500 (EST) Received: from lists.libvirt.org.85.43.8.in-addr.arpa (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 36CE71A15; Tue, 13 Feb 2024 08:52:13 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id E6C0A19DA; Tue, 13 Feb 2024 08:51:52 -0500 (EST) 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 5D16F18F7 for ; Tue, 13 Feb 2024 08:51:52 -0500 (EST) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-596-O4hNNr9UN5G3pTCUZFKyCA-1; Tue, 13 Feb 2024 08:51:50 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 92E2A38212D5 for ; Tue, 13 Feb 2024 13:51:50 +0000 (UTC) Received: from maggie.brq.redhat.com (unknown [10.43.3.102]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3B0D3C03380 for ; Tue, 13 Feb 2024 13:51:50 +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=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: O4hNNr9UN5G3pTCUZFKyCA-1 From: Michal Privoznik To: devel@lists.libvirt.org Subject: [PATCH 3/4] virSecretDef: Convert 'usage_type' field to proper enum type Date: Tue, 13 Feb 2024 14:51:29 +0100 Message-ID: <2d8aabe53bdfbf054523ecb6773f5f47b2a01437.1707832214.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: OQ3RQABY2BSD7Y33FCHIZMYLQFS3UYAL X-Message-ID-Hash: OQ3RQABY2BSD7Y33FCHIZMYLQFS3UYAL X-MailFrom: mprivozn@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: Content-Type: text/plain; charset="utf-8"; x-default="true" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1707832551541100001 Convert the field and adjust the XML parsers to use virXMLPropEnum(). Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko --- src/access/viraccessdriverpolkit.c | 4 ++++ src/conf/secret_conf.c | 24 ++++++++---------------- src/conf/secret_conf.h | 2 +- 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/src/access/viraccessdriverpolkit.c b/src/access/viraccessdrive= rpolkit.c index b78049583c..83381183a5 100644 --- a/src/access/viraccessdriverpolkit.c +++ b/src/access/viraccessdriverpolkit.c @@ -403,6 +403,10 @@ virAccessDriverPolkitCheckSecret(virAccessManager *man= ager, virAccessPermSecretTypeToString(p= erm), attrs); } break; + + case VIR_SECRET_USAGE_TYPE_LAST: + virReportEnumRangeError(virSecretUsageType, secret->usage_type); + return -1; } } =20 diff --git a/src/conf/secret_conf.c b/src/conf/secret_conf.c index d8ce772d3b..c6c8c30ba9 100644 --- a/src/conf/secret_conf.c +++ b/src/conf/secret_conf.c @@ -51,27 +51,19 @@ virSecretDefParseUsage(xmlXPathContextPtr ctxt, { xmlNodePtr node =3D NULL; VIR_XPATH_NODE_AUTORESTORE(ctxt) - g_autofree char *type_str =3D NULL; - int type; =20 if (!(node =3D virXPathNode("./usage", ctxt))) return 0; =20 ctxt->node =3D node; =20 - type_str =3D virXMLPropString(node, "type"); - if (type_str =3D=3D NULL) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("unknown secret usage type")); + if (virXMLPropEnum(node, "type", + virSecretUsageTypeFromString, + VIR_XML_PROP_REQUIRED, + &def->usage_type) < 0) { return -1; } - type =3D virSecretUsageTypeFromString(type_str); - if (type < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown secret usage type %1$s"), type_str); - return -1; - } - def->usage_type =3D type; + switch (def->usage_type) { case VIR_SECRET_USAGE_TYPE_NONE: break; @@ -121,6 +113,7 @@ virSecretDefParseUsage(xmlXPathContextPtr ctxt, } break; =20 + case VIR_SECRET_USAGE_TYPE_LAST: default: virReportError(VIR_ERR_INTERNAL_ERROR, _("unexpected secret usage type %1$d"), @@ -238,9 +231,8 @@ virSecretDefFormatUsage(virBuffer *buf, break; =20 default: - virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected secret usage type %1$d"), - def->usage_type); + case VIR_SECRET_USAGE_TYPE_LAST: + virReportEnumRangeError(virSecretUsageType, def->usage_type); return -1; } virBufferAdjustIndent(buf, -2); diff --git a/src/conf/secret_conf.h b/src/conf/secret_conf.h index dee98899ac..8f8f47933a 100644 --- a/src/conf/secret_conf.h +++ b/src/conf/secret_conf.h @@ -28,7 +28,7 @@ struct _virSecretDef { bool isprivate; unsigned char uuid[VIR_UUID_BUFLEN]; char *description; /* May be NULL */ - int usage_type; /* virSecretUsageType */ + virSecretUsageType usage_type; char *usage_id; /* May be NULL */ }; =20 --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Thu May 9 04:03:34 2024 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 170783272792855.8271019092017; Tue, 13 Feb 2024 05:58:47 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id D7DF91B78; Tue, 13 Feb 2024 08:58:46 -0500 (EST) Received: from lists.libvirt.org.85.43.8.in-addr.arpa (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 3D3D71B64; Tue, 13 Feb 2024 08:52:31 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 89F2219DA; Tue, 13 Feb 2024 08:51:54 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 A30541775 for ; Tue, 13 Feb 2024 08:51:53 -0500 (EST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-425-tm3f3WdBP_6n33GTXw03dQ-1; Tue, 13 Feb 2024 08:51:51 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2C0488A2F54 for ; Tue, 13 Feb 2024 13:51:51 +0000 (UTC) Received: from maggie.brq.redhat.com (unknown [10.43.3.102]) by smtp.corp.redhat.com (Postfix) with ESMTP id C8642C185C4 for ; Tue, 13 Feb 2024 13:51:50 +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=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: tm3f3WdBP_6n33GTXw03dQ-1 From: Michal Privoznik To: devel@lists.libvirt.org Subject: [PATCH 4/4] secret_conf: Modernize XML parsing & formatting Date: Tue, 13 Feb 2024 14:51:30 +0100 Message-ID: <272afe5ed9f98440b948098348c80d5c202cad83.1707832214.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: SLLR2GHNOMOWCKK6DL2QW7I5YGQ4E7H6 X-Message-ID-Hash: SLLR2GHNOMOWCKK6DL2QW7I5YGQ4E7H6 X-MailFrom: mprivozn@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: Content-Type: text/plain; charset="utf-8"; x-default="true" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1707832730040100001 Our virSecret XML is still parsed and formatted using old way (e.g. virXPathString() + virXXXTypeFromString() combo, or formatting elements using plain virBufferAsprintf() instead of virXMLFormatElement()). Modernize the code as it'll make it easier for future expansion. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko --- src/conf/secret_conf.c | 47 ++++++++++++++++++------------------------ 1 file changed, 20 insertions(+), 27 deletions(-) diff --git a/src/conf/secret_conf.c b/src/conf/secret_conf.c index c6c8c30ba9..966536599e 100644 --- a/src/conf/secret_conf.c +++ b/src/conf/secret_conf.c @@ -195,39 +195,34 @@ static int virSecretDefFormatUsage(virBuffer *buf, const virSecretDef *def) { - const char *type; + g_auto(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf =3D VIR_BUFFER_INIT_CHILD(buf); + + virBufferAsprintf(&attrBuf, " type=3D'%s'", + virSecretUsageTypeToString(def->usage_type)); =20 - type =3D virSecretUsageTypeToString(def->usage_type); - if (type =3D=3D NULL) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected secret usage type %1$d"), - def->usage_type); - return -1; - } - virBufferAsprintf(buf, "\n", type); - virBufferAdjustIndent(buf, 2); switch (def->usage_type) { case VIR_SECRET_USAGE_TYPE_NONE: break; =20 case VIR_SECRET_USAGE_TYPE_VOLUME: - virBufferEscapeString(buf, "%s\n", def->usage_id); + virBufferEscapeString(&childBuf, "%s\n", def->usa= ge_id); break; =20 case VIR_SECRET_USAGE_TYPE_CEPH: - virBufferEscapeString(buf, "%s\n", def->usage_id); + virBufferEscapeString(&childBuf, "%s\n", def->usage_i= d); break; =20 case VIR_SECRET_USAGE_TYPE_ISCSI: - virBufferEscapeString(buf, "%s\n", def->usage_id); + virBufferEscapeString(&childBuf, "%s\n", def->usa= ge_id); break; =20 case VIR_SECRET_USAGE_TYPE_TLS: - virBufferEscapeString(buf, "%s\n", def->usage_id); + virBufferEscapeString(&childBuf, "%s\n", def->usage_i= d); break; =20 case VIR_SECRET_USAGE_TYPE_VTPM: - virBufferEscapeString(buf, "%s\n", def->usage_id); + virBufferEscapeString(&childBuf, "%s\n", def->usage_i= d); break; =20 default: @@ -235,8 +230,8 @@ virSecretDefFormatUsage(virBuffer *buf, virReportEnumRangeError(virSecretUsageType, def->usage_type); return -1; } - virBufferAdjustIndent(buf, -2); - virBufferAddLit(buf, "\n"); + + virXMLFormatElement(buf, "usage", &attrBuf, &childBuf); =20 return 0; } @@ -245,25 +240,23 @@ char * virSecretDefFormat(const virSecretDef *def) { g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; - const unsigned char *uuid; + g_auto(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf =3D VIR_BUFFER_INIT_CHILD(&buf); char uuidstr[VIR_UUID_STRING_BUFLEN]; =20 - virBufferAsprintf(&buf, "\n", + virBufferAsprintf(&attrBuf, " ephemeral=3D'%s' private=3D'%s'", def->isephemeral ? "yes" : "no", def->isprivate ? "yes" : "no"); =20 - uuid =3D def->uuid; - virUUIDFormat(uuid, uuidstr); - virBufferAdjustIndent(&buf, 2); - virBufferEscapeString(&buf, "%s\n", uuidstr); + virUUIDFormat(def->uuid, uuidstr); + virBufferEscapeString(&childBuf, "%s\n", uuidstr); if (def->description !=3D NULL) - virBufferEscapeString(&buf, "%s\n", + virBufferEscapeString(&childBuf, "%s\n", def->description); if (def->usage_type !=3D VIR_SECRET_USAGE_TYPE_NONE && - virSecretDefFormatUsage(&buf, def) < 0) + virSecretDefFormatUsage(&childBuf, def) < 0) return NULL; - virBufferAdjustIndent(&buf, -2); - virBufferAddLit(&buf, "\n"); =20 + virXMLFormatElement(&buf, "secret", &attrBuf, &childBuf); return virBufferContentAndReset(&buf); } --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org