[v2] CU185-update.sh: Add drop hostile in & out logging entries if not already present

Message ID 20240325174456.35715-1-adolf.belka@ipfire.org
State Accepted
Commit 3d947e6e6b9f492fa0a12b40db0495b6eac6d967
Series [v2] CU185-update.sh: Add drop hostile in & out logging entries if not already present |

Commit Message

Adolf Belka March 25, 2024, 5:44 p.m. UTC
  - This v2 patch corrects that the previous script was looking for =on. If a user had
   modified the preferences to change it to =off then the script would have resulted in
   both =on and =off versions being in the settings file.
- This patch ensures that those people who updated to CU184 before the CU184-update.sh
   patch fix to add the logging entries was added will get their optionsfw settings file
   correctly updated with CU185
- This only adds the LOGDROPHOSTILEIN & LOGDROPHOSTILEOUT entries if they do not already
   exist in the optionsfw settings file.
- This change also does the check for LOGDROPHOSTILEIN and LOGDROPHOSTILEOUT as two
   separate checks and then runs the firewall update command

Tested-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
 config/rootfiles/core/185/update.sh | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)


diff --git a/config/rootfiles/core/185/update.sh b/config/rootfiles/core/185/update.sh
index ec4d8ab82..002f92bbb 100644
--- a/config/rootfiles/core/185/update.sh
+++ b/config/rootfiles/core/185/update.sh
@@ -117,11 +117,17 @@  chown nobody:nobody /var/ipfire/ovpn/ovpnconfig
 # Check if the drop hostile in and out logging options need to be added
 # into the optionsfw settings file and apply to firewall
-if ! [ $(grep "LOGDROPHOSTILEIN=on" /var/ipfire/optionsfw/settings) ] && \
-   ! [ $(grep "LOGDROPHOSTILEOUT=on" /var/ipfire/optionsfw/settings) ]; then
-        sed -i '$ a\LOGDROPHOSTILEIN=on' /var/ipfire/optionsfw/settings
-        sed -i '$ a\LOGDROPHOSTILEOUT=on' /var/ipfire/optionsfw/settings
-        /usr/local/bin/firewallctrl
+if ! [ $(grep "^LOGDROPHOSTILEIN=" /var/ipfire/optionsfw/settings) ]; then
+    sed -i '$ a\LOGDROPHOSTILEIN=on' /var/ipfire/optionsfw/settings
+    optionsfw="updated"
+if ! [ $(grep "^LOGDROPHOSTILEOUT=" /var/ipfire/optionsfw/settings) ]; then
+    sed -i '$ a\LOGDROPHOSTILEOUT=on' /var/ipfire/optionsfw/settings
+    optionsfw="updated"
+if ! [ -z "$optionsfw" ]; then
+    /usr/local/bin/firewallctrl
 # Rebuild initial ramdisks