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 DBBF161E80 for ; Tue, 15 Sep 2020 12:21:35 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D138619507 for ; Tue, 15 Sep 2020 12:21:05 +0200 (CEST) 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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id B3983194FB for ; Tue, 15 Sep 2020 12:21:04 +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 7F1FE44C2B for ; Tue, 15 Sep 2020 12:21:04 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pbs-devel@lists.proxmox.com Date: Tue, 15 Sep 2020 12:20:51 +0200 Message-Id: <20200915102054.2866527-3-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200915102054.2866527-1-f.gruenbichler@proxmox.com> References: <20200915102054.2866527-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.223 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_NUMSUBJECT 0.5 Subject ends in numbers excluding current years 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [time.rs] Subject: [pbs-devel] [RFC proxmox 2/5] time: allow leap seconds when parsing RFC3339 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: Tue, 15 Sep 2020 10:21:35 -0000 we don't ever produce those, but they are valid RFC3339 strings Signed-off-by: Fabian Grünbichler --- Notes: alternatively: print a nice error message for seconds == 60, these should only ever happen when we parse some user provided RFC3339 string.. proxmox/src/tools/time.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proxmox/src/tools/time.rs b/proxmox/src/tools/time.rs index 78d75b9..f7faade 100644 --- a/proxmox/src/tools/time.rs +++ b/proxmox/src/tools/time.rs @@ -257,7 +257,7 @@ pub fn parse_rfc3339(i: &str) -> Result { expect(13, b':')?; tm.set_min(check_max(digit(14)?*10 + digit(15)?, 59)?)?; expect(16, b':')?; - tm.set_sec(check_max(digit(17)?*10 + digit(18)?, 59)?)?; + tm.set_sec(check_max(digit(17)?*10 + digit(18)?, 60)?)?; let epoch = tm.into_epoch()?; if tz == b'Z' { -- 2.20.1