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 320308906 for ; Thu, 31 Aug 2023 15:34:01 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 14506AC38 for ; Thu, 31 Aug 2023 15:34:01 +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 for ; Thu, 31 Aug 2023 15:34:00 +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 5750D47B26 for ; Thu, 31 Aug 2023 15:34:00 +0200 (CEST) From: Maximiliano Sandoval To: pmg-devel@lists.proxmox.com Date: Thu, 31 Aug 2023 15:33:57 +0200 Message-Id: <20230831133357.149789-1-m.sandoval@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.004 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] [PATCH pmg-api] 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: Thu, 31 Aug 2023 13:34:01 -0000 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 --- src/PMG/Utils.pm | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/src/PMG/Utils.pm b/src/PMG/Utils.pm index c19b31f..f8e6b7c 100644 --- a/src/PMG/Utils.pm +++ b/src/PMG/Utils.pm @@ -49,6 +49,8 @@ postgres_admin_cmd try_decode_utf8 ); +my $host_rsa_key_path = '/etc/ssh/ssh_host_rsa_key.pub'; + my $valid_pmg_realms = ['pam', 'pmg', 'quarantine']; PVE::JSONSchema::register_standard_option('realm', { @@ -1353,14 +1355,32 @@ sub scan_journal_for_rbl_rejects { } my $hwaddress; +my $hwaddress_st = {}; + +sub get_server_id { + my $sshkey = PVE::Tools::file_get_contents($host_rsa_key_path); + return uc(Digest::MD5::md5_hex($sshkey)); +} sub get_hwaddress { + my $st = stat($host_rsa_key_path); - return $hwaddress if defined ($hwaddress); + if (! defined($hwaddress)) { + $hwaddress_st->{mtime} = $st->mtime; + $hwaddress_st->{ino} = $st->ino; + $hwaddress_st->{dev} = $st->dev; + $hwaddress = get_server_id(); + } + + if ($hwaddress_st->{mtime} != $st->mtime + || $hwaddress_st->{ino} != $st->ino + || $hwaddress_st->{dev} != $st->dev) { + $hwaddress_st->{mtime} = $st->mtime; + $hwaddress_st->{ino} = $st->ino; + $hwaddress_st->{dev} = $st->dev; - 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 = get_server_id(); + } return $hwaddress; } -- 2.39.2