Skip to content

Remove .toml extension as it is not needed, and results in double ext… #17

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

Open
d4z3x wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Remove .toml extension as it is not needed, and results in double ext… #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
864673d
Remove .toml extension as it is not needed, and results in double ext…
Jun 8, 2023
4dc304a
Update to external DNS checkers to provide IPv4 and add enforce the same
Jun 9, 2023
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
2 changes: 1 addition & 1 deletion conf/conf.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

var (
ConfigFile string // Path to the config file, if any
DefaultConfigFilename = "cloudflare-ddns.toml"
DefaultConfigFilename = "cloudflare-ddns"

Config = StringOption{
Name: "config",
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/mattolenik/cloudflare-ddns-client

go 1.17
go 1.20

require (
github.com/cloudflare/cloudflare-go v0.30.0
Expand Down
22 changes: 14 additions & 8 deletions ip/ip.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/rs/zerolog/log"
)

var apiURLs = []string{"http://whatismyip.akamai.com", "https://ipecho.net/plain", "https://wtfismyip.com/text"}
var apiURLs = []string{"http://whatismyip.akamai.com", "http://ipecho.net/plain", "http://ipv4.icanhazip.com"}

type dnsLookup struct {
// DNS server to dig
Expand Down Expand Up @@ -51,7 +51,15 @@ func GetPublicIPWithRetry(numRetries int, delay time.Duration) (string, error) {
// GetPublicIP tries to detect the public IP address of this machine. First using DNS, then using several public HTTP APIs.
func GetPublicIP() (string, error) {
ip, success, errs := getPublicIPFromDNS(dnsLookupOpenDNS, dnsLookupGoogle)
if !success && len(errs) > 0 {
var isGoodIP bool
if isGoodIP = isValidIP(ip); !isGoodIP {
// errs = append(errs, errors.Errorf("invalid IP '%s' from DNS lookup of record '%s' at '%s'", record, lookup.RecordName, lookup.Address))
log.Error().Msgf("Appears to not be an IPv4 record: %s", ip)
}

log.Debug().Msgf("retrieved IP from DNS: %+v", ip)

if !isGoodIP || (!success && len(errs) > 0) {
log.Warn().Msgf("failed to retrieve IP from DNS: %+v", errs)
ip, success, errs := getPublicIPFromAPIs(apiURLs...)
if !success && len(errs) > 0 {
Expand Down Expand Up @@ -95,9 +103,7 @@ func getPublicIPFromDNS(lookups ...dnsLookup) (string, bool, []error) {
errs = append(errs, errors.Annotatef(err, "DNS lookup of record '%s' at '%s' failed", lookup.RecordName, lookup.Address))
continue
}
if !isValidIP(record) {
errs = append(errs, errors.Errorf("invalid IP '%s' from DNS lookup of record '%s' at '%s'", record, lookup.RecordName, lookup.Address))
}
log.Debug().Msgf("invalid IP '%s' from DNS lookup of record '%s' at '%s'", record, lookup.RecordName, lookup.Address)
return record, true, nil
}
return "", false, errs
Expand Down Expand Up @@ -158,7 +164,7 @@ func getDNSTXTRecord(addr, record string) (string, error) {
return out[0].Txt[0], nil
}

// getDNSARecord gets a DNS A record
// getDNSARecord gets a DNS A record
func getDNSARecord(address, record string) (string, error) {
dig := dnsutil.Dig{}
dig.RemoteAddr = address
Expand All @@ -175,7 +181,7 @@ func getDNSARecord(address, record string) (string, error) {
return out[0].A.String(), nil
}

// isValidIP returns whether or not an IP address is valid
// isValidIP returns whether or not an IP address is a valid IPv4 address
func isValidIP(ip string) bool {
return net.ParseIP(ip) != nil
return net.ParseIP(ip).To4() != nil
}