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

Guardian in Snort eingebaut

Browse Source 
QoS CGI wegen den Language Anpassungen korrigiert
Tripwire Policy soll Snortregeln ignorieren
Network Skript angepasst


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@726 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
maniacikarus
2007-07-29 17:55:20 +00:00
parent 7c98b47551
commit 1b73b07ee8
5 changed files with 273 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/tripwire/twpol.txt
View File

@@ -33,13 +33,13 @@ SIG_HI = 100 ; # Critical files that are significant point
/bin -> $(SEC_CRIT) ;
/boot -> $(SEC_CRIT) ;
/etc -> $(SEC_CRIT) ;
/etc/snort/rules/ -> $(Dynamic) ;
/lib -> $(SEC_CRIT) ;
/root -> $(SEC_CRIT) ;
/root/.bash_history -> $(Dynamic) ;
/sbin -> $(SEC_CRIT) ;
/usr -> $(SEC_CRIT) ;
!/usr/src ;
!/usr/share/clamav ;
/usr/share/clamav -> $(Dynamic) ;
/etc/mtab -> $(SEC_CONFIG) -i ; # Inode number changes on any mount/unmount
#don't scan the individual reports

41
html/cgi-bin/ids.cgi
View File

@@ -43,6 +43,7 @@ $snortsettings{'ENABLE_SNORT'} = 'off';
$snortsettings{'ENABLE_SNORT_GREEN'} = 'off';
$snortsettings{'ENABLE_SNORT_BLUE'} = 'off';
$snortsettings{'ENABLE_SNORT_ORANGE'} = 'off';
$snortsettings{'ENABLE_GUARDIAN'} = 'off';
$snortsettings{'ACTION'} = '';
$snortsettings{'RULES'} = '';
$snortsettings{'OINKCODE'} = '';
@@ -278,6 +279,12 @@ if ($snortsettings{'ACTION'} eq $Lang::tr{'save'})
} else {
unlink "${General::swroot}/snort/enable_orange";
}
if ($snortsettings{'ENABLE_GUARDIAN'} eq 'on')
{
system ('/usr/bin/touch', "${General::swroot}/guardian/enable");
} else {
unlink "${General::swroot}/guardian/enable";
}
system('/usr/local/bin/snortctrl restart >/dev/null');
@@ -320,6 +327,9 @@ $checked{'ENABLE_SNORT_BLUE'}{$snortsettings{'ENABLE_SNORT_BLUE'}} = "checked='c
$checked{'ENABLE_SNORT_ORANGE'}{'off'} = '';
$checked{'ENABLE_SNORT_ORANGE'}{'on'} = '';
$checked{'ENABLE_SNORT_ORANGE'}{$snortsettings{'ENABLE_SNORT_ORANGE'}} = "checked='checked'";
$checked{'ENABLE_GUARDIAN'}{'off'} = '';
$checked{'ENABLE_GUARDIAN'}{'on'} = '';
$checked{'ENABLE_GUARDIAN'}{$snortsettings{'ENABLE_GUARDIAN'}} = "checked='checked'";
$selected{'RULES'}{'nothing'} = '';
$selected{'RULES'}{'community'} = '';
$selected{'RULES'}{'registered'} = '';
@@ -366,35 +376,22 @@ if ($errormessage) {
&Header::openbox('100%', 'left', $Lang::tr{'intrusion detection system2'});
print <<END
<form method='post' action='$ENV{'SCRIPT_NAME'}'><table width='100%'>
<tr>
<td class='base'><input type='checkbox' name='ENABLE_SNORT_GREEN' $checked{'ENABLE_SNORT_GREEN'}{'on'} />
GREEN Snort</td>
</tr>
<tr><td class='base'><input type='checkbox' name='ENABLE_SNORT_GREEN' $checked{'ENABLE_SNORT_GREEN'}{'on'} />GREEN Snort
END
;
if ($netsettings{'BLUE_DEV'} ne '') {
print <<END
<tr>
<td class='base'><input type='checkbox' name='ENABLE_SNORT_BLUE' $checked{'ENABLE_SNORT_BLUE'}{'on'} />
BLUE Snort</td>
</tr>
END
;
print "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type='checkbox' name='ENABLE_SNORT_BLUE' $checked{'ENABLE_SNORT_BLUE'}{'on'} /> BLUE Snort";
}
if ($netsettings{'ORANGE_DEV'} ne '') {
print <<END
<tr>
<td class='base'><input type='checkbox' name='ENABLE_SNORT_ORANGE' $checked{'ENABLE_SNORT_ORANGE'}{'on'} />
ORANGE Snort</td>
</tr>
END
;
print "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type='checkbox' name='ENABLE_SNORT_ORANGE' $checked{'ENABLE_SNORT_ORANGE'}{'on'} /> ORANGE Snort";
}
print "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type='checkbox' name='ENABLE_SNORT' $checked{'ENABLE_SNORT'}{'on'} /> RED Snort";
if ( -e "/var/ipfire/guardian/guardian.conf" ) {
print "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type='checkbox' name='ENABLE_GUARDIAN' $checked{'ENABLE_GUARDIAN'}{'on'} /> Guardian";
}
print <<END
<tr>
<td class='base'><input type='checkbox' name='ENABLE_SNORT' $checked{'ENABLE_SNORT'}{'on'} />
RED Snort</td>
</tr>
</td></tr>
<tr>
<td><hr /></td>
</tr>

22
html/cgi-bin/qos.cgi
View File

@@ -611,9 +611,9 @@ END
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
<table width='66%'>
<tr><td colspan='3'>&nbsp;
<tr><td width='40%' align='right'>$Lang::tr{'downlink speed'}: <td width='40%' align='left'>$qossettings{'INC_SPD'} kbps
<tr><td width='50%' align='right'>$Lang::tr{'downlink speed'}: <td width='30%' align='left'>$qossettings{'INC_SPD'}
<td width='20%' rowspan='2' align='center' valign='middle'><input type='submit' name='ACTIONBW' value='Andern' />
<tr><td width='40%' align='right'>$Lang::tr{'uplink speed'}: <td width='40%' align='left'>$qossettings{'OUT_SPD'} kbps
<tr><td width='50%' align='right'>$Lang::tr{'uplink speed'}: <td width='30%' align='left'>$qossettings{'OUT_SPD'}
</table></form>
END
;
@@ -623,10 +623,10 @@ END
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
<table width='66%'>
<tr><td colspan='3'><hr />
<tr><td width='40%' align='right'>$Lang::tr{'downlink std class'}: <td width='40%' align='left'>$qossettings{'DEFCLASS_INC'}
<tr><td width='50%' align='right'>$Lang::tr{'downlink std class'}: <td width='30%' align='left'>$qossettings{'DEFCLASS_INC'}
<td width='20%' rowspan='3' align='center' valign='middle'><input type='submit' name='ACTIONDEF' value='Andern' />
<tr><td width='40%' align='right'>$Lang::tr{'uplink std class'}: <td width='40%' align='left'>$qossettings{'DEFCLASS_OUT'}
<tr><td width='40%' align='right'>ACKs: <td width='40%' align='left'>$qossettings{'ACK'}
<tr><td width='50%' align='right'>$Lang::tr{'uplink std class'}: <td width='30%' align='left'>$qossettings{'DEFCLASS_OUT'}
<tr><td width='50%' align='right'>ACKs: <td width='30%' align='left'>$qossettings{'ACK'}
<tr><td colspan='3' width='100%'><hr />
<tr><td colspan='3' width='100%' align='center'>
</table>
@@ -750,12 +750,12 @@ sub changebandwidth {
<input type='hidden' name='DEF_OUT_SPD' value='' /><input type='hidden' name='DEF_INC_SPD' value='' />
<table width='66%'>
<tr><td width='100%' colspan='3'>$Lang::tr{'down and up speed'}
<tr><td width='33%' align='right'>$Lang::tr{'downlink speed'}:
<td width='33%' align='left'><input type='text' name='INC_SPD' maxlength='8' value="$qossettings{'INC_SPD'}" /> &nbsp; kbps
<td width='33%' align='center'>&nbsp;
<tr><td width='33%' align='right'>$Lang::tr{'uplink speed'}:
<td width='33%' align='left'><input type='text' name='OUT_SPD' maxlength='8' value="$qossettings{'OUT_SPD'}" /> &nbsp; kbps
<td width='33%' align='center'><input type='submit' name='ACTION' value="$Lang::tr{'save'}" />&nbsp;<input type='reset' name='ACTION' value="$Lang::tr{'reset'}" />
<tr><td width='50%' align='right'>$Lang::tr{'downlink speed'}:
<td width='30%' align='left'><input type='text' name='INC_SPD' maxlength='8' value="$qossettings{'INC_SPD'}" />
<td width='20%' align='center'>&nbsp;
<tr><td width='50%' align='right'>$Lang::tr{'uplink speed'}:
<td width='30%' align='left'><input type='text' name='OUT_SPD' maxlength='8' value="$qossettings{'OUT_SPD'}" />
<td width='20%' align='center'><input type='submit' name='ACTION' value="$Lang::tr{'save'}" />&nbsp;<input type='reset' name='ACTION' value="$Lang::tr{'reset'}" />
</table>
</form>
END

18
src/initscripts/init.d/network
View File

@@ -118,16 +118,21 @@ case "${DO}" in
else
name=red /etc/rc.d/init.d/net/ifup
fi
fi
fi
if [ -f "/var/ipfire/ovpn/enable" -o -f "/var/ipfire/ovpn/enable_blue" -o -f "/var/ipfire/ovpn/enable_orange" ];then
boot_mesg "Setting OpenVPN Rules if enabled"
/etc/rc.d/init.d/firewall startovpn; evaluate_retval
fi
fi
boot_mesg "Setting OpenVPN if enabled"
/usr/local/bin/openvpnctrl -s; evaluate_retval
fi
if [ -f "/var/ipfire/snort/enable" -o -f "/var/ipfire/snort/enable_blue" -o -f "/var/ipfire/snort/enable_orange" ];then
boot_mesg "Starting Snort if enabled"
/etc/rc.d/init.d/snort start; evaluate_retval
fi
;;
stop)
@@ -155,16 +160,21 @@ case "${DO}" in
if [ "$red" == "1" ]; then
if [ "$CONFIG_TYPE" = "1" -o "$CONFIG_TYPE" = "2" -o "$CONFIG_TYPE" = "3" -o "$CONFIG_TYPE" = "4" ]; then
name=red /etc/rc.d/init.d/net/ifdown
fi
fi
if [ -f "/var/ipfire/ovpn/enable" -o -f "/var/ipfire/ovpn/enable_blue" -o -f "/var/ipfire/ovpn/enable_orange" ];then
boot_mesg "Deleting OpenVPN Rules if enabled"
/etc/rc.d/init.d/firewall stopovpn; evaluate_retval
fi
fi
boot_mesg "Stopping OpenVPN if enabled"
/usr/local/bin/openvpnctrl -k; evaluate_retval
fi
if [ -f "/var/ipfire/snort/enable" -o -f "/var/ipfire/snort/enable_blue" -o -f "/var/ipfire/snort/enable_orange" ];then
boot_mesg "Stopping Snort if enabled"
/etc/rc.d/init.d/snort stop; evaluate_retval
fi
;;
restart)

