summaryrefslogtreecommitdiff
path: root/vendor/github.com/miekg/dns
diff options
context:
space:
mode:
Diffstat (limited to 'vendor/github.com/miekg/dns')
-rw-r--r--vendor/github.com/miekg/dns/README.md1
-rw-r--r--vendor/github.com/miekg/dns/defaults.go13
-rw-r--r--vendor/github.com/miekg/dns/msg.go33
-rw-r--r--vendor/github.com/miekg/dns/types.go10
-rw-r--r--vendor/github.com/miekg/dns/version.go2
5 files changed, 49 insertions, 10 deletions
diff --git a/vendor/github.com/miekg/dns/README.md b/vendor/github.com/miekg/dns/README.md
index 06bea9fab..95bc08d5c 100644
--- a/vendor/github.com/miekg/dns/README.md
+++ b/vendor/github.com/miekg/dns/README.md
@@ -81,6 +81,7 @@ A not-so-up-to-date-list-that-may-be-actually-current:
* https://addr.tools/
* https://dnscheck.tools/
* https://github.com/egbakou/domainverifier
+* https://github.com/semihalev/sdns
Send pull request if you want to be listed here.
diff --git a/vendor/github.com/miekg/dns/defaults.go b/vendor/github.com/miekg/dns/defaults.go
index c1558b79c..6d7e17605 100644
--- a/vendor/github.com/miekg/dns/defaults.go
+++ b/vendor/github.com/miekg/dns/defaults.go
@@ -5,6 +5,7 @@ import (
"net"
"strconv"
"strings"
+ "unicode"
)
const hexDigit = "0123456789abcdef"
@@ -330,8 +331,18 @@ func Fqdn(s string) string {
// CanonicalName returns the domain name in canonical form. A name in canonical
// form is lowercase and fully qualified. See Section 6.2 in RFC 4034.
+// According to the RFC all uppercase US-ASCII letters in the owner name of the
+// RR areeplaced by the corresponding lowercase US-ASCII letters.
func CanonicalName(s string) string {
- return strings.ToLower(Fqdn(s))
+ var result strings.Builder
+ for _, ch := range s {
+ if unicode.IsUpper(ch) && (ch >= 0x00 && ch <= 0x7F) {
+ result.WriteRune(unicode.ToLower(ch))
+ } else {
+ result.WriteRune(ch)
+ }
+ }
+ return Fqdn(result.String())
}
// Copied from the official Go code.
diff --git a/vendor/github.com/miekg/dns/msg.go b/vendor/github.com/miekg/dns/msg.go
index d5049a4f9..b05cf14e9 100644
--- a/vendor/github.com/miekg/dns/msg.go
+++ b/vendor/github.com/miekg/dns/msg.go
@@ -896,23 +896,38 @@ func (dns *Msg) String() string {
return "<nil> MsgHdr"
}
s := dns.MsgHdr.String() + " "
- s += "QUERY: " + strconv.Itoa(len(dns.Question)) + ", "
- s += "ANSWER: " + strconv.Itoa(len(dns.Answer)) + ", "
- s += "AUTHORITY: " + strconv.Itoa(len(dns.Ns)) + ", "
- s += "ADDITIONAL: " + strconv.Itoa(len(dns.Extra)) + "\n"
+ if dns.MsgHdr.Opcode == OpcodeUpdate {
+ s += "ZONE: " + strconv.Itoa(len(dns.Question)) + ", "
+ s += "PREREQ: " + strconv.Itoa(len(dns.Answer)) + ", "
+ s += "UPDATE: " + strconv.Itoa(len(dns.Ns)) + ", "
+ s += "ADDITIONAL: " + strconv.Itoa(len(dns.Extra)) + "\n"
+ } else {
+ s += "QUERY: " + strconv.Itoa(len(dns.Question)) + ", "
+ s += "ANSWER: " + strconv.Itoa(len(dns.Answer)) + ", "
+ s += "AUTHORITY: " + strconv.Itoa(len(dns.Ns)) + ", "
+ s += "ADDITIONAL: " + strconv.Itoa(len(dns.Extra)) + "\n"
+ }
opt := dns.IsEdns0()
if opt != nil {
// OPT PSEUDOSECTION
s += opt.String() + "\n"
}
if len(dns.Question) > 0 {
- s += "\n;; QUESTION SECTION:\n"
+ if dns.MsgHdr.Opcode == OpcodeUpdate {
+ s += "\n;; ZONE SECTION:\n"
+ } else {
+ s += "\n;; QUESTION SECTION:\n"
+ }
for _, r := range dns.Question {
s += r.String() + "\n"
}
}
if len(dns.Answer) > 0 {
- s += "\n;; ANSWER SECTION:\n"
+ if dns.MsgHdr.Opcode == OpcodeUpdate {
+ s += "\n;; PREREQUISITE SECTION:\n"
+ } else {
+ s += "\n;; ANSWER SECTION:\n"
+ }
for _, r := range dns.Answer {
if r != nil {
s += r.String() + "\n"
@@ -920,7 +935,11 @@ func (dns *Msg) String() string {
}
}
if len(dns.Ns) > 0 {
- s += "\n;; AUTHORITY SECTION:\n"
+ if dns.MsgHdr.Opcode == OpcodeUpdate {
+ s += "\n;; UPDATE SECTION:\n"
+ } else {
+ s += "\n;; AUTHORITY SECTION:\n"
+ }
for _, r := range dns.Ns {
if r != nil {
s += r.String() + "\n"
diff --git a/vendor/github.com/miekg/dns/types.go b/vendor/github.com/miekg/dns/types.go
index 03afeccda..c9a03dec6 100644
--- a/vendor/github.com/miekg/dns/types.go
+++ b/vendor/github.com/miekg/dns/types.go
@@ -236,6 +236,9 @@ var CertTypeToString = map[uint16]string{
CertOID: "OID",
}
+// Prefix for IPv4 encoded as IPv6 address
+const ipv4InIPv6Prefix = "::ffff:"
+
//go:generate go run types_generate.go
// Question holds a DNS question. Usually there is just one. While the
@@ -751,6 +754,11 @@ func (rr *AAAA) String() string {
if rr.AAAA == nil {
return rr.Hdr.String()
}
+
+ if rr.AAAA.To4() != nil {
+ return rr.Hdr.String() + ipv4InIPv6Prefix + rr.AAAA.String()
+ }
+
return rr.Hdr.String() + rr.AAAA.String()
}
@@ -1517,7 +1525,7 @@ func (a *APLPrefix) str() string {
case net.IPv6len:
// add prefix for IPv4-mapped IPv6
if v4 := a.Network.IP.To4(); v4 != nil {
- sb.WriteString("::ffff:")
+ sb.WriteString(ipv4InIPv6Prefix)
}
sb.WriteString(a.Network.IP.String())
}
diff --git a/vendor/github.com/miekg/dns/version.go b/vendor/github.com/miekg/dns/version.go
index 5891044a3..a09113662 100644
--- a/vendor/github.com/miekg/dns/version.go
+++ b/vendor/github.com/miekg/dns/version.go
@@ -3,7 +3,7 @@ package dns
import "fmt"
// Version is current version of this library.
-var Version = v{1, 1, 55}
+var Version = v{1, 1, 56}
// v holds the version of this library.
type v struct {