Skip to content
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

Forward queries to correct servers for delegated domains #187

Merged
merged 10 commits into from
Jan 31, 2025
Merged

Forward queries to correct servers for delegated domains #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2642cc3
rules
james-otten Jan 28, 2025
9315145
rules
james-otten Jan 28, 2025
83ddef7
rules
james-otten Jan 29, 2025
49f04ef
rules
james-otten Jan 29, 2025
bbae47b
remove outgoing ip for now
james-otten Jan 30, 2025
2bf2b97
no ipv6
james-otten Jan 30, 2025
e38d7ee
deploy
james-otten Jan 30, 2025
44d8953
deploy
james-otten Jan 30, 2025
d054b97
auth stub
james-otten Jan 30, 2025
3e32ab8
clean
james-otten Jan 30, 2025
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
31 changes: 30 additions & 1 deletion infra/ansible/roles/knot_recursive/templates/kresd.conf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,13 @@ net.listen('{{ EXTERNAL_LISTEN_IP }}', 53, { kind = 'dns' })
net.listen('{{ EXTERNAL_LISTEN_IP }}', 443, { kind = 'doh2' })
{% endif %}

-- No ipv6
net.ipv6 = false

{% if EXTERNAL_OUTGOING_IP != "" %}
-- EXTERNAL_OUTGOING_IP
net.outgoing_v4('{{ EXTERNAL_OUTGOING_IP }}')
-- Not until things are sorted out with the delegated subdomains, but keep the IPs
--net.outgoing_v4('{{ EXTERNAL_OUTGOING_IP }}')
{% endif %}

-- Load useful modules
Expand All @@ -36,6 +40,31 @@ nsid.name('{{ SERVER_HOSTNAME }}')
net.tls("/etc/knot-resolver/server-cert.pem", "/etc/knot-resolver/server-key.pem")
{% endif %}

-- Subdomains delegated outside of "this" server from within the mesh
view:addr('10.0.0.0/8', policy.suffix(policy.STUB('10.70.90.174'), policy.todnames({'em.mesh.', 'em.mesh.nycmesh.net.'})))
view:addr('23.158.16.0/24', policy.suffix(policy.STUB('10.70.90.174'), policy.todnames({'em.mesh.', 'em.mesh.nycmesh.net.'})))
view:addr('199.167.59.0/24', policy.suffix(policy.STUB('10.70.90.174'), policy.todnames({'em.mesh.', 'em.mesh.nycmesh.net.'})))
view:addr('199.170.132.0/24', policy.suffix(policy.STUB('10.70.90.174'), policy.todnames({'em.mesh.', 'em.mesh.nycmesh.net.'})))
view:addr('208.68.5.0/24', policy.suffix(policy.STUB('10.70.90.174'), policy.todnames({'em.mesh.', 'em.mesh.nycmesh.net.'})))

view:addr('10.0.0.0/8', policy.suffix(policy.STUB('10.70.132.1'), policy.todnames({'zrg.mesh.', 'zrg.mesh.nycmesh.net.', 'n363.mesh.', 'n363.mesh.nycmesh.net.'})))
view:addr('23.158.16.0/24', policy.suffix(policy.STUB('10.70.132.1'), policy.todnames({'zrg.mesh.', 'zrg.mesh.nycmesh.net.', 'n363.mesh.', 'n363.mesh.nycmesh.net.'})))
view:addr('199.167.59.0/24', policy.suffix(policy.STUB('10.70.132.1'), policy.todnames({'zrg.mesh.', 'zrg.mesh.nycmesh.net.', 'n363.mesh.', 'n363.mesh.nycmesh.net.'})))
view:addr('199.170.132.0/24', policy.suffix(policy.STUB('10.70.132.1'), policy.todnames({'zrg.mesh.', 'zrg.mesh.nycmesh.net.', 'n363.mesh.', 'n363.mesh.nycmesh.net.'})))
view:addr('208.68.5.0/24', policy.suffix(policy.STUB('10.70.132.1'), policy.todnames({'zrg.mesh.', 'zrg.mesh.nycmesh.net.', 'n363.mesh.', 'n363.mesh.nycmesh.net.'})))

view:addr('10.0.0.0/8', policy.suffix(policy.STUB('199.170.132.101'), policy.todnames({'daniel.mesh.', 'daniel.mesh.nycmesh.net.'})))
view:addr('23.158.16.0/24', policy.suffix(policy.STUB('199.170.132.101'), policy.todnames({'daniel.mesh.', 'daniel.mesh.nycmesh.net.'})))
view:addr('199.167.59.0/24', policy.suffix(policy.STUB('199.170.132.101'), policy.todnames({'daniel.mesh.', 'daniel.mesh.nycmesh.net.'})))
view:addr('199.170.132.0/24', policy.suffix(policy.STUB('199.170.132.101'), policy.todnames({'daniel.mesh.', 'daniel.mesh.nycmesh.net.'})))
view:addr('208.68.5.0/24', policy.suffix(policy.STUB('199.170.132.101'), policy.todnames({'daniel.mesh.', 'daniel.mesh.nycmesh.net.'})))

view:addr('10.0.0.0/8', policy.suffix(policy.STUB('54.161.165.190'), policy.todnames({'andrew.mesh.', 'andrew.mesh.nycmesh.net.'})))
view:addr('23.158.16.0/24', policy.suffix(policy.STUB('54.161.165.190'), policy.todnames({'andrew.mesh.', 'andrew.mesh.nycmesh.net.'})))
view:addr('199.167.59.0/24', policy.suffix(policy.STUB('54.161.165.190'), policy.todnames({'andrew.mesh.', 'andrew.mesh.nycmesh.net.'})))
view:addr('199.170.132.0/24', policy.suffix(policy.STUB('54.161.165.190'), policy.todnames({'andrew.mesh.', 'andrew.mesh.nycmesh.net.'})))
view:addr('208.68.5.0/24', policy.suffix(policy.STUB('54.161.165.190'), policy.todnames({'andrew.mesh.', 'andrew.mesh.nycmesh.net.'})))

-- Mesh from mesh
view:addr('10.0.0.0/8', policy.suffix(policy.STUB('{{ MESH_STUB_RESOLVER }}'), policy.todnames({'mesh.', 'mesh.nycmesh.net.'})))
view:addr('23.158.16.0/24', policy.suffix(policy.STUB('{{ MESH_STUB_RESOLVER }}'), policy.todnames({'mesh.', 'mesh.nycmesh.net.'})))
Expand Down
2 changes: 1 addition & 1 deletion infra/terraform/dev_jon.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ recursive_cores = 4
recursive_sockets = 1
recursive_memory = 4096
enable_doh = ""
#mesh_stub_resolver = "23.158.16.23"
mesh_stub_resolver = "23.158.16.23"
2 changes: 1 addition & 1 deletion infra/terraform/prod_sn10.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,4 @@ recursive_cores = 5
recursive_sockets = 1
recursive_memory = 4096
enable_doh = "enable"
#mesh_stub_resolver = "199.170.132.47"
mesh_stub_resolver = "199.170.132.47"
2 changes: 1 addition & 1 deletion infra/terraform/prod_sn3.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,4 @@ recursive_cores = 5
recursive_sockets = 1
recursive_memory = 4096
enable_doh = "enable"
#mesh_stub_resolver = "23.158.16.23"
mesh_stub_resolver = "23.158.16.23"
Loading