Skip to content
Snippets Groups Projects
Commit cbcdc4dd authored by Bob Mottram's avatar Bob Mottram
Browse files

Adding users to the blocklist

parent df3df89f
No related branches found
No related tags found
No related merge requests found
...@@ -465,6 +465,7 @@ function firewall_block_domain { ...@@ -465,6 +465,7 @@ function firewall_block_domain {
blocked_domain="$1" blocked_domain="$1"
if [[ "$blocked_domain" == *'@'* ]]; then if [[ "$blocked_domain" == *'@'* ]]; then
# Don't try to block email/microblog addresses # Don't try to block email/microblog addresses
echo "${blocked_domain}" >> $FIREWALL_DOMAINS
return return
fi fi
if ! grep -q "$blocked_domain" $FIREWALL_DOMAINS; then if ! grep -q "$blocked_domain" $FIREWALL_DOMAINS; then
...@@ -538,15 +539,17 @@ function firewall_refresh_blocklist { ...@@ -538,15 +539,17 @@ function firewall_refresh_blocklist {
function firewall_unblock_domain { function firewall_unblock_domain {
unblocked_domain="$1" unblocked_domain="$1"
if grep -q "${unblocked_domain}" $FIREWALL_DOMAINS; then if grep -q "${unblocked_domain}" $FIREWALL_DOMAINS; then
hexstr=$(domain_to_hex_string $unblocked_domain) if [[ "${unblocked_domain}" != *'@'* ]]; then
iptables -D INPUT -p udp --dport 53 -m string --hex-string "$hexstr" --algo bm -j DROP hexstr=$(domain_to_hex_string $unblocked_domain)
iptables -D INPUT -p tcp --dport 53 -m string --hex-string "$hexstr" --algo bm -j DROP iptables -D INPUT -p udp --dport 53 -m string --hex-string "$hexstr" --algo bm -j DROP
iptables -D OUTPUT -p udp --dport 53 -m string --hex-string "$hexstr" --algo bm -j DROP iptables -D INPUT -p tcp --dport 53 -m string --hex-string "$hexstr" --algo bm -j DROP
iptables -D OUTPUT -p tcp --dport 53 -m string --hex-string "$hexstr" --algo bm -j DROP iptables -D OUTPUT -p udp --dport 53 -m string --hex-string "$hexstr" --algo bm -j DROP
iptables -D FORWARD -p udp --dport 53 -m string --hex-string "$hexstr" --algo bm -j DROP iptables -D OUTPUT -p tcp --dport 53 -m string --hex-string "$hexstr" --algo bm -j DROP
iptables -D FORWARD -p tcp --dport 53 -m string --hex-string "$hexstr" --algo bm -j DROP iptables -D FORWARD -p udp --dport 53 -m string --hex-string "$hexstr" --algo bm -j DROP
iptables -D FORWARD -p tcp --dport 53 -m string --hex-string "$hexstr" --algo bm -j DROP
save_firewall_settings
fi
sed -i "/${unblocked_domain}/d" $FIREWALL_DOMAINS sed -i "/${unblocked_domain}/d" $FIREWALL_DOMAINS
save_firewall_settings
fi fi
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment