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 77C587788B for ; Wed, 28 Apr 2021 13:07:41 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6C72FD2C0 for ; Wed, 28 Apr 2021 13:07:41 +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 id E266ED2B5 for ; Wed, 28 Apr 2021 13:07:40 +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 B5A724299C for ; Wed, 28 Apr 2021 13:07:40 +0200 (CEST) Date: Wed, 28 Apr 2021 13:07:39 +0200 From: Wolfgang Bumiller To: Dietmar Maurer Cc: Proxmox Backup Server development discussion Message-ID: <20210428110739.afkc6qunl74ni7zh@wobu-vie.proxmox.com> References: <20210422140213.30989-1-w.bumiller@proxmox.com> <20210422140213.30989-3-w.bumiller@proxmox.com> <544f87b6-0687-4770-6bce-579fab820779@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <544f87b6-0687-4770-6bce-579fab820779@proxmox.com> User-Agent: NeoMutt/20180716 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.037 Adjusted score from AWL reputation of From: address 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 v2 backup 02/27] add dns alias schema 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, 28 Apr 2021 11:07:41 -0000 On Wed, Apr 28, 2021 at 12:26:11PM +0200, Dietmar Maurer wrote: > Sorry, I don't get this. Why is DNS_LABEL and DNS_ALIAS_LABEL different? One allows underscores at the beginning, the other doesn't, as for "regular" domains that's not allowed, and the acme challenge domain uses `_acme_challenge` as a prefix and it makes sense to allow users to use this in their aliases as well, as that's just the domain where the challenge data ultimately ends up at. > > > On 4/22/21 4:01 PM, Wolfgang Bumiller wrote: > > Signed-off-by: Wolfgang Bumiller > > --- > > src/api2/types/mod.rs | 10 ++++++++++ > > 1 file changed, 10 insertions(+) > > > > diff --git a/src/api2/types/mod.rs b/src/api2/types/mod.rs > > index 9d1bd301..eee91dfd 100644 > > --- a/src/api2/types/mod.rs > > +++ b/src/api2/types/mod.rs > > @@ -51,6 +51,11 @@ pub const FILENAME_FORMAT: ApiStringFormat = ApiStringFormat::VerifyFn(|name| { > > macro_rules! DNS_LABEL { () => (r"(?:[a-zA-Z0-9](?:[a-zA-Z0-9\-]*[a-zA-Z0-9])?)") } > > macro_rules! DNS_NAME { () => (concat!(r"(?:(?:", DNS_LABEL!() , r"\.)*", DNS_LABEL!(), ")")) } > > +macro_rules! DNS_ALIAS_LABEL { () => (r"(?:[a-zA-Z0-9_](?:[a-zA-Z0-9\-]*[a-zA-Z0-9])?)") } > > +macro_rules! DNS_ALIAS_NAME { > > + () => (concat!(r"(?:(?:", DNS_ALIAS_LABEL!() , r"\.)*", DNS_ALIAS_LABEL!(), ")")) > > +} > > + > > macro_rules! CIDR_V4_REGEX_STR { () => (concat!(r"(?:", IPV4RE!(), r"/\d{1,2})$")) } > > macro_rules! CIDR_V6_REGEX_STR { () => (concat!(r"(?:", IPV6RE!(), r"/\d{1,3})$")) } > > @@ -87,6 +92,8 @@ const_regex!{ > > pub DNS_NAME_REGEX = concat!(r"^", DNS_NAME!(), r"$"); > > + pub DNS_ALIAS_REGEX = concat!(r"^", DNS_ALIAS_NAME!(), r"$"); > > + > > pub DNS_NAME_OR_IP_REGEX = concat!(r"^(?:", DNS_NAME!(), "|", IPRE!(), r")$"); > > pub BACKUP_REPO_URL_REGEX = concat!(r"^^(?:(?:(", USER_ID_REGEX_STR!(), "|", APITOKEN_ID_REGEX_STR!(), ")@)?(", DNS_NAME!(), "|", IPRE_BRACKET!() ,"):)?(?:([0-9]{1,5}):)?(", PROXMOX_SAFE_ID_REGEX_STR!(), r")$"); > > @@ -142,6 +149,9 @@ pub const HOSTNAME_FORMAT: ApiStringFormat = > > pub const DNS_NAME_FORMAT: ApiStringFormat = > > ApiStringFormat::Pattern(&DNS_NAME_REGEX); > > +pub const DNS_ALIAS_FORMAT: ApiStringFormat = > > + ApiStringFormat::Pattern(&DNS_ALIAS_REGEX); > > + > > pub const DNS_NAME_OR_IP_FORMAT: ApiStringFormat = > > ApiStringFormat::Pattern(&DNS_NAME_OR_IP_REGEX);