mirror of
https://github.com/miekg/dns.git
synced 2025-08-10 11:36:58 +02:00
* 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
174 lines
3.9 KiB
Go
174 lines
3.9 KiB
Go
//+build ignore
|
|
|
|
// types_generate.go is meant to run with go generate. It will use
|
|
// go/{importer,types} to track down all the RR struct types. Then for each type
|
|
// it will generate conversion tables (TypeToRR and TypeToString) and banal
|
|
// methods (len, Header, copy) based on the struct tags. The generated source is
|
|
// written to ztypes.go, and is meant to be checked into git.
|
|
package main
|
|
|
|
import (
|
|
"bytes"
|
|
"fmt"
|
|
"go/format"
|
|
"go/types"
|
|
"log"
|
|
"os"
|
|
|
|
"golang.org/x/tools/go/packages"
|
|
)
|
|
|
|
var packageHdr = `
|
|
// Code generated by "go run duplicate_generate.go"; DO NOT EDIT.
|
|
|
|
package dns
|
|
|
|
`
|
|
|
|
func getTypeStruct(t types.Type, scope *types.Scope) (*types.Struct, bool) {
|
|
st, ok := t.Underlying().(*types.Struct)
|
|
if !ok {
|
|
return nil, false
|
|
}
|
|
if st.NumFields() == 0 {
|
|
return nil, false
|
|
}
|
|
if st.Field(0).Type() == scope.Lookup("RR_Header").Type() {
|
|
return st, false
|
|
}
|
|
if st.Field(0).Anonymous() {
|
|
st, _ := getTypeStruct(st.Field(0).Type(), scope)
|
|
return st, true
|
|
}
|
|
return nil, false
|
|
}
|
|
|
|
// loadModule retrieves package description for a given module.
|
|
func loadModule(name string) (*types.Package, error) {
|
|
conf := packages.Config{Mode: packages.NeedTypes | packages.NeedTypesInfo}
|
|
pkgs, err := packages.Load(&conf, name)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return pkgs[0].Types, nil
|
|
}
|
|
|
|
func main() {
|
|
// Import and type-check the package
|
|
pkg, err := loadModule("github.com/miekg/dns")
|
|
fatalIfErr(err)
|
|
scope := pkg.Scope()
|
|
|
|
// Collect actual types (*X)
|
|
var namedTypes []string
|
|
for _, name := range scope.Names() {
|
|
o := scope.Lookup(name)
|
|
if o == nil || !o.Exported() {
|
|
continue
|
|
}
|
|
|
|
if st, _ := getTypeStruct(o.Type(), scope); st == nil {
|
|
continue
|
|
}
|
|
|
|
if name == "PrivateRR" || name == "OPT" {
|
|
continue
|
|
}
|
|
|
|
namedTypes = append(namedTypes, o.Name())
|
|
}
|
|
|
|
b := &bytes.Buffer{}
|
|
b.WriteString(packageHdr)
|
|
|
|
// Generate the duplicate check for each type.
|
|
fmt.Fprint(b, "// isDuplicate() functions\n\n")
|
|
for _, name := range namedTypes {
|
|
|
|
o := scope.Lookup(name)
|
|
st, _ := getTypeStruct(o.Type(), scope)
|
|
fmt.Fprintf(b, "func (r1 *%s) isDuplicate(_r2 RR) bool {\n", name)
|
|
fmt.Fprintf(b, "r2, ok := _r2.(*%s)\n", name)
|
|
fmt.Fprint(b, "if !ok { return false }\n")
|
|
fmt.Fprint(b, "_ = r2\n")
|
|
for i := 1; i < st.NumFields(); i++ {
|
|
field := st.Field(i).Name()
|
|
o2 := func(s string) { fmt.Fprintf(b, s+"\n", field, field) }
|
|
o3 := func(s string) { fmt.Fprintf(b, s+"\n", field, field, field) }
|
|
|
|
// For some reason, a and aaaa don't pop up as *types.Slice here (mostly like because the are
|
|
// *indirectly* defined as a slice in the net package).
|
|
if _, ok := st.Field(i).Type().(*types.Slice); ok {
|
|
o2("if len(r1.%s) != len(r2.%s) {\nreturn false\n}")
|
|
|
|
if st.Tag(i) == `dns:"cdomain-name"` || st.Tag(i) == `dns:"domain-name"` {
|
|
o3(`for i := 0; i < len(r1.%s); i++ {
|
|
if !isDuplicateName(r1.%s[i], r2.%s[i]) {
|
|
return false
|
|
}
|
|
}`)
|
|
|
|
continue
|
|
}
|
|
|
|
if st.Tag(i) == `dns:"apl"` {
|
|
o3(`for i := 0; i < len(r1.%s); i++ {
|
|
if !r1.%s[i].equals(&r2.%s[i]) {
|
|
return false
|
|
}
|
|
}`)
|
|
|
|
continue
|
|
}
|
|
|
|
if st.Tag(i) == `dns:"pairs"` {
|
|
o2(`if !areSVCBPairArraysEqual(r1.%s, r2.%s) {
|
|
return false
|
|
}`)
|
|
|
|
continue
|
|
}
|
|
|
|
o3(`for i := 0; i < len(r1.%s); i++ {
|
|
if r1.%s[i] != r2.%s[i] {
|
|
return false
|
|
}
|
|
}`)
|
|
|
|
continue
|
|
}
|
|
|
|
switch st.Tag(i) {
|
|
case `dns:"-"`:
|
|
// ignored
|
|
case `dns:"a"`, `dns:"aaaa"`:
|
|
o2("if !r1.%s.Equal(r2.%s) {\nreturn false\n}")
|
|
case `dns:"cdomain-name"`, `dns:"domain-name"`:
|
|
o2("if !isDuplicateName(r1.%s, r2.%s) {\nreturn false\n}")
|
|
default:
|
|
o2("if r1.%s != r2.%s {\nreturn false\n}")
|
|
}
|
|
}
|
|
fmt.Fprintf(b, "return true\n}\n\n")
|
|
}
|
|
|
|
// gofmt
|
|
res, err := format.Source(b.Bytes())
|
|
if err != nil {
|
|
b.WriteTo(os.Stderr)
|
|
log.Fatal(err)
|
|
}
|
|
|
|
// write result
|
|
f, err := os.Create("zduplicate.go")
|
|
fatalIfErr(err)
|
|
defer f.Close()
|
|
f.Write(res)
|
|
}
|
|
|
|
func fatalIfErr(err error) {
|
|
if err != nil {
|
|
log.Fatal(err)
|
|
}
|
|
}
|