From 6ef82579b6be8166730ea62186d5e9b8a4ceddb7 Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Wed, 25 Sep 2019 16:10:09 +0200
Subject: [PATCH] Blacklist migration

---
 encrypted-dns.toml.in |  2 +-
 entrypoint.sh         | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/encrypted-dns.toml.in b/encrypted-dns.toml.in
index d4104b6..d6afa67 100644
--- a/encrypted-dns.toml.in
+++ b/encrypted-dns.toml.in
@@ -160,4 +160,4 @@ key_cache_capacity = 10000
 
 [filtering]
 
-# domain_blacklist = "/etc/domain_blacklist.txt"
+@DOMAIN_BLACKLIST_CONFIGURATION@
diff --git a/entrypoint.sh b/entrypoint.sh
index c2f5c5e..2155a24 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -5,7 +5,9 @@ set -e
 action="$1"
 
 LEGACY_KEYS_DIR="/opt/dnscrypt-wrapper/etc/keys"
+LEGACY_LISTS_DIR="/opt/dnscrypt-wrapper/etc/lists"
 KEYS_DIR="/opt/encrypted-dns/etc/keys"
+LISTS_DIR="/opt/encrypted-dns/etc/lists"
 CONF_DIR="/opt/encrypted-dns/etc"
 CONFIG_FILE="${CONF_DIR}/encrypted-dns.toml"
 CONFIG_FILE_TEMPLATE="${CONF_DIR}/encrypted-dns.toml.in"
@@ -47,6 +49,12 @@ init() {
         tls_proxy_configuration="upstream_addr = \"${tls_proxy_upstream_address}\""
     fi
 
+    domain_blacklist_file="${LISTS_DIR}/blacklist.txt"
+    domain_blacklist_configuration=""
+    if [ -s "$domain_blacklist_file" ]; then
+        domain_blacklist_configuration="domain_blacklist = \"${domain_blacklist_file}\""
+    fi
+
     echo "Provider name: [$provider_name]"
 
     echo "$provider_name" >"${KEYS_DIR}/provider_name"
@@ -56,6 +64,7 @@ init() {
         -e "s/@PROVIDER_NAME@/${provider_name}/" \
         -e "s/@EXTERNAL_IPV4@/${ext_address}/" \
         -e "s/@TLS_PROXY_CONFIGURATION@/${tls_proxy_configuration}/" \
+        -e "s/@DOMAIN_BLACKLIST_CONFIGURATION@/${domain_blacklist_configuration}/" \
         "$CONFIG_FILE_TEMPLATE" >"$CONFIG_FILE"
 
     /opt/encrypted-dns/sbin/encrypted-dns \
@@ -127,7 +136,13 @@ dnscrypt_wrapper_compat() {
     chmod 600 "${LEGACY_KEYS_DIR}/secret.key"
     echo "Done!" >&2
     echo >&2
+
+    if [ -s "${LEGACY_LISTS_DIR}/blacklist.txt" ]; then
+        echo "Your blacklist [${LEGACY_LISTS_DIR}/blacklist.txt] will be loaded as well." >&2
+    fi
+
     export KEYS_DIR="$LEGACY_KEYS_DIR"
+    export LISTS_DIR="$LEGACY_LISTS_DIR"
 }
 
 is_initialized() {