Skip to content

Fixes #1833 - Use private IPv4 address space in tests #1841

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fixes #1833 - Use private IPv4 address space in tests #1841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions docker/batch-test.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,20 @@ IPV6_SUBNET_PUBLIC=fd00:43:1::/48
IPV6_GATEWAY_PUBLIC=fd00:43:1::1
IPV6_IP_PUBLIC=fd00:43:1::100
# use internal IPv4 subnet and IP's
IPV4_SUBNET_PUBLIC=172.43.0.0/16
IPV4_IP_PUBLIC=172.43.0.100
IPV4_WEBSERVER_IP_PUBLIC=172.43.0.100
IPV4_UNBOUND_IP_PUBLIC=172.43.0.101
IPV4_SUBNET_PUBLIC=172.16.43.0/24
IPV4_IP_PUBLIC=172.16.43.100
IPV4_WEBSERVER_IP_PUBLIC=172.16.43.100
IPV4_UNBOUND_IP_PUBLIC=172.16.43.101
IPV6_UNBOUND_IP_PUBLIC=fd00:43:1::101

# use fixed IPv4 addresses for internal networking to prevent resolving cache issues when recreating containers
IPV4_SUBNET_INTERNAL=192.168.43.0/24

IPV4_IP_MOCK_RESOLVER_PUBLIC=172.43.0.114
IPV4_IP_MOCK_RESOLVER_PUBLIC=172.16.43.114
IPV6_IP_MOCK_RESOLVER_PUBLIC=fd00:43:1::114

IPV4_IP_TEST_TARGET_PUBLIC=172.43.0.51
IPV4_IP_TEST_TARGET_MAIL_PUBLIC=172.43.0.52
IPV4_IP_TEST_TARGET_PUBLIC=172.16.43.51
IPV4_IP_TEST_TARGET_MAIL_PUBLIC=172.16.43.52
IPV6_IP_TEST_TARGET_PUBLIC=fd00:43:1::51
IPV6_IP_TEST_TARGET_MAIL_PUBLIC=fd00:43:1::52

Expand Down
4 changes: 2 additions & 2 deletions docker/integration-tests/mock-resolver/bad-ipv6-ns.test.zone
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
NS bad-ns1
NS bad-ns2

good-ns1 A 172.43.0.114
good-ns1 A 172.16.43.114
good-ns1 AAAA fd00:43:1::114
bad-ns1 AAAA fd00:90::1
bad-ns2 AAAA fd00:90::2

; IPV4_IP_TEST_TARGET_PUBLIC
* A 172.43.0.51
* A 172.16.43.51
AAAA fd00:43:1::51
10 changes: 5 additions & 5 deletions docker/integration-tests/mock-resolver/test.zone
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

; configure DNS for the internet.nl application instance that is running in test
; IPV4_WEBSERVER_IP_PUBLIC
internet A 172.43.0.100
internet A 172.16.43.100
; IPV6_IP_PUBLIC
AAAA fd00:43:1::100
; all it's subdomains
Expand Down Expand Up @@ -30,7 +30,7 @@ conn.www.ipv6.internet CNAME ipv6.internet
; nameserver setup for the connection test
test-ns-signed.internet NS ns.test-ns-signed.internet
; IPV4_UNBOUND_IP_PUBLIC
ns.test-ns-signed.internet A 172.43.0.101
ns.test-ns-signed.internet A 172.16.43.101
; IPV6_UNBOUND_IP_PUBLIC
AAAA fd00:43:1::101

Expand All @@ -44,15 +44,15 @@ platforminternet CNAME internet
; configure DNS for targets that are tested by the internet.test instance
; normal 100% website test target
; IPV4_IP_TEST_TARGET_PUBLIC
target A 172.43.0.51
target A 172.16.43.51
; IPV6_IP_TEST_TARGET_PUBLIC
AAAA fd00:43:1::51
*.target CNAME target

; normal 100% email test target
*.mail-target MX 10 mx.mail-target.test.
; IPV4_IP_TEST_TARGET_MAIL_PUBLIC
mx.mail-target A 172.43.0.52
mx.mail-target A 172.16.43.52
; IPV6_IP_TEST_TARGET_MAIL_PUBLIC
AAAA fd00:43:1::52

