0972db6834
* Implement SVCB * Fix serialization and deserialization of double quotes * More effort (?) 4 months old commit * DEBUG * _ * Presentation format serialization/deserialization * _ Remove generated * Progress on presentation format parse & write * _ * Finish parsing presentation format * Regenerate * Pack unpack * Move to svcb.go Scan_rr.go and types.go should be untouched now * 🐛 Thanks ghedo * Definitions * TypeHTTPSSVC * Generated and isDuplicate * Goodbye lenient functions Now private key=value pairs have to be defined as structs too. They are no longer automatically named as KeyNNNNN * Encode/decode * Experimental svc * Read method * Implement some of the methods, use trick... to report where the error is while reading it. This should be applied to EDNS too. Todo: Find if case can only contain e := new(SVC_ALPN) and rest moved out Also fix two compile errors * Add SVC_LOCAL methods, reorder, remove alpn value, bugs * Errors * Alpn, make it build * Correct testsuite * Fully implement parser Change from keeping a state variable to reading in one iteration until the key=value pair is fully consumed * Simplify and document EDNS should be simplified too * Attempt to fix fuzzer And Alpn bug * A bug and change type values to match @ghedo's implementation * IP bug Also there are two ip duplicating patterns, one with copy, one with append. Maybe change it to be consistent. * Check for strictly increasing keys as required * Don't panic on invalid alpn * Redundant check, don't modify original array * Size calculation * Fix the fuzzer, match the style * 65535 is reserved too, don't delay errors * Check keyNNN, check for aliasform having values * IPvNHint is an array * Fix ipvNHint * Rename everything * Unrecognized keys according to the updated specification * Skip zero-length structs in generators. Fix CI * Doc cleanup * Off by one * Add parse tests * Check if private key doesn't collide with known key, invalid tests * Disallow IPv4 as IPv6. More tests. Related #1107 * Style fixes * More consistency, more tests * 🐛 Deep copy as in the documentation a := make([]net.IP, 1) a[0] = net.ParseIP("1.1.1.1").To4() b := append(make([]net.IP, 0, 1), a...) b[0] = net.ParseIP("3.1.1.1").To4() fmt.Println(a[0][0]) * Make tests readable * Move valid parse tests to different file * 🐛 One of previous commits not fully committed * Test binary single value encoding/decoding and full encode/decode * Add worst-case grows to builders, 🐛 Wrong visible character range, redundant tests * Testing improvements And don't convert to IPv4 twice * Doc update only * Document worst case allocations and ipv6 can be at most of length 39, not 40 * Redundant IP copy, consistent IPv6 behavior, fix deep copy * isDuplicate for SVCB * Optimizations * echoconfig * Svc => SVCB * Fix CI * Regenerate after REBASE (2) Rebased twice on 15th and 20th May * Rename svc, use escapeByte. * Fix parsing whitespaces between quotes, rename ECHOHOConfig * resolve Remove svcbFieldLen Use reverseInt Uppercase SVCB Rename key_value "invalid" => bad Alpn comments > 65535 check Unneeded slices * a little more read => parse IP array meaning Force pushed because forgot to change read in svcb_test.go * HTTPSSVC -> HTTPS * Use new values * mandatory code https://github.com/MikeBishop/dns-alt-svc/pull/205 * Resolve comments Rename svcb-pairs Remove SVCB_PRIVATE ranges Comment on SVCB_KEY65535 ParseError return l.token rename svcbKeyToString and svcbStringToKey privatize SVCBKeyToString, SVCBStringToKey * Refactor 1 Rename sorted, originalPairs Use append instead of copy Use svcb_RESERVED instead of 65535, with it now being private "type SVCBKey uint16" * Refactor 2 svcbKeyToString as method svcbStringToKey updated after key 0 🐛 mandatory has missing key Rename str idx < 0 * Refactor 3 Use l.token as z var key, value string Comment wrap 0: Sentences with '.' keyValue => kv * Refactor 4 * Refactor 5 len() int * Refactor 6 * Refactor 7 * Test remove parsing * Error messages * Rewrite two estimate comments * parse shouldn't modify original array 🐛 * Remove two unneeded comments * Address review comments Push 2 because can't build fuzzer python Push 3 to try again * Simplify argument duplication as per tmthrgd's suggestion And add the relevant test Force push edit: Make sorting code fit into one line * Rewrite ECHConfig and address the review * Remove the optional tab * Add To4() Check * More cleanup and fix mandatory not sorting bug
118 lines
3.8 KiB
Go
118 lines
3.8 KiB
Go
package dns
|
|
|
|
import "testing"
|
|
|
|
func TestDuplicateA(t *testing.T) {
|
|
a1, _ := NewRR("www.example.org. 2700 IN A 127.0.0.1")
|
|
a2, _ := NewRR("www.example.org. IN A 127.0.0.1")
|
|
if !IsDuplicate(a1, a2) {
|
|
t.Errorf("expected %s/%s to be duplicates, but got false", a1.String(), a2.String())
|
|
}
|
|
|
|
a2, _ = NewRR("www.example.org. IN A 127.0.0.2")
|
|
if IsDuplicate(a1, a2) {
|
|
t.Errorf("expected %s/%s not to be duplicates, but got true", a1.String(), a2.String())
|
|
}
|
|
}
|
|
|
|
func TestDuplicateTXT(t *testing.T) {
|
|
a1, _ := NewRR("www.example.org. IN TXT \"aa\"")
|
|
a2, _ := NewRR("www.example.org. IN TXT \"aa\"")
|
|
|
|
if !IsDuplicate(a1, a2) {
|
|
t.Errorf("expected %s/%s to be duplicates, but got false", a1.String(), a2.String())
|
|
}
|
|
|
|
a2, _ = NewRR("www.example.org. IN TXT \"aa\" \"bb\"")
|
|
if IsDuplicate(a1, a2) {
|
|
t.Errorf("expected %s/%s not to be duplicates, but got true", a1.String(), a2.String())
|
|
}
|
|
|
|
a1, _ = NewRR("www.example.org. IN TXT \"aa\" \"bc\"")
|
|
if IsDuplicate(a1, a2) {
|
|
t.Errorf("expected %s/%s not to be duplicates, but got true", a1.String(), a2.String())
|
|
}
|
|
}
|
|
|
|
func TestDuplicateSVCB(t *testing.T) {
|
|
a1, _ := NewRR(`example.com. 3600 IN SVCB 1 . ipv6hint=1::3:3:3:3 key65300=\254\032\030\000\ \043,\;`)
|
|
a2, _ := NewRR(`example.com. 3600 IN SVCB 1 . ipv6hint=1:0::3:3:3:3 key65300="\254\ \030\000 +\,;"`)
|
|
|
|
if !IsDuplicate(a1, a2) {
|
|
t.Errorf("expected %s/%s to be duplicates, but got false", a1.String(), a2.String())
|
|
}
|
|
|
|
a2, _ = NewRR(`example.com. 3600 IN SVCB 1 . ipv6hint=1::3:3:3:3 key65300="\255\ \030\000 +\,;"`)
|
|
|
|
if IsDuplicate(a1, a2) {
|
|
t.Errorf("expected %s/%s not to be duplicates, but got true", a1.String(), a2.String())
|
|
}
|
|
|
|
a1, _ = NewRR(`example.com. 3600 IN SVCB 1 . ipv6hint=1::3:3:3:3`)
|
|
|
|
if IsDuplicate(a1, a2) {
|
|
t.Errorf("expected %s/%s not to be duplicates, but got true", a1.String(), a2.String())
|
|
}
|
|
|
|
a2, _ = NewRR(`example.com. 3600 IN SVCB 1 . ipv4hint=1.1.1.1`)
|
|
|
|
if IsDuplicate(a1, a2) {
|
|
t.Errorf("expected %s/%s not to be duplicates, but got true", a1.String(), a2.String())
|
|
}
|
|
|
|
a1, _ = NewRR(`example.com. 3600 IN SVCB 1 . ipv4hint=1.1.1.1,1.0.2.1`)
|
|
|
|
if IsDuplicate(a1, a2) {
|
|
t.Errorf("expected %s/%s not to be duplicates, but got true", a1.String(), a2.String())
|
|
}
|
|
}
|
|
|
|
func TestDuplicateOwner(t *testing.T) {
|
|
a1, _ := NewRR("www.example.org. IN A 127.0.0.1")
|
|
a2, _ := NewRR("www.example.org. IN A 127.0.0.1")
|
|
if !IsDuplicate(a1, a2) {
|
|
t.Errorf("expected %s/%s to be duplicates, but got false", a1.String(), a2.String())
|
|
}
|
|
|
|
a2, _ = NewRR("WWw.exaMPle.org. IN A 127.0.0.2")
|
|
if IsDuplicate(a1, a2) {
|
|
t.Errorf("expected %s/%s to be duplicates, but got false", a1.String(), a2.String())
|
|
}
|
|
}
|
|
|
|
func TestDuplicateDomain(t *testing.T) {
|
|
a1, _ := NewRR("www.example.org. IN CNAME example.org.")
|
|
a2, _ := NewRR("www.example.org. IN CNAME example.org.")
|
|
if !IsDuplicate(a1, a2) {
|
|
t.Errorf("expected %s/%s to be duplicates, but got false", a1.String(), a2.String())
|
|
}
|
|
|
|
a2, _ = NewRR("www.example.org. IN CNAME exAMPLe.oRG.")
|
|
if !IsDuplicate(a1, a2) {
|
|
t.Errorf("expected %s/%s to be duplicates, but got false", a1.String(), a2.String())
|
|
}
|
|
}
|
|
|
|
func TestDuplicateWrongRrtype(t *testing.T) {
|
|
// Test that IsDuplicate won't panic for a record that's lying about
|
|
// it's Rrtype.
|
|
|
|
r1 := &A{Hdr: RR_Header{Rrtype: TypeA}}
|
|
r2 := &AAAA{Hdr: RR_Header{Rrtype: TypeA}}
|
|
if IsDuplicate(r1, r2) {
|
|
t.Errorf("expected %s/%s not to be duplicates, but got true", r1.String(), r2.String())
|
|
}
|
|
|
|
r3 := &AAAA{Hdr: RR_Header{Rrtype: TypeA}}
|
|
r4 := &A{Hdr: RR_Header{Rrtype: TypeA}}
|
|
if IsDuplicate(r3, r4) {
|
|
t.Errorf("expected %s/%s not to be duplicates, but got true", r3.String(), r4.String())
|
|
}
|
|
|
|
r5 := &AAAA{Hdr: RR_Header{Rrtype: TypeA}}
|
|
r6 := &AAAA{Hdr: RR_Header{Rrtype: TypeA}}
|
|
if !IsDuplicate(r5, r6) {
|
|
t.Errorf("expected %s/%s to be duplicates, but got false", r5.String(), r6.String())
|
|
}
|
|
}
|