Fix: filter empty strings in regex for kresd

rootfs/etc/knot-resolver/kresd.conf

@@ -50,29 +50,29 @@ local adguard = os.getenv('ADGUARD')
 
 policy.add(
     function (_, query)
-           local cmdTpl = [[
-               domain="$(echo "%s" | sed -nr 's/(.*)\.$/\1/p')"
-               (echo "$domain" | grep -Eq "%s" && echo "allowed") || (echo "$domain" | grep -Eq "%s" && echo "blocked")
-           ]]
-           local command = string.format(
-                cmdTpl,
-                kres.dname2str(query.sname),
-                regex_allowed,
-                regex_blocked
-           )
-           local handle = io.popen(command)
-           local result = handle:read("*line")
-           handle:close()
-
-           if result == 'blocked' then
-                return policy.STUB({'127.0.0.4'})
-           elseif result == 'allowed' then
-                return policy.FORWARD({dns})
-           end
-
-       -- filter did not match, continue with next filter
-       return nil
-   end
+        if (regex_allowed == '' or regex_allowed == nil) and (regex_blocked  == '' or regex_blocked == nil) then
+            return nil
+        end
+
+        local command = string.format(
+            '/etc/knot-resolver/regex.sh "%s" "%s" "%s"',
+            kres.dname2str(query.sname),
+            regex_allowed,
+            regex_blocked
+        )
+        local handle = io.popen(command)
+        local result = handle:read("*line")
+        handle:close()
+
+        if result == 'blocked' then
+            return policy.STUB({'127.0.0.4'})
+        elseif result == 'allowed' then
+            return policy.FORWARD({dns})
+        end
+
+        -- filter did not match, continue with next filter
+        return nil
+    end
 )
 
 -- Forward blocked domains to dnsmap

rootfs/etc/knot-resolver/regex.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+domain="$(echo "$1" | sed -nr 's/(.*)\.$/\1/p')"
+regex_allowed="$2"
+regex_blocked="$3"
+
+if [[ -n "$regex_allowed" ]] && [[ "$domain" =~ $regex_allowed ]]; then
+    echo "allowed"
+elif [[ -n "$regex_blocked"  ]] && [[ "$domain" =~ $regex_blocked ]]; then
+    echo "blocked"
+fi

rootfs/root/antizapret/build_regex.sh

@@ -14,10 +14,11 @@ for file in config/custom/{include,exclude}-regex-custom.txt; do
 
     #regex_allowed
     #regex_blocked
-    if [ "$(cat "$file" | wc -l)" -gt 0 ]; then
-        echo "regex_$type = '($(sed -E '/^(#.*)?[[:space:]]*$/d' "$file" | tr '\n' '|' | xargs | sed "s/|$//g"))'" >> result/knot-aliases-alt.conf
+    REGEX=$(sed -E '/^(#.*)?[[:space:]]*$/d' "$file" | tr '\n' '|' | xargs | sed "s/|$//g");
+    if [[ -n "$REGEX" ]]; then
+        echo "regex_$type = '($REGEX)'" >> result/knot-aliases-alt.conf
     else
-        echo "regex_$type = '^$'" >> result/knot-aliases-alt.conf
+        echo "regex_$type = ''" >> result/knot-aliases-alt.conf
     fi
 done