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 29B39924B6 for ; Wed, 29 Mar 2023 13:55:27 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0E9023A8E1 for ; Wed, 29 Mar 2023 13:54:57 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 firstgate.proxmox.com (Proxmox) with ESMTPS for ; Wed, 29 Mar 2023 13:54:56 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 5887A472CC; Wed, 29 Mar 2023 13:54:56 +0200 (CEST) Message-ID: <7a52e4c5-c8ca-e9e9-8a62-3aaa5a1d38f0@proxmox.com> Date: Wed, 29 Mar 2023 13:54:55 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: Stefan Sterz , Proxmox Backup Server development discussion References: <20230329100644.2887875-1-d.csapak@proxmox.com> <70fec0a4-ebc6-f3f6-cd2c-60bf13df4d01@proxmox.com> From: Dominik Csapak In-Reply-To: <70fec0a4-ebc6-f3f6-cd2c-60bf13df4d01@proxmox.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.010 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: Re: [pbs-devel] [PATCH proxmox-backup] tape: fix anchoring of datastore map regex X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Mar 2023 11:55:27 -0000 On 3/29/23 13:50, Stefan Sterz wrote: > On 3/29/23 12:06, Dominik Csapak wrote: >> was missing. In practice it was not doing any harm, since we always >> checked for an existing datastore with the target name anyway, and >> if the source did not exists, we could not restore from that anyway. >> >> Both the source datastore on the tape, as well as the existing >> datastores have to adhere to the correct regex. >> >> Signed-off-by: Dominik Csapak >> --- >> pbs-api-types/src/datastore.rs | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/pbs-api-types/src/datastore.rs b/pbs-api-types/src/datastore.rs >> index 72e8d1ee..7f8c1f09 100644 >> --- a/pbs-api-types/src/datastore.rs >> +++ b/pbs-api-types/src/datastore.rs >> @@ -34,7 +34,7 @@ const_regex! { >> pub SNAPSHOT_PATH_REGEX = concat!(r"^", SNAPSHOT_PATH_REGEX_STR!(), r"$"); >> pub GROUP_OR_SNAPSHOT_PATH_REGEX = concat!(r"^", GROUP_OR_SNAPSHOT_PATH_REGEX_STR!(), r"$"); >> >> - pub DATASTORE_MAP_REGEX = concat!(r"(:?", PROXMOX_SAFE_ID_REGEX_STR!(), r"=)?", PROXMOX_SAFE_ID_REGEX_STR!()); >> + pub DATASTORE_MAP_REGEX = concat!(r"^(:?", PROXMOX_SAFE_ID_REGEX_STR!(), r"=)?", PROXMOX_SAFE_ID_REGEX_STR!(), r"$"); > > small question: should the `(:?` be a non-capturing group (`(?:`) here > instead? or am i missing something? afaict this would allow colons at > the beginning of the source datastore, creating a similar problem as was > fixed here, i'd assume. yep, you're right, should be '(?:' instead at least 2 other regex also have this wrong: ---- pub BLOCKDEVICE_NAME_REGEX = r"^(:?(:?h|s|x?v)d[a-z]+)|(:?nvme\d+n\d+)$"; ---- and ---- pub TAPE_RESTORE_SNAPSHOT_REGEX = concat!(r"^", PROXMOX_SAFE_ID_REGEX_STR!(), r" ---- will send a patch... > >> } >> >> pub const CHUNK_DIGEST_FORMAT: ApiStringFormat = ApiStringFormat::Pattern(&SHA256_HEX_REGEX); >