From nobody Mon Feb 9 06:27:13 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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=1583771105; cv=none; d=zohomail.com; s=zohoarc; b=N5GvlhUSsZHNyKMcMRpjvSdt9ogJgD3uxrugeCZkFyFhg84ZaBk1OPFaJqoGAYnZTcSNH91lqCWgyCZOgxjVByJWrIckeEX6+26mP+vbO0GJaHin1KhflBmJMPcWmQiJdVyMPIHy4xFszQbily+qwKHMkVTR8Uy2y64V2EBIG8g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583771105; 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=MCj8+7z6F7Lvy/vDbBijZGY065IDcdBNur4+q55iN5k=; b=UEmCWiKu8nRJjyIJ5NNf3a5EJuLnxnJrPtxVmm+DqCaMMOpns40vUtlX3Tb79yLfMa2+YMTQXJ/zsp3Qa+WWDu8Cpm5XmPxev+bN/DQDdDVju7e+fxVCQeJGBHtdoVkEzyzt036sSdxMOGgTbEW+yVKrs5kKHbv0QdDQP9EqqGk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1583771105302565.0517195991353; Mon, 9 Mar 2020 09:25:05 -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-436-sHTSMIP2P6m83QpRQRVpGw-1; Mon, 09 Mar 2020 12:24:09 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 76AA1DB61; Mon, 9 Mar 2020 16:24:01 +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 44D615C557; Mon, 9 Mar 2020 16:24:01 +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 EACB118034ED; Mon, 9 Mar 2020 16:24:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 029GNYa5020880 for ; Mon, 9 Mar 2020 12:23:34 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8AED390779; Mon, 9 Mar 2020 16:23:34 +0000 (UTC) Received: from angien.redhat.com (unknown [10.43.2.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 10EED9051C for ; Mon, 9 Mar 2020 16:23:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583771104; 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=MCj8+7z6F7Lvy/vDbBijZGY065IDcdBNur4+q55iN5k=; b=FUXUwYnqvnTdszN5igfgyN2JMMzjJoxIZ5MKUFz6TcljgSZfbw29zg4xf4B1kr+EheoBDZ mvQ9mV40vyUfylsOG+wWFZk94j3AW3fLbcJc9Msv+OFx6EDY6h+YQGurYKm9heGEYhZDQQ hJ4zkyS5Lu5IQinqJrAxqPi1zNIJyD8= X-MC-Unique: sHTSMIP2P6m83QpRQRVpGw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 20/30] qemuDomainSecretStorageSourcePrepare: Setup secret for http cookies Date: Mon, 9 Mar 2020 17:23:00 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" QEMU's curl driver requires the cookes concatenated and allows them passed in via a secret. Prepare the value for the secret and encrypt it. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_domain.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index b36ff434f3..5c8fc83417 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1727,6 +1727,30 @@ qemuDomainDiskHasEncryptionSecret(virStorageSourcePt= r src) } +static qemuDomainSecretInfoPtr +qemuDomainSecretStorageSourcePrepareCookies(qemuDomainObjPrivatePtr priv, + virStorageSourcePtr src, + const char *aliasprotocol) +{ + g_autofree char *secretalias =3D qemuAliasForSecret(aliasprotocol, "ht= tpcookie"); + g_autofree char *cookies =3D NULL; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + size_t i; + + for (i =3D 0; i < src->ncookies; i++) { + virStorageNetCookieDefPtr cookie =3D src->cookies[i]; + + virBufferAsprintf(&buf, "%s=3D%s; ", cookie->name, cookie->value); + } + + virBufferTrim(&buf, "; "); + cookies =3D virBufferContentAndReset(&buf); + + return qemuDomainSecretAESSetup(priv, secretalias, NULL, + (uint8_t *) cookies, strlen(cookies)); +} + + /** * qemuDomainSecretStorageSourcePrepare: * @priv: domain private object @@ -1752,7 +1776,7 @@ qemuDomainSecretStorageSourcePrepare(qemuDomainObjPri= vatePtr priv, bool hasAuth =3D qemuDomainStorageSourceHasAuth(src); bool hasEnc =3D qemuDomainDiskHasEncryptionSecret(src); - if (!hasAuth && !hasEnc) + if (!hasAuth && !hasEnc && src->ncookies =3D=3D 0) return 0; if (!(src->privateData =3D qemuDomainStorageSourcePrivateNew())) @@ -1792,6 +1816,13 @@ qemuDomainSecretStorageSourcePrepare(qemuDomainObjPr= ivatePtr priv, return -1; } + if (src->ncookies && + virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV) && + !(srcPriv->httpcookie =3D qemuDomainSecretStorageSourcePrepareCook= ies(priv, + = src, + = aliasprotocol))) + return -1; + return 0; } --=20 2.24.1