michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-02-03 14:13:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Read jails from jail.local file

Browse Source
This commit is contained in:
Jamie Cameron
2014-05-22 18:07:39 -07:00
parent c768cc2c46
commit eee243a6cd
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
fail2ban/fail2ban-lib.pl
View File

@@ -72,7 +72,18 @@ sub list_jails
my @rv;
my $jfile = "$config{'config_dir'}/jail.conf";
if (-r $jfile) {
push(@rv, &parse_config_file("$config{'config_dir'}/jail.conf"));
push(@rv, &parse_config_file($jfile));
}
my $jlfile = "$config{'config_dir'}/jail.local";
if (-r $jlfile) {
# Add jails from .local file that aren't directive-level overrides
my @lrv = &parse_config_file($jlfile);
my %names = map { $_->{'name'}, $_ } @rv;
foreach my $j (@lrv) {
if (!$names{$j->{'name'}}) {
push(@rv, $j);
}
}
}
my $jdir = "$config{'config_dir'}/jail.d";
if (-d $jdir) {
@@ -204,11 +215,11 @@ $lref->[$sect->{'line'}] = $lines[0];
&flush_file_lines($file);
}
# delete_section(file, &section)
# delete_section(file, &section, [keep-file])
# Remove a section and all directives from a file
sub delete_section
{
my ($file, $sect) = @_;
my ($file, $sect, $keepfile) = @_;
my $lref = &read_file_lines($file);
splice(@$lref, $sect->{'line'}, $sect->{'eline'} - $sect->{'line'} + 1);
my $empty = 1;
@@ -217,7 +228,7 @@ foreach my $l (@$lref) {
$ll =~ s/^\s*#.*//;
$empty = 0 if ($ll =~ /\S/);
}
if ($empty) {
if ($empty && !$keepfile) {
# File is now empty, so delete it
&unflush_file_lines($file);
&unlink_file($file);

7
fail2ban/save_jail.cgi
View File

@@ -13,8 +13,10 @@ my @jails = &list_jails();
if ($in{'new'}) {
# Create new jail object
my $jfile = "$config{'config_dir'}/jail.conf";
my $jlfile = "$config{'config_dir'}/jail.local";
$jail = { 'members' => [ ],
'file' => "$config{'config_dir'}/jail.conf" };
'file' => -r $jlfile ? $jlfile : $jfile };
}
else {
# Find existing jail
@@ -25,7 +27,8 @@ else {
if ($in{'delete'}) {
# Just delete the jail
&lock_file($jail->{'file'});
&delete_section($jail->{'file'}, $jail);
&delete_section($jail->{'file'}, $jail,
$jail->{'file'} =~ /jail.local$/ ? 1 : 0);
&unlock_file($jail->{'file'});
}
else {