webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-27 19:23:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add missing default values for firewall options of the new firewall.

Browse Source 
The new firewall uses some new options which can be configured on the optionsfw page in the WUI.
In the past these settings where missing on updated systems.
This commit is contained in:
Stefan Schantl
2014-02-23 22:05:57 +01:00
committed by Michael Tremer
parent 0a79ec4505
commit 37013b3a47
1 changed files with 53 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
config/rootfiles/core/76/update.sh
View File

@@ -282,6 +282,59 @@ chown -R nobody:nobody /var/ipfire/fwhosts
# Remove old firewall configuration files
rm -rf /var/ipfire/{dmzholes,portfw,outgoing,xtaccess}
# In previously released IPFire versions the DROPOUTPUT and DROPINPUT
# option have two identical lines in the optionsfw/settings file as long as
# the user hasn't done any changes on the WUI.
#
# To prevent from any kind of side effects we are going to solve this issue now.
# Fix doubble enties of DROPOUTPUT when the default settings are still in use
# (the save button on the WUI page never has been clicked) or convert to the
# new option name required by the firewall of IPFire 2.15.
optionsfw_file="/var/ipfire/optionsfw/settings"
if [ $(grep -c "DROPOUTPUT" ${optionsfw_file}) -gt 1 ] ; then
# Drop all DROPUTPUT entries.
sed -e "/DROPOUTPUT/d" -i ${optionsfw_file}
# Add default line for new option.
echo "DROPOUTGOING=on" >> ${optionsfw_file}
else
# Convert option name to new format.
sed -e "s/DROPOUTPUT/DROPOUTGOING/g" -i ${optionsfw_file}
fi
# Fix doubble enties of DROPINPUT when the default settings are still in use
# (the save button on the WUI page never has been clicked).
if [ $(grep -c "DROPINPUT" ${optionsfw_file}) -gt 1 ] ; then
# We only can remove all entries with an defined string.
sed -e "/DROPINPUT/d" -i ${optionsfw_file}
# Afterwards we have to add the required string with the default
# value again.
echo "DROPINPUT=on" >> ${optionsfw_file}
fi
# Add strings and default values for new options of the firewall.
echo "DROPFORWARD=on" >> ${optionsfw_file}
echo "FWPOLICY=DROP" >> ${optionsfw_file}
echo "FWPOLICY1=DROP" >> ${optionsfw_file}
echo "FWPOLICY2=DROP" >> ${optionsfw_file}
echo "DROPSAMBA=off" >> ${optionsfw_file}
echo "DROPPROXY=off" >> ${optionsfw_file}
echo "SHOWREMARK=on" >> ${optionsfw_file}
echo "SHOWCOLORS=on" >> ${optionsfw_file}
echo "SHOWTABLES=off" >> ${optionsfw_file}
echo "SHOWDROPDOWN=off" >> ${optionsfw_file}
echo "DROPWIRELESSINPUT=on" >> ${optionsfw_file}
echo "DROPWIRELESSFORWARD=on" >> ${optionsfw_file}
unset optionsfw_file
# Convert inittab and fstab
sed -i -e "s/tty1 9600$/tty1 9600 --noclear/g" /etc/inittab
sed -i -e "s/xvc0 9600$/xvc0 9600 --noclear/g" /etc/inittab