From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 4F6C31FF16F for ; Tue, 16 Sep 2025 19:20:57 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1456A19DA3; Tue, 16 Sep 2025 19:20:56 +0200 (CEST) From: "Max R. Carrara" To: pve-devel@lists.proxmox.com Date: Tue, 16 Sep 2025 19:20:02 +0200 Message-ID: <20250916172012.739807-2-m.carrara@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20250916172012.739807-1-m.carrara@proxmox.com> References: <20250916172012.739807-1-m.carrara@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1758043215127 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.088 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH pve-manager master v1 1/6] ceph: tools: add helper sub for creating or updating keyring files X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Add `create_or_update_keyring_file()`, a more generic version of `create_or_update_crash_keyring_file()`, in order to avoid duplicating the underlying logic for other kinds of keyrings / Ceph auth entities. Signed-off-by: Max R. Carrara --- PVE/Ceph/Tools.pm | 80 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/PVE/Ceph/Tools.pm b/PVE/Ceph/Tools.pm index f50d2272..dce9156a 100644 --- a/PVE/Ceph/Tools.pm +++ b/PVE/Ceph/Tools.pm @@ -3,6 +3,7 @@ package PVE::Ceph::Tools; use strict; use warnings; +use Carp qw(croak); use File::Path; use File::Basename; use IO::File; @@ -455,6 +456,85 @@ sub get_or_create_admin_keyring { return $pve_ckeyring_path; } +=head3 create_or_update_keyring_file($dest_file, $entity, $caps [, $rados]) + +Creates or updates a keyring file C<$dest_file> for C<$entity>. If the +C<$entity> is created, it gains the capabilities provided with C<$caps>. +Otherwise, capabilities are not updated. + +B The caller is responsible for ensuring that the provided C<$dest_file> +is in fact for the given C<$entity>. + +Returns C<1> if C<$dest_file> was created or updated, C<0> otherwise. + +=over + +=item * C<$dest_file> + +The path of the keyring file, for example C. + +=item * C<$entity> + +The entity for which to create the authentication entry and corresponding +keyring, for example C. If the entity already exists, its +capabilities are not updated. + +=item * C<$caps> + +The capabilities to set when creating C<$entity>, for example: + + my $caps = [ + mgr => 'allow profile osd', + mon => 'allow profile osd', + osd => 'allow *', + ]; + +=item * C<$rados> (optional) + +An existing C> object. If not provided, a new object will be +created instead. + +=back + +For an explanation on Ceph capabilities, see: +L + +=cut + +my sub create_or_update_keyring_file { + my ($dest_file, $entity, $caps, $rados) = @_; + + croak '$dest_file is undef' if !defined($dest_file); + croak '$entity is undef' if !defined($entity); + croak '$caps is undef' if !defined($caps); + + $rados = PVE::RADOS->new() if !defined($rados); + + my $output = $rados->mon_command({ + prefix => 'auth get-or-create', + entity => "$entity", + caps => $caps, + format => 'plain', + }); + + if (-f $dest_file) { + my $contents = PVE::Tools::file_get_contents($dest_file); + + if ($contents ne $output) { + PVE::Tools::file_set_contents($dest_file, $output); + return 1; + } + + return 0; + + } else { + PVE::Tools::file_set_contents($dest_file, $output); + return 1; + } + + return 0; +} + # is also used in `pve-init-ceph-crash` helper sub create_or_update_crash_keyring_file { my ($rados) = @_; -- 2.47.3 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel