From 1b0195d4e3d3060afde056bb3c4c4a16daccd2c5 Mon Sep 17 00:00:00 2001 From: Max Resnick Date: Thu, 6 Mar 2025 22:28:26 -0800 Subject: feat: make sure the local-zone is under the serverkey --- main.go | 3 ++- main_test.go | 15 +++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/main.go b/main.go index 09fc095..051e6cd 100644 --- a/main.go +++ b/main.go @@ -104,6 +104,7 @@ func fetchDomainsAndWrite(url string, w *bufio.Writer, seen map[string]struct{}) } defer resp.Body.Close() + fmt.Fprint(w, "server:\n") var count int scanner := bufio.NewScanner(resp.Body) for scanner.Scan() { @@ -137,7 +138,7 @@ func fetchDomainsAndWrite(url string, w *bufio.Writer, seen map[string]struct{}) seen[domain] = struct{}{} count++ - if _, err := fmt.Fprintf(w, "local-zone: %q refuse\n", domain); err != nil { + if _, err := fmt.Fprintf(w, " local-zone: %q refuse\n", domain); err != nil { return fmt.Errorf("failed to write domain: %w", err) } } diff --git a/main_test.go b/main_test.go index e231051..64c87cd 100644 --- a/main_test.go +++ b/main_test.go @@ -75,8 +75,9 @@ func TestFetchDomainsAndWrite(t *testing.T) { content: `# comment 0.0.0.0 domain1.com 0.0.0.0 domain2.com`, - want: `local-zone: "domain1.com" refuse -local-zone: "domain2.com" refuse + want: `server: + local-zone: "domain1.com" refuse + local-zone: "domain2.com" refuse `, wantSeen: map[string]struct{}{ "domain1.com": {}, @@ -88,8 +89,9 @@ local-zone: "domain2.com" refuse content: `# comment domain1.com domain2.com`, - want: `local-zone: "domain1.com" refuse -local-zone: "domain2.com" refuse + want: `server: + local-zone: "domain1.com" refuse + local-zone: "domain2.com" refuse `, wantSeen: map[string]struct{}{ "domain1.com": {}, @@ -102,8 +104,9 @@ local-zone: "domain2.com" refuse 0.0.0.0 domain1.com 0.0.0.0 DOMAIN1.COM domain2.com`, - want: `local-zone: "domain1.com" refuse -local-zone: "domain2.com" refuse + want: `server: + local-zone: "domain1.com" refuse + local-zone: "domain2.com" refuse `, wantSeen: map[string]struct{}{ "domain1.com": {}, -- cgit v1.2.3