webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 03:33:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

guardian.cgi: Add option to configure the BlockCount.

Browse Source 
Some small code fixes.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
This commit is contained in:
Stefan Schantl
2014-10-19 19:58:45 +02:00
parent 06ff7e28d7
commit a35a066845
1 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
html/cgi-bin/guardian.cgi
View File

@@ -39,7 +39,6 @@ my $memory=();
my @memory=(); my @memory=();
my @pid=(); my @pid=();
my @guardian=(); my @guardian=();
my %cgiparams=();
# Path to the guardian.ignore file. # Path to the guardian.ignore file.
my $ignorefile ='/var/ipfire/guardian/guardian.ignore'; my $ignorefile ='/var/ipfire/guardian/guardian.ignore';
@@ -58,7 +57,8 @@ $settings{'GUARDIAN_ENABLED'} = 'off';
$settings{'GUARDIAN_ENABLE_SNORT'} = 'on'; $settings{'GUARDIAN_ENABLE_SNORT'} = 'on';
$settings{'GUARDIAN_ENABLE_SSH'} = 'on'; $settings{'GUARDIAN_ENABLE_SSH'} = 'on';
$settings{'GUARDIAN_ENABLE_HTTPD'} = 'on'; $settings{'GUARDIAN_ENABLE_HTTPD'} = 'on';
$settings{'GUARDIAN_LOGLEVEL'} ='info'; $settings{'GUARDIAN_LOGLEVEL'} = 'info';
$settings{'GUARDIAN_BLOCKCOUNT'} = '3';
$settings{'GUARDIAN_BLOCKTIME'} = '86400'; $settings{'GUARDIAN_BLOCKTIME'} = '86400';
$settings{'GUARDIAN_LOGFILE'} = '/var/log/guardian/guardian.log'; $settings{'GUARDIAN_LOGFILE'} = '/var/log/guardian/guardian.log';
$settings{'GUARDIAN_SNORT_ALERTFILE'} = '/var/log/snort/alert'; $settings{'GUARDIAN_SNORT_ALERTFILE'} = '/var/log/snort/alert';
@@ -71,32 +71,29 @@ my $errormessage = '';
# Get GUI values. # Get GUI values.
&Header::getcgihash(\%settings); &Header::getcgihash(\%settings);
&Header::getcgihash(\%cgiparams);
## Perform input checks and save settings. ## Perform input checks and save settings.
# #
if ($settings{'ACTION'} eq $Lang::tr{'save'}) { if ($settings{'ACTION'} eq $Lang::tr{'save'}) {
# Check for valid blocktime. # Check for valid blocktime.
if ($settings{'GUARDIAN_BLOCKTIME'} ne '') { if (! $settings{'GUARDIAN_BLOCKTIME'} =~ /^\d+$/) {
if (($settings{'GUARDIAN_BLOCKTIME'} !~ /^[0-9]+$/) || ($settings{'GUARDIAN_BLOCKTIME'} le '0')) {
$errormessage = "$Lang::tr{'guardian invalid blocktime'}"; $errormessage = "$Lang::tr{'guardian invalid blocktime'}";
} }
# Check if the bloccount is valid.
if (! $settings{'GUARDIAN_BLOCKCOUNT'} =~ /^\d+$/) {
$errormessage = "$Lang::tr{'guardian invalid blockcount'}";
} }
# Check Logfile. # Check Logfile.
if ($settings{'GUARDIAN_LOGFILE'} ne '') { if (! $settings{'GUARDIAN_LOGFILE'} =~ /^[a-zA-Z0-9\.\/]+$/) {
if ($settings{'GUARDIAN_LOGFILE'} !~ /^[a-zA-Z0-9\.\/]+$/) { $errormessage = "$Lang::tr{'guardian invalid logfile'}";
$errormessage = "$Lang::tr{'guardian invalid logfile'}";
}
} }
# Check input for snort alert file. # Check input for snort alert file.
if ($settings{'GUARDIAN_SNORT_ALERTFILE'} ne '') { if (! $settings{'GUARDIAN_SNORT_ALERTFILE'} =~ /^[a-zA-Z0-9\.\/]+$/) {
if ($settings{'GUARDIAN_SNORT_ALERTFILE'} !~ /^[a-zA-Z0-9\.\/]+$/) { $errormessage = "$Lang::tr{'guardian invalid alertfile'}";
$errormessage = "$Lang::tr{'guardian invalid alertfile'}"; }
}
}
# Only continue if no error message has been set. # Only continue if no error message has been set.
if ($errormessage eq '') { if ($errormessage eq '') {
@@ -152,7 +149,7 @@ if ($settings{'ACTION'} eq $Lang::tr{'save'}) {
# So this line is missing in the new file and the entry has been deleted. # So this line is missing in the new file and the entry has been deleted.
foreach my $line (@current) { foreach my $line (@current) {
$id++; $id++;
unless ($cgiparams{'ID'} eq $id) { unless ($settings{'ID'} eq $id) {
print FILE "$line"; print FILE "$line";
} }
} }
@@ -341,14 +338,20 @@ END
<td colspan='2'><br></td> <td colspan='2'><br></td>
</tr> </tr>
<tr> <tr>
<td align='left' width='20%'>$Lang::tr{'guardian loglevel'}</td> <td align='left' width='20%'>$Lang::tr{'guardian loglevel'}:</td>
<td><select name='GUARDIAN_LOGLEVEL'> <td><select name='GUARDIAN_LOGLEVEL'>
<option value='off' $selected{'GUARDIAN_LOGLEVEL'}{'off'}>off</option> <option value='off' $selected{'GUARDIAN_LOGLEVEL'}{'off'}>off</option>
<option value='info' $selected{'GUARDIAN_LOGLEVEL'}{'info'}>info</option> <option value='info' $selected{'GUARDIAN_LOGLEVEL'}{'info'}>info</option>
<option value='debug' $selected{'GUARDIAN_LOGLEVEL'}{'debug'}>debug</option> <option value='debug' $selected{'GUARDIAN_LOGLEVEL'}{'debug'}>debug</option>
</select></td> </select></td>
</tr> </tr>
<tr>
<td colspan='2'><br></td>
</tr>
<tr>
<td width='20%' class='base'>$Lang::tr{'guardian blockcount'}:</td>
<td><input type='text' name='GUARDIAN_BLOCKCOUNT' value='$settings{'GUARDIAN_BLOCKCOUNT'}' size='5' /></td>
</tr>
<tr> <tr>
<td width='20%' class='base'>$Lang::tr{'guardian blocktime'}:</td> <td width='20%' class='base'>$Lang::tr{'guardian blocktime'}:</td>
<td><input type='text' name='GUARDIAN_BLOCKTIME' value='$settings{'GUARDIAN_BLOCKTIME'}' size='10' /></td> <td><input type='text' name='GUARDIAN_BLOCKTIME' value='$settings{'GUARDIAN_BLOCKTIME'}' size='10' /></td>
@@ -416,7 +419,7 @@ END
<tr> <tr>
<td width='80%' class='base' $col>$ignored_element</td> <td width='80%' class='base' $col>$ignored_element</td>
<td width='20%' align='center' $col> <td width='20%' align='center' $col>
<form method='post' name='frma$id' action='$ENV{'SCRIPT_NAME'}'> <form method='post' name='$id' action='$ENV{'SCRIPT_NAME'}'>
<input type='image' name='$Lang::tr{'remove'}' src='/images/delete.gif' title='$Lang::tr{'remove'}' alt='$Lang::tr{'remove'}'> <input type='image' name='$Lang::tr{'remove'}' src='/images/delete.gif' title='$Lang::tr{'remove'}' alt='$Lang::tr{'remove'}'>
<input type='hidden' name='ID' value='$id'> <input type='hidden' name='ID' value='$id'>
<input type='hidden' name='ACTION' value='$Lang::tr{'remove'}'> <input type='hidden' name='ACTION' value='$Lang::tr{'remove'}'>
@@ -608,6 +611,7 @@ sub BuildConfiguration() {
print FILE "EnableSSHMonitoring $settings{'GUARDIAN_ENABLE_SSH'}\n"; print FILE "EnableSSHMonitoring $settings{'GUARDIAN_ENABLE_SSH'}\n";
print FILE "EnableHTTPDMonitoring $settings{'GUARDIAN_ENABLE_HTTPD'}\n"; print FILE "EnableHTTPDMonitoring $settings{'GUARDIAN_ENABLE_HTTPD'}\n";
print FILE "LogLevel $settings{'GUARDIAN_LOGLEVEL'}\n"; print FILE "LogLevel $settings{'GUARDIAN_LOGLEVEL'}\n";
print FILE "BlockCount $settings{'GUARDIAN_BLOCKCOUNT'}\n";
print FILE "HostGatewayByte $HostGatewayByte\n"; print FILE "HostGatewayByte $HostGatewayByte\n";
print FILE "LogFile $settings{'GUARDIAN_LOGFILE'}\n"; print FILE "LogFile $settings{'GUARDIAN_LOGFILE'}\n";
print FILE "AlertFile $settings{'GUARDIAN_SNORT_ALERTFILE'}\n"; print FILE "AlertFile $settings{'GUARDIAN_SNORT_ALERTFILE'}\n";