From: Stefan Schantl <stefan.schantl@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] ids.cgi: Only read-in ignored hosts, if the ignore file exists.
Date: Mon, 07 Mar 2022 17:52:36 +0100 [thread overview]
Message-ID: <20220307165236.2944-1-stefan.schantl@ipfire.org> (raw)
In-Reply-To: <db3fd3c7d884c8572ee9c15876644bbc5afd9023.camel@ipfire.org>
[-- Attachment #1: Type: text/plain, Size: 1934 bytes --]
Otherwise the CGI will crash.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
html/cgi-bin/ids.cgi | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi
index 27e61e9bb..722715667 100644
--- a/html/cgi-bin/ids.cgi
+++ b/html/cgi-bin/ids.cgi
@@ -103,7 +103,7 @@ if (($cgiparams{'WHITELIST'} eq $Lang::tr{'add'}) || ($cgiparams{'WHITELIST'} eq
my $new_entry_remark = $cgiparams{'IGNORE_ENTRY_REMARK'};
# Read-in ignoredfile.
- &General::readhasharray($IDS::ignored_file, \%ignored);
+ &General::readhasharray($IDS::ignored_file, \%ignored) if (-e $IDS::ignored_file);
# Check if we should edit an existing entry and got an ID.
if (($cgiparams{'WHITELIST'} eq $Lang::tr{'update'}) && ($cgiparams{'ID'})) {
@@ -165,7 +165,7 @@ if (($cgiparams{'WHITELIST'} eq $Lang::tr{'add'}) || ($cgiparams{'WHITELIST'} eq
undef($cgiparams{'ID'});
# Read-in ignoredfile.
- &General::readhasharray($IDS::ignored_file, \%ignored);
+ &General::readhasharray($IDS::ignored_file, \%ignored) if (-e $IDS::ignored_file);
# Grab the configured status of the corresponding entry.
my $status = $ignored{$id}[2];
@@ -199,7 +199,7 @@ if (($cgiparams{'WHITELIST'} eq $Lang::tr{'add'}) || ($cgiparams{'WHITELIST'} eq
my %ignored = ();
# Read-in ignoredfile.
- &General::readhasharray($IDS::ignored_file, \%ignored);
+ &General::readhasharray($IDS::ignored_file, \%ignored) if (-e $IDS::ignored_file);
# Drop entry from the hash.
delete($ignored{$cgiparams{'ID'}});
@@ -1071,7 +1071,7 @@ sub show_mainpage() {
}
# Read-in ignored hosts.
- &General::readhasharray("$IDS::settingsdir/ignored", \%ignored);
+ &General::readhasharray("$IDS::ignored_file", \%ignored) if (-e $IDS::ignored_file);
$checked{'ENABLE_IDS'}{'off'} = '';
$checked{'ENABLE_IDS'}{'on'} = '';
--
2.30.2
prev parent reply other threads:[~2022-03-07 16:52 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <16a1fbd2-c1fc-50a5-8c58-5a85a0528f5c@yahoo.com>
2022-03-07 16:51 ` Testing Issues with core165 Development Build: next/cad86575 Stefan Schantl
2022-03-07 16:52 ` Stefan Schantl [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=20220307165236.2944-1-stefan.schantl@ipfire.org \
--to=stefan.schantl@ipfire.org \
--cc=development@lists.ipfire.org \
/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