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 86A4D1FF185 for ; Mon, 17 Nov 2025 18:15:45 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C2A5F70F; Mon, 17 Nov 2025 18:15:48 +0100 (CET) From: Filip Schauer To: pve-devel@lists.proxmox.com Date: Mon, 17 Nov 2025 18:13:14 +0100 Message-ID: <20251117171528.262443-2-f.schauer@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251117171528.262443-1-f.schauer@proxmox.com> References: <20251117171528.262443-1-f.schauer@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1763399717016 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.006 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 storage 1/4] api: storage status: pull OCI image to temporary file 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" Pull the OCI image to a temporary file first. Once it has finished, rename it, which is an atomic operation. This prevents accidental usage of an incomplete OCI image file for container creation. Signed-off-by: Filip Schauer --- src/PVE/API2/Storage/Status.pm | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/PVE/API2/Storage/Status.pm b/src/PVE/API2/Storage/Status.pm index 5abf53b..96832b9 100644 --- a/src/PVE/API2/Storage/Status.pm +++ b/src/PVE/API2/Storage/Status.pm @@ -959,14 +959,26 @@ __PACKAGE__->register_method({ die "storage '$storage' is not configured for content-type 'vztmpl'\n" if !$scfg->{content}->{vztmpl}; - my $filename = PVE::Storage::normalize_content_filename($reference); + my $filename = PVE::Storage::normalize_content_filename($reference) . ".tar"; + my $tmp_filename = "$filename.tmp.$$"; my $path = PVE::Storage::get_vztmpl_dir($cfg, $storage); PVE::Storage::activate_storage($cfg, $storage); + local $SIG{INT} = sub { + unlink "$path/$tmp_filename" + or warn "could not cleanup temporary file: $!" + if -e "$path/$tmp_filename"; + die "got interrupted by signal\n"; + }; + my $worker = sub { PVE::Tools::run_command( - ["skopeo", "copy", "docker://$reference", "oci-archive:$path/$filename.tar"], + [ + "skopeo", "copy", "docker://$reference", "oci-archive:$path/$tmp_filename", + ], ); + rename("$path/$tmp_filename", "$path/$filename") + or die "unable to rename temporary file: $!\n"; }; my $worker_id = PVE::Tools::encode_text($filename); # must not pass : or the like as w-ID -- 2.47.3 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel