From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id BB0F262923 for ; Tue, 27 Oct 2020 13:18:16 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id ADD02179E8 for ; Tue, 27 Oct 2020 13:18:16 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 3CF2D179DD for ; Tue, 27 Oct 2020 13:18:16 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 0697F45F58 for ; Tue, 27 Oct 2020 13:18:16 +0100 (CET) To: Proxmox VE development discussion , =?UTF-8?Q?Dominic_J=c3=a4ger?= References: <20201027101207.73749-1-d.jaeger@proxmox.com> From: Thomas Lamprecht Message-ID: <36ff14ea-46b5-be9f-d2ff-6080b41abc5c@proxmox.com> Date: Tue, 27 Oct 2020 13:18:15 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:83.0) Gecko/20100101 Thunderbird/83.0 MIME-Version: 1.0 In-Reply-To: <20201027101207.73749-1-d.jaeger@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 AWL -0.186 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment NICE_REPLY_A -2.167 Looks like a legit reply (A) RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record TVD_SUBJ_WIPE_DEBT 2.291 Spam advertising a way to eliminate debt URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [lvmthinplugin.pm] Subject: Re: [pve-devel] [PATCH storage] lvmthin: Match snapshot remove regex to allowed names 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: , X-List-Received-Date: Tue, 27 Oct 2020 12:18:16 -0000 On 27.10.20 11:12, Dominic J=C3=A4ger wrote: > We allow snapshot names that match pve-configid but during qm destroy w= e have > not removed all snapshots that match pve-configid so far. For example, = the name > x-y was allowed but the resulting snap_vm-105-disk-0_x-y was not remove= d. >=20 > Reported-by: Hannes Laimer > Signed-off-by: Dominic J=C3=A4ger > --- > Something like m/^snap_${volname}_${configidre}$/ would maybe be nicer,= but I > didn't see how to get that RE from JSONSchema in a shorter way than tha= t single > function call. >=20 hmm, I'd either: * move that regex to an `our $PROXMOX_CONFID_RE =3D ...` variable (or a m= ethod which returns it * copy over that regex to here, could be just fine here but I'd like to avoid using a capture group just to pass it a method whic= h then regex checks it again. > PVE/Storage/LvmThinPlugin.pm | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) >=20 > diff --git a/PVE/Storage/LvmThinPlugin.pm b/PVE/Storage/LvmThinPlugin.p= m > index d1c5b1f..4af57be 100644 > --- a/PVE/Storage/LvmThinPlugin.pm > +++ b/PVE/Storage/LvmThinPlugin.pm > @@ -117,7 +117,8 @@ sub free_image { > =20 > # remove all volume snapshots first > foreach my $lv (keys %$dat) { > - next if $lv !~ m/^snap_${volname}_(\w+)$/; > + next if $lv !~ m/^snap_${volname}_(.+)$/; > + next if !PVE::JSONSchema::pve_verify_configid($1, 1); > my $cmd =3D ['/sbin/lvremove', '-f', "$vg/$lv"]; > run_command($cmd, errmsg =3D> "lvremove snapshot '$vg/$lv' error"= ); > } >=20