mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-09 18:45:54 +02:00
Viele kleine Änderungen an Samba und Tripwire
git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@497 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
maniacikarus
@@ -1,9 +1,9 @@
|
||||
ROOT =/usr/sbin
|
||||
POLFILE =/var/ipfire/tripwire/tw.pol
|
||||
DBFILE =/var/ipfire/tripwire/$(HOSTNAME).twd
|
||||
REPORTFILE =/var/ipfire/tripwire/report/$(HOSTNAME)-$(DATE).twr
|
||||
REPORTFILE =/var/ipfire/tripwire/report/$(DATE).twr
|
||||
SITEKEYFILE =/var/ipfire/tripwire/site.key
|
||||
LOCALKEYFILE =/var/ipfire/tripwire/$(HOSTNAME)-local.key
|
||||
LOCALKEYFILE =/var/ipfire/tripwire/local.key
|
||||
EDITOR =/usr/bin/vi
|
||||
LATEPROMPTING =false
|
||||
LOOSEDIRECTORYCHECKING =false
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -222,7 +222,6 @@ WARNING: translation string unused: ovpnstatus log
|
||||
WARNING: translation string unused: ovpnsys log
|
||||
WARNING: translation string unused: package failed to install
|
||||
WARNING: translation string unused: password crypting key
|
||||
WARNING: translation string unused: pc
|
||||
WARNING: translation string unused: polfile
|
||||
WARNING: translation string unused: pots
|
||||
WARNING: translation string unused: profiles
|
||||
|
||||
@@ -235,7 +235,6 @@ WARNING: translation string unused: ovpn log
|
||||
WARNING: translation string unused: ovpnstatus log
|
||||
WARNING: translation string unused: ovpnsys log
|
||||
WARNING: translation string unused: package failed to install
|
||||
WARNING: translation string unused: pc
|
||||
WARNING: translation string unused: polfile
|
||||
WARNING: translation string unused: pots
|
||||
WARNING: translation string unused: profiles
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
# $Id: firewalllog.dat,v 1.4.2.18 2005/08/23 12:01:50 eoberlander Exp $
|
||||
#
|
||||
# July 28, 2003 - Darren Critchley - darren@kdi.ca
|
||||
# - added source mac adapter to layout
|
||||
# - added source mac adapter to layout
|
||||
#
|
||||
use strict;
|
||||
|
||||
@@ -35,11 +35,11 @@ my %logsettings=();
|
||||
my $errormessage = '';
|
||||
|
||||
my @shortmonths = ( 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug',
|
||||
'Sep', 'Oct', 'Nov', 'Dec' );
|
||||
'Sep', 'Oct', 'Nov', 'Dec' );
|
||||
my @longmonths = ( $Lang::tr{'january'}, $Lang::tr{'february'}, $Lang::tr{'march'},
|
||||
$Lang::tr{'april'}, $Lang::tr{'may'}, $Lang::tr{'june'}, $Lang::tr{'july'}, $Lang::tr{'august'},
|
||||
$Lang::tr{'september'}, $Lang::tr{'october'}, $Lang::tr{'november'},
|
||||
$Lang::tr{'december'} );
|
||||
$Lang::tr{'april'}, $Lang::tr{'may'}, $Lang::tr{'june'}, $Lang::tr{'july'}, $Lang::tr{'august'},
|
||||
$Lang::tr{'september'}, $Lang::tr{'october'}, $Lang::tr{'november'},
|
||||
$Lang::tr{'december'} );
|
||||
|
||||
my @now = localtime();
|
||||
my $dow = $now[6];
|
||||
@@ -60,17 +60,17 @@ my $start = ($logsettings{'LOGVIEW_REVERSE'} eq 'on') ? 0x7FFFF000 : 0; #index o
|
||||
|
||||
if ($ENV{'QUERY_STRING'} && $cgiparams{'ACTION'} ne $Lang::tr{'update'})
|
||||
{
|
||||
my @temp = split(',',$ENV{'QUERY_STRING'});
|
||||
$start = $temp[0];
|
||||
$cgiparams{'MONTH'} = $temp[1];
|
||||
$cgiparams{'DAY'} = $temp[2];
|
||||
my @temp = split(',',$ENV{'QUERY_STRING'});
|
||||
$start = $temp[0];
|
||||
$cgiparams{'MONTH'} = $temp[1];
|
||||
$cgiparams{'DAY'} = $temp[2];
|
||||
}
|
||||
|
||||
if (!($cgiparams{'MONTH'} =~ /^(0|1|2|3|4|5|6|7|8|9|10|11)$/) ||
|
||||
!($cgiparams{'DAY'} =~ /^(0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31)$/))
|
||||
!($cgiparams{'DAY'} =~ /^(0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31)$/))
|
||||
{
|
||||
$cgiparams{'DAY'} = $now[3];
|
||||
$cgiparams{'MONTH'} = $now[4];
|
||||
$cgiparams{'DAY'} = $now[3];
|
||||
$cgiparams{'MONTH'} = $now[4];
|
||||
}
|
||||
elsif($cgiparams{'ACTION'} eq '>>')
|
||||
{
|
||||
@@ -78,16 +78,16 @@ elsif($cgiparams{'ACTION'} eq '>>')
|
||||
my @temp_now = localtime(time);
|
||||
$temp_now[4] = $cgiparams{'MONTH'};
|
||||
$temp_now[3] = $cgiparams{'DAY'};
|
||||
if ($cgiparams{'DAY'}) {
|
||||
if ($cgiparams{'DAY'}) {
|
||||
@temp_then = localtime(POSIX::mktime(@temp_now) + 86400);
|
||||
## Retrieve the same time on the next day +
|
||||
## 86400 seconds in a day
|
||||
} else {
|
||||
$temp_now[3] = 1;
|
||||
$temp_now[4] = ($temp_now[4]+1) %12;
|
||||
@temp_then = localtime(POSIX::mktime(@temp_now) );
|
||||
$temp_then[3] = 0;
|
||||
}
|
||||
## Retrieve the same time on the next day +
|
||||
## 86400 seconds in a day
|
||||
} else {
|
||||
$temp_now[3] = 1;
|
||||
$temp_now[4] = ($temp_now[4]+1) %12;
|
||||
@temp_then = localtime(POSIX::mktime(@temp_now) );
|
||||
$temp_then[3] = 0;
|
||||
}
|
||||
$cgiparams{'MONTH'} = $temp_then[4];
|
||||
$cgiparams{'DAY'} = $temp_then[3];
|
||||
}
|
||||
@@ -97,16 +97,16 @@ elsif($cgiparams{'ACTION'} eq '<<')
|
||||
my @temp_now = localtime(time);
|
||||
$temp_now[4] = $cgiparams{'MONTH'};
|
||||
$temp_now[3] = $cgiparams{'DAY'};
|
||||
if ($cgiparams{'DAY'}) {
|
||||
if ($cgiparams{'DAY'}) {
|
||||
@temp_then = localtime(POSIX::mktime(@temp_now) - 86400);
|
||||
## Retrieve the same time on the next day -
|
||||
## 86400 seconds in a day
|
||||
} else {
|
||||
$temp_now[3] = 1;
|
||||
$temp_now[4] = ($temp_now[4]-1) %12;
|
||||
@temp_then = localtime(POSIX::mktime(@temp_now) );
|
||||
$temp_then[3] = 0;
|
||||
}
|
||||
## Retrieve the same time on the next day -
|
||||
## 86400 seconds in a day
|
||||
} else {
|
||||
$temp_now[3] = 1;
|
||||
$temp_now[4] = ($temp_now[4]-1) %12;
|
||||
@temp_then = localtime(POSIX::mktime(@temp_now) );
|
||||
$temp_then[3] = 0;
|
||||
}
|
||||
$cgiparams{'MONTH'} = $temp_then[4];
|
||||
$cgiparams{'DAY'} = $temp_then[3];
|
||||
}
|
||||
@@ -135,9 +135,9 @@ my $date = $cgiparams{'DAY'} == 0 ? '' : $cgiparams{'DAY'} <= 9 ? "0$cgiparams{
|
||||
$sunday += (6-$then[6]) * 86400;
|
||||
|
||||
# Convert delta in second to full weeks
|
||||
$gzindex = int (($sunday-$xday)/604800 );
|
||||
$gzindex = int (($sunday-$xday)/604800 );
|
||||
}
|
||||
|
||||
|
||||
my $monthstr = $shortmonths[$cgiparams{'MONTH'}];
|
||||
my $daystr = $cgiparams{'DAY'} == 0 ? '..' : $cgiparams{'DAY'} <= 9 ? " $cgiparams{'DAY'}" : "$cgiparams{'DAY'}";
|
||||
|
||||
@@ -148,72 +148,72 @@ my $loop = 1;
|
||||
my $filestr = 0;
|
||||
my $lastdatetime; # for debug
|
||||
my $search_for_end = 0;
|
||||
|
||||
|
||||
while ($gzindex >=0 && $loop) {
|
||||
# calculate file name
|
||||
if ($gzindex == 0) {
|
||||
$filestr = "/var/log/messages";
|
||||
} else {
|
||||
$filestr = "/var/log/messages.$gzindex";
|
||||
$filestr = "$filestr.gz" if -f "$filestr.gz";
|
||||
$filestr = "$filestr.gz" if -f "$filestr.gz";
|
||||
}
|
||||
# now read file if existing
|
||||
if (open (FILE,($filestr =~ /.gz$/ ? "gzip -dc $filestr |" : $filestr))) {
|
||||
#&General::log("reading $filestr");
|
||||
READ:while (<FILE>) {
|
||||
my $line = $_;
|
||||
if ($line =~ /^${monthstr} ${daystr} ..:..:.. [\w\-]+ kernel:.*IN=.*$/) {
|
||||
# when standart viewing, just keep in memory the correct slice
|
||||
# it starts a '$start' and size is $viewport
|
||||
# If export, then keep all lines...
|
||||
if ($cgiparams{'ACTION'} eq $Lang::tr{'export'}){
|
||||
$log[$lines++] = "$line";
|
||||
} else {
|
||||
if ($lines++ < ($start + $Header::viewsize)) {
|
||||
push(@log,"$line");
|
||||
if (@log > $Header::viewsize) {
|
||||
shift (@log);
|
||||
}
|
||||
#} else { dont do this optimisation, need to count lines !
|
||||
# $datetime = $maxtime; # we have read viewsize lines, stop main loop
|
||||
# last READ; # exit read file
|
||||
}
|
||||
}
|
||||
$search_for_end = 1; # we find the start of slice, can look for end now
|
||||
} else {
|
||||
if ($search_for_end == 1) {
|
||||
#finish read files when date is over (test month equality only)
|
||||
$line =~ /^(...) (..) ..:..:..*$/;
|
||||
$loop = 0 if ( ($1 ne $monthstr) || ( ($daystr ne '..') && ($daystr ne $2) ) );
|
||||
}
|
||||
}
|
||||
}
|
||||
close (FILE);
|
||||
}
|
||||
$gzindex--; # will try next gz file eg 40,39,38,.... because it may have holes when ipcop stopped
|
||||
# for a long time
|
||||
# now read file if existing
|
||||
if (open (FILE,($filestr =~ /.gz$/ ? "gzip -dc $filestr |" : $filestr))) {
|
||||
#&General::log("reading $filestr");
|
||||
READ:while (<FILE>) {
|
||||
my $line = $_;
|
||||
if ($line =~ /^${monthstr} ${daystr} ..:..:.. [\w\-]+ kernel:.*IN=.*$/) {
|
||||
# when standart viewing, just keep in memory the correct slice
|
||||
# it starts a '$start' and size is $viewport
|
||||
# If export, then keep all lines...
|
||||
if ($cgiparams{'ACTION'} eq $Lang::tr{'export'}){
|
||||
$log[$lines++] = "$line";
|
||||
} else {
|
||||
if ($lines++ < ($start + $Header::viewsize)) {
|
||||
push(@log,"$line");
|
||||
if (@log > $Header::viewsize) {
|
||||
shift (@log);
|
||||
}
|
||||
#} else { dont do this optimisation, need to count lines !
|
||||
# $datetime = $maxtime; # we have read viewsize lines, stop main loop
|
||||
# last READ; # exit read file
|
||||
}
|
||||
}
|
||||
$search_for_end = 1; # we find the start of slice, can look for end now
|
||||
} else {
|
||||
if ($search_for_end == 1) {
|
||||
#finish read files when date is over (test month equality only)
|
||||
$line =~ /^(...) (..) ..:..:..*$/;
|
||||
$loop = 0 if ( ($1 ne $monthstr) || ( ($daystr ne '..') && ($daystr ne $2) ) );
|
||||
}
|
||||
}
|
||||
}
|
||||
close (FILE);
|
||||
}
|
||||
$gzindex--; # will try next gz file eg 40,39,38,.... because it may have holes when ipcop stopped
|
||||
# for a long time
|
||||
}# while
|
||||
|
||||
# $errormessage = "$Lang::tr{'date not in logs'}: $filestr $Lang::tr{'could not be opened'}";
|
||||
|
||||
if ($cgiparams{'ACTION'} eq $Lang::tr{'export'})
|
||||
{
|
||||
print "Content-type: text/plain\n\n";
|
||||
print "IPFire firewall log\r\n";
|
||||
print "$Lang::{'date'}: $date\r\n\r\n";
|
||||
print "Content-type: text/plain\n\n";
|
||||
print "IPFire firewall log\r\n";
|
||||
print "$Lang::{'date'}: $date\r\n\r\n";
|
||||
|
||||
if ($logsettings{'LOGVIEW_REVERSE'} eq 'on') { @log = reverse @log; }
|
||||
if ($logsettings{'LOGVIEW_REVERSE'} eq 'on') { @log = reverse @log; }
|
||||
|
||||
foreach $_ (@log)
|
||||
{
|
||||
/^... (..) (..:..:..) [\w\-]+ kernel:.*(IN=.*)$/;
|
||||
my $day = $1;
|
||||
$day =~ tr / /0/;
|
||||
my $time = $cgiparams{'DAY'} ? "$2" : "$day/$2" ;
|
||||
print "$time $3\r\n";
|
||||
|
||||
}
|
||||
exit 0;
|
||||
foreach $_ (@log)
|
||||
{
|
||||
/^... (..) (..:..:..) [\w\-]+ kernel:.*(IN=.*)$/;
|
||||
my $day = $1;
|
||||
$day =~ tr / /0/;
|
||||
my $time = $cgiparams{'DAY'} ? "$2" : "$day/$2" ;
|
||||
print "$time $3\r\n";
|
||||
|
||||
}
|
||||
exit 0;
|
||||
}
|
||||
|
||||
&Header::showhttpheaders();
|
||||
@@ -223,9 +223,9 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'export'})
|
||||
&Header::openbigbox('100%', 'left', '', $errormessage);
|
||||
|
||||
if ($errormessage) {
|
||||
&Header::openbox('100%', 'left', $Lang::tr{'error messages'});
|
||||
print "<font class='base'>$errormessage </font>\n";
|
||||
&Header::closebox();
|
||||
&Header::openbox('100%', 'left', $Lang::tr{'error messages'});
|
||||
print "<font class='base'>$errormessage </font>\n";
|
||||
&Header::closebox();
|
||||
}
|
||||
|
||||
&Header::openbox('100%', 'left', "$Lang::tr{'settings'}:");
|
||||
@@ -234,33 +234,33 @@ print <<END
|
||||
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
|
||||
<table width='100%'>
|
||||
<tr>
|
||||
<td width='10%' class='base'>$Lang::tr{'month'}: </td>
|
||||
<td width='10%'>
|
||||
<select name='MONTH'>
|
||||
<td width='10%' class='base'>$Lang::tr{'month'}: </td>
|
||||
<td width='10%'>
|
||||
<select name='MONTH'>
|
||||
END
|
||||
;
|
||||
for (my $month = 0; $month < 12; $month++)
|
||||
{
|
||||
print "\t<option ";
|
||||
if ($month == $cgiparams{'MONTH'}) {
|
||||
print "selected='selected' "; }
|
||||
print "value='$month'>$longmonths[$month]</option>\n";
|
||||
print "\t<option ";
|
||||
if ($month == $cgiparams{'MONTH'}) {
|
||||
print "selected='selected' "; }
|
||||
print "value='$month'>$longmonths[$month]</option>\n";
|
||||
}
|
||||
print <<END
|
||||
</select>
|
||||
</td>
|
||||
<td width='10%' class='base' align='right'> $Lang::tr{'day'}: </td>
|
||||
<td width='40%'>
|
||||
<select name='DAY'>
|
||||
</select>
|
||||
</td>
|
||||
<td width='10%' class='base' align='right'> $Lang::tr{'day'}: </td>
|
||||
<td width='40%'>
|
||||
<select name='DAY'>
|
||||
END
|
||||
;
|
||||
print "<option value='0'>$Lang::tr{'all'}</option>\n";
|
||||
for (my $day = 1; $day <= 31; $day++)
|
||||
{
|
||||
print "\t<option ";
|
||||
if ($day == $cgiparams{'DAY'}) {
|
||||
print "selected='selected' "; }
|
||||
print "value='$day'>$day</option>\n";
|
||||
print "\t<option ";
|
||||
if ($day == $cgiparams{'DAY'}) {
|
||||
print "selected='selected' "; }
|
||||
print "value='$day'>$day</option>\n";
|
||||
}
|
||||
print <<END
|
||||
</select>
|
||||
@@ -285,12 +285,12 @@ $start = 0 if ($start < 0);
|
||||
|
||||
my $prev;
|
||||
if ($start == 0) {
|
||||
$prev = -1;
|
||||
$prev = -1;
|
||||
} else {
|
||||
$prev = $start - ${Header::viewsize};
|
||||
$prev = 0 if ( $prev < 0);
|
||||
$prev = $start - ${Header::viewsize};
|
||||
$prev = 0 if ( $prev < 0);
|
||||
}
|
||||
|
||||
|
||||
my $next;
|
||||
if ($start == $lines - ${Header::viewsize}) {
|
||||
$next = -1;
|
||||
@@ -305,14 +305,14 @@ if ($lines != 0) { &oldernewer(); }
|
||||
print <<END
|
||||
<table width='100%'>
|
||||
<tr>
|
||||
<td align='center' class='boldbase'><b>$Lang::tr{'time'}</b></td>
|
||||
<td align='center' class='boldbase'><b>$Lang::tr{'chain'}</b></td>
|
||||
<td align='center' class='boldbase'><b>$Lang::tr{'iface'}</b></td>
|
||||
<td align='center' class='boldbase'><b>$Lang::tr{'proto'}</b></td>
|
||||
<td align='center' class='boldbase'><b>$Lang::tr{'source'}<br/>$Lang::tr{'destination'}</b></td>
|
||||
<td align='center' class='boldbase'><b>$Lang::tr{'src port'}<br />$Lang::tr{'dst port'}</b></td>
|
||||
<td align='center' class='boldbase'><b>Flag</b></td>
|
||||
<td align='center' class='boldbase'><b>$Lang::tr{'mac address'}</b></td>
|
||||
<td align='center' class='boldbase'><b>$Lang::tr{'time'}</b></td>
|
||||
<td align='center' class='boldbase'><b>$Lang::tr{'chain'}</b></td>
|
||||
<td align='center' class='boldbase'><b>$Lang::tr{'iface'}</b></td>
|
||||
<td align='center' class='boldbase'><b>$Lang::tr{'proto'}</b></td>
|
||||
<td align='center' class='boldbase'><b>$Lang::tr{'source'}<br/>$Lang::tr{'destination'}</b></td>
|
||||
<td align='center' class='boldbase'><b>$Lang::tr{'src port'}<br />$Lang::tr{'dst port'}</b></td>
|
||||
<td align='center' class='boldbase'><b>Flag</b></td>
|
||||
<td align='center' class='boldbase'><b>$Lang::tr{'mac address'}</b></td>
|
||||
</tr>
|
||||
END
|
||||
;
|
||||
@@ -321,51 +321,51 @@ END
|
||||
$lines = 0;
|
||||
foreach $_ (@log)
|
||||
{
|
||||
/^... (..) (..:..:..) [\w\-]+ kernel:(.*)(IN=.*)$/;
|
||||
my $day = $1;
|
||||
$day =~ tr / /0/;
|
||||
my $time = $cgiparams{'DAY'} ? "$2" : "$day/$2" ;
|
||||
my $comment = $3;
|
||||
my $packet = $4;
|
||||
/^... (..) (..:..:..) [\w\-]+ kernel:(.*)(IN=.*)$/;
|
||||
my $day = $1;
|
||||
$day =~ tr / /0/;
|
||||
my $time = $cgiparams{'DAY'} ? "$2" : "$day/$2" ;
|
||||
my $comment = $3;
|
||||
my $packet = $4;
|
||||
|
||||
$packet =~ /IN=(\w+)/; my $iface=$1;
|
||||
$packet =~ /SRC=([\d\.]+)/; my $srcaddr=$1;
|
||||
$packet =~ /DST=([\d\.]+)/; my $dstaddr=$1;
|
||||
$packet =~ /MAC=([\w+\:]+)/; my $macaddr=$1;
|
||||
$packet =~ /PROTO=(\w+)/; my $proto=$1;
|
||||
$packet =~ /SPT=(\d+)/; my $srcport=$1;
|
||||
$packet =~ /DPT=(\d+)/; my $dstport=$1;
|
||||
$packet =~ /IN=(\w+)/; my $iface=$1;
|
||||
$packet =~ /SRC=([\d\.]+)/; my $srcaddr=$1;
|
||||
$packet =~ /DST=([\d\.]+)/; my $dstaddr=$1;
|
||||
$packet =~ /MAC=([\w+\:]+)/; my $macaddr=$1;
|
||||
$packet =~ /PROTO=(\w+)/; my $proto=$1;
|
||||
$packet =~ /SPT=(\d+)/; my $srcport=$1;
|
||||
$packet =~ /DPT=(\d+)/; my $dstport=$1;
|
||||
|
||||
my $gi = Geo::IP::PurePerl->new();
|
||||
my $ccode = $gi->country_code_by_name($srcaddr);
|
||||
my $fcode = lc($ccode);
|
||||
my $gi = Geo::IP::PurePerl->new();
|
||||
my $ccode = $gi->country_code_by_name($srcaddr);
|
||||
my $fcode = lc($ccode);
|
||||
|
||||
my $servi = uc(getservbyport($srcport, lc($proto)));
|
||||
if ($servi ne '' && $srcport < 1024) {
|
||||
$srcport = "$srcport($servi)"; }
|
||||
$servi = uc(getservbyport($dstport, lc($proto)));
|
||||
if ($servi ne '' && $dstport < 1024) {
|
||||
$dstport = "$dstport($servi)";}
|
||||
my @mactemp = split(/:/,$macaddr);
|
||||
$macaddr = "$mactemp[6]:$mactemp[7]:$mactemp[8]:$mactemp[9]:$mactemp[10]:$mactemp[11]";
|
||||
if ($lines % 2) {
|
||||
print "<tr bgcolor='${Header::table1colour}'>\n"; }
|
||||
else {
|
||||
print "<tr bgcolor='${Header::table2colour}'>\n"; }
|
||||
print <<END
|
||||
my $servi = uc(getservbyport($srcport, lc($proto)));
|
||||
if ($servi ne '' && $srcport < 1024) {
|
||||
$srcport = "$srcport($servi)"; }
|
||||
$servi = uc(getservbyport($dstport, lc($proto)));
|
||||
if ($servi ne '' && $dstport < 1024) {
|
||||
$dstport = "$dstport($servi)";}
|
||||
my @mactemp = split(/:/,$macaddr);
|
||||
$macaddr = "$mactemp[6]:$mactemp[7]:$mactemp[8]:$mactemp[9]:$mactemp[10]:$mactemp[11]";
|
||||
if ($lines % 2) {
|
||||
print "<tr bgcolor='${Header::table1colour}'>\n"; }
|
||||
else {
|
||||
print "<tr bgcolor='${Header::table2colour}'>\n"; }
|
||||
print <<END
|
||||
|
||||
<td align='center'>$time</td>
|
||||
<td align='center'>$comment</td>
|
||||
<td align='center'>$iface</td>
|
||||
<td align='center'>$proto</td>
|
||||
<td align='center'><a href='/cgi-bin/ipinfo.cgi?ip=$srcaddr'>$srcaddr</a><br /><a href='/cgi-bin/ipinfo.cgi?ip=$dstaddr'>$dstaddr</a></td>
|
||||
<td align='center'>$srcport<br/>$dstport</td>
|
||||
<td align='center'><a href='../country.cgi#$fcode'><img src='/images/flags/$fcode.png' border='0' align='absmiddle' alt='$ccode'></a></td>
|
||||
<td align='center'>$macaddr</td>
|
||||
<td align='center'>$time</td>
|
||||
<td align='center'>$comment</td>
|
||||
<td align='center'>$iface</td>
|
||||
<td align='center'>$proto</td>
|
||||
<td align='center'><a href='/cgi-bin/ipinfo.cgi?ip=$srcaddr'>$srcaddr</a><br /><a href='/cgi-bin/ipinfo.cgi?ip=$dstaddr'>$dstaddr</a></td>
|
||||
<td align='center'>$srcport<br/>$dstport</td>
|
||||
<td align='center'><a href='../country.cgi#$fcode'><img src='/images/flags/$fcode.png' border='0' align='absmiddle' alt='$ccode'></a></td>
|
||||
<td align='center'>$macaddr</td>
|
||||
</tr>
|
||||
END
|
||||
;
|
||||
$lines++;
|
||||
;
|
||||
$lines++;
|
||||
}
|
||||
|
||||
print "</table>";
|
||||
@@ -388,16 +388,16 @@ END
|
||||
|
||||
print "<td align='center' width='50%'>";
|
||||
if ($prev != -1) {
|
||||
print "<a href='/cgi-bin/logs.cgi/firewalllog.dat?$prev,$cgiparams{'MONTH'},$cgiparams{'DAY'}'>$Lang::tr{'older'}</a>"; }
|
||||
print "<a href='/cgi-bin/logs.cgi/firewalllog.dat?$prev,$cgiparams{'MONTH'},$cgiparams{'DAY'}'>$Lang::tr{'older'}</a>"; }
|
||||
else {
|
||||
print "$Lang::tr{'older'}"; }
|
||||
print "$Lang::tr{'older'}"; }
|
||||
print "</td>\n";
|
||||
|
||||
print "<td align='center' width='50%'>";
|
||||
if ($next >= 0) {
|
||||
print "<a href='/cgi-bin/logs.cgi/firewalllog.dat?$next,$cgiparams{'MONTH'},$cgiparams{'DAY'}'>$Lang::tr{'newer'}</a>"; }
|
||||
print "<a href='/cgi-bin/logs.cgi/firewalllog.dat?$next,$cgiparams{'MONTH'},$cgiparams{'DAY'}'>$Lang::tr{'newer'}</a>"; }
|
||||
else {
|
||||
print "$Lang::tr{'newer'}"; }
|
||||
print "$Lang::tr{'newer'}"; }
|
||||
print "</td>\n";
|
||||
|
||||
print <<END
|
||||
@@ -406,3 +406,4 @@ print <<END
|
||||
END
|
||||
;
|
||||
}
|
||||
|
||||
|
||||
@@ -726,7 +726,7 @@ END
|
||||
{
|
||||
if ($userline[0] =~ /\$/)
|
||||
{
|
||||
print "$Lang::tr{'interfaces'}</td><td align='left'>";
|
||||
print "$Lang::tr{'pc'}</td><td align='left'>";
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -960,10 +960,8 @@ print <<END
|
||||
<input type='hidden' name='ACTION' value='sharesreset' />
|
||||
<input type='image' alt='$Lang::tr{'reset'}' src='/images/reload.gif' />
|
||||
</form></td>
|
||||
<td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
|
||||
<input type='hidden' name='ACTION' value='sharecaption' />
|
||||
<input type='image' alt='$Lang::tr{'caption'}' src='/images/help-browser.png' />
|
||||
</form></td></tr>
|
||||
<td align='center'><a target="popup" onClick="window.open ('', 'popup', 'width=580,height=360,scrollbars=no, toolbar=no,status=no, resizable=yes,menubar=no,location=no,directories=no,top=10,left=10')"href="sambahlp.cgi"><form method='post' action='$ENV{'SCRIPT_NAME'}'><img border="0" src="/images/help-browser.png"></a>
|
||||
</td></tr>
|
||||
</table>
|
||||
END
|
||||
;
|
||||
@@ -1048,64 +1046,7 @@ END
|
||||
;
|
||||
}
|
||||
|
||||
if ($sambasettings{'ACTION'} eq 'optioncaption' || $sambasettings{'ACTION'} eq 'optioncaption2')
|
||||
{
|
||||
print <<END
|
||||
<br />
|
||||
<table width='95%' cellspacing='0'>
|
||||
<tr><td><b>$Lang::tr{'caption'}</b></td></tr>
|
||||
<tr><td><u>$Lang::tr{'options'}</u></td><td><u>$Lang::tr{'meaning'}</u> / <u>$Lang::tr{'exampel'}</u></td></tr>
|
||||
<tr><td>comment</td><td>$Lang::tr{'comment'}</td></tr>
|
||||
<tr><td></td><td>comment = $Lang::tr{'my new share'}</td></tr>
|
||||
<tr><td><br /></td><td></td></tr>
|
||||
<tr><td>path</td><td>$Lang::tr{'path to directory'}</td></tr>
|
||||
<tr><td></td><td>path = /tmp</td></tr>
|
||||
<tr><td><br /></td><td></td></tr>
|
||||
<tr><td>writeable</td><td>$Lang::tr{'directory writeable'}</td></tr>
|
||||
<tr><td></td><td>writeable = yes</td></tr>
|
||||
<tr><td><br /></td><td></td></tr>
|
||||
<tr><td>browseable</td><td>sichtbar in Verzeichnisliste</td></tr>
|
||||
<tr><td></td><td>browsable = yes</td></tr>
|
||||
<tr><td><br /></td><td></td></tr>
|
||||
<tr><td>user</td><td>Besitzer der Freigabe</td></tr>
|
||||
<tr><td></td><td>user = samba</td></tr>
|
||||
<tr><td><br /></td><td></td></tr>
|
||||
<tr><td>valid users</td><td>Liste der Zugriffsberechtigten</td></tr>
|
||||
<tr><td></td><td>valid users = samba, user1</td></tr>
|
||||
<tr><td><br /></td><td></td></tr>
|
||||
<tr><td>write list</td><td>$Lang::tr{'visible in browselist'}</td></tr>
|
||||
<tr><td></td><td>write list = samba</td></tr>
|
||||
<tr><td><br /></td><td></td></tr>
|
||||
<tr><td>hosts allow</td><td>$Lang::tr{'host allow'}</td></tr>
|
||||
<tr><td></td><td>hosts allow = localhost 192.168.1.1 192.168.2.0/24</td></tr>
|
||||
<tr><td><br /></td><td></td></tr>
|
||||
<tr><td>hosts deny</td><td>$Lang::tr{'host deny'}</td></tr>
|
||||
<tr><td></td><td>hosts deny = 192.168.1.2 192.168.3.0/24</td></tr>
|
||||
<tr><td><br /></td><td></td></tr>
|
||||
<tr><td>read list</td><td>$Lang::tr{'read list'}</td></tr>
|
||||
<tr><td></td><td>read list = user1</td></tr>
|
||||
<tr><td><br /></td><td></td></tr>
|
||||
<tr><td>admin users</td><td>$Lang::tr{'admin users'}</td></tr>
|
||||
<tr><td></td><td>admin users = user1</td></tr>
|
||||
<tr><td><br /></td><td></td></tr>
|
||||
<tr><td>invalid users</td><td>$Lang::tr{'invalid users'}</td></tr>
|
||||
<tr><td></td><td>invalid users = user2</td></tr>
|
||||
<tr><td><br /></td><td></td></tr>
|
||||
<tr><td>force user</td><td>$Lang::tr{'force user'}</td></tr>
|
||||
<tr><td></td><td>force user = samba</td></tr>
|
||||
<tr><td><br /></td><td></td></tr>
|
||||
<tr><td>directory mask</td><td>$Lang::tr{'directory mask'}</td></tr>
|
||||
<tr><td></td><td>directory mask = 0777</td></tr>
|
||||
<tr><td><br /></td><td></td></tr>
|
||||
<tr><td>create mask</td><td>U$Lang::tr{'create mask'}</td></tr>
|
||||
<tr><td></td><td>create mask = 0777</td></tr>
|
||||
<tr><td><br /></td><td></td></tr>
|
||||
<tr><td>guest ok</td><td>$Lang::tr{'guest ok'}</td></tr>
|
||||
<tr><td></td><td>guest ok = yes</td></tr>
|
||||
</table>
|
||||
END
|
||||
;
|
||||
}
|
||||
|
||||
|
||||
&Header::closebox();
|
||||
|
||||
|
||||
81
html/cgi-bin/sambahlp.cgi
Normal file
81
html/cgi-bin/sambahlp.cgi
Normal file
@@ -0,0 +1,81 @@
|
||||
#!/usr/bin/perl
|
||||
#
|
||||
# IPFire CGIs
|
||||
#
|
||||
# This code is distributed under the terms of the GPL
|
||||
#
|
||||
# (c) The IPFire Team
|
||||
|
||||
use strict;
|
||||
# enable only the following on debugging purpose
|
||||
use warnings;
|
||||
use CGI::Carp 'fatalsToBrowser';
|
||||
|
||||
require '/var/ipfire/general-functions.pl';
|
||||
require "${General::swroot}/lang.pl";
|
||||
require "${General::swroot}/header.pl";
|
||||
|
||||
&Header::showhttpheaders();
|
||||
&Header::openpage('Samba', 1, '');
|
||||
&Header::openbigbox('100%', 'left', '', 'BigBox');
|
||||
&Header::openbox('100%', 'left', '', 'Sambahelp');
|
||||
|
||||
print <<END
|
||||
<br />
|
||||
<table width='95%' cellspacing='0'>
|
||||
<tr><td><b>$Lang::tr{'caption'}</b></td></tr>
|
||||
<tr><td><u>$Lang::tr{'options'}</u></td><td><u>$Lang::tr{'meaning'}</u> / <u>$Lang::tr{'exampel'}</u></td></tr>
|
||||
<tr><td>comment</td><td>$Lang::tr{'comment'}</td></tr>
|
||||
<tr><td></td><td>comment = $Lang::tr{'my new share'}</td></tr>
|
||||
<tr><td><br /></td><td></td></tr>
|
||||
<tr><td>path</td><td>$Lang::tr{'path to directory'}</td></tr>
|
||||
<tr><td></td><td>path = /tmp</td></tr>
|
||||
<tr><td><br /></td><td></td></tr>
|
||||
<tr><td>writeable</td><td>$Lang::tr{'directory writeable'}</td></tr>
|
||||
<tr><td></td><td>writeable = yes</td></tr>
|
||||
<tr><td><br /></td><td></td></tr>
|
||||
<tr><td>browseable</td><td>sichtbar in Verzeichnisliste</td></tr>
|
||||
<tr><td></td><td>browsable = yes</td></tr>
|
||||
<tr><td><br /></td><td></td></tr>
|
||||
<tr><td>user</td><td>Besitzer der Freigabe</td></tr>
|
||||
<tr><td></td><td>user = samba</td></tr>
|
||||
<tr><td><br /></td><td></td></tr>
|
||||
<tr><td>valid users</td><td>Liste der Zugriffsberechtigten</td></tr>
|
||||
<tr><td></td><td>valid users = samba, user1</td></tr>
|
||||
<tr><td><br /></td><td></td></tr>
|
||||
<tr><td>write list</td><td>$Lang::tr{'visible in browselist'}</td></tr>
|
||||
<tr><td></td><td>write list = samba</td></tr>
|
||||
<tr><td><br /></td><td></td></tr>
|
||||
<tr><td>hosts allow</td><td>$Lang::tr{'host allow'}</td></tr>
|
||||
<tr><td></td><td>hosts allow = localhost 192.168.1.1 192.168.2.0/24</td></tr>
|
||||
<tr><td><br /></td><td></td></tr>
|
||||
<tr><td>hosts deny</td><td>$Lang::tr{'host deny'}</td></tr>
|
||||
<tr><td></td><td>hosts deny = 192.168.1.2 192.168.3.0/24</td></tr>
|
||||
<tr><td><br /></td><td></td></tr>
|
||||
<tr><td>read list</td><td>$Lang::tr{'read list'}</td></tr>
|
||||
<tr><td></td><td>read list = user1</td></tr>
|
||||
<tr><td><br /></td><td></td></tr>
|
||||
<tr><td>admin users</td><td>$Lang::tr{'admin users'}</td></tr>
|
||||
<tr><td></td><td>admin users = user1</td></tr>
|
||||
<tr><td><br /></td><td></td></tr>
|
||||
<tr><td>invalid users</td><td>$Lang::tr{'invalid users'}</td></tr>
|
||||
<tr><td></td><td>invalid users = user2</td></tr>
|
||||
<tr><td><br /></td><td></td></tr>
|
||||
<tr><td>force user</td><td>$Lang::tr{'force user'}</td></tr>
|
||||
<tr><td></td><td>force user = samba</td></tr>
|
||||
<tr><td><br /></td><td></td></tr>
|
||||
<tr><td>directory mask</td><td>$Lang::tr{'directory mask'}</td></tr>
|
||||
<tr><td></td><td>directory mask = 0777</td></tr>
|
||||
<tr><td><br /></td><td></td></tr>
|
||||
<tr><td>create mask</td><td>U$Lang::tr{'create mask'}</td></tr>
|
||||
<tr><td></td><td>create mask = 0777</td></tr>
|
||||
<tr><td><br /></td><td></td></tr>
|
||||
<tr><td>guest ok</td><td>$Lang::tr{'guest ok'}</td></tr>
|
||||
<tr><td></td><td>guest ok = yes</td></tr>
|
||||
</table>
|
||||
END
|
||||
;
|
||||
|
||||
&Header::closebox();
|
||||
&Header::closebigbox();
|
||||
&Header::closepage();
|
||||
@@ -20,7 +20,8 @@ my %checked = ();
|
||||
my %netsettings = ();
|
||||
my $message = "";
|
||||
my $errormessage = "";
|
||||
my @Logs = qx(ls /var/ipfire/tripwire/report/);
|
||||
my @Logs = qx(ls -r /var/ipfire/tripwire/report/);
|
||||
my $file = `ls -tr /var/ipfire/tripwire/report/ | tail -1`;
|
||||
my $Log =$Lang::tr{'no log selected'};
|
||||
|
||||
############################################################################################################################
|
||||
@@ -29,9 +30,9 @@ my $Log =$Lang::tr{'no log selected'};
|
||||
$tripwiresettings{'ROOT'} = '/usr/sbin';
|
||||
$tripwiresettings{'POLFILE'} = '/var/ipfire/tripwire/tw.pol';
|
||||
$tripwiresettings{'DBFILE'} = '/var/ipfire/tripwire/$(HOSTNAME).twd';
|
||||
$tripwiresettings{'REPORTFILE'} = '/var/ipfire/tripwire/report/$(HOSTNAME)-$(DATE).twr';
|
||||
$tripwiresettings{'REPORTFILE'} = '/var/ipfire/tripwire/report/$(DATE).twr';
|
||||
$tripwiresettings{'SITEKEYFILE'} = '/var/ipfire/tripwire/site.key';
|
||||
$tripwiresettings{'LOCALKEYFILE'} = '/var/ipfire/tripwire/$(HOSTNAME)-local.key';
|
||||
$tripwiresettings{'LOCALKEYFILE'} = '/var/ipfire/tripwire/local.key';
|
||||
$tripwiresettings{'EDITOR'} = '/usr/bin/vi';
|
||||
$tripwiresettings{'LATEPROMPTING'} = 'false';
|
||||
$tripwiresettings{'LOOSEDIRECTORYCHECKING'} = 'false';
|
||||
@@ -43,10 +44,12 @@ $tripwiresettings{'SMTPHOST'} = 'ipfire.myipfire.de';
|
||||
$tripwiresettings{'SMTPPORT'} = '25';
|
||||
$tripwiresettings{'SYSLOGREPORTING'} = 'false';
|
||||
$tripwiresettings{'MAILPROGRAM'} = '/usr/sbin/sendmail -oi -t';
|
||||
$tripwiresettings{'SITEKEY'} = 'IPFire';
|
||||
$tripwiresettings{'LOCALKEY'} = 'IPFire';
|
||||
$tripwiresettings{'SITEKEY'} = 'ipfire';
|
||||
$tripwiresettings{'LOCALKEY'} = 'ipfire';
|
||||
$tripwiresettings{'ACTION'} = '';
|
||||
|
||||
&General::readhash("${General::swroot}/tripwire/settings", \%tripwiresettings);
|
||||
|
||||
############################################################################################################################
|
||||
######################################################### Tripwire HTML Part ###############################################
|
||||
|
||||
@@ -61,7 +64,7 @@ $tripwiresettings{'ACTION'} = '';
|
||||
if ($tripwiresettings{'ACTION'} eq $Lang::tr{'save'})
|
||||
{
|
||||
system("/usr/local/bin/tripwirectrl readconfig");
|
||||
open (FILE, ">${General::swroot}/tripwire/tw.cfg") or die "Can't save tripwire config: $!";
|
||||
open (FILE, ">${General::swroot}/tripwire/twcfg.txt") or die "Can't save tripwire config: $!";
|
||||
flock (FILE, 2);
|
||||
|
||||
print FILE <<END
|
||||
@@ -122,9 +125,10 @@ if ($tripwiresettings{'ACTION'} eq 'generatepolicypw')
|
||||
<tr><td bgcolor='${Header::table1colour}' colspan='2' align='center'><b>$Lang::tr{'generatepolicy'}</b>
|
||||
<tr><td colspan='2' align='center'><font color=red>$Lang::tr{'tripwirewarningpolicy'}<br /><br /></font></td></tr>
|
||||
<tr><td align='left' width='40%'><form method='post' action='$ENV{'SCRIPT_NAME'}'>$Lang::tr{'sitekey'}</td><td align='left'><input type='password' name='SITEKEY' value='$tripwiresettings{'SITEKEY'}' size="30" /></td></tr>
|
||||
<tr><td align='left' width='40%'><form method='post' action='$ENV{'SCRIPT_NAME'}'>$Lang::tr{'localkey'}</td><td align='left'><input type='password' name='LOCALKEY' value='$tripwiresettings{'LOCALKEY'}' size="30" /></td></tr>
|
||||
<tr><td align='right' width='50%'>
|
||||
$Lang::tr{'yes'} <input type='image' alt='$Lang::tr{'yes'}' src='/images/edit-redo.png' />
|
||||
<input type='hidden' name='ACTION' value='generatepolicy' /></form></td>
|
||||
<input type='hidden' name='ACTION' value='generatepolicyyes' /></form></td>
|
||||
<td align='left' width='50%'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
|
||||
<input type='image' alt='$Lang::tr{'no'}' src='/images/dialog-error.png' /> $Lang::tr{'no'}
|
||||
<input type='hidden' name='ACTION' value='cancel' /></form></td>
|
||||
@@ -142,6 +146,7 @@ if ($tripwiresettings{'ACTION'} eq 'policyresetpw')
|
||||
<tr><td bgcolor='${Header::table1colour}' colspan='2' align='center'><b>$Lang::tr{'resetpolicy'}</b>
|
||||
<tr><td colspan='2' align='center'><font color=red>$Lang::tr{'tripwirewarningpolicy'}<br /><br /></font></td></tr>
|
||||
<tr><td align='left' width='40%'><form method='post' action='$ENV{'SCRIPT_NAME'}'>$Lang::tr{'sitekey'}</td><td align='left'><input type='password' name='SITEKEY' value='$tripwiresettings{'SITEKEY'}' size="30" /></td></tr>
|
||||
<tr><td align='left' width='40%'><form method='post' action='$ENV{'SCRIPT_NAME'}'>$Lang::tr{'localkey'}</td><td align='left'><input type='password' name='LOCALKEY' value='$tripwiresettings{'LOCALKEY'}' size="30" /></td></tr>
|
||||
<tr><td align='right' width='50%'>
|
||||
$Lang::tr{'yes'} <input type='image' alt='$Lang::tr{'yes'}' src='/images/edit-redo.png' />
|
||||
<input type='hidden' name='ACTION' value='resetpolicyyes' /></form></td>
|
||||
@@ -214,12 +219,63 @@ END
|
||||
############################################################################################################################
|
||||
######################################################## Tripwire Funktionen ###############################################
|
||||
|
||||
if ($tripwiresettings{'ACTION'} eq 'globalresetyes'){system("/usr/local/bin/tripwirectrl globalreset");}
|
||||
if ($tripwiresettings{'ACTION'} eq 'generatekeysyes'){system("/usr/local/bin/tripwirectrl keys $tripwiresettings{'SITEKEY'} $tripwiresettings{'LOCALKEY'}");$tripwiresettings{'SITEKEY'} = 'IPFire';$tripwiresettings{'LOCALKEY'} = 'IPFire';}
|
||||
if ($tripwiresettings{'ACTION'} eq 'keyresetyes'){system("/usr/local/bin/tripwirectrl keys IPFire IPFire");$tripwiresettings{'SITEKEY'} = 'IPFire';$tripwiresettings{'LOCALKEY'} = 'IPFire';}
|
||||
if ($tripwiresettings{'ACTION'} eq 'resetpolicyyes'){system("/usr/local/bin/tripwirectrl resetpolicy tripwiresettings{'SITEKEY'}");$tripwiresettings{'SITEKEY'} = 'IPFire';}
|
||||
if ($tripwiresettings{'ACTION'} eq 'generatepolicyyes'){system("/usr/local/bin/tripwirectrl generatepolicy $tripwiresettings{'SITEKEY'}");$tripwiresettings{'SITEKEY'} = 'IPFire';}
|
||||
if ($tripwiresettings{'ACTION'} eq 'updatedatabaseyes'){system("/usr/local/bin/tripwirectrl updatedatabase $tripwiresettings{'LOCALKEY'}");$tripwiresettings{'LOCALKEY'} = 'IPFire';}
|
||||
if ($tripwiresettings{'ACTION'} eq 'globalresetyes')
|
||||
{
|
||||
$tripwiresettings{'ROOT'} = '/usr/sbin';
|
||||
$tripwiresettings{'POLFILE'} = '/var/ipfire/tripwire/tw.pol';
|
||||
$tripwiresettings{'DBFILE'} = '/var/ipfire/tripwire/$(HOSTNAME).twd';
|
||||
$tripwiresettings{'REPORTFILE'} = '/var/ipfire/tripwire/report/$(DATE).twr';
|
||||
$tripwiresettings{'SITEKEYFILE'} = '/var/ipfire/tripwire/site.key';
|
||||
$tripwiresettings{'LOCALKEYFILE'} = '/var/ipfire/tripwire/local.key';
|
||||
$tripwiresettings{'EDITOR'} = '/usr/bin/vi';
|
||||
$tripwiresettings{'LATEPROMPTING'} = 'false';
|
||||
$tripwiresettings{'LOOSEDIRECTORYCHECKING'} = 'false';
|
||||
$tripwiresettings{'MAILNOVIOLATIONS'} = 'false';
|
||||
$tripwiresettings{'EMAILREPORTLEVEL'} = '3';
|
||||
$tripwiresettings{'REPORTLEVEL'} = '3';
|
||||
$tripwiresettings{'MAILMETHOD'} = 'SENDMAIL';
|
||||
$tripwiresettings{'SMTPHOST'} = 'ipfire.myipfire.de';
|
||||
$tripwiresettings{'SMTPPORT'} = '25';
|
||||
$tripwiresettings{'SYSLOGREPORTING'} = 'false';
|
||||
$tripwiresettings{'MAILPROGRAM'} = '/usr/sbin/sendmail -oi -t';
|
||||
$tripwiresettings{'SITEKEY'} = 'ipfire';
|
||||
$tripwiresettings{'LOCALKEY'} = 'ipfire';
|
||||
$tripwiresettings{'ACTION'} = '';
|
||||
system("/usr/local/bin/tripwirectrl readconfig");
|
||||
open (FILE, ">${General::swroot}/tripwire/twcfg.txt") or die "Can't save tripwire config: $!";
|
||||
flock (FILE, 2);
|
||||
print FILE <<END
|
||||
|
||||
ROOT =$tripwiresettings{'ROOT'}
|
||||
POLFILE =$tripwiresettings{'POLFILE'}
|
||||
DBFILE =$tripwiresettings{'DBFILE'}
|
||||
REPORTFILE =$tripwiresettings{'REPORTFILE'}
|
||||
SITEKEYFILE =$tripwiresettings{'SITEKEYFILE'}
|
||||
LOCALKEYFILE =$tripwiresettings{'LOCALKEYFILE'}
|
||||
EDITOR =$tripwiresettings{'EDITOR'}
|
||||
LATEPROMPTING =$tripwiresettings{'LATEPROMPTING'}
|
||||
LOOSEDIRECTORYCHECKING =$tripwiresettings{'LOOSEDIRECTORYCHECKING'}
|
||||
MAILNOVIOLATIONS =$tripwiresettings{'MAILNOVIOLATIONS'}
|
||||
EMAILREPORTLEVEL =$tripwiresettings{'EMAILREPORTLEVEL'}
|
||||
REPORTLEVEL =$tripwiresettings{'REPORTLEVEL'}
|
||||
MAILMETHOD =$tripwiresettings{'MAILMETHOD'}
|
||||
SMTPHOST =$tripwiresettings{'SMTPHOST'}
|
||||
SMTPPORT =$tripwiresettings{'SMTPPORT'}
|
||||
SYSLOGREPORTING =$tripwiresettings{'SYSLOGREPORTING'}
|
||||
MAILPROGRAM =$tripwiresettings{'MAILPROGRAM'}
|
||||
|
||||
END
|
||||
;
|
||||
close FILE;
|
||||
&General::writehash("${General::swroot}/tripwire/settings", \%tripwiresettings);
|
||||
system("/usr/local/bin/tripwirectrl lockconfig");
|
||||
system("/usr/local/bin/tripwirectrl keys ipfire ipfire");$tripwiresettings{'SITEKEY'} = 'ipfire';$tripwiresettings{'LOCALKEY'} = 'ipfire';
|
||||
}
|
||||
if ($tripwiresettings{'ACTION'} eq 'generatekeysyes'){system("/usr/local/bin/tripwirectrl keys $tripwiresettings{'SITEKEY'} $tripwiresettings{'LOCALKEY'}");$tripwiresettings{'SITEKEY'} = 'ipfire';$tripwiresettings{'LOCALKEY'} = 'ipfire';}
|
||||
if ($tripwiresettings{'ACTION'} eq 'keyresetyes'){system("/usr/local/bin/tripwirectrl keys ipfire ipfire");$tripwiresettings{'SITEKEY'} = 'ipfire';$tripwiresettings{'LOCALKEY'} = 'ipfire';}
|
||||
if ($tripwiresettings{'ACTION'} eq 'resetpolicyyes'){system("/usr/local/bin/tripwirectrl resetpolicy tripwiresettings{'SITEKEY'} $tripwiresettings{'LOCALKEY'}");$tripwiresettings{'SITEKEY'} = 'ipfire';$tripwiresettings{'LOCALKEY'} = 'ipfire';}
|
||||
if ($tripwiresettings{'ACTION'} eq 'generatepolicyyes'){system("/usr/local/bin/tripwirectrl generatepolicy $tripwiresettings{'SITEKEY'} $tripwiresettings{'LOCALKEY'}");$tripwiresettings{'SITEKEY'} = 'ipfire';$tripwiresettings{'LOCALKEY'} = 'ipfire';}
|
||||
if ($tripwiresettings{'ACTION'} eq 'updatedatabaseyes'){system("/usr/local/bin/tripwirectrl updatedatabase $tripwiresettings{'LOCALKEY'} /var/ipfire/tripwire/report/$file");$tripwiresettings{'LOCALKEY'} = 'ipfire';}
|
||||
if ($tripwiresettings{'ACTION'} eq 'generatereport'){system("/usr/local/bin/tripwirectrl generatereport");}
|
||||
|
||||
############################################################################################################################
|
||||
@@ -360,7 +416,7 @@ END
|
||||
&Header::closebox();
|
||||
|
||||
############################################################################################################################
|
||||
####################################################### Tripwire Init Policy ###############################################
|
||||
####################################################### Tripwire Log View ##################################################
|
||||
|
||||
&Header::openbox('100%', 'center', $Lang::tr{'tripwire reports'});
|
||||
print <<END
|
||||
@@ -384,12 +440,11 @@ END
|
||||
if ($tripwiresettings{'ACTION'} eq 'showlog')
|
||||
{
|
||||
$Log = qx(/usr/local/bin/tripwirectrl tripwirelog $tripwiresettings{'LOG'});
|
||||
#$Log=~s/\n/<br \/>/g;
|
||||
#$Log=~s/\t/.... /g;
|
||||
$Log=~s/--cfgfile \/var\/ipfire\/tripwire\/tw.cfg --polfile \/var\/ipfire\/tripwire\/tw.pol//g;
|
||||
print <<END
|
||||
<table width='95%' cellspacing='0'>
|
||||
<tr><td><br /></td></tr>
|
||||
<tr><td><pre>LOG - $Log </pre></td></tr>
|
||||
<tr><td><pre>$Log</pre></td></tr>
|
||||
<tr><td><br /></td></tr>
|
||||
<tr><td align=center>$tripwiresettings{'LOG'}</td></tr>
|
||||
</table>
|
||||
|
||||
@@ -108,6 +108,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
cp -vfp /var/ipfire/samba/default.shares /var/ipfire/samba/shares
|
||||
cp -vfp /var/ipfire/samba/default.printer /var/ipfire/samba/printer
|
||||
cat /var/ipfire/samba/global /var/ipfire/samba/shares > /var/ipfire/samba/smb.conf
|
||||
-mkdir -p /var/log/samba
|
||||
#useradd -c 'Samba User' -s /bin/false
|
||||
#groupadd sambauser
|
||||
#groupadd sambawks
|
||||
|
||||
@@ -23,7 +23,7 @@ case "${2}" in
|
||||
|
||||
if [ "${METHOD}" != "PPPOE_PLUGIN" ]; then
|
||||
PPPCOMMAND="/usr/sbin/pppd pty"
|
||||
PPPOECOMMAND="/usr/sbin/pppoe -p /var/run/pppoe.pid -I ${1} -T 80 -U -m 1412"
|
||||
PPPOECOMMAND="/usr/sbin/pppoe -p /var/run/pppoe.pid -I ${1} -T 80 -U -m ${${MTU}-80}"
|
||||
if [ -n ${SERVICENAME} ]; then
|
||||
PPPOECOMMAND+=" -S ${SERVICENAME}"
|
||||
fi
|
||||
|
||||
@@ -37,7 +37,7 @@ case "$1" in
|
||||
|
||||
restart)
|
||||
$0 stop
|
||||
sleep 1
|
||||
sleep 3
|
||||
$0 start
|
||||
;;
|
||||
|
||||
|
||||
@@ -52,12 +52,24 @@ int main(int argc, char *argv[])
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (strcmp(argv[1], "smbsafeconfcups")==0)
|
||||
{
|
||||
safe_system("/bin/cat /var/ipfire/samba/global /var/ipfire/samba/shares /var/ipfire/samba/printer > /var/ipfire/samba/smb.conf");
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (strcmp(argv[1], "smbsafeconfpdc")==0)
|
||||
{
|
||||
safe_system("/bin/cat /var/ipfire/samba/global /var/ipfire/samba/pdc /var/ipfire/samba/shares > /var/ipfire/samba/smb.conf");
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (strcmp(argv[1], "smbsafeconfpdccups")==0)
|
||||
{
|
||||
safe_system("/bin/cat /var/ipfire/samba/global /var/ipfire/samba/pdc /var/ipfire/samba/shares /var/ipfire/samba/printer > /var/ipfire/samba/smb.conf");
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (strcmp(argv[1], "smbglobalreset")==0)
|
||||
{
|
||||
safe_system("/bin/cat /var/ipfire/samba/default.global /var/ipfire/samba/shares > /var/ipfire/samba/smb.conf");
|
||||
@@ -74,31 +86,34 @@ int main(int argc, char *argv[])
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (strcmp(argv[1], "smbprinterreset")==0)
|
||||
{
|
||||
safe_system("/bin/cat /var/ipfire/samba/global /var/ipfire/samba/shares /var/default.printer > /var/ipfire/samba/smb.conf");
|
||||
safe_system("/bin/cat /var/ipfire/samba/default.printer > /var/ipfire/samba/printer");
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (strcmp(argv[1], "smbstop")==0)
|
||||
{
|
||||
safe_system("/etc/rc.d/init.d/samba stop");
|
||||
printf(command);
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (strcmp(argv[1], "smbstart")==0)
|
||||
{
|
||||
safe_system("/etc/rc.d/init.d/samba start");
|
||||
printf(command);
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (strcmp(argv[1], "smbrestart")==0)
|
||||
{
|
||||
safe_system("/etc/rc.d/init.d/samba restart");
|
||||
printf(command);
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (strcmp(argv[1], "smbreload")==0)
|
||||
{
|
||||
safe_system("/etc/rc.d/init.d/samba reload");
|
||||
printf(command);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -155,12 +170,5 @@ int main(int argc, char *argv[])
|
||||
safe_system("/bin/chmod 600 /var/ipfire/samba/private");
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (strcmp(argv[1], "smbechotest")==0)
|
||||
{
|
||||
sprintf(command, BUFFER_SIZE-1, "/usr/bin/printf %s %s", argv[2], argv[3]);
|
||||
printf(command);
|
||||
safe_system(command);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
@@ -13,95 +13,88 @@ char command[BUFFER_SIZE];
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
|
||||
if (!(initsetuid()))
|
||||
exit(1);
|
||||
if (!(initsetuid()))
|
||||
exit(1);
|
||||
|
||||
// Check what command is asked
|
||||
if (argc==1)
|
||||
{
|
||||
fprintf (stderr, "Missing tripwirectrl command!\n");
|
||||
return 1;
|
||||
}
|
||||
// Check what command is asked
|
||||
if (argc==1)
|
||||
{
|
||||
fprintf (stderr, "Missing tripwirectrl command!\n");
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (strcmp(argv[1], "tripwirelog")==0)
|
||||
{
|
||||
snprintf(command, BUFFER_SIZE-1, "/usr/sbin/twprint -m r --cfgfile /var/ipfire/tripwire/tw.cfg --twrfile /var/ipfire/tripwire/report/%s", argv[2]);
|
||||
safe_system(command);
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (strcmp(argv[1], "generatereport")==0)
|
||||
{
|
||||
safe_system("/usr/sbin/tripwire --check --cfgfile /var/ipfire/tripwire/tw.cfg --polfile /var/ipfire/tripwire/tw.pol >/dev/null 2>&1");
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (strcmp(argv[1], "deletereport")==0)
|
||||
{
|
||||
sprintf(command, "rm -f /var/ipfire/tripwire/report/%s", argv[2]);
|
||||
safe_system(command);
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (strcmp(argv[1], "updatedatabase")==0)
|
||||
{
|
||||
snprintf(command, BUFFER_SIZE-1, "/usr/sbin/tripwire --update --accept-all --cfgfile /var/ipfire/tripwire/tw.cfg --polfile /var/ipfire/tripwire/tw.pol --local-passphrase %s --twrfile %s >/dev/null 2>&1", argv[2], argv[3]);
|
||||
safe_system(command);
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (strcmp(argv[1], "keys")==0)
|
||||
{
|
||||
printf("Generating Site Key<br />");
|
||||
snprintf(command, BUFFER_SIZE-1, "rm -rf /var/ipfire/tripwire/site.key && /usr/sbin/twadmin --generate-keys --site-keyfile /var/ipfire/tripwire/site.key --site-passphrase %s && chmod 640 /var/ipfire/tripwire/site.key >/dev/null 2>&1", argv[2]);
|
||||
safe_system(command);
|
||||
printf("Generating Local Key<br />");
|
||||
snprintf(command, BUFFER_SIZE-1, "rm -rf /var/ipfire/tripwire/local.key && /usr/sbin/twadmin --generate-keys --local-keyfile /var/ipfire/tripwire/local.key --local-passphrase %s && chmod 640 /var/ipfire/tripwire/local.key >/dev/null 2>&1", argv[3]);
|
||||
safe_system(command);
|
||||
printf("Generating Config File<br />");
|
||||
snprintf(command, BUFFER_SIZE-1, "rm -rf /var/ipfire/tripwire/tw.cfg && /usr/sbin/twadmin --create-cfgfile --cfgfile /var/ipfire/tripwire/tw.cfg --site-keyfile /var/ipfire/tripwire/site.key --site-passphrase %s /var/ipfire/tripwire/twcfg.txt && chmod 640 /var/ipfire/tripwire/tw.cfg >/dev/null 2>&1", argv[2]);
|
||||
safe_system(command);
|
||||
printf("Generating Policy File<br />");
|
||||
snprintf(command, BUFFER_SIZE-1, "rm -rf /var/ipfire/tripwire/tw.pol && /usr/sbin/twadmin --create-polfile --cfgfile /var/ipfire/tripwire/tw.cfg --site-keyfile /var/ipfire/tripwire/site.key --site-passphrase %s /var/ipfire/tripwire/twpol.txt && chmod 640 /var/ipfire/tripwire/tw.pol >/dev/null 2>&1", argv[2]);
|
||||
safe_system(command);
|
||||
printf("Initialising - This may take a while depending on your Policy<br />");
|
||||
snprintf(command, BUFFER_SIZE-1, "/usr/sbin/tripwire --init --cfgfile /var/ipfire/tripwire/tw.cfg --polfile /var/ipfire/tripwire/tw.pol --local-passphrase %s >/dev/null 2>&1", argv[3]);
|
||||
safe_system(command);
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (strcmp(argv[1], "generatepolicy")==0)
|
||||
{
|
||||
printf("Generating Policy File<br />");
|
||||
snprintf(command, BUFFER_SIZE-1, "/usr/sbin/twadmin --create-polfile --site-keyfile /var/ipfire/tripwire/site.key --site-passphrase %s --polfile /var/ipfire/tripwire/tw.pol --cfgfile /var/ipfire/tripwire/tw.cfg /var/ipfire/tripwire/twpol.txt >/dev/null 2>&1", argv[2]);
|
||||
safe_system(command);
|
||||
printf("Initialising - This may take a while depending on your Policy<br />");
|
||||
snprintf(command, BUFFER_SIZE-1, "/usr/sbin/tripwire --init --cfgfile /var/ipfire/tripwire/tw.cfg --polfile /var/ipfire/tripwire/tw.cfg --local-passphrase %s >/dev/null 2>&1", argv[3]);
|
||||
safe_system(command);
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (strcmp(argv[1], "resetpolicy")==0)
|
||||
{
|
||||
printf("Generating Policy File<br />");
|
||||
snprintf(command, BUFFER_SIZE-1, "/usr/sbin/twadmin --create-polfile --site-keyfile /var/ipfire/tripwire/site.key --site-passphrase %s --polfile /var/ipfire/tripwire/tw.pol --cfgfile /var/ipfire/tripwire/tw.cfg /var/ipfire/tripwire/twpol.default >/dev/null 2>&1", argv[2]);
|
||||
safe_system(command);
|
||||
printf("Initialising - This may take a while depending on your Policy");
|
||||
snprintf(command, BUFFER_SIZE-1, "/usr/sbin/tripwire --init --cfgfile /var/ipfire/tripwire/tw.cfg --polfile /var/ipfire/tripwire/tw.cfg --local-passphrase %s >/dev/null 2>&1", argv[3]);
|
||||
safe_system(command);
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (strcmp(argv[1], "readconfig")==0)
|
||||
{
|
||||
safe_system("/bin/chown nobody:nobody /var/ipfire/tripwire/twcfg.txt");
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (strcmp(argv[1], "lockconfig")==0)
|
||||
{
|
||||
safe_system("/bin/chown root:root /var/ipfire/tripwire/twcfg.txt");
|
||||
return 0;
|
||||
}
|
||||
if (strcmp(argv[1], "tripwirelog")==0)
|
||||
{
|
||||
snprintf(command, BUFFER_SIZE-1, "/usr/sbin/twprint -m r --cfgfile /var/ipfire/tripwire/tw.cfg --twrfile /var/ipfire/tripwire/report/%s", argv[2]);
|
||||
safe_system(command);
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (strcmp(argv[1], "generatereport")==0)
|
||||
{
|
||||
safe_system("/usr/sbin/tripwire --check --cfgfile /var/ipfire/tripwire/tw.cfg --polfile /var/ipfire/tripwire/tw.pol >/dev/null 2>&1");
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (strcmp(argv[1], "deletereport")==0)
|
||||
{
|
||||
sprintf(command, "rm -f /var/ipfire/tripwire/report/%s", argv[2]);
|
||||
safe_system(command);
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (strcmp(argv[1], "updatedatabase")==0)
|
||||
{
|
||||
snprintf(command, BUFFER_SIZE-1, "/usr/sbin/tripwire --update --accept-all --cfgfile /var/ipfire/tripwire/tw.cfg --polfile /var/ipfire/tripwire/tw.pol --local-passphrase %s --twrfile %s >/dev/null 2>&1", argv[2], argv[3]);
|
||||
safe_system(command);
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (strcmp(argv[1], "keys")==0)
|
||||
{
|
||||
snprintf(command, BUFFER_SIZE-1, "rm -rf /var/ipfire/tripwire/site.key && /usr/sbin/twadmin --generate-keys --site-keyfile /var/ipfire/tripwire/site.key --site-passphrase %s >/dev/null 2>&1 && chmod 640 /var/ipfire/tripwire/site.key", argv[2]);
|
||||
safe_system(command);
|
||||
snprintf(command, BUFFER_SIZE-1, "rm -rf /var/ipfire/tripwire/local.key && /usr/sbin/twadmin --generate-keys --local-keyfile /var/ipfire/tripwire/local.key --local-passphrase %s >/dev/null 2>&1 && chmod 640 /var/ipfire/tripwire/local.key", argv[3]);
|
||||
safe_system(command);
|
||||
snprintf(command, BUFFER_SIZE-1, "rm -rf /var/ipfire/tripwire/tw.cfg && /usr/sbin/twadmin --create-cfgfile --cfgfile /var/ipfire/tripwire/tw.cfg --site-keyfile /var/ipfire/tripwire/site.key --site-passphrase %s /var/ipfire/tripwire/twcfg.txt >/dev/null 2>&1 && chmod 640 /var/ipfire/tripwire/tw.cfg", argv[2]);
|
||||
safe_system(command);
|
||||
snprintf(command, BUFFER_SIZE-1, "rm -rf /var/ipfire/tripwire/tw.pol && /usr/sbin/twadmin --create-polfile --cfgfile /var/ipfire/tripwire/tw.cfg --site-keyfile /var/ipfire/tripwire/site.key --site-passphrase %s /var/ipfire/tripwire/twpol.txt >/dev/null 2>&1 && chmod 640 /var/ipfire/tripwire/tw.pol", argv[2]);
|
||||
safe_system(command);
|
||||
snprintf(command, BUFFER_SIZE-1, "/usr/sbin/tripwire --init --cfgfile /var/ipfire/tripwire/tw.cfg --polfile /var/ipfire/tripwire/tw.pol --local-passphrase %s >/dev/null 2>&1", argv[3]);
|
||||
safe_system(command);
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (strcmp(argv[1], "generatepolicy")==0)
|
||||
{
|
||||
printf("Generating Policy File<br />");
|
||||
snprintf(command, BUFFER_SIZE-1, "/usr/sbin/twadmin --create-polfile --site-keyfile /var/ipfire/tripwire/site.key --site-passphrase %s --polfile /var/ipfire/tripwire/tw.pol --cfgfile /var/ipfire/tripwire/tw.cfg /var/ipfire/tripwire/twpol.txt >/dev/null 2>&1", argv[2]);
|
||||
safe_system(command);
|
||||
printf("Initialising - This may take a while depending on your Policy<br />");
|
||||
snprintf(command, BUFFER_SIZE-1, "/usr/sbin/tripwire --init --cfgfile /var/ipfire/tripwire/tw.cfg --polfile /var/ipfire/tripwire/tw.cfg --local-passphrase %s >/dev/null 2>&1", argv[3]);
|
||||
safe_system(command);
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (strcmp(argv[1], "resetpolicy")==0)
|
||||
{
|
||||
snprintf(command, BUFFER_SIZE-1, "/usr/sbin/twadmin --create-polfile --site-keyfile /var/ipfire/tripwire/site.key --site-passphrase %s --polfile /var/ipfire/tripwire/tw.pol --cfgfile /var/ipfire/tripwire/tw.cfg /var/ipfire/tripwire/twpol.default >/dev/null 2>&1", argv[2]);
|
||||
safe_system(command);
|
||||
snprintf(command, BUFFER_SIZE-1, "/usr/sbin/tripwire --init --cfgfile /var/ipfire/tripwire/tw.cfg --polfile /var/ipfire/tripwire/tw.cfg --local-passphrase %s >/dev/null 2>&1", argv[3]);
|
||||
safe_system(command);
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (strcmp(argv[1], "readconfig")==0)
|
||||
{
|
||||
safe_system("/bin/chown nobody:nobody /var/ipfire/tripwire/twcfg.txt");
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (strcmp(argv[1], "lockconfig")==0)
|
||||
{
|
||||
safe_system("/bin/chown root:root /var/ipfire/tripwire/twcfg.txt");
|
||||
return 0;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
Reference in New Issue
Block a user