From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <mira@nena.proxmox.com>
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) server-digest SHA256)
(No client certificate requested)
by lists.proxmox.com (Postfix) with ESMTPS id 4C68E9A9E
for <pmg-devel@lists.proxmox.com>; Mon, 26 Jun 2023 12:41:49 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 34EF926DED
for <pmg-devel@lists.proxmox.com>; Mon, 26 Jun 2023 12:41:49 +0200 (CEST)
Received: from nena.proxmox.com (unknown [94.136.29.99])
by firstgate.proxmox.com (Proxmox) with ESMTP
for <pmg-devel@lists.proxmox.com>; Mon, 26 Jun 2023 12:41:48 +0200 (CEST)
Received: by nena.proxmox.com (Postfix, from userid 1000)
id 15BA02567DD; Mon, 26 Jun 2023 12:41:48 +0200 (CEST)
From: Mira Limbeck <m.limbeck@proxmox.com>
To: pmg-devel@lists.proxmox.com
Date: Mon, 26 Jun 2023 12:41:41 +0200
Message-Id: <20230626104142.519755-1-m.limbeck@proxmox.com>
X-Mailer: git-send-email 2.39.2
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL -0.701 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
KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery
methods
RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_NONE 0.001 SPF: sender does not publish an SPF Record
T_SCC_BODY_TEXT_LINE -0.01 -
Subject: [pmg-devel] [PATCH log-tracker 1/2] add support for bookworm syslog
time format
X-BeenThere: pmg-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox Mail Gateway development discussion
<pmg-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pmg-devel>,
<mailto:pmg-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pmg-devel/>
List-Post: <mailto:pmg-devel@lists.proxmox.com>
List-Help: <mailto:pmg-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel>,
<mailto:pmg-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Mon, 26 Jun 2023 10:41:49 -0000
Adds `proxmox-time` as dependency to parse the timestamp
Since parse_rfc3339 can't handle microseconds, we try to remove the dot
followed by 6 digits of microseconds before passing it to parse_rfc3339.
A fallback to the previous format is used when when it fails to parse
the new format.
Signed-off-by: Mira Limbeck <m.limbeck@proxmox.com>
---
Cargo.toml | 1 +
src/main.rs | 36 ++++++++++++++++++++++++++++++++++++
2 files changed, 37 insertions(+)
diff --git a/Cargo.toml b/Cargo.toml
index b484137..6d92253 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,3 +14,4 @@ anyhow = "1"
clap = { version = "3.2.23", features = ["cargo"] }
flate2 = "1.0"
libc = "0.2"
+proxmox-time = "1.1"
diff --git a/src/main.rs b/src/main.rs
index 20d8404..e7bffd8 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -2236,6 +2236,42 @@ fn parse_number(data: &[u8], max_digits: usize) -> Option<(usize, &[u8])> {
/// Parse time. Returns a tuple of (parsed_time, remaining_text) or None.
fn parse_time(data: &'_ [u8], cur_year: i64, cur_month: i64) -> Option<(time_t, &'_ [u8])> {
+ parse_time_with_year(data).or_else(|| parse_time_no_year(data, cur_year, cur_month))
+}
+
+fn parse_time_with_year(data: &'_ [u8]) -> Option<(time_t, &'_ [u8])> {
+ let mut timestamp_buffer = [0u8; 25];
+
+ let count = data.iter().take_while(|b| **b != b' ').count();
+ if count != 27 && count != 32 {
+ return None;
+ }
+ let (timestamp, data) = data.split_at(count);
+ // remove whitespace
+ let data = &data[1..];
+
+ // microseconds: .123456 -> 7 bytes
+ let microseconds_idx = timestamp.iter().take_while(|b| **b != b'.').count();
+
+ // YYYY-MM-DDTHH:MM:SS
+ let year_time = ×tamp[0..microseconds_idx];
+ let year_time_len = year_time.len();
+ // Z | +HH:MM | -HH:MM
+ let timezone = ×tamp[microseconds_idx + 7..];
+ let timezone_len = timezone.len();
+ let timestamp_len = year_time_len + timezone_len;
+ timestamp_buffer[0..year_time_len].copy_from_slice(year_time);
+ timestamp_buffer[year_time_len..timestamp_len].copy_from_slice(timezone);
+
+ match proxmox_time::parse_rfc3339(unsafe {
+ std::str::from_utf8_unchecked(×tamp_buffer[0..timestamp_len])
+ }) {
+ Ok(ltime) => Some((ltime, data)),
+ Err(_err) => None,
+ }
+}
+
+fn parse_time_no_year(data: &'_ [u8], cur_year: i64, cur_month: i64) -> Option<(time_t, &'_ [u8])> {
if data.len() < 15 {
return None;
}
--
2.30.2