From d9dfc584e77861190bf7f20b273421cf1d266c42 Mon Sep 17 00:00:00 2001
From: Cuong Manh Le <cuong@windscribe.com>
Date: Mon, 15 May 2023 22:34:27 +0700
Subject: [PATCH] internal/router: disable DNSSEC on ddwrt/merlin

---
 internal/router/dnsmasq.go | 4 +++-
 internal/router/nvram.go   | 9 +++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/internal/router/dnsmasq.go b/internal/router/dnsmasq.go
index 009bf27..b8fad8c 100644
--- a/internal/router/dnsmasq.go
+++ b/internal/router/dnsmasq.go
@@ -29,8 +29,10 @@ if [ -n "$pid" ] && [ -f "/proc/${pid}/cmdline" ]; then
   pc_append "no-resolv" "$config_file"              # do not read /etc/resolv.conf
   pc_append "server=127.0.0.1#5354" "$config_file"  # use ctrld as upstream
   {{- if .SendClientInfo}}
-  pc_append "add-mac" "$config_file"                 # add client mac
+  pc_append "add-mac" "$config_file"                # add client mac
   {{- end}}
+  pc_delete "dnssec" "$config_file"                 # disable DNSSEC
+  pc_delete "trust-anchor=" "$config_file"          # disable DNSSEC
 	
   # For John fork
   pc_delete "resolv-file" "$config_file"            # no WAN DNS settings
diff --git a/internal/router/nvram.go b/internal/router/nvram.go
index 79a7657..b66fcdb 100644
--- a/internal/router/nvram.go
+++ b/internal/router/nvram.go
@@ -18,6 +18,14 @@ func nvram(args ...string) (string, error) {
 	return strings.TrimSpace(stdout.String()), nil
 }
 
+/*
+NOTE:
+  - For Openwrt, DNSSEC is not included in default dnsmasq (require dnsmasq-full).
+  - For Merlin, DNSSEC is configured during postconf script (see merlinDNSMasqPostConfTmpl).
+  - For Ubios UDM Pro/Dream Machine, DNSSEC is not included in their dnsmasq package:
+    +https://community.ui.com/questions/Implement-DNSSEC-into-UniFi/951c72b0-4d88-4c86-9174-45417bd2f9ca
+    +https://community.ui.com/questions/Enable-DNSSEC-for-Unifi-Dream-Machine-FW-updates/e68e367c-d09b-4459-9444-18908f7c1ea1
+*/
 func nvramKV() map[string]string {
 	switch Name() {
 	case DDWrt:
@@ -25,6 +33,7 @@ func nvramKV() map[string]string {
 			"dns_dnsmasq":     "1", // Make dnsmasq running but disable DNS ability, ctrld will replace it.
 			"dnsmasq_options": "",  // Configuration of dnsmasq set by ctrld, filled by setupDDWrt.
 			"dns_crypt":       "0", // Disable DNSCrypt.
+			"dnssec":          "0", // Disable DNSSEC.
 		}
 	case Merlin:
 		return map[string]string{