Skip to content

Fix trailing dot bug #1

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

Merged
merged 1 commit into from
May 5, 2023
Merged

Fix trailing dot bug #1

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
132 changes: 47 additions & 85 deletions client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,17 @@ import (
"log"
"net/http"
"net/url"
"runtime"
"strconv"
"strings"
)

func (p *Provider) getZoneRecords(ctx context.Context, zone string) ([]libdns.Record, error) {
p.mutex.Lock()
defer p.mutex.Unlock()
callerSkipDepth := 2

reqURL, err := url.Parse(p.ServerURL)
if err != nil {
fmt.Printf("[%s] failed to parse server url: %v\n", p.caller(callerSkipDepth), err)
return nil, err
}

Expand All @@ -35,29 +36,33 @@ func (p *Provider) getZoneRecords(ctx context.Context, zone string) ([]libdns.Re

req, err := http.NewRequestWithContext(ctx, http.MethodGet, reqURL.String(), nil)
if err != nil {
fmt.Printf("[%s] failed to build new request: %v\n", p.caller(callerSkipDepth), err)
return nil, err
}

req.SetBasicAuth(p.User, p.LoginKey)

resp, err := http.DefaultClient.Do(req)
if err != nil {
fmt.Printf("[%s] failed to execute request: %v\n", p.caller(callerSkipDepth), err)
return nil, err
}
defer func(Body io.ReadCloser) {
err := Body.Close()
if err != nil {
fmt.Printf("failed to close body: %v", err)
fmt.Printf("[%s] failed to close body: %v\n", p.caller(callerSkipDepth), err)
}
}(resp.Body)

if resp.StatusCode != http.StatusOK {
fmt.Printf("[%s] api response error, status code: %v\n", p.caller(callerSkipDepth), resp.StatusCode)
return nil, err
}

var respData daZone
err = json.NewDecoder(resp.Body).Decode(&respData)
if err != nil {
fmt.Printf("[%s] failed to json decode response: %v\n", p.caller(callerSkipDepth), err)
return nil, err
}

Expand All @@ -67,7 +72,7 @@ func (p *Provider) getZoneRecords(ctx context.Context, zone string) ([]libdns.Re
if err != nil {
switch err {
case ErrUnsupported:
fmt.Printf("unsupported record conversion of type %v: %v", libDnsRecord.Type, libDnsRecord.Name)
fmt.Printf("[%s] unsupported record conversion of type %v: %v\n", p.caller(callerSkipDepth), libDnsRecord.Type, libDnsRecord.Name)
continue
default:
return nil, err
Expand All @@ -85,6 +90,7 @@ func (p *Provider) appendZoneRecord(ctx context.Context, zone string, record lib

reqURL, err := url.Parse(p.ServerURL)
if err != nil {
fmt.Printf("[%s] failed to parse server url: %v\n", p.caller(2), err)
return libdns.Record{}, err
}

Expand All @@ -106,46 +112,11 @@ func (p *Provider) appendZoneRecord(ctx context.Context, zone string, record lib

reqURL.RawQuery = queryString.Encode()

req, err := http.NewRequestWithContext(ctx, http.MethodGet, reqURL.String(), nil)
if err != nil {
return libdns.Record{}, err
}

req.SetBasicAuth(p.User, p.LoginKey)

resp, err := http.DefaultClient.Do(req)
if err != nil {
return libdns.Record{}, err
}
defer func(Body io.ReadCloser) {
err := Body.Close()
if err != nil {
fmt.Printf("failed to close body: %v", err)
}
}(resp.Body)

var respData daResponse
err = json.NewDecoder(resp.Body).Decode(&respData)
err = p.executeRequest(ctx, http.MethodGet, reqURL.String())
if err != nil {
return libdns.Record{}, err
}

if len(respData.Error) > 0 {
return libdns.Record{}, fmt.Errorf("%v: %v", respData.Error, respData.Result)
}

if resp.StatusCode != http.StatusOK {
bodyBytes, err := io.ReadAll(resp.Body)
if err != nil {
fmt.Printf("failed to read response body: %v", err)
return libdns.Record{}, err
}
bodyString := string(bodyBytes)
log.Println(bodyString)

return libdns.Record{}, err
}

record.ID = fmt.Sprintf("name=%v&value=%v", record.Name, record.Value)

return record, nil
Expand All @@ -157,6 +128,7 @@ func (p *Provider) setZoneRecord(ctx context.Context, zone string, record libdns

reqURL, err := url.Parse(p.ServerURL)
if err != nil {
fmt.Printf("[%s] failed to parse server url: %v\n", p.caller(2), err)
return libdns.Record{}, err
}

Expand Down Expand Up @@ -193,46 +165,11 @@ func (p *Provider) setZoneRecord(ctx context.Context, zone string, record libdns

reqURL.RawQuery = queryString.Encode()

req, err := http.NewRequestWithContext(ctx, http.MethodGet, reqURL.String(), nil)
if err != nil {
return libdns.Record{}, err
}

req.SetBasicAuth(p.User, p.LoginKey)

resp, err := http.DefaultClient.Do(req)
if err != nil {
return libdns.Record{}, err
}
defer func(Body io.ReadCloser) {
err := Body.Close()
if err != nil {
fmt.Printf("failed to close body: %v", err)
}
}(resp.Body)

var respData daResponse
err = json.NewDecoder(resp.Body).Decode(&respData)
err = p.executeRequest(ctx, http.MethodGet, reqURL.String())
if err != nil {
return libdns.Record{}, err
}

if len(respData.Error) > 0 {
return libdns.Record{}, fmt.Errorf("%v: %v", respData.Error, respData.Result)
}

if resp.StatusCode != http.StatusOK {
bodyBytes, err := io.ReadAll(resp.Body)
if err != nil {
fmt.Printf("failed to read response body: %v", err)
return libdns.Record{}, err
}
bodyString := string(bodyBytes)
log.Println(bodyString)

return libdns.Record{}, err
}

record.ID = fmt.Sprintf("name=%v&value=%v", record.Name, record.Value)

return record, nil
Expand All @@ -244,6 +181,7 @@ func (p *Provider) deleteZoneRecord(ctx context.Context, zone string, record lib

reqURL, err := url.Parse(p.ServerURL)
if err != nil {
fmt.Printf("[%s] failed to parse server url: %v\n", p.caller(2), err)
return libdns.Record{}, err
}

Expand All @@ -260,45 +198,69 @@ func (p *Provider) deleteZoneRecord(ctx context.Context, zone string, record lib

reqURL.RawQuery = queryString.Encode()

req, err := http.NewRequestWithContext(ctx, http.MethodGet, reqURL.String(), nil)
err = p.executeRequest(ctx, http.MethodGet, reqURL.String())
if err != nil {
return libdns.Record{}, err
}

return record, nil
}

func (p *Provider) executeRequest(ctx context.Context, method, url string) error {
callerSkipDepth := 3

req, err := http.NewRequestWithContext(ctx, method, url, nil)
if err != nil {
fmt.Printf("[%s] failed to build new request: %v\n", p.caller(callerSkipDepth), err)
return err
}

req.SetBasicAuth(p.User, p.LoginKey)

resp, err := http.DefaultClient.Do(req)
if err != nil {
return libdns.Record{}, err
fmt.Printf("[%s] failed to execute request: %v\n", p.caller(callerSkipDepth), err)
return err
}
defer func(Body io.ReadCloser) {
err := Body.Close()
if err != nil {
fmt.Printf("failed to close body: %v", err)
fmt.Printf("[%s] failed to close body: %v\n", p.caller(callerSkipDepth), err)
}
}(resp.Body)

var respData daResponse
err = json.NewDecoder(resp.Body).Decode(&respData)
if err != nil {
return libdns.Record{}, err
fmt.Printf("[%s] failed to json decode response: %v\n", p.caller(callerSkipDepth), err)
return err
}

if len(respData.Error) > 0 {
return libdns.Record{}, fmt.Errorf("%v: %v", respData.Error, respData.Result)
trimmedResult := strings.Split(respData.Result, "\n")[0]
fmt.Printf("[%s] api response error: %v: %v\n", p.caller(callerSkipDepth), respData.Error, trimmedResult)
return fmt.Errorf("[%s] api response error: %v: %v\n", p.caller(callerSkipDepth), respData.Error, trimmedResult)
}

if resp.StatusCode != http.StatusOK {
bodyBytes, err := io.ReadAll(resp.Body)
if err != nil {
fmt.Printf("failed to read response body: %v", err)
return libdns.Record{}, err
fmt.Printf("[%s] failed to read response body: %v\n", p.caller(callerSkipDepth), err)
return err
}
bodyString := string(bodyBytes)
log.Println(bodyString)

return libdns.Record{}, err
return err
}

return record, nil
return nil
}

func (p *Provider) caller(skip int) string {
pc := make([]uintptr, 15)
n := runtime.Callers(skip, pc)
frames := runtime.CallersFrames(pc[:n])
frame, _ := frames.Next()
return frame.Function
}
9 changes: 9 additions & 0 deletions provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ package directadmin

import (
"context"
"strings"
"sync"

"github.com/libdns/libdns"
Expand Down Expand Up @@ -45,6 +46,8 @@ type Provider struct {

// GetRecords lists all the records in the zone.
func (p *Provider) GetRecords(ctx context.Context, zone string) ([]libdns.Record, error) {
zone = strings.TrimRight(zone, ".")

records, err := p.getZoneRecords(ctx, zone)
if err != nil {
return nil, err
Expand All @@ -55,6 +58,8 @@ func (p *Provider) GetRecords(ctx context.Context, zone string) ([]libdns.Record

// AppendRecords adds records to the zone. It returns the records that were added.
func (p *Provider) AppendRecords(ctx context.Context, zone string, records []libdns.Record) ([]libdns.Record, error) {
zone = strings.TrimRight(zone, ".")

var created []libdns.Record
for _, rec := range records {
result, err := p.appendZoneRecord(ctx, zone, rec)
Expand All @@ -70,6 +75,8 @@ 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) {
zone = strings.TrimRight(zone, ".")

var updated []libdns.Record
for _, rec := range records {
result, err := p.setZoneRecord(ctx, zone, rec)
Expand All @@ -84,6 +91,8 @@ func (p *Provider) SetRecords(ctx context.Context, zone string, records []libdns

// DeleteRecords deletes the records from the zone. It returns the records that were deleted.
func (p *Provider) DeleteRecords(ctx context.Context, zone string, records []libdns.Record) ([]libdns.Record, error) {
zone = strings.TrimRight(zone, ".")

var deleted []libdns.Record
for _, rec := range records {
result, err := p.deleteZoneRecord(ctx, zone, rec)
Expand Down
Loading