mirror of
				https://github.com/coredns/coredns.git
				synced 2025-11-03 02:33:21 -05:00 
			
		
		
		
	The DoH work (#1619) made changes to pkg/nonwriter.Writer that in hindsight were not backwards compatible; it added override for the LocalAddr() and RemoteAddr(). Instead of rolling back that PR, this PR reverts those changes and creates a DoHWriter for use in the https-server.go side of things. This was only caught in the integration test making this hard to catch, so we add a upstream_file_test.go that tries (doesn't work yet) to test this in the unit tests as well. Esp. helpful when 'git bisecting'. Fixes #1826
		
			
				
	
	
		
			22 lines
		
	
	
		
			579 B
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			22 lines
		
	
	
		
			579 B
		
	
	
	
		
			Go
		
	
	
	
	
	
// Package nonwriter implements a dns.ResponseWriter that never writes, but captures the dns.Msg being written.
 | 
						|
package nonwriter
 | 
						|
 | 
						|
import (
 | 
						|
	"github.com/miekg/dns"
 | 
						|
)
 | 
						|
 | 
						|
// Writer is a type of ResponseWriter that captures the message, but never writes to the client.
 | 
						|
type Writer struct {
 | 
						|
	dns.ResponseWriter
 | 
						|
	Msg *dns.Msg
 | 
						|
}
 | 
						|
 | 
						|
// New makes and returns a new NonWriter.
 | 
						|
func New(w dns.ResponseWriter) *Writer { return &Writer{ResponseWriter: w} }
 | 
						|
 | 
						|
// WriteMsg records the message, but doesn't write it itself.
 | 
						|
func (w *Writer) WriteMsg(res *dns.Msg) error {
 | 
						|
	w.Msg = res
 | 
						|
	return nil
 | 
						|
}
 |