From: Mukund Sivaraman Date: Mon, 25 Jun 2012 19:42:22 +0000 (+0530) Subject: [2025] Make xfr master/slaves run on IPv6 entirely (to avoid issues with certain... X-Git-Tag: trac2351_base~213^2~3 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9b410a87bfebfb3329e30f5949070a81bb22235a;p=thirdparty%2Fkea.git [2025] Make xfr master/slaves run on IPv6 entirely (to avoid issues with certain ports on 127.0.0.1) --- diff --git a/tests/lettuce/configurations/xfrin/inmem_slave.conf b/tests/lettuce/configurations/xfrin/inmem_slave.conf index a6d88ee013..9b693005da 100644 --- a/tests/lettuce/configurations/xfrin/inmem_slave.conf +++ b/tests/lettuce/configurations/xfrin/inmem_slave.conf @@ -19,8 +19,8 @@ } ] } ], "listen_on": [ { - "port": 47806, - "address": "127.0.0.1" + "address": "::1", + "port": 47806 } ] }, "Boss": { diff --git a/tests/lettuce/configurations/xfrin/retransfer_master.conf b/tests/lettuce/configurations/xfrin/retransfer_master.conf index 3f91a5a3c1..5efd133172 100644 --- a/tests/lettuce/configurations/xfrin/retransfer_master.conf +++ b/tests/lettuce/configurations/xfrin/retransfer_master.conf @@ -10,7 +10,7 @@ "Auth": { "database_file": "data/example.org.sqlite3", "listen_on": [ { - "address": "127.0.0.1", + "address": "::1", "port": 47807 } ] }, @@ -19,7 +19,7 @@ "origin": "example.org" } ], "test_notify_slaves": [ { - "address": "127.0.0.1", + "address": "::1", "port": 47806 } ] }, diff --git a/tests/lettuce/configurations/xfrin/retransfer_slave.conf b/tests/lettuce/configurations/xfrin/retransfer_slave.conf index 2296b8f9a3..260147dfbe 100644 --- a/tests/lettuce/configurations/xfrin/retransfer_slave.conf +++ b/tests/lettuce/configurations/xfrin/retransfer_slave.conf @@ -10,8 +10,8 @@ "Auth": { "database_file": "data/test_nonexistent_db.sqlite3", "listen_on": [ { - "port": 47806, - "address": "127.0.0.1" + "address": "::1", + "port": 47806 } ] }, "Boss": { diff --git a/tests/lettuce/configurations/xfrin/retransfer_slave_notify.conf b/tests/lettuce/configurations/xfrin/retransfer_slave_notify.conf index 383a39596f..57244a49f8 100644 --- a/tests/lettuce/configurations/xfrin/retransfer_slave_notify.conf +++ b/tests/lettuce/configurations/xfrin/retransfer_slave_notify.conf @@ -10,14 +10,14 @@ "Auth": { "database_file": "data/xfrin-notify.sqlite3", "listen_on": [ { - "address": "127.0.0.1", + "address": "::1", "port": 47806 } ] }, "Xfrin": { "zones": [ { "name": "example.org", - "master_addr": "127.0.0.1", + "master_addr": "::1", "master_port": 47807 } ] }, diff --git a/tests/lettuce/features/inmemory_over_sqlite3.feature b/tests/lettuce/features/inmemory_over_sqlite3.feature index 2e48689564..851cacaa42 100644 --- a/tests/lettuce/features/inmemory_over_sqlite3.feature +++ b/tests/lettuce/features/inmemory_over_sqlite3.feature @@ -26,18 +26,18 @@ Feature: In-memory zone using SQLite3 backend And wait for bind10 stderr message XFRIN_STARTED And wait for bind10 stderr message ZONEMGR_STARTED - A query for www.example.org should have rcode NOERROR + A query for www.example.org to [::1]:47806 should have rcode NOERROR """ www.example.org. 3600 IN A 192.0.2.63 """ - A query for mail.example.org should have rcode NXDOMAIN + A query for mail.example.org to [::1]:47806 should have rcode NXDOMAIN When I send bind10 the command Xfrin retransfer example.org IN ::1 47807 Then wait for new bind10 stderr message XFRIN_TRANSFER_SUCCESS not XFRIN_XFR_PROCESS_FAILURE Then wait for new bind10 stderr message AUTH_LOAD_ZONE - A query for www.example.org should have rcode NOERROR + A query for www.example.org to [::1]:47807 should have rcode NOERROR The answer section of the last query response should be """ www.example.org. 3600 IN A 192.0.2.1 """ - A query for mail.example.org should have rcode NOERROR + A query for mail.example.org to [::1]:47806 should have rcode NOERROR diff --git a/tests/lettuce/features/terrain/transfer.py b/tests/lettuce/features/terrain/transfer.py index 4ba45b89be..eb4ddc0b72 100644 --- a/tests/lettuce/features/terrain/transfer.py +++ b/tests/lettuce/features/terrain/transfer.py @@ -67,11 +67,11 @@ def perform_axfr(step, zone_name, address, port): Step definition: An AXFR transfer of [from
:] - Address defaults to 127.0.0.1 + Address defaults to ::1 Port defaults to 47806 """ if address is None: - address = "127.0.0.1" + address = "::1" # convert [IPv6_addr] to IPv6_addr: address = re.sub(r"\[(.+)\]", r"\1", address) if port is None: diff --git a/tests/lettuce/features/xfrin_bind10.feature b/tests/lettuce/features/xfrin_bind10.feature index a967e700b3..7a45ddd8b5 100644 --- a/tests/lettuce/features/xfrin_bind10.feature +++ b/tests/lettuce/features/xfrin_bind10.feature @@ -23,11 +23,11 @@ Feature: Xfrin # Now we use the first step again to see if the file has been created The file data/test_nonexistent_db.sqlite3 should exist - A query for www.example.org should have rcode REFUSED - When I send bind10 the command Xfrin retransfer example.org IN 127.0.0.1 47807 + A query for www.example.org to [::1]:47806 should have rcode REFUSED + When I send bind10 the command Xfrin retransfer example.org IN ::1 47807 Then wait for new bind10 stderr message XFRIN_TRANSFER_SUCCESS not XFRIN_XFR_PROCESS_FAILURE Then wait for new bind10 stderr message ZONEMGR_RECEIVE_XFRIN_SUCCESS - A query for www.example.org should have rcode NOERROR + A query for www.example.org to [::1]:47806 should have rcode NOERROR # The transferred zone should have 11 non-NSEC3 RRs and 1 NSEC3 RR. # The following check will get these by AXFR, so the total # of RRs diff --git a/tests/lettuce/features/xfrin_notify_handling.feature b/tests/lettuce/features/xfrin_notify_handling.feature index 2a445b6e8d..e514b83c1d 100644 --- a/tests/lettuce/features/xfrin_notify_handling.feature +++ b/tests/lettuce/features/xfrin_notify_handling.feature @@ -16,7 +16,7 @@ Feature: Xfrin incoming notify handling And wait for bind10 stderr message XFRIN_STARTED And wait for bind10 stderr message ZONEMGR_STARTED - A query for www.example.org should have rcode NXDOMAIN + A query for www.example.org to [::1]:47806 should have rcode NXDOMAIN When I send bind10 with cmdctl port 47804 the command Xfrout notify example.org IN Then wait for new master stderr message XFROUT_NOTIFY_COMMAND @@ -26,4 +26,4 @@ Feature: Xfrin incoming notify handling Then wait for new bind10 stderr message XFRIN_TRANSFER_SUCCESS not XFRIN_XFR_PROCESS_FAILURE Then wait for new bind10 stderr message ZONEMGR_RECEIVE_XFRIN_SUCCESS - A query for www.example.org should have rcode NOERROR + A query for www.example.org to [::1]:47806 should have rcode NOERROR