Skip to content

Commit

Permalink
Add freshly whitelisted domains to shared whitelist
Browse files Browse the repository at this point in the history
  • Loading branch information
Adamm00 committed Jul 7, 2018
1 parent 4bb2523 commit 6da63de
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions firewall.sh
Expand Up @@ -9,7 +9,7 @@
# __/ | #
# |___/ #
# #
## - 01/07/2018 - Asus Firewall Addition By Adamm v6.2.7 #
## - 07/07/2018 - Asus Firewall Addition By Adamm v6.3.0 #
## https://github.com/Adamm00/IPSet_ASUS #
#############################################################################################################

Expand Down Expand Up @@ -620,7 +620,7 @@ Load_Menu () {
echo "Boot Args; $(grep -E "start.* # Skynet" /jffs/scripts/firewall-start 2>/dev/null | grep -vE "^#" | cut -c 4- | cut -d '#' -f1)"
if [ -n "$countrylist" ]; then echo "Banned Countries; $countrylist"; fi
if [ -f "/tmp/skynet.lock" ] && [ -d "/proc/$(sed -n '2p' /tmp/skynet.lock)" ]; then $red "Lock File Detected ($(sed -n '1p' /tmp/skynet.lock)) (pid=$(sed -n '2p' /tmp/skynet.lock))"; lockedwarning=1; fi
if [ -n "$lockedwarning" ]; then $ylow "Locked Processes Generally Take 20-60s To Complete And May Result In Temporarily \"Failed\" Tests"; fi
if [ -n "$lockedwarning" ]; then $ylow "Locked Processes Generally Take 1-2 Minutes To Complete And May Result In Temporarily \"Failed\" Tests"; fi
unset "lockedwarning"
echo
if ! grep -E "start.* # Skynet" /jffs/scripts/firewall-start 2>/dev/null | grep -qvE "^#"; then printf "Checking Firewall-Start Entry... "; $red "[Failed]"; fi
Expand Down Expand Up @@ -2009,6 +2009,7 @@ case "$1" in
ipset -A Skynet-Whitelist "$ip" comment "ManualWlistD: $3" && sed -i "\\~=$ip ~d" "$skynetlog" "$skynetevents" && echo "$(date +"%b %d %T") Skynet: [Manual Whitelist] TYPE=Domain SRC=$ip Host=$3 " >> "$skynetevents"
ipset -q -D Skynet-Blacklist "$ip"
done
if [ "$?" = "1" ]; then echo "$3" >> /jffs/shared-Skynet2-whitelist; fi
;;
vpn)
logger -st Skynet "[INFO] Updating VPN Whitelist..."
Expand Down Expand Up @@ -2376,7 +2377,7 @@ case "$1" in
echo "Boot Args; $(grep -E "start.* # Skynet" /jffs/scripts/firewall-start | grep -vE "^#" | cut -c 4- | cut -d '#' -f1)"
if [ -n "$countrylist" ]; then echo "Banned Countries; $countrylist"; fi
if [ -f "/tmp/skynet.lock" ] && [ -d "/proc/$(sed -n '2p' /tmp/skynet.lock)" ]; then $red "Lock File Detected ($(sed -n '1p' /tmp/skynet.lock)) (pid=$(sed -n '2p' /tmp/skynet.lock))"; lockedwarning=1; else $grn "No Lock File Found"; fi
if [ -n "$lockedwarning" ]; then $ylow "Locked Processes Generally Take 20-60s To Complete And May Result In Temporarily \"Failed\" Tests"; fi
if [ -n "$lockedwarning" ]; then $ylow "Locked Processes Generally Take 1-2 Minutes To Complete And May Result In Temporarily \"Failed\" Tests"; fi
unset "lockedwarning"
echo
printf "Checking Install Directory Write Permissions... "
Expand Down

0 comments on commit 6da63de

Please sign in to comment.