From nobody Tue May 7 01:36:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1629462872; cv=none; d=zohomail.com; s=zohoarc; b=mFd1Sr7xgjO1E/ZJYHDenwVfz/JSDbA4BZagBIJp+RcSAwxdhpEA1D7mRf5nKOpdOheVEiuafG52wLlHNkwMBXAbi3IT7cZB1FSHQiz3EMl+1oROhrpxshIKOLVWK7lnmOpo1z2dLVWB8p2Kt0KYtv7ZirGoKOK5bQzrVHZQe8c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629462872; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=fpvaKcHkmpxpsZ1oLsdyWE/bWTq//JjUbTchyBd/cD0=; b=cLniiFbS5aNxCzAmBdw9p0ZoPfz2LFHgeqh109ckPhGwQeJL0r71cbHapA6w96q2YeEH8P9/FJ4xQ5ErUoEBrMVP5nNN8iG1uPsdv10tGl2X5LecCdAvONDY5/xV5YT1r07y5u7ax/vUHD8zlI2+c97eXsriPiUrSOmyAbtxJoM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1629462871996149.18396374513236; Fri, 20 Aug 2021 05:34:31 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-523-NtWwfONEN9urBso1tdTyIQ-1; Fri, 20 Aug 2021 08:34:28 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 08804779; Fri, 20 Aug 2021 12:34:23 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CB5CA5D741; Fri, 20 Aug 2021 12:34:22 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 5C019181A1CD; Fri, 20 Aug 2021 12:34:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 17KCUmKh011211 for ; Fri, 20 Aug 2021 08:30:48 -0400 Received: by smtp.corp.redhat.com (Postfix) id EA8D93AFD; Fri, 20 Aug 2021 12:30:48 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.43.2.2]) by smtp.corp.redhat.com (Postfix) with ESMTP id 73A411A26A for ; Fri, 20 Aug 2021 12:30:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629462870; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=fpvaKcHkmpxpsZ1oLsdyWE/bWTq//JjUbTchyBd/cD0=; b=RMuCNPecZXcD3OKZQI6Tc3LB4Ac4bA7gp3Xt2RZBp1SpUysJaR7RXLy97loS+LTnNcZPEq VRgltaW5AXj4bSLyonF/1wo9/HyFIh/FZn3PjQP0vvUe5J2kbzoRj1i95hr2DmO09chmdJ 7MRv4xOkgbhfhcykLno+ngX6m1eO+K8= X-MC-Unique: NtWwfONEN9urBso1tdTyIQ-1 From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH 1/4] api: add virSecretDefineFlags Date: Fri, 20 Aug 2021 14:30:37 +0200 Message-Id: <2e5bdd0279dfcf6e897025505982f8248a0e6d86.1629462494.git.khanicov@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1629462873709100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Kristina Hanicova Reviewed-by: J=C3=A1n Tomko --- include/libvirt/libvirt-secret.h | 5 +++++ src/libvirt-secret.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/include/libvirt/libvirt-secret.h b/include/libvirt/libvirt-sec= ret.h index e5aaac9450..b8e53674d8 100644 --- a/include/libvirt/libvirt-secret.h +++ b/include/libvirt/libvirt-secret.h @@ -88,6 +88,11 @@ virSecretPtr virSecretLookupByUUIDString(virC= onnectPtr conn, virSecretPtr virSecretLookupByUsage(virConnectPtr conn, int usageType, const char *usageID); + +typedef enum { + VIR_SECRET_DEFINE_VALIDATE =3D 1 << 0, /* Validate the XML document ag= ainst schema */ +} virSecretDefineFlags; + virSecretPtr virSecretDefineXML (virConnectPtr conn, const char *xml, unsigned int flags); diff --git a/src/libvirt-secret.c b/src/libvirt-secret.c index a427805c7a..d3626ed561 100644 --- a/src/libvirt-secret.c +++ b/src/libvirt-secret.c @@ -316,7 +316,7 @@ virSecretLookupByUsage(virConnectPtr conn, * virSecretDefineXML: * @conn: virConnect connection * @xml: XML describing the secret. - * @flags: extra flags; not used yet, so callers should always pass 0 + * @flags: bitwise-OR of virSecretDefineFlags * * If XML specifies a UUID, locates the specified secret and replaces all * attributes of the secret specified by UUID by attributes specified in x= ml --=20 2.31.1 From nobody Tue May 7 01:36:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1629462734; cv=none; d=zohomail.com; s=zohoarc; b=QCdy9J7Ky94tCt7TZtxoxWYyI4EAOJuMHRGBiC94T+uUdUulu+thMkpwo1e3aW8drANBy2SA7LSoVY0TVOuAOToRsZAnUl8WVJzS6bE5IRMU0eRTznMO+B2dPYCxPG3YJinsioijOaTkkKGxCQlneXRCiZuwDBm9CwJ9vM6zSdI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629462734; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=mXPqXrFE4g3i8PSOVQXSay+fkvS9bZcJbrzW75BpgQw=; b=PDlnNkLuapvI9LRpf5mMIGc0jjBODPWfK8f9qCGJ7b+W6W0k0LRhK27RtLS3QzfrSzFjJVsqMyZrrk8PqdD6h/97zrTgnMv4uG0mjqz4J+bKjRvbHYtaRocP2sfL3vL4vk/vi3uHVafOGM7fhL//5NU46Xi5Uij6tsKDz5jWCDk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1629462734788389.3592290571563; Fri, 20 Aug 2021 05:32:14 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-490-VoNctFP6Nn-SBpXcrkSIGA-1; Fri, 20 Aug 2021 08:32:12 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1D0CF871805; Fri, 20 Aug 2021 12:32:07 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0EAD560938; Fri, 20 Aug 2021 12:32:06 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 87F481819AC2; Fri, 20 Aug 2021 12:32:05 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 17KCUn1E011220 for ; Fri, 20 Aug 2021 08:30:49 -0400 Received: by smtp.corp.redhat.com (Postfix) id BC3603AFD; Fri, 20 Aug 2021 12:30:49 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.43.2.2]) by smtp.corp.redhat.com (Postfix) with ESMTP id 450991A26A for ; Fri, 20 Aug 2021 12:30:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629462733; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=mXPqXrFE4g3i8PSOVQXSay+fkvS9bZcJbrzW75BpgQw=; b=L8bS/oKAo+gXmA8+JWV1TJ2Q0tWbQrSiW6T4GdszHzxcUeWAHfCj2O2/8rCaEpltOQ9Cy9 qk1IONw/XwrJirPvA6ty7HjcAIWITl4ociD5Adt+PG1rxx1abO7298z6LkJh7jFuI55kOl EH5Swf++XqJeGIekSPhI/tX4RAveXOA= X-MC-Unique: VoNctFP6Nn-SBpXcrkSIGA-1 From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH 2/4] secret_conf: add validation against schema in define Date: Fri, 20 Aug 2021 14:30:38 +0200 Message-Id: <7d03fb6d683f200648164841c1732c164686947f.1629462494.git.khanicov@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1629462736313100001 Content-Type: text/plain; charset="utf-8" We need to validate the XML against schema if option '--validate' was passed to the virsh command. This patch also includes propagation of flags into the virSecretDefParse() function. Signed-off-by: Kristina Hanicova Reviewed-by: J=C3=A1n Tomko --- src/conf/secret_conf.c | 13 ++++++++----- src/conf/secret_conf.h | 2 +- src/secret/secret_driver.c | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/conf/secret_conf.c b/src/conf/secret_conf.c index ef6a4b606e..1dee90eba1 100644 --- a/src/conf/secret_conf.c +++ b/src/conf/secret_conf.c @@ -191,12 +191,14 @@ secretXMLParseNode(xmlDocPtr xml, xmlNodePtr root) =20 static virSecretDef * virSecretDefParse(const char *xmlStr, - const char *filename) + const char *filename, + unsigned int flags) { g_autoptr(xmlDoc) xml =3D NULL; virSecretDef *ret =3D NULL; =20 - if ((xml =3D virXMLParse(filename, xmlStr, _("(definition_of_secret)")= , NULL, false))) { + if ((xml =3D virXMLParse(filename, xmlStr, _("(definition_of_secret)")= , "secret.rng", + flags & VIR_SECRET_DEFINE_VALIDATE))) { ret =3D secretXMLParseNode(xml, xmlDocGetRootElement(xml)); } =20 @@ -204,15 +206,16 @@ virSecretDefParse(const char *xmlStr, } =20 virSecretDef * -virSecretDefParseString(const char *xmlStr) +virSecretDefParseString(const char *xmlStr, + unsigned int flags) { - return virSecretDefParse(xmlStr, NULL); + return virSecretDefParse(xmlStr, NULL, flags); } =20 virSecretDef * virSecretDefParseFile(const char *filename) { - return virSecretDefParse(NULL, filename); + return virSecretDefParse(NULL, filename, 0); } =20 static int diff --git a/src/conf/secret_conf.h b/src/conf/secret_conf.h index 373c96b729..36d50407fd 100644 --- a/src/conf/secret_conf.h +++ b/src/conf/secret_conf.h @@ -35,7 +35,7 @@ struct _virSecretDef { void virSecretDefFree(virSecretDef *def); G_DEFINE_AUTOPTR_CLEANUP_FUNC(virSecretDef, virSecretDefFree); =20 -virSecretDef *virSecretDefParseString(const char *xml); +virSecretDef *virSecretDefParseString(const char *xml, unsigned int flags); virSecretDef *virSecretDefParseFile(const char *filename); char *virSecretDefFormat(const virSecretDef *def); =20 diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c index d2175de8ed..6b3f0711aa 100644 --- a/src/secret/secret_driver.c +++ b/src/secret/secret_driver.c @@ -222,7 +222,7 @@ secretDefineXML(virConnectPtr conn, =20 virCheckFlags(0, NULL); =20 - if (!(def =3D virSecretDefParseString(xml))) + if (!(def =3D virSecretDefParseString(xml, 0))) return NULL; =20 if (virSecretDefineXMLEnsureACL(conn, def) < 0) --=20 2.31.1 From nobody Tue May 7 01:36:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1629462739; cv=none; d=zohomail.com; s=zohoarc; b=MGcb/2gK43OwAdiOUPcf26vF93lnqwm+MvefaUHN9b2PORaGheFAkqHsuDSOzwBgnepFN/7MBBF5nLyFQLeqAIix5/Ekh1C/HAMnGYYGQAD/533VZLsTutHnOtDaVXtVj83GVaxDrlF3QRKWXC76d4tcVMLK0NqVL0t/lagOWYc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629462739; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=C7+b0HbgLNk/ndWm3tv+LCZdBGUWMEqtBNZiyTgEX+s=; b=K8OYNyoFpvg8PkPOpDo69avin6+U9WBpGC9Vzw6b9+GIY9UAenMNG/wsmCUQTXN+d2h8HI3RdzvQhEW6vERC/XB17L/0aMta/5IOofMI0EhdzyldWIomoHG7/3gxw1QW91K+k6P/4E2xTLl4rc1PvcZTs5kvrhdOqtJntJu7hMk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 162946273954331.227535618140223; Fri, 20 Aug 2021 05:32:19 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-578-sQHxRLESNfyGpp9qiOgsHA-1; Fri, 20 Aug 2021 08:32:17 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0BFC2801AEB; Fri, 20 Aug 2021 12:32:12 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D8F535D741; Fri, 20 Aug 2021 12:32:11 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id A1B68181A0F8; Fri, 20 Aug 2021 12:32:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 17KCUoUx011227 for ; Fri, 20 Aug 2021 08:30:50 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8DBD71A26A; Fri, 20 Aug 2021 12:30:50 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.43.2.2]) by smtp.corp.redhat.com (Postfix) with ESMTP id 16B563AFD for ; Fri, 20 Aug 2021 12:30:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629462738; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=C7+b0HbgLNk/ndWm3tv+LCZdBGUWMEqtBNZiyTgEX+s=; b=hBuQtj7EJA3g672H62v9n8Qmik9W06iS+36mapd91HdJesSAonYmHUMWh5yPJ9y3GS69Oc gpIFvi3vQ73B5vvCqGlqN4R0BEPdN7CjodhdvYuumwOgH0+RS4KbzKBFfZMDaOyjAL6di8 nF5V2ZZzTMLqtCqLmmAzKDL/krWkK7I= X-MC-Unique: sQHxRLESNfyGpp9qiOgsHA-1 From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH 3/4] secret_driver: allow VIR_SECRET_DEFINE_VALIDATE flag Date: Fri, 20 Aug 2021 14:30:39 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1629462741047100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Kristina Hanicova Reviewed-by: J=C3=A1n Tomko --- src/secret/secret_driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c index 6b3f0711aa..43aeae9568 100644 --- a/src/secret/secret_driver.c +++ b/src/secret/secret_driver.c @@ -220,9 +220,9 @@ secretDefineXML(virConnectPtr conn, virSecretDef *def; virObjectEvent *event =3D NULL; =20 - virCheckFlags(0, NULL); + virCheckFlags(VIR_SECRET_DEFINE_VALIDATE, NULL); =20 - if (!(def =3D virSecretDefParseString(xml, 0))) + if (!(def =3D virSecretDefParseString(xml, flags))) return NULL; =20 if (virSecretDefineXMLEnsureACL(conn, def) < 0) --=20 2.31.1 From nobody Tue May 7 01:36:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1629462742; cv=none; d=zohomail.com; s=zohoarc; b=KK7ZJ1Xn61Xg1Pb79SVZhOM/XwxExxo9aMBbZCAIB3MS4CsQetBoYyk7qHrtu5l/OMFjnB+rjVdS81Kq2Dk4CxKlP60L9WKAY7Rvw1utbW5AjzvSnRTYg3Yoocktm8YQ2S4sJvH/BUbtUNQ/oI/HFEJjcV9t4w1wYPoTolhlB8g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629462742; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0nL04W+4v1j8KL+4pgwivdYM+QYLPE58LB8eUZCMTJE=; b=Siq2E6ncq/9AE8HZIyZidGUgF+volwL51RCrQfWwFYVY5JFc0dc2sb9qotyqpBbeZRT8xqLK5W2OhgOHPkHGM8DxrIZOLAwFpR+E3faIyZa8u2gpo5oL+no3PfmtasQZjpTd8Rz7oKXK/xrSjQDiYhcIQgI8bYQCCwfRzMJyfOs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1629462742904478.33855483510854; Fri, 20 Aug 2021 05:32:22 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-146-rDqRqqbYPtS5eKCtM1Fs5w-1; Fri, 20 Aug 2021 08:32:19 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F04871082920; Fri, 20 Aug 2021 12:32:14 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B219718A66; Fri, 20 Aug 2021 12:32:14 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 81365181A137; Fri, 20 Aug 2021 12:32:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 17KCUppN011233 for ; Fri, 20 Aug 2021 08:30:51 -0400 Received: by smtp.corp.redhat.com (Postfix) id 602503AFD; Fri, 20 Aug 2021 12:30:51 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.43.2.2]) by smtp.corp.redhat.com (Postfix) with ESMTP id DD2061A26A for ; Fri, 20 Aug 2021 12:30:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629462741; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=0nL04W+4v1j8KL+4pgwivdYM+QYLPE58LB8eUZCMTJE=; b=cRm/rUSlyHaz2EAFszmt34q9xgqpjnrlawBh2TMwMqPo2Ld10o3LgmBTrDM9mIETKt3vtd HmhSg+5B00R3660ur0EG7Nax0TqWXxhfYI1qVm/IWjZnMHG4oGT/KOz5UhyuwhbAX4n1Tu lY5rMkFjYRqHDsH8rTXmmwOt5VjzqeM= X-MC-Unique: rDqRqqbYPtS5eKCtM1Fs5w-1 From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH 4/4] virsh: add support for '--validate' option in define secret Date: Fri, 20 Aug 2021 14:30:40 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1629462743351100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Kristina Hanicova Reviewed-by: J=C3=A1n Tomko --- docs/manpages/virsh.rst | 4 +++- tools/virsh-secret.c | 10 +++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst index 3eb310d02e..de6d6ee1c2 100644 --- a/docs/manpages/virsh.rst +++ b/docs/manpages/virsh.rst @@ -6697,13 +6697,15 @@ secret-define =20 :: =20 - secret-define file + secret-define file [--validate] =20 Create a secret with the properties specified in *file*, with no associated secret value. If *file* does not specify a UUID, choose one automatically. If *file* specifies a UUID of an existing secret, replace its properties by properties defined in *file*, without affecting the secret value. =20 +Optionally, the format of the input XML file can be validated against an +internal RNG schema with *--validate*. =20 secret-dumpxml -------------- diff --git a/tools/virsh-secret.c b/tools/virsh-secret.c index dde0d26398..173a77fd90 100644 --- a/tools/virsh-secret.c +++ b/tools/virsh-secret.c @@ -73,6 +73,10 @@ static const vshCmdInfo info_secret_define[] =3D { =20 static const vshCmdOptDef opts_secret_define[] =3D { VIRSH_COMMON_OPT_FILE(N_("file containing secret attributes in XML")), + {.name =3D "validate", + .type =3D VSH_OT_BOOL, + .help =3D N_("validate the XML against the schema") + }, {.name =3D NULL} }; =20 @@ -84,15 +88,19 @@ cmdSecretDefine(vshControl *ctl, const vshCmd *cmd) virSecretPtr res; char uuid[VIR_UUID_STRING_BUFLEN]; bool ret =3D false; + unsigned int flags =3D 0; virshControl *priv =3D ctl->privData; =20 if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0) return false; =20 + if (vshCommandOptBool(cmd, "validate")) + flags |=3D VIR_SECRET_DEFINE_VALIDATE; + if (virFileReadAll(from, VSH_MAX_XML_FILE, &buffer) < 0) return false; =20 - if (!(res =3D virSecretDefineXML(priv->conn, buffer, 0))) { + if (!(res =3D virSecretDefineXML(priv->conn, buffer, flags))) { vshError(ctl, _("Failed to set attributes from %s"), from); goto cleanup; } --=20 2.31.1