Implement notifies for transfer plugin (#3972)

* Fix notifies in transfer plugin Signed-off-by: Miek Gieben <miek@miek.nl> * Make it compile Signed-off-by: Miek Gieben <miek@miek.nl> * Port more plugins Signed-off-by: Miek Gieben <miek@miek.nl> * golint Signed-off-by: Miek Gieben <miek@miek.nl> * Fix tests Signed-off-by: Miek Gieben <miek@miek.nl> * Fix notifies in transfer plugin Signed-off-by: Miek Gieben <miek@miek.nl> * Make it compile Signed-off-by: Miek Gieben <miek@miek.nl> * Port more plugins Signed-off-by: Miek Gieben <miek@miek.nl> * golint Signed-off-by: Miek Gieben <miek@miek.nl> * Fix tests Signed-off-by: Miek Gieben <miek@miek.nl> * Fix tests Signed-off-by: Miek Gieben <miek@miek.nl> * really fix test Signed-off-by: Miek Gieben <miek@miek.nl> * Implement ixfr fallback and unify file and auto for transfering Signed-off-by: Miek Gieben <miek@miek.nl> * Add transfer tests copied and modified from #3452 Signed-off-by: Miek Gieben <miek@miek.nl> * Test correct selection of plugin Signed-off-by: Miek Gieben <miek@miek.nl> * add upstream back in Signed-off-by: Miek Gieben <miek@miek.nl> * Implement ixfr fallback and unify file and auto for transfering Signed-off-by: Miek Gieben <miek@miek.nl> * fix test Signed-off-by: Miek Gieben <miek@miek.nl> * properly merge Signed-off-by: Miek Gieben <miek@miek.nl>
2025-11-01 18:53:43 -04:00 · 2020-07-07 21:38:07 +02:00
parent 435d27b58d
commit 68f1dd5ddf
42 changed files with 705 additions and 986 deletions
--- a/plugin/secondary/README.md
+++ b/plugin/secondary/README.md
@@ -24,17 +24,16 @@ A working syntax would be:
 ~~~
 secondary [zones...] {
    transfer from ADDRESS
-    transfer to ADDRESS
 }
 ~~~

 * `transfer from` specifies from which address to fetch the zone. It can be specified multiple times;
-    if one does not work, another will be tried.
-* `transfer to` can be enabled to allow this secondary zone to be transferred again.
+    if one does not work, another will be tried. Transfering this zone outwards again can be done by
+    enableing the *transfer* plugin.

 When a zone is due to be refreshed (Refresh timer fires) a random jitter of 5 seconds is
 applied, before fetching. In the case of retry this will be 2 seconds. If there are any errors
-during the transfer the transfer fails; this will be logged.
+during the transfer in, the transfer fails; this will be logged.

 ## Examples

@@ -43,8 +42,7 @@ Transfer `example.org` from 10.0.1.1, and if that fails try 10.1.2.1.
 ~~~ corefile
 example.org {
    secondary {
-        transfer from 10.0.1.1
-        transfer from 10.1.2.1
+        transfer from 10.0.1.1 10.1.2.1
    }
 }
 ~~~
@@ -52,10 +50,12 @@ example.org {
 Or re-export the retrieved zone to other secondaries.

 ~~~ corefile
-. {
-    secondary example.net {
+example.net {
+    secondary {
        transfer from 10.1.2.1
-        transfer to *
+    }
+    transfer {
+        to *
    }
 }
 ~~~
@@ -63,3 +63,7 @@ Or re-export the retrieved zone to other secondaries.
 ## Bugs

 Only AXFR is supported and the retrieved zone is not committed to disk.
+
+## Also See
+
+See the *transfer* plugin to enable zone transfers _to_ other servers.
--- a/plugin/secondary/setup.go
+++ b/plugin/secondary/setup.go
@@ -44,7 +44,6 @@ func setup(c *caddy.Controller) error {
 func secondaryParse(c *caddy.Controller) (file.Zones, error) {
 	z := make(map[string]*file.Zone)
 	names := []string{}
-	upstr := upstream.New()
 	for c.Next() {

 		if c.Val() == "secondary" {
@@ -63,30 +62,24 @@ func secondaryParse(c *caddy.Controller) (file.Zones, error) {

 			for c.NextBlock() {

-				t, f := []string{}, []string{}
-				var e error
+				f := []string{}

 				switch c.Val() {
 				case "transfer":
-					t, f, e = parse.Transfer(c, true)
-					if e != nil {
-						return file.Zones{}, e
+					var err error
+					f, err = parse.TransferIn(c)
+					if err != nil {
+						return file.Zones{}, err
 					}
-				case "upstream":
-					// remove soon
-					c.RemainingArgs()
 				default:
 					return file.Zones{}, c.Errf("unknown property '%s'", c.Val())
 				}

 				for _, origin := range origins {
-					if t != nil {
-						z[origin].TransferTo = append(z[origin].TransferTo, t...)
-					}
 					if f != nil {
 						z[origin].TransferFrom = append(z[origin].TransferFrom, f...)
 					}
-					z[origin].Upstream = upstr
+					z[origin].Upstream = upstream.New()
 				}
 			}
 		}
--- a/plugin/secondary/setup_test.go
+++ b/plugin/secondary/setup_test.go
@@ -22,7 +22,6 @@ func TestSecondaryParse(t *testing.T) {
 		{
 			`secondary {
 				transfer from 127.0.0.1
-				transfer to 127.0.0.1
 			}`,
 			false,
 			"127.0.0.1:53",
@@ -31,7 +30,6 @@ func TestSecondaryParse(t *testing.T) {
 		{
 			`secondary example.org {
 				transfer from 127.0.0.1
-				transfer to 127.0.0.1
 			}`,
 			false,
 			"127.0.0.1:53",