Expand All @@ -62,7 +62,7 @@ bad-ipv6-ns NS good-ns1.bad-ipv6-ns
NS bad-ns2.bad-ipv6-ns
NS bad-ns3.bad-ipv6-ns
; IPV4_IP_MOCK_RESOLVER_PUBLIC
good-ns1.bad-ipv6-ns A 172.43.0.114
good-ns1.bad-ipv6-ns A 172.16.43.114
; IPV6_IP_MOCK_RESOLVER_PUBLIC
good-ns1.bad-ipv6-ns AAAA fd00:43:1::114
bad-ns2.bad-ipv6-ns AAAA fd00:90::1
Expand Down
14 changes: 7 additions & 7 deletions docker/test.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,20 @@ IPV6_SUBNET_PUBLIC=fd00:43:1::/48
IPV6_GATEWAY_PUBLIC=fd00:43:1::1
IPV6_IP_PUBLIC=fd00:43:1::100
# use internal IPv4 subnet and IP's
IPV4_SUBNET_PUBLIC=172.43.0.0/16
IPV4_IP_PUBLIC=172.43.0.100
IPV4_WEBSERVER_IP_PUBLIC=172.43.0.100
IPV4_UNBOUND_IP_PUBLIC=172.43.0.101
IPV4_SUBNET_PUBLIC=172.16.43.0/24
IPV4_IP_PUBLIC=172.16.43.100
IPV4_WEBSERVER_IP_PUBLIC=172.16.43.100
IPV4_UNBOUND_IP_PUBLIC=172.16.43.101
IPV6_UNBOUND_IP_PUBLIC=fd00:43:1::101

# use fixed IPv4 addresses for internal networking to prevent resolving cache issues when recreating containers
IPV4_SUBNET_INTERNAL=192.168.43.0/24

IPV4_IP_MOCK_RESOLVER_PUBLIC=172.43.0.114
IPV4_IP_MOCK_RESOLVER_PUBLIC=172.16.43.114
IPV6_IP_MOCK_RESOLVER_PUBLIC=fd00:43:1::114

IPV4_IP_TEST_TARGET_PUBLIC=172.43.0.51
IPV4_IP_TEST_TARGET_MAIL_PUBLIC=172.43.0.52
IPV4_IP_TEST_TARGET_PUBLIC=172.16.43.51
IPV4_IP_TEST_TARGET_MAIL_PUBLIC=172.16.43.52
IPV6_IP_TEST_TARGET_PUBLIC=fd00:43:1::51
IPV6_IP_TEST_TARGET_MAIL_PUBLIC=fd00:43:1::52

Expand Down
2 changes: 1 addition & 1 deletion documentation/Docker-integration-tests.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Test are run by the `test-runner` which spawns as a container inside the isolate

### Internal resolver

All IP addresses used in the isolated network are in private address ranges (`172.43.0.0/24`, `fd00:43:1::/64`) and all domain names use the `.test` domain. The internal `resolver` runs dnsmasq to provide routing of the internal domain and stub records for external services (eg: Cymru origin ASN query). The resolver configuration file is `docker/integration-tests/dnsmasq/entrypoint.sh`.
All IP addresses used in the isolated network are in private address ranges (`172.16.43.0/24`, `fd00:43:1::/64`) and all domain names use the `.test` domain. The internal `resolver` runs dnsmasq to provide routing of the internal domain and stub records for external services (eg: Cymru origin ASN query). The resolver configuration file is `docker/integration-tests/dnsmasq/entrypoint.sh`.

During integration test runs the environment variable `INTEGRATION_TESTS` is set to `True` which makes the application's Unbound resolver use the internal resolver, and allows resolving of the `.test` TLD.

Expand Down
4 changes: 2 additions & 2 deletions integration_tests/batch/results.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@
"nameservers": {},
"webservers": {
"ipv4": {
"addresses": [{"address": "172.43.0.51", "reachable": True, "routing": []}],
"addresses": [{"address": "172.16.43.51", "reachable": True, "routing": []}],
"https_enabled": True,
"server_reachable": True,
"tested_address": "172.43.0.51",
"tested_address": "172.16.43.51",
"details": {
"dane_status": "none",
"dane_records": [],
Expand Down
Loading