23
src/initscripts/init.d/snort
View File

@@ -15,6 +15,8 @@
. /etc/sysconfig/rc
. ${rc_functions}
PATH=/usr/local/sbin:/usr/local/bin:/bin:/usr/bin:/sbin:/usr/sbin; export PATH
eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
eval $(/usr/local/bin/readhash /var/ipfire/snort/settings)
@@ -40,7 +42,7 @@ if [ "$ENABLE_SNORT" == "on" ]; then
else
exit 1 ## Add error handling here
fi
DEVICES+=`cat /var/ipfire/red/iface`
DEVICES+=`cat /var/ipfire/red/iface 2>/dev/null`
fi
COUNT=`echo $HOME_NET | wc -m`
@@ -66,6 +68,16 @@ case "$1" in
evaluate_retval
chmod 644 /var/run/snort_$DEVICE.pid
done
if [ -r /var/ipfire/guardian/enable ]; then
IFACE=`/bin/cat /var/ipfire/red/iface 2>/dev/null | /usr/bin/tr -d '\012'`
sed -e "s/^Interface.*/Interface ${IFACE}/" /var/ipfire/guardian/guardian.conf > temp
mv temp /var/ipfire/guardian/guardian.conf
boot_mesg "Starting Guardian..."
loadproc /usr/local/bin/guardian.pl -c /var/ipfire/guardian/guardian.conf
fi
;;
stop)
@@ -73,14 +85,16 @@ case "$1" in
if [ -r /var/run/snort_$BLUE_DEV.pid ]; then
DEVICES+="$BLUE_DEV "
fi
if [ -r /var/run/snort_$GREEN_DEV.pid ]; then
DEVICES+="$GREEN_DEV "
fi
if [ -r /var/run/snort_$ORANGE_DEV.pid ]; then
DEVICES+="$ORANGE_DEV "
fi
RED=`cat /var/ipfire/red/iface`
RED=`cat /var/ipfire/red/iface 2>/dev/null`
if [ -r /var/run/snort_$RED.pid ]; then
DEVICES+=`cat /var/ipfire/red/iface 2>/dev/null`
fi
@@ -91,6 +105,11 @@ case "$1" in
done
rm /var/run/snort_* >/dev/null 2>/dev/null
if [ -r /var/ipfire/guardian/enable ]; then
boot_mesg "Stopping Guardian..."
killproc /usr/local/bin/guardian.pl
fi
;;
status)