public inbox for pmg-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Stoiko Ivanov <s.ivanov@proxmox.com>
To: Maximiliano Sandoval <m.sandoval@proxmox.com>
Cc: pmg-devel@lists.proxmox.com
Subject: [pmg-devel] applied: [PATCH pmg-api v2] utils: check if file changed before reusing its hash
Date: Tue, 12 Sep 2023 17:12:51 +0200	[thread overview]
Message-ID: <20230912171251.6b4e6e28@rosa.proxmox.com> (raw)
In-Reply-To: <20230831144113.172122-1-m.sandoval@proxmox.com>

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 <m.sandoval@proxmox.com> 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 <m.sandoval@proxmox.com>
> ---
>  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;
>  }





      reply	other threads:[~2023-09-12 15:12 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-31 14:41 [pmg-devel] " Maximiliano Sandoval
2023-09-12 15:12 ` Stoiko Ivanov [this message]

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=20230912171251.6b4e6e28@rosa.proxmox.com \
    --to=s.ivanov@proxmox.com \
    --cc=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
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal