From nobody Fri Dec 12 14:05:57 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=1765223989; cv=none; d=zohomail.com; s=zohoarc; b=gt9yut3CSEXkVzHJaWu0B+vmCVf/f6dTek+xEg+CPb1XqBVh/nrPXNeHcMREZ6UZlU1UXyN5hp9Q35szkdDcVNjtPeoo6U6uvlTUjNzRg8FJLM/h+pVTUdv3OXmupQvF4HsQ07CE8KQ18tkWrVP8NgGX7mpWPgQOAqeafbYaQms= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765223989; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id; bh=GH2uqIsdJBJ4/hAdR1cPgM5LESiNOjysz14YsnbrO24=; b=a3k6ysn28h4u+EyiL2xneBkUEogqlJrcPHRWCbswGF8+k18wk5busLDOC4tNVlTbECU5PckHa2sURQINyzikxvNx/yNbln+yOxc5FcrlmMtjMtOenwU9DldBJZr+nJnDOnT1MiL2vlsUjQs6t1GITmTFnC0ZDJF5kM31nmN+98g= 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 1765223989809364.5032320969482; Mon, 8 Dec 2025 11:59:49 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id B14D543DE0; Mon, 8 Dec 2025 14:59:48 -0500 (EST) Received: from [172.19.199.80] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id A083D43DD1; Mon, 8 Dec 2025 14:53:31 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 0E34543E77; Mon, 8 Dec 2025 14:53:15 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 2D82043E72 for ; Mon, 8 Dec 2025 14:52:50 -0500 (EST) Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-318-0mg4_05ROniC_NJCq-BTRQ-1; Mon, 08 Dec 2025 14:52:43 -0500 Received: by mail-pl1-f198.google.com with SMTP id d9443c01a7336-29848363458so99423735ad.2 for ; Mon, 08 Dec 2025 11:52:43 -0800 (PST) Received: from armenon-kvm.armenon-thinkpadp16vgen1.bengluru.csb ([49.36.110.66]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29daeaab9c0sm134095235ad.68.2025.12.08.11.52.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Dec 2025 11:52:40 -0800 (PST) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-5.0 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1765223569; 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=GH2uqIsdJBJ4/hAdR1cPgM5LESiNOjysz14YsnbrO24=; b=cbK5EQ+kdcTxaBzJzzD7XVCEMFOkC2lGN18aJWvoNQxB0eyXOifq1yyHxuzeWfC/K4APcs fsS7b/BCIiIIuebmOUaSkbNed+KJW29pBfIuJ40Mw07bl2Wl59EVAygfIrKA7WAOZBzheU FzUdN9MlPN73a+nkX6Q4Yu/OTyYVILE= X-MC-Unique: 0mg4_05ROniC_NJCq-BTRQ-1 X-Mimecast-MFC-AGG-ID: 0mg4_05ROniC_NJCq-BTRQ_1765223562 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765223561; x=1765828361; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=GH2uqIsdJBJ4/hAdR1cPgM5LESiNOjysz14YsnbrO24=; b=LL+yaYYgTlCz0MmcSQxnMdGFGgugyLDWaqtNTxxbqvWZwLirIwCtZBJlvDnZDn/DJ4 noWWm2q4CTmCjLgC4D7cB6+KfKyZ1ghUdkmqKI3Q8P6306y/Tow4a8vzkQKCNiKYv7PY hW56B9/aNXrtTOuDodagMjI0agWIjbACQIUYsZErDnu/suonqCzI/mgezVii738qEtQQ Oyi/orn4oiF/j+qIcQGtBAqbnmh55w32gXOeRukK7Ode9pYxyHU+8JvwkIqdv+PEQvAS N3dBAANPEV1IdhiCxSf/LHPhMXV/BSnxjg+Wb4QLeCvd3WDs+7W6DaBAdo5vY9Xyvy9k fxtw== X-Gm-Message-State: AOJu0YyKZvb8JgJm0SiMXRhWWOmaNIY/nrMF1DsCjnHlietKOjMpA2gm 9NuSHR7KaVi+d39/955ObOINaCsnp9+MhPhqaEdI0oN5a5uwk5oA8tx61tfgLtPb95fy7cl+dUf Io2RRkSWh7Qa/t04y4+rzM/hCQokRT0cqvL4IUlYmSrh/PjcobNBgdGlRFKBJT7FLmrD8nv2eBl lIiG38R0Tr/4N16EkVL5MvaGOfdxlQ6rf5EgnU55LRPA== X-Gm-Gg: ASbGncs5ktAo1SeZ3me4eRZabLiJO1fZWp8H27MXHaaM1BcY02thRkxfBCokj+NJWzt 9jM3OB7Ld7JGZSBOoCcN8FxwBGVh4qD/Fz+T5SRa0W12cOjfLxrRdP7YruA/JWWv/DdhI+WvhRW hHeELzV2qBQAO6uwYiYztWYd0LlC8YLiJViHrpirsk90Ixip5/XioLCZ4KND1dqRAx5NkihglIB P8ya+G/Unw06VikM+Pyz8e+c7u6Z8708pqJMIf2G49fMkbVaavKI+uNj94GO566neRjKudfw8K2 jCR+muYt2b/4+an2ogkNzH1WsdJJ0j1nshDgXDSdQ587Vl8SQ4/8uFD+4LHw45Z/3oYre8aUbIe 7qCNALNrWaDRZtEVdMtFdPaM1yt3WXFKHS+2wafX5Kyjlb0E5GY+6IkZO X-Received: by 2002:a17:902:e80a:b0:295:f47:75cb with SMTP id d9443c01a7336-29df5793251mr90407165ad.23.1765223561508; Mon, 08 Dec 2025 11:52:41 -0800 (PST) X-Google-Smtp-Source: AGHT+IG+LIZIaBnj1BY6Q4BcQw288iKRRTI65376PCqBKCHCATEUDIBaFODONAo2cAzYPoP82DFQTg== X-Received: by 2002:a17:902:e80a:b0:295:f47:75cb with SMTP id d9443c01a7336-29df5793251mr90406975ad.23.1765223561030; Mon, 08 Dec 2025 11:52:41 -0800 (PST) To: devel@lists.libvirt.org Subject: [PATCH 2/5] secret: Set up default encryption secret key for the virtsecretd service Date: Tue, 9 Dec 2025 01:22:28 +0530 Message-ID: <20251208195231.98170-3-armenon@redhat.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251208195231.98170-1-armenon@redhat.com> References: <20251208195231.98170-1-armenon@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: hZ6KXUSyq7_OE8g7p92CeWQEYLhECwMMHIS5cE6oEhE_1765223562 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: RZ2XN35SK7CWG3V6V7IIKYFEMMUZABB7 X-Message-ID-Hash: RZ2XN35SK7CWG3V6V7IIKYFEMMUZABB7 X-MailFrom: armenon@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Arun Menon X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Arun Menon via Devel Reply-To: Arun Menon X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1765223995579158500 Content-Type: text/plain; charset="utf-8"; x-default="true" This commit sets the foundation for encrypting the libvirt secrets by provi= ding a secure way to pass a secret encryption key to the virtsecretd service. A random secret key is generated using the new virt-secret-init-encryption service. This key can be consumed by the virtsecretd service. By using the "Before=3D" directive in the new virt-secret-init-encryption service and using "Requires=3D" directive in the virtsecretd service, we make sure that the daemon is run only after we have an encrypted secret key file generated and placed in /var/lib/libvirt/secrets. The virtsecretd service can then read the key from CREDENTIALS_DIRECTORY. [= 1] This setup therefore provides a default key out-of-the-box for initial use. A subsequent commit will introduce the logic for virtsecretd to access and use this key via the $CREDENTIALS_DIRECTORY environment varia= ble. [2] [1] https://www.freedesktop.org/software/systemd/man/latest/systemd-creds.h= tml [2] https://systemd.io/CREDENTIALS/ Signed-off-by: Arun Menon --- libvirt.spec.in | 4 ++++ src/meson.build | 1 + src/remote/libvirtd.service.in | 2 ++ src/secret/meson.build | 15 +++++++++++++++ src/secret/virt-secret-init-encryption.service.in | 7 +++++++ src/secret/virtsecretd.service.extra.in | 8 ++++++++ 6 files changed, 37 insertions(+) create mode 100644 src/secret/virt-secret-init-encryption.service.in diff --git a/libvirt.spec.in b/libvirt.spec.in index ccfe75135b..8505a220c7 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1890,13 +1890,16 @@ exit 0 %pre daemon-driver-secret %libvirt_sysconfig_pre virtsecretd %libvirt_systemd_unix_pre virtsecretd +%libvirt_systemd_oneshot_pre virt-secret-init-encryption =20 %posttrans daemon-driver-secret %libvirt_sysconfig_posttrans virtsecretd %libvirt_systemd_unix_posttrans virtsecretd +%libvirt_systemd_unix_posttrans virt-secret-init-encryption =20 %preun daemon-driver-secret %libvirt_systemd_unix_preun virtsecretd +%libvirt_systemd_unix_preun virt-secret-init-encryption =20 %pre daemon-driver-storage-core %libvirt_sysconfig_pre virtstoraged @@ -2248,6 +2251,7 @@ exit 0 %{_datadir}/augeas/lenses/virtsecretd.aug %{_datadir}/augeas/lenses/tests/test_virtsecretd.aug %{_unitdir}/virtsecretd.service +%{_unitdir}/virt-secret-init-encryption.service %{_unitdir}/virtsecretd.socket %{_unitdir}/virtsecretd-ro.socket %{_unitdir}/virtsecretd-admin.socket diff --git a/src/meson.build b/src/meson.build index 47c978cc1f..f18f562fd9 100644 --- a/src/meson.build +++ b/src/meson.build @@ -837,6 +837,7 @@ if conf.has('WITH_LIBVIRTD') 'sbindir': sbindir, 'sysconfdir': sysconfdir, 'initconfdir': initconfdir, + 'localstatedir': localstatedir, 'name': unit['name'], 'service': unit['service'], 'SERVICE': unit['service'].to_upper(), diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in index b0a062e885..84447e0bcf 100644 --- a/src/remote/libvirtd.service.in +++ b/src/remote/libvirtd.service.in @@ -29,6 +29,8 @@ Conflicts=3Dxendomains.service Type=3Dnotify-reload Environment=3DLIBVIRTD_ARGS=3D"--timeout 120" EnvironmentFile=3D-@initconfdir@/libvirtd +Environment=3DSECRETS_ENCRYPTION_KEY=3D%d/secrets-encryption-key +LoadCredentialEncrypted=3Dsecrets-encryption-key:@localstatedir@/lib/libvi= rt/secrets/secrets-encryption-key ExecStart=3D@sbindir@/libvirtd $LIBVIRTD_ARGS ExecReload=3D/bin/kill -HUP $MAINPID KillMode=3Dprocess diff --git a/src/secret/meson.build b/src/secret/meson.build index 3b859ea7b4..b0977eadc8 100644 --- a/src/secret/meson.build +++ b/src/secret/meson.build @@ -31,6 +31,21 @@ if conf.has('WITH_SECRETS') 'name': 'virtsecretd', } =20 + virt_secret_init_encryption_conf =3D configuration_data() + + virt_secret_init_encryption_conf.set('localstatedir', localstatedir) + virt_secret_init_encryption_conf.set('name', 'Libvirt Secret Encryption = Init') + virt_secret_init_encryption_conf.set('service', 'virt-secret-init-encryp= tion') + virt_secret_init_encryption_conf.set('SERVICE', 'virt-secret-init-encryp= tion'.to_upper()) + + configure_file( + input: 'virt-secret-init-encryption.service.in', + output: '@0@.service'.format('virt-secret-init-encryption'), + configuration: virt_secret_init_encryption_conf, + install: true, + install_dir: unitdir, + ) + virt_daemon_units +=3D { 'service': 'virtsecretd', 'name': 'secret', diff --git a/src/secret/virt-secret-init-encryption.service.in b/src/secret= /virt-secret-init-encryption.service.in new file mode 100644 index 0000000000..0a23d452e8 --- /dev/null +++ b/src/secret/virt-secret-init-encryption.service.in @@ -0,0 +1,7 @@ +[Unit] +Before=3Dvirtsecretd.service +ConditionPathExists=3D!@localstatedir@/lib/libvirt/secrets/secrets-encrypt= ion-key + +[Service] +Type=3Doneshot +ExecStart=3D/usr/bin/sh -c 'umask 0066 && (dd if=3D/dev/urandom status=3Dn= one bs=3D32 count=3D1 | systemd-creds encrypt --name=3Dsecrets-encryption-k= ey - @localstatedir@/lib/libvirt/secrets/secrets-encryption-key)' diff --git a/src/secret/virtsecretd.service.extra.in b/src/secret/virtsecre= td.service.extra.in index 1fc8c672f7..116458b22a 100644 --- a/src/secret/virtsecretd.service.extra.in +++ b/src/secret/virtsecretd.service.extra.in @@ -1,2 +1,10 @@ # The contents of this unit will be merged into a base template. # Additional units might be merged as well. See meson.build for details. +# +[Unit] +Requires=3Dvirt-secret-init-encryption.service +After=3Dvirt-secret-init-encryption.service + +[Service] +LoadCredentialEncrypted=3Dsecrets-encryption-key:@localstatedir@/lib/libvi= rt/secrets/secrets-encryption-key +Environment=3DSECRETS_ENCRYPTION_KEY=3D%d/secrets-encryption-key --=20 2.51.1