From a6a26b430ba187de57340cde0b09b8ce8c012c68 Mon Sep 17 00:00:00 2001
From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Tue, 15 Dec 2015 14:56:53 +0100
Subject: [PATCH] Add test for comments in forward-zones-file

---
 .travis.yml                                   |  1 +
 .../comments-in-forward-zones-file/command    |  2 ++
 .../description                               |  1 +
 .../expected_result                           | 20 +++++++++++++++++++
 regression-tests.recursor/config.sh           | 11 ++++++++++
 5 files changed, 35 insertions(+)
 create mode 100755 regression-tests.recursor/comments-in-forward-zones-file/command
 create mode 100644 regression-tests.recursor/comments-in-forward-zones-file/description
 create mode 100644 regression-tests.recursor/comments-in-forward-zones-file/expected_result

diff --git a/.travis.yml b/.travis.yml
index 08927f0459..2cc026a040 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -69,6 +69,7 @@ before_script:
     unbound-host
     validns
     default-jre
+    jq
   - cd ..
   - wget http://www.verisignlabs.com/dnssec-tools/packages/jdnssec-tools-0.12.tar.gz
   - sudo tar xfz jdnssec-tools-0.12.tar.gz --strip-components=1 -C /
diff --git a/regression-tests.recursor/comments-in-forward-zones-file/command b/regression-tests.recursor/comments-in-forward-zones-file/command
new file mode 100755
index 0000000000..dd28cdf813
--- /dev/null
+++ b/regression-tests.recursor/comments-in-forward-zones-file/command
@@ -0,0 +1,2 @@
+#!/bin/sh
+curl -s -H 'X-API-Key: secret' 127.0.0.1:8082/api/v1/servers/localhost/zones | jq '.[] | select(.kind=="Forwarded")'
diff --git a/regression-tests.recursor/comments-in-forward-zones-file/description b/regression-tests.recursor/comments-in-forward-zones-file/description
new file mode 100644
index 0000000000..e5c84e330c
--- /dev/null
+++ b/regression-tests.recursor/comments-in-forward-zones-file/description
@@ -0,0 +1 @@
+Check if the comments in the forward-zones-file are indeed ignored
diff --git a/regression-tests.recursor/comments-in-forward-zones-file/expected_result b/regression-tests.recursor/comments-in-forward-zones-file/expected_result
new file mode 100644
index 0000000000..59ff5a91ef
--- /dev/null
+++ b/regression-tests.recursor/comments-in-forward-zones-file/expected_result
@@ -0,0 +1,20 @@
+{
+  "id": "forward-zones-test2.non-existing.powerdns.com.",
+  "url": "/api/v1/servers/localhost/zones/forward-zones-test2.non-existing.powerdns.com.",
+  "name": "forward-zones-test2.non-existing.powerdns.com.",
+  "kind": "Forwarded",
+  "servers": [
+    "8.8.8.8:53"
+  ],
+  "recursion_desired": false
+}
+{
+  "id": "forward-zones-test.non-existing.powerdns.com.",
+  "url": "/api/v1/servers/localhost/zones/forward-zones-test.non-existing.powerdns.com.",
+  "name": "forward-zones-test.non-existing.powerdns.com.",
+  "kind": "Forwarded",
+  "servers": [
+    "8.8.8.8:53"
+  ],
+  "recursion_desired": false
+}
diff --git a/regression-tests.recursor/config.sh b/regression-tests.recursor/config.sh
index 3e5b72d655..c309aecbe8 100755
--- a/regression-tests.recursor/config.sh
+++ b/regression-tests.recursor/config.sh
@@ -450,7 +450,18 @@ EOF
     ln -s ../run-auth $dir/run
 done
 
+cat > recursor-service/forward-zones-file << EOF
+# Some comment that should be ignored
+forward-zones-test.non-existing.powerdns.com=8.8.8.8
+forward-zones-test2.non-existing.powerdns.com=8.8.8.8# This comment should be ignored as well
+EOF
+
 cat > recursor-service/recursor.conf <<EOF
+webserver=yes
+api-key=secret
+api-readonly=yes
+forward-zones-file=$(pwd)/recursor-service/forward-zones-file
+
 socket-dir=$(pwd)/recursor-serviceS
 auth-zones=global.box.answer-cname-in-local.example.net=$(pwd)/recursor-service/global.box.answer-cname-in-local.example.net.zone,auth-zone.example.net=$(pwd)/recursor-service/auth-zone.example.net.zone,another-auth-zone.example.net=$(pwd)/recursor-service/another-auth-zone.example.net.zone
 
-- 
2.47.2