[pmg-devel] [PATCH pmg-api] utils: check if file changed before reusing its hash
Maximiliano Sandoval
m.sandoval at proxmox.com
Thu Aug 31 15:33:57 CEST 2023
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 at 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
More information about the pmg-devel
mailing list