From 7fe973a9712321f01ff1e36d7f0d717e1a199b76 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Wed, 18 Nov 2020 17:25:44 +0100 Subject: [PATCH] quarantine: self service: early return for limit check, consistent code Signed-off-by: Thomas Lamprecht --- src/PMG/API2/Quarantine.pm | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/PMG/API2/Quarantine.pm b/src/PMG/API2/Quarantine.pm index e7e8a5a..f0d9003 100644 --- a/src/PMG/API2/Quarantine.pm +++ b/src/PMG/API2/Quarantine.pm @@ -1324,17 +1324,16 @@ __PACKAGE__->register_method ({ } PVE::Tools::lock_file_full("${link_map_fn}.lck", 10, 1, sub { - if (-f $link_map_fn) { - # check if user is allowed to request mail - my $lines = [split("\n", PVE::Tools::file_get_contents($link_map_fn))]; - for my $line (@$lines) { - next if $line !~ m/^\Q$receiver\E (\d+)$/; - if (($1 + $per_user_limit) > $starttime) { - die "Too many requests for '$receiver', only one request per hour is permitted. ". - "Please try again later\n"; - } else { - last; - } + return if !-f $link_map_fn; + # check if user is allowed to request mail + my $data = PVE::Tools::file_get_contents($link_map_fn); + for my $line (split("\n", $data)) { + next if $line !~ m/^\Q$receiver\E (\d+)$/; + if (($1 + $per_user_limit) > $starttime) { + die "Too many requests for '$receiver', only one request per" + ."hour is permitted. Please try again later\n"; + } else { + last; } } }); -- 2.39.2