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

correct k8s name parsing response codes (#493)

Browse source
This commit is contained in:
Chris O'Haver 2017-01-23 15:11:32 -05:00 • committed by Miek Gieben
parent 299360fe01
commit c62bd639ff
2 changed files with 17 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
middleware/kubernetes/kubernetes.go
View file

@ -225,7 +225,10 @@ func (k *Kubernetes) parseRequest(lowerCasedName, qtype string) (r recordRequest
} }
offset := 0 offset := 0
if len(segs) == 5 { if qtype == "SRV" {
if len(segs) != 5 {
return r, errInvalidRequest
}
// This is a SRV style request, get first two elements as port and // This is a SRV style request, get first two elements as port and
// protocol, stripping leading underscores if present. // protocol, stripping leading underscores if present.
if segs[0][0] == '_' { if segs[0][0] == '_' {
@ -233,40 +236,31 @@ func (k *Kubernetes) parseRequest(lowerCasedName, qtype string) (r recordRequest
} else { } else {
r.port = segs[0] r.port = segs[0]
if !symbolContainsWildcard(r.port) { if !symbolContainsWildcard(r.port) {
return r, errors.New("srv port must start with an underscore or be a wildcard") return r, errInvalidRequest
} }
} }
if segs[1][0] == '_' { if segs[1][0] == '_' {
r.protocol = segs[1][1:] r.protocol = segs[1][1:]
if r.protocol != "tcp" && r.protocol != "udp" { if r.protocol != "tcp" && r.protocol != "udp" {
return r, errors.New("invalid srv protocol: " + r.protocol) return r, errInvalidRequest
} }
} else { } else {
r.protocol = segs[1] r.protocol = segs[1]
if !symbolContainsWildcard(r.protocol) { if !symbolContainsWildcard(r.protocol) {
return r, errors.New("srv protocol must start with an underscore or be a wildcard") return r, errInvalidRequest
} }
} }
if r.port == "" || r.protocol == "" {
return r, errInvalidRequest
}
offset = 2 offset = 2
} else if len(segs) == 4 { }
// This is an endpoint A style request. Get first element as endpoint. if qtype == "A" && len(segs) == 4 {
// This is an endpoint A record request. Get first element as endpoint.
r.endpoint = segs[0] r.endpoint = segs[0]
offset = 1 offset = 1
} }
// SRV requests require a port and protocol
if qtype == "SRV" {
if r.port == "" || r.protocol == "" {
return r, errors.New("invalid srv request")
}
}
// A requests cannot have port/protocol
if qtype == "A" {
if r.port != "" && r.protocol != "" {
return r, errors.New("invalid a request")
}
}
if len(segs) == (offset + 3) { if len(segs) == (offset + 3) {
r.service = segs[offset] r.service = segs[offset]
r.namespace = segs[offset+1] r.namespace = segs[offset+1]
@ -280,7 +274,7 @@ func (k *Kubernetes) parseRequest(lowerCasedName, qtype string) (r recordRequest
return r, nil return r, nil
} }
return r, errors.New("invalid request") return r, errInvalidRequest
} }

6
test/kubernetes_test.go
View file

@ -181,17 +181,17 @@ var dnsTestCases = []test.Case{
}, },
{ {
Qname: "*.svc-1-a.test-1.svc.cluster.local.", Qtype: dns.TypeSRV, Qname: "*.svc-1-a.test-1.svc.cluster.local.", Qtype: dns.TypeSRV,
Rcode: dns.RcodeServerFailure, Rcode: dns.RcodeNameError,
Answer: []dns.RR{}, Answer: []dns.RR{},
}, },
{ {
Qname: "*._not-udp-or-tcp.svc-1-a.test-1.svc.cluster.local.", Qtype: dns.TypeSRV, Qname: "*._not-udp-or-tcp.svc-1-a.test-1.svc.cluster.local.", Qtype: dns.TypeSRV,
Rcode: dns.RcodeServerFailure, Rcode: dns.RcodeNameError,
Answer: []dns.RR{}, Answer: []dns.RR{},
}, },
{ {
Qname: "svc-1-a.test-1.svc.cluster.local.", Qtype: dns.TypeSRV, Qname: "svc-1-a.test-1.svc.cluster.local.", Qtype: dns.TypeSRV,
Rcode: dns.RcodeServerFailure, Rcode: dns.RcodeNameError,
Answer: []dns.RR{}, Answer: []dns.RR{},
}, },
{ {