From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <s.ivanov@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))
(No client certificate requested)
by lists.proxmox.com (Postfix) with ESMTPS id B56CF91070
for <pmg-devel@lists.proxmox.com>; Tue, 13 Feb 2024 15:05:00 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 9730536DE3
for <pmg-devel@lists.proxmox.com>; Tue, 13 Feb 2024 15:04:30 +0100 (CET)
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 <pmg-devel@lists.proxmox.com>; Tue, 13 Feb 2024 15:04:29 +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 27EB747CA2
for <pmg-devel@lists.proxmox.com>; Tue, 13 Feb 2024 15:04:29 +0100 (CET)
Date: Tue, 13 Feb 2024 15:04:27 +0100
From: Stoiko Ivanov <s.ivanov@proxmox.com>
To: Mira Limbeck <m.limbeck@proxmox.com>
Cc: pmg-devel@lists.proxmox.com
Message-ID: <20240213150427.1ea759c5@rosa.proxmox.com>
In-Reply-To: <20230718160101.1070267-2-m.limbeck@proxmox.com>
References: <20230718160101.1070267-1-m.limbeck@proxmox.com>
<20230718160101.1070267-2-m.limbeck@proxmox.com>
X-Mailer: Claws Mail 4.1.1 (GTK 3.24.38; x86_64-pc-linux-gnu)
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.087 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
T_SCC_BODY_TEXT_LINE -0.01 -
URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See
http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more
information. [mailtracker.pm]
Subject: Re: [pmg-devel] [RFC api] MailTracker: remove timezone offset
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: Tue, 13 Feb 2024 14:05:00 -0000
Thanks for addressing this and for the patches!
gave it a spin with a few logs from a longer period of time.
in general it looks ok (with my rudimentary tests)
one issue is that the starttime and endtime parameters you can provide to
the API call seem to not have been shifted by the offset.
(i.e. when searching for mails sent in CEST the start-end times in the
results are shifted by 2h based on the entry)
On Tue, 18 Jul 2023 18:01:01 +0200
Mira Limbeck <m.limbeck@proxmox.com> wrote:
> The timezone offset is moved to `pmg-log-tracker` in the
> compatibility code path. This way the new rfc3339 timestamp, which is
> already in UTC, can be used as is.
>
> Signed-off-by: Mira Limbeck <m.limbeck@proxmox.com>
> ---
> This change only makes sense in combination with the log-tracker one.
> Please DO NOT apply any of those 2 patches without the other one.
>
> src/PMG/API2/MailTracker.pm | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/src/PMG/API2/MailTracker.pm b/src/PMG/API2/MailTracker.pm
> index b8b25ad..ffda4b5 100644
> --- a/src/PMG/API2/MailTracker.pm
> +++ b/src/PMG/API2/MailTracker.pm
> @@ -43,8 +43,6 @@ my $run_pmg_log_tracker = sub {
>
> my $logids = {};
>
> - my $timezone = tz_local_offset();;
> -
> if (defined(my $id = $includelog)) {
> if ($id =~ m/^Q([a-f0-9]+)R([a-f0-9]+)$/i) {
> $logids->{$1} = 1;
> @@ -128,7 +126,7 @@ my $run_pmg_log_tracker = sub {
> } elsif ($line =~ m/^TO:([0-9A-F]+):([0-9A-F]+):([0-9A-Z]):\s+from <([^>]*)>\s+to\s+<([^>]+)>\s+\((\S+)\)$/) {
> my $new = {
> size => $entry->{size} // 0,
> - time => hex($1) - $timezone,
> + time => hex($1),
> qid => $2,
> dstatus => $3,
> from => $4,
> @@ -174,7 +172,7 @@ my $run_pmg_log_tracker = sub {
> } elsif ($line =~ m/^TO:([0-9A-F]+):(T[0-9A-F]+L[0-9A-F]+):([0-9A-Z]):\s+from <([^>]*)>\s+to\s+<([^>]*)>$/) {
> my $e = {};
> $e->{client} = $entry->{client} if defined($entry->{client});
> - $e->{time} = hex($1) - $timezone;
> + $e->{time} = hex($1);
> $e->{id} = $2;
> $e->{dstatus} = $3;
> $e->{from} = $4;