Revise firewalling rules in relation to Tor malfunctions

globaleaks · Dec 8, 2023 · 5064107 · 5064107
1 parent cb1980a
commit 5064107
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 43 deletions.
diff --git a/backend/default b/backend/default
@@ -6,10 +6,6 @@ USERNAME=globaleaks
 # permits to enable apparmor sandboxing
 APPARMOR_SANDBOXING=1
 
-# NETWORK_SANDBOXING = [0/1]
-# permits to enable network sandboxing
-NETWORK_SANDBOXING=1
-
 # LISTENING_IP = [ip]
 # permits to configure an ip on which the platform will listen
 LISTENING_IP=::

diff --git a/debian/globaleaks.init b/debian/globaleaks.init
@@ -99,7 +99,7 @@ network_sandboxing_start()
         exit 1
     fi
 
-    # remove all rules with the comment: "globaleaks-network-sandboxing"
+    # remove all rules with the comment: "globaleaks"
     iptables-save | grep -v "globaleaks" | iptables-restore
     ip6tables-save | grep -v "globaleaks" | ip6tables-restore
 
@@ -117,7 +117,6 @@ network_sandboxing_start()
         return
     fi
 
-    # OUTBOUND
     if [[ "$TOR_SANDBOXING" -eq "1" ]]; then
         declare -a PORTS=("80" "443")
         for PORT in "${PORTS[@]}"; do
@@ -126,16 +125,6 @@ network_sandboxing_start()
             ip6tables -m comment --comment "globaleaks" -A INPUT -p tcp -d :: --dport $PORT -s ::1 -j ACCEPT
             ip6tables -m comment --comment "globaleaks" -A INPUT -p tcp -d :: --dport $PORT -j DROP
         done
-
-        # All outbound connections from GlobaLeaks goes through Tor except of allowed and enstablished connections.
-        iptables -m comment --comment "globaleaks" -A OUTPUT -m state --state RELATED,ESTABLISHED -m owner --uid-owner globaleaks -d 127.0.0.1 -j ACCEPT
-        ip6tables -m comment --comment "globaleaks" -A OUTPUT -m state --state RELATED,ESTABLISHED -m owner --uid-owner globaleaks -d ::1 -j ACCEPT
-        iptables -m comment --comment "globaleaks" -t nat -A OUTPUT ! -o lo -p tcp -m owner --uid-owner ${USERNAME} -m tcp -j REDIRECT --to-ports 9050
-        iptables -m comment --comment "globaleaks" -t filter -A OUTPUT -p tcp -m owner --uid-owner ${USERNAME} -m tcp -d 127.0.0.1 --dport 9050 -j ACCEPT
-        iptables -m comment --comment "globaleaks" -t filter -A OUTPUT ! -o lo -m owner --uid-owner ${USERNAME} -j DROP
-        ip6tables -m comment --comment "globaleaks" -t nat -A OUTPUT ! -o lo -p tcp -m owner --uid-owner ${USERNAME} -m tcp -j REDIRECT --to-ports 9050
-        ip6tables -m comment --comment "globaleaks" -t filter -A OUTPUT -p tcp -m owner --uid-owner ${USERNAME} -m tcp -d ::1 --dport 9050 -j ACCEPT
-        ip6tables -m comment --comment "globaleaks" -t filter -A OUTPUT ! -o lo -m owner --uid-owner ${USERNAME} -j DROP
     else
         iptables -m comment --comment "globaleaks" -t filter -A INPUT -p tcp --dport 8080 -j ACCEPT
         ip6tables -m comment --comment "globaleaks" -t filter -A INPUT -p tcp --dport 8080 -j ACCEPT
@@ -154,27 +143,8 @@ network_sandboxing_start()
 
         iptables -m comment --comment "globaleaks" -t nat -A OUTPUT -o lo -p tcp --dport 443 -j REDIRECT --to-port 8443
         ip6tables -m comment --comment "globaleaks" -t nat -A OUTPUT -o lo -p tcp --dport 443 -j REDIRECT --to-port 8443
-
-        # Enable enstablished connections, new connections on used tcp and udp ports
-        iptables -m comment --comment "globaleaks" -A OUTPUT -m state --state RELATED,ESTABLISHED -m owner --uid-owner globaleaks -j ACCEPT
-        ip6tables -m comment --comment "globaleaks" -A OUTPUT -m state --state RELATED,ESTABLISHED -m owner --uid-owner globaleaks -j ACCEPT
-
-        declare -a PORTS=("25" "80" "53" "443" "465" "587" "9050")
-        for PORT in "${PORTS[@]}"; do
-            iptables -m comment --comment "globaleaks" -t filter -A OUTPUT -p tcp -m owner --uid-owner ${USERNAME} -m tcp --dport $PORT -j ACCEPT
-            ip6tables -m comment --comment "globaleaks" -t filter -A OUTPUT -p tcp -m owner --uid-owner ${USERNAME} -m tcp --dport $PORT -j ACCEPT
-        done
-
-        declare -a PORTS=("53")
-        for PORT in "${PORTS[@]}"; do
-            iptables -m comment --comment "globaleaks" -t filter -A OUTPUT -p udp -m owner --uid-owner ${USERNAME} -m udp --dport $PORT -j ACCEPT
-            ip6tables -m comment --comment "globaleaks" -t filter -A OUTPUT -p udp -m owner --uid-owner ${USERNAME} -m udp --dport $PORT -j ACCEPT
-        done
     fi
 
-    iptables -m comment --comment "globaleaks" -t filter -A OUTPUT ! -o lo -m owner --uid-owner ${USERNAME} -j DROP
-    ip6tables -m comment --comment "globaleaks" -t filter -A OUTPUT ! -o lo -m owner --uid-owner ${USERNAME} -j DROP
-
     log_action_end_msg 0
 }
 
@@ -187,7 +157,7 @@ network_sandboxing_stop()
 
     log_action_begin_msg "Disabling GlobaLeaks Network Sandboxing"
 
-    # remove all rules with the comment: "globaleaks-network-sandboxing"
+    # remove all rules with the comment: "globaleaks"
     iptables-save | grep -v "globaleaks" | iptables-restore
     ip6tables-save | grep -v "globaleaks" | ip6tables-restore
 
@@ -270,20 +240,15 @@ case "$1" in
 
     log_action_begin_msg "Starting $DESC"
 
-    if [[ "$NETWORK_SANDBOXING" -eq "1" ]]; then
-        network_sandboxing_start
-    fi
+    network_sandboxing_start
 
     globaleaks_start
 
     ;;
   stop)
     log_action_begin_msg "Stopping $DESC"
 
-
-    if [[ "$NETWORK_SANDBOXING" -eq "1" ]]; then
-        network_sandboxing_stop
-    fi
+    network_sandboxing_stop
 
     globaleaks_stop
     ;;