mirror of
https://github.com/coredns/coredns.git
synced 2025-11-02 10:13:14 -05:00
8555716046
For some reasons there was a dnsserver/middleware.go that defined the middleware handlers. This code was a repeat from middleware/middleware.go. Removed dnsserver/middleware.go and replaced all uses of dnsserver.Middleware with middleware.Middleware. Added dnsserver/address_test.go to test the zone normalization (and to improve the test coverage). The deleted file will also improve the test coverage :)
47 lines
1.0 KiB
Go
47 lines
1.0 KiB
Go
package dnsserver
|
|
|
|
import (
|
|
"fmt"
|
|
"net"
|
|
"strings"
|
|
|
|
"github.com/miekg/dns"
|
|
)
|
|
|
|
type zoneAddr struct {
|
|
Zone string
|
|
Port string
|
|
}
|
|
|
|
// String return z.Zone + ":" + z.Port as a string.
|
|
func (z zoneAddr) String() string { return z.Zone + ":" + z.Port }
|
|
|
|
// normalizeZone parses an zone string into a structured format with separate
|
|
// host, and port portions, as well as the original input string.
|
|
//
|
|
// TODO(miek): possibly move this to middleware/normalize.go
|
|
func normalizeZone(str string) (zoneAddr, error) {
|
|
var err error
|
|
|
|
// separate host and port
|
|
host, port, err := net.SplitHostPort(str)
|
|
if err != nil {
|
|
host, port, err = net.SplitHostPort(str + ":")
|
|
// no error check here; return err at end of function
|
|
}
|
|
|
|
if len(host) > 255 {
|
|
return zoneAddr{}, fmt.Errorf("specified zone is too long: %d > 255", len(host))
|
|
}
|
|
_, d := dns.IsDomainName(host)
|
|
if !d {
|
|
return zoneAddr{}, fmt.Errorf("zone is not a valid domain name: %s", host)
|
|
}
|
|
|
|
if port == "" {
|
|
port = "53"
|
|
}
|
|
|
|
return zoneAddr{Zone: strings.ToLower(dns.Fqdn(host)), Port: port}, err
|
|
}
|