Faster and persistent whitelist setup

domcloud · Oct 22, 2024 · f73bcfc · f73bcfc
1 parent c7a1a47
commit f73bcfc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 18 deletions.
diff --git a/src/whitelist/refresh.sh b/src/whitelist/refresh.sh
@@ -5,26 +5,16 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 
 bash "$SCRIPT_DIR/resolve.sh"
 
-### Create Ipset
 ipset -! create whitelist hash:ip
 ipset -! create whitelist-v6 hash:ip family inet6
-### Clear Ipset
-ipset flush whitelist
-ipset flush whitelist-v6
 
-while read p; do
-  if [[ $p != "" ]];
-  then
-    ipset -! add whitelist $p
-  fi
-done <"$SCRIPT_DIR/ipv4_addresses.txt"
+ipset flush whitelist
+ipset restore -! <"$SCRIPT_DIR/ipv4_addresses.txt"
+ipset save whitelist > /etc/ipset
 
-while read p; do
-  if [[ $p != "" ]];
-  then
-    ipset -! add whitelist-v6 $p
-  fi
-done <"$SCRIPT_DIR/ipv6_addresses.txt"
+ipset flush whitelist-v6
+ipset restore -! <"$SCRIPT_DIR/ipv6_addresses.txt"
+ipset save whitelist-v6 > /etc/ipset6
 
 if [ ! -f "$SCRIPT_DIR/hosts.txt" ]; then
     cat /etc/hosts > "$SCRIPT_DIR/hosts.txt"

diff --git a/src/whitelist/resolve.sh b/src/whitelist/resolve.sh
@@ -16,9 +16,9 @@ for RECORD_TYPE in A AAAA; do
         if [[ $q != "" ]]; then
           HOST_ADDRESSES+="$q $p"$'\n'
           if [[ $RECORD_TYPE == "A" ]]; then
-            IPV4_ADDRESSES+="$q"$'\n'
+            IPV4_ADDRESSES+="add whitelist $q"$'\n'
           else
-            IPV6_ADDRESSES+="$q"$'\n'
+            IPV6_ADDRESSES+="add whitelist-v6 $q"$'\n'
           fi
         fi
       done <<< "$FFI"