From: Maximiliano Sandoval <m.sandoval@proxmox.com>
To: pmg-devel@lists.proxmox.com
Subject: [pmg-devel] [PATCH pmg-api] utils: check if file changed before reusing its hash
Date: Thu, 31 Aug 2023 15:33:57 +0200 [thread overview]
Message-ID: <20230831133357.149789-1-m.sandoval@proxmox.com> (raw)
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 <m.sandoval@proxmox.com>
---
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
next reply other threads:[~2023-08-31 13:34 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-31 13:33 Maximiliano Sandoval [this message]
2023-08-31 14:00 ` Thomas Lamprecht
2023-08-31 14:17 ` Fabian Grünbichler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230831133357.149789-1-m.sandoval@proxmox.com \
--to=m.sandoval@proxmox.com \
--cc=pmg-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox