Skip to content

Upgrade to codeberg.org/miekg/dns #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
emersion wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Upgrade to codeberg.org/miekg/dns #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
module github.com/libdns/dnsupdate

go 1.24.0
go 1.25.0

require (
codeberg.org/miekg/dns v0.6.32
github.com/libdns/libdns v1.1.1
github.com/miekg/dns v1.1.70
)

require (
golang.org/x/mod v0.32.0 // indirect
golang.org/x/crypto v0.47.0 // indirect
golang.org/x/net v0.49.0 // indirect
golang.org/x/sync v0.19.0 // indirect
golang.org/x/sys v0.40.0 // indirect
golang.org/x/tools v0.41.0 // indirect
)
14 changes: 4 additions & 10 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,10 @@
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
codeberg.org/miekg/dns v0.6.32 h1:gDL5biG7fjKUQWakPbOsFchT+lC87ImZALqzFnXiEIE=
codeberg.org/miekg/dns v0.6.32/go.mod h1:baZDrslaQO95dQsCNN5KJDJHRkENDhNS6NuRpXJ9huA=
github.com/libdns/libdns v1.1.1 h1:wPrHrXILoSHKWJKGd0EiAVmiJbFShguILTg9leS/P/U=
github.com/libdns/libdns v1.1.1/go.mod h1:4Bj9+5CQiNMVGf87wjX4CY3HQJypUHRuLvlsfsZqLWQ=
github.com/miekg/dns v1.1.70 h1:DZ4u2AV35VJxdD9Fo9fIWm119BsQL5cZU1cQ9s0LkqA=
github.com/miekg/dns v1.1.70/go.mod h1:+EuEPhdHOsfk6Wk5TT2CzssZdqkmFhf8r+aVyDEToIs=
golang.org/x/mod v0.32.0 h1:9F4d3PHLljb6x//jOyokMv3eX+YDeepZSEo3mFJy93c=
golang.org/x/mod v0.32.0/go.mod h1:SgipZ/3h2Ci89DlEtEXWUk/HteuRin+HHhN+WbNhguU=
golang.org/x/crypto v0.47.0 h1:V6e3FRj+n4dbpw86FJ8Fv7XVOql7TEwpHapKoMJ/GO8=
golang.org/x/crypto v0.47.0/go.mod h1:ff3Y9VzzKbwSSEzWqJsJVBnWmRwRSHt/6Op5n9bQc4A=
golang.org/x/net v0.49.0 h1:eeHFmOGUTtaaPSGNmjBKpbng9MulQsJURQUAfUwY++o=
golang.org/x/net v0.49.0/go.mod h1:/ysNB2EvaqvesRkuLAyjI1ycPZlQHM3q01F02UY/MV8=
golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ=
golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
golang.org/x/tools v0.41.0 h1:a9b8iMweWG+S0OBnlU36rzLp20z1Rp10w+IY2czHTQc=
golang.org/x/tools v0.41.0/go.mod h1:XSY6eDqxVNiYgezAVqqCeihT4j1U2CCsqvH3WhQpnlg=
39 changes: 22 additions & 17 deletions provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@ package dnsupdate

import (
"context"
"encoding/base64"
"fmt"
"strings"
"time"

"codeberg.org/miekg/dns"
"github.com/libdns/libdns"
"github.com/miekg/dns"
)

// Provider facilitates DNS record manipulation with the DNS UPDATE protocol.
Expand All @@ -21,19 +22,26 @@ type Provider struct {
}

func (p *Provider) roundTrip(ctx context.Context, query *dns.Msg) (*dns.Msg, error) {
client := dns.Client{Net: "tcp"}
var client dns.Client

if p.TSIG != "" {
tsig := strings.Split(p.TSIG, ":")
if len(tsig) != 3 {
return nil, fmt.Errorf("invalid TSIG format: expected 3 fields, got %v", len(tsig))
params := strings.Split(p.TSIG, ":")
if len(params) != 3 {
return nil, fmt.Errorf("invalid TSIG format: expected 3 fields, got %v", len(params))
}
algo, name, secret := tsig[0], tsig[1], tsig[2]
client.TsigSecret = map[string]string{name + ".": secret}
query.SetTsig(name+".", algo+".", 300, time.Now().Unix())
algo, name, secret := params[0], params[1], params[2]
rawSecret, err := base64.StdEncoding.DecodeString(secret)
if err != nil {
return nil, fmt.Errorf("invalid TSIG secret: %v", err)
}

client.Transfer.TSIGSigner = dns.HmacTSIG{Secret: rawSecret}

tsig := dns.NewTSIG(name+".", algo+".", 0)
query.Extra = append(query.Extra, tsig)
}

reply, _, err := client.ExchangeContext(ctx, query, p.Addr)
reply, _, err := client.Exchange(ctx, query, "tcp", p.Addr)
if err != nil {
return nil, err
} else if reply.Rcode != dns.RcodeSuccess {
Expand All @@ -44,10 +52,9 @@ func (p *Provider) roundTrip(ctx context.Context, query *dns.Msg) (*dns.Msg, err

// GetRecords lists all the records in the zone.
func (p *Provider) GetRecords(ctx context.Context, zone string) ([]libdns.Record, error) {
var axfr dns.Msg
axfr.SetAxfr(zone)
axfr := dns.NewMsg(zone, dns.TypeAXFR)

reply, err := p.roundTrip(ctx, &axfr)
reply, err := p.roundTrip(ctx, axfr)
if err != nil {
return nil, err
}
Expand All @@ -62,8 +69,7 @@ func (p *Provider) AppendRecords(ctx context.Context, zone string, records []lib
return nil, err
}

var update dns.Msg
update.SetUpdate(zone)
update := dns.NewMsg(zone, dns.TypeSOA)
update.Insert(rrs)

if _, err := p.roundTrip(ctx, &update); err != nil {
Expand All @@ -76,10 +82,9 @@ func (p *Provider) AppendRecords(ctx context.Context, zone string, records []lib
// SetRecords sets the records in the zone, either by updating existing records or creating new ones.
// It returns the updated records.
func (p *Provider) SetRecords(ctx context.Context, zone string, records []libdns.Record) ([]libdns.Record, error) {
var axfr dns.Msg
axfr.SetAxfr(zone)
axfr := dns.NewMsg(zone, dns.TypeAXFR)

reply, err := p.roundTrip(ctx, &axfr)
reply, err := p.roundTrip(ctx, axfr)
if err != nil {
return nil, err
}
Expand Down