Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2025-10-30 17:53:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add server instance to the context in ServerTLS and ServerHTTPS (#2840)

Browse Source 
* Add server instance to the context in ServerTLS and ServerHTTPS

The problem with the current code is that there's no way to get the server instance inside a plugin.
Because of that "metrics" plugin sets empty "server" label for requests served over TLS or HTTPS.

* use s.Server instead of s

* Added server to the context of grpc requests
This commit is contained in:
Andrey Meshkov
2019-05-27 17:52:48 +03:00
committed by Miek Gieben
parent c5f49257be
commit aebbc4883d
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/dnsserver/server_grpc.go
View File

@@ -129,7 +129,8 @@ func (s *ServergRPC) Query(ctx context.Context, in *pb.DnsPacket) (*pb.DnsPacket
w := &gRPCresponse{localAddr: s.listenAddr, remoteAddr: a, Msg: msg} w := &gRPCresponse{localAddr: s.listenAddr, remoteAddr: a, Msg: msg}
s.ServeDNS(ctx, w, msg) dnsCtx := context.WithValue(ctx, Key{}, s.Server)
s.ServeDNS(dnsCtx, w, msg)
packed, err := w.Msg.Pack() packed, err := w.Msg.Pack()
if err != nil { if err != nil {

3
core/dnsserver/server_https.go
View File

@@ -117,7 +117,8 @@ func (s *ServerHTTPS) ServeHTTP(w http.ResponseWriter, r *http.Request) {
// We just call the normal chain handler - all error handling is done there. // We just call the normal chain handler - all error handling is done there.
// We should expect a packet to be returned that we can send to the client. // We should expect a packet to be returned that we can send to the client.
s.ServeDNS(context.Background(), dw, msg) ctx := context.WithValue(context.Background(), Key{}, s.Server)
s.ServeDNS(ctx, dw, msg)
// See section 4.2.1 of RFC 8484. // See section 4.2.1 of RFC 8484.
// We are using code 500 to indicate an unexpected situation when the chain // We are using code 500 to indicate an unexpected situation when the chain

2
core/dnsserver/server_tls.go
View File

@@ -44,7 +44,7 @@ func (s *ServerTLS) Serve(l net.Listener) error {
// Only fill out the TCP server for this one. // Only fill out the TCP server for this one.
s.server[tcp] = &dns.Server{Listener: l, Net: "tcp-tls", Handler: dns.HandlerFunc(func(w dns.ResponseWriter, r *dns.Msg) { s.server[tcp] = &dns.Server{Listener: l, Net: "tcp-tls", Handler: dns.HandlerFunc(func(w dns.ResponseWriter, r *dns.Msg) {
ctx := context.Background() ctx := context.WithValue(context.Background(), Key{}, s.Server)
s.ServeDNS(ctx, w, r) s.ServeDNS(ctx, w, r)
})} })}
s.m.Unlock() s.m.Unlock()