add first stab at str conversion
This commit is contained in:
Miek Gieben
parent
c6e16cc054
commit
b0d68e5fa9
1
Makefile
1
Makefile
|
|
@ -11,6 +11,7 @@ GOFILES=\
|
|||
types.go\
|
||||
dnssec.go\
|
||||
edns.go \
|
||||
strconv.go \
|
||||
|
||||
include $(GOROOT)/src/Make.pkg
|
||||
|
||||
|
|
|
|||
83
pack_test.go
83
pack_test.go
|
|
@ -9,94 +9,77 @@ func TestPackUnpack(t *testing.T) {
|
|||
out := new(Msg)
|
||||
r := new(RR_AAAA)
|
||||
r.AAAA = net.ParseIP("2001:7b8:206:1:200:39ff:fe59:b187").To16()
|
||||
r.Hdr.Name = "a.miek.nl"
|
||||
r.Hdr.Rrtype = TypeAAAA
|
||||
r.Hdr.Class = ClassINET
|
||||
r.Hdr.Ttl = 3600
|
||||
r.Hdr = RR_Header{Name: "a.miek.nl", Rrtype: TypeAAAA, Class: ClassINET, Ttl: 3600}
|
||||
out.Answer = make([]RR, 1)
|
||||
out.Answer[0] = r
|
||||
|
||||
msg, ok := out.Pack()
|
||||
if ! ok {
|
||||
if !ok {
|
||||
t.Log("Failed to pack msg with AAAA")
|
||||
t.Fail()
|
||||
}
|
||||
|
||||
in := new(Msg)
|
||||
if ! in.Unpack(msg) {
|
||||
if !in.Unpack(msg) {
|
||||
t.Log("Failed to unpack msg with AAAA")
|
||||
t.Fail()
|
||||
}
|
||||
|
||||
key := new(RR_DNSKEY)
|
||||
key.Hdr.Name = "miek.nl."
|
||||
key.Hdr.Rrtype = TypeDNSKEY
|
||||
key.Hdr.Class = ClassINET
|
||||
key.Hdr.Ttl = 3600
|
||||
key.Flags = 257
|
||||
key.Protocol = 3
|
||||
key.Algorithm = AlgRSASHA1
|
||||
key.Hdr = RR_Header{Name: "miek.nl.", Rrtype: TypeDNSKEY, Class: ClassINET, Ttl: 3600}
|
||||
key = &RR_DNSKEY{Flags: 257, Protocol: 3, Algorithm: AlgRSASHA1}
|
||||
key.PubKey = "AwEAAaHIwpx3w4VHKi6i1LHnTaWeHCL154Jug0Rtc9ji5qwPXpBo6A5sRv7cSsPQKPIwxLpyCrbJ4mr2L0EPOdvP6z6YfljK2ZmTbogU9aSU2fiq/4wjxbdkLyoDVgtO+JsxNN4bjr4WcWhsmk1Hg93FV9ZpkWb0Tbad8DFqNDzr//kZ"
|
||||
|
||||
out.Answer[0] = key
|
||||
msg, ok = out.Pack()
|
||||
if ! ok {
|
||||
if !ok {
|
||||
t.Log("Failed to pack msg with DNSKEY")
|
||||
t.Fail()
|
||||
}
|
||||
|
||||
if ! in.Unpack(msg) {
|
||||
if !in.Unpack(msg) {
|
||||
t.Log("Failed to unpack msg with DNSKEY")
|
||||
t.Fail()
|
||||
}
|
||||
|
||||
sig := new(RR_RRSIG)
|
||||
sig.Hdr.Name = "miek.nl."
|
||||
sig.Hdr.Rrtype = TypeRRSIG
|
||||
sig.Hdr.Class = ClassINET
|
||||
sig.Hdr.Ttl = 3600
|
||||
sig.TypeCovered = TypeDNSKEY
|
||||
sig.Algorithm = AlgRSASHA1
|
||||
sig.Labels = 2
|
||||
sig.OrigTtl = 4000
|
||||
sig.Expiration = 1000
|
||||
sig.Inception = 800
|
||||
sig.KeyTag = 34641
|
||||
sig.SignerName = "miek.nl."
|
||||
sig.Sig = "AwEAAaHIwpx3w4VHKi6i1LHnTaWeHCL154Jug0Rtc9ji5qwPXpBo6A5sRv7cSsPQKPIwxLpyCrbJ4mr2L0EPOdvP6z6YfljK2ZmTbogU9aSU2fiq/4wjxbdkLyoDVgtO+JsxNN4bjr4WcWhsmk1Hg93FV9ZpkWb0Tbad8DFqNDzr//kZ"
|
||||
sig.Hdr = RR_Header{Name: "miek.nl.", Rrtype: TypeRRSIG, Class: ClassINET, Ttl: 3600}
|
||||
sig = &RR_RRSIG{TypeCovered: TypeDNSKEY, Algorithm: AlgRSASHA1, Labels: 2,
|
||||
OrigTtl: 3600, Expiration: 4000, Inception: 4000, KeyTag: 34641, SignerName: "miek.nl.",
|
||||
Sig: "AwEAAaHIwpx3w4VHKi6i1LHnTaWeHCL154Jug0Rtc9ji5qwPXpBo6A5sRv7cSsPQKPIwxLpyCrbJ4mr2L0EPOdvP6z6YfljK2ZmTbogU9aSU2fiq/4wjxbdkLyoDVgtO+JsxNN4bjr4WcWhsmk1Hg93FV9ZpkWb0Tbad8DFqNDzr//kZ"}
|
||||
|
||||
out.Answer[0] = sig
|
||||
msg, ok = out.Pack()
|
||||
if ! ok {
|
||||
if !ok {
|
||||
t.Log("Failed to pack msg with RRSIG")
|
||||
t.Fail()
|
||||
}
|
||||
|
||||
if ! in.Unpack(msg) {
|
||||
if !in.Unpack(msg) {
|
||||
t.Log("Failed to unpack msg with RRSIG")
|
||||
t.Fail()
|
||||
}
|
||||
|
||||
edns := new(RR_OPT)
|
||||
edns.Hdr.Name = "."
|
||||
edns.Hdr.Rrtype = TypeOPT
|
||||
edns.Hdr.Class = ClassINET
|
||||
edns.Hdr.Ttl = 3600
|
||||
edns.Option = make([]Option, 1)
|
||||
edns.Option[0].Code = OptionCodeNSID
|
||||
edns.Option[0].Data = "lalalala"
|
||||
edns := new(RR_OPT)
|
||||
edns.Hdr.Name = "."
|
||||
edns.Hdr.Rrtype = TypeOPT
|
||||
edns.Hdr.Class = ClassINET
|
||||
edns.Hdr.Ttl = 3600
|
||||
edns.Option = make([]Option, 1)
|
||||
edns.Option[0].Code = OptionCodeNSID
|
||||
edns.Option[0].Data = "lalalala"
|
||||
|
||||
_, ok = packRR(edns, msg, 0)
|
||||
if !ok {
|
||||
t.Logf("%v\n", edns)
|
||||
t.Log("Failed")
|
||||
t.Fail()
|
||||
}
|
||||
_, ok = packRR(edns, msg, 0)
|
||||
if !ok {
|
||||
t.Logf("%v\n", edns)
|
||||
t.Log("Failed")
|
||||
t.Fail()
|
||||
}
|
||||
|
||||
unpacked, _, ok := unpackRR(msg, 0)
|
||||
if !ok {
|
||||
t.Logf("%v\n", unpacked)
|
||||
t.Log("Failed")
|
||||
t.Fail()
|
||||
}
|
||||
unpacked, _, ok := unpackRR(msg, 0)
|
||||
if !ok {
|
||||
t.Logf("%v\n", unpacked)
|
||||
t.Log("Failed")
|
||||
t.Fail()
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,21 @@
|
|||
package dns
|
||||
|
||||
// subpackage?
|
||||
|
||||
// Convert a string to an resource record
|
||||
// The string must fit on one line and must be fully formatted
|
||||
// IN A 192.168.1.1 // not ok
|
||||
// miek.nl. 3600 IN A 192.168.1.1 // ok
|
||||
// miek.nl. IN A 192.168.1.1 // ok, ttl may be omitted
|
||||
// miek.nl. A 192.168.1.1 // ok, ttl and class omitted
|
||||
// miek.nl. 3600 A 192.168.1.1 // ok, class omitted
|
||||
func AtoRR(s string) *RR {
|
||||
// up to first whitespace is domainname
|
||||
// next word is:
|
||||
// <number> -> TTL
|
||||
// IN|CH|HS -> Class
|
||||
// <rest> -> Type
|
||||
// When the type is seen, we can read the rest
|
||||
// of the string in an rr-specific manner
|
||||
return nil
|
||||
}
|
||||
Loading…
Reference in New Issue