TrueCloudLab/coredns
16
0
Fork 2
Code Issues Pull requests 3 Projects Releases Packages Wiki Activity Actions

plugin/kubernetes: filter ExternalName services from matching double subdomain wildcard (#6162)

Browse source 
remove double subdomain reference from review feedback



not subdoman

Signed-off-by: emaildanwilson <dan@controlplane.com>
Co-authored-by: emaildanwilson <dan@controlplane.com>
This commit is contained in:
Dan Wilson 2023-06-19 05:42:17 -07:00 • committed by GitHub
parent 7e6d3bb533
commit 5b5a6ac6ad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
plugin/kubernetes/handler_test.go
View file

@ -408,6 +408,14 @@ var dnsTestCases = []kubeTestCase{
test.SOA("cluster.local. 5 IN SOA ns.dns.cluster.local. hostmaster.cluster.local. 1499347823 7200 1800 86400 5"), test.SOA("cluster.local. 5 IN SOA ns.dns.cluster.local. hostmaster.cluster.local. 1499347823 7200 1800 86400 5"),
}, },
}}, }},
// A query for a subdomain of a subdomain of an external service should not resolve to the external service
{Case: test.Case{
Qname: "subdomain.subdomain.external.testns.svc.cluster.local.", Qtype: dns.TypeCNAME,
Rcode: dns.RcodeNameError,
Ns: []dns.RR{
test.SOA("cluster.local. 5 IN SOA ns.dns.cluster.local. hostmaster.cluster.local. 1499347823 7200 1800 86400 5"),
},
}},
} }
func TestServeDNS(t *testing.T) { func TestServeDNS(t *testing.T) {

4
plugin/kubernetes/kubernetes.go
View file

@ -445,8 +445,8 @@ func (k *Kubernetes) findServices(r recordRequest, zone string) (services []msg.
// External service // External service
if svc.Type == api.ServiceTypeExternalName { if svc.Type == api.ServiceTypeExternalName {
//External services cannot have endpoints, so skip this service if an endpoint is present in the request // External services do not have endpoints, nor can we accept port/protocol pseudo subdomains in an SRV query, so skip this service if endpoint, port, or protocol is non-empty in the request
if r.endpoint != "" { if r.endpoint != "" || r.port != "" || r.protocol != "" {
continue continue
} }
s := msg.Service{Key: strings.Join([]string{zonePath, Svc, svc.Namespace, svc.Name}, "/"), Host: svc.ExternalName, TTL: k.ttl} s := msg.Service{Key: strings.Join([]string{zonePath, Svc, svc.Namespace, svc.Name}, "/"), Host: svc.ExternalName, TTL: k.ttl}