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 BA9ABB9D5 for ; Tue, 12 Sep 2023 17:12:53 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9D92014B12 for ; Tue, 12 Sep 2023 17:12:53 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Tue, 12 Sep 2023 17:12:53 +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 BFF8F46032 for ; Tue, 12 Sep 2023 17:12:52 +0200 (CEST) Date: Tue, 12 Sep 2023 17:12:51 +0200 From: Stoiko Ivanov To: Maximiliano Sandoval Cc: pmg-devel@lists.proxmox.com Message-ID: <20230912171251.6b4e6e28@rosa.proxmox.com> In-Reply-To: <20230831144113.172122-1-m.sandoval@proxmox.com> References: <20230831144113.172122-1-m.sandoval@proxmox.com> X-Mailer: Claws Mail 4.1.1 (GTK 3.24.37; 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.089 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [utils.pm] Subject: [pmg-devel] applied: [PATCH pmg-api v2] utils: check if file changed before reusing its hash X-BeenThere: pmg-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Mail Gateway development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Sep 2023 15:12:53 -0000 applied the patch - Thanks! a follow-up that does a syslog on a rather visible level ('err'), in case this actually changes while a system is running, as Thomas suggested would still be appreciated though! On Thu, 31 Aug 2023 16:41:13 +0200 Maximiliano Sandoval wrote: > We cache the hash of this file, it makes sense to first check if the > file changed via `stat` and recompute the hash if needed. > > Signed-off-by: Maximiliano Sandoval > --- > Differences from v1: > - Dont add unnecesary variables or functions > - Use hash slices > > src/PMG/Utils.pm | 12 ++++++++++-- > 1 file changed, 10 insertions(+), 2 deletions(-) > > diff --git a/src/PMG/Utils.pm b/src/PMG/Utils.pm > index c19b31f..d9c9d2d 100644 > --- a/src/PMG/Utils.pm > +++ b/src/PMG/Utils.pm > @@ -1353,14 +1353,22 @@ sub scan_journal_for_rbl_rejects { > } > > my $hwaddress; > +my $hwaddress_st = {}; > > sub get_hwaddress { > + my $fn = '/etc/ssh/ssh_host_rsa_key.pub'; > + my $st = stat($fn); > > - return $hwaddress if defined ($hwaddress); > + if (defined($hwaddress) > + && $hwaddress_st->{mtime} == $st->mtime > + && $hwaddress_st->{ino} == $st->ino > + && $hwaddress_st->{dev} == $st->dev) { > + return $hwaddress; > + } > > - my $fn = '/etc/ssh/ssh_host_rsa_key.pub'; > my $sshkey = PVE::Tools::file_get_contents($fn); > $hwaddress = uc(Digest::MD5::md5_hex($sshkey)); > + $hwaddress_st->@{'mtime', 'ino', 'dev'} = ($st->mtime, $st->ino, $st->dev); > > return $hwaddress; > }