From nobody Mon Feb 9 03:16:09 2026 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 --- 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