tgrosinger/digitalocean-dynamic-dns-ip
1
0
Fork 0
Code

Add support for configuring IP check URLs

Browse Source
This commit is contained in:
Chris Dzombak 2019-09-26 11:23:15 -04:00
parent e1d1df8415
commit 8309b1bb64
No known key found for this signature in database
GPG Key ID: 18A9AB4B8C54123A
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
digitalocean-dynamic-ip.go
View File

@ -31,6 +31,8 @@ type ClientConfig struct {
DOPageSize int `json:"doPageSize"` DOPageSize int `json:"doPageSize"`
UseIPv4 *bool `json:"useIPv4"` UseIPv4 *bool `json:"useIPv4"`
UseIPv6 *bool `json:"useIPv6"` UseIPv6 *bool `json:"useIPv6"`
IPv4CheckURL string `json:"ipv4CheckUrl"`
IPv6CheckURL string `json:"ipv6CheckUrl"`
AllowIPv4InIPv6 bool `json:"allowIPv4InIPv6"` AllowIPv4InIPv6 bool `json:"allowIPv4InIPv6"`
Domains []Domain `json:"domains"` Domains []Domain `json:"domains"`
} }
@ -118,9 +120,17 @@ func usage() {
//CheckLocalIPs : get current IP of server. checks both IPv4 and Ipv6 to support dual stack environments //CheckLocalIPs : get current IP of server. checks both IPv4 and Ipv6 to support dual stack environments
func CheckLocalIPs() (ipv4, ipv6 net.IP) { func CheckLocalIPs() (ipv4, ipv6 net.IP) {
var ipv4String, ipv6String string var ipv4String, ipv6String string
ipv4CheckUrl := "https://ipv4bot.whatismyipaddress.com"
ipv6CheckUrl := "https://ipv6bot.whatismyipaddress.com"
if len(config.IPv4CheckURL) > 0 {
ipv4CheckUrl = config.IPv4CheckURL
}
if len(config.IPv6CheckURL) > 0 {
ipv6CheckUrl = config.IPv6CheckURL
}
if config.UseIPv4 == nil || *(config.UseIPv4) { if config.UseIPv4 == nil || *(config.UseIPv4) {
ipv4String, _ = getURLBody("https://ipv4bot.whatismyipaddress.com") ipv4String, _ = getURLBody(ipv4CheckUrl)
if ipv4String == "" { if ipv4String == "" {
log.Println("No IPv4 address found. Consider disabling IPv4 checks in the config `\"useIPv4\": false`") log.Println("No IPv4 address found. Consider disabling IPv4 checks in the config `\"useIPv4\": false`")
} else { } else {
@ -128,6 +138,7 @@ func CheckLocalIPs() (ipv4, ipv6 net.IP) {
if ipv4 != nil { if ipv4 != nil {
// make sure we got back an actual ipv4 address // make sure we got back an actual ipv4 address
ipv4 = ipv4.To4() ipv4 = ipv4.To4()
log.Printf("Discovered IPv4 address `%s`", ipv4.String())
} }
if ipv4 == nil { if ipv4 == nil {
log.Printf("Unable to parse `%s` as an IPv4 address", ipv4String) log.Printf("Unable to parse `%s` as an IPv4 address", ipv4String)
@ -136,13 +147,15 @@ func CheckLocalIPs() (ipv4, ipv6 net.IP) {
} }
if config.UseIPv6 == nil || *(config.UseIPv6) { if config.UseIPv6 == nil || *(config.UseIPv6) {
ipv6String, _ = getURLBody("https://ipv6bot.whatismyipaddress.com") ipv6String, _ = getURLBody(ipv6CheckUrl)
if ipv6String == "" { if ipv6String == "" {
log.Println("No IPv6 address found. Consider disabling IPv6 checks in the config `\"useIPv6\": false`") log.Println("No IPv6 address found. Consider disabling IPv6 checks in the config `\"useIPv6\": false`")
} else { } else {
ipv6 = net.ParseIP(ipv6String) ipv6 = net.ParseIP(ipv6String)
if ipv6 == nil { if ipv6 == nil {
log.Printf("Unable to parse `%s` as an IPv6 address", ipv6String) log.Printf("Unable to parse `%s` as an IPv6 address", ipv6String)
} else {
log.Printf("Discovered IPv6 address `%s`", ipv6.String())
} }
} }
} }
@ -151,9 +164,7 @@ func CheckLocalIPs() (ipv4, ipv6 net.IP) {
func getURLBody(url string) (string, error) { func getURLBody(url string) (string, error) {
request, err := http.Get(url) request, err := http.Get(url)
if err != nil { checkError(err)
return "", err
}
defer request.Body.Close() defer request.Body.Close()
body, err := ioutil.ReadAll(request.Body) body, err := ioutil.ReadAll(request.Body)
checkError(err) checkError(err)

6
digitalocean-dynamic-ip.sample.json
View File

@ -3,6 +3,8 @@
"doPageSize": 20, "doPageSize": 20,
"useIPv4": true, "useIPv4": true,
"useIPv6": true, "useIPv6": true,
"ipv4CheckUrl": "https://ipv4bot.whatismyipaddress.com",
"ipv6CheckUrl": "https://ipv6bot.whatismyipaddress.com",
"allowIPv4InIPv6": false, "allowIPv4InIPv6": false,
"domains": [ "domains": [
{ {
@ -11,6 +13,10 @@
{ {
"name": "subdomainOrRecord", "name": "subdomainOrRecord",
"type": "A" "type": "A"
},
{
"name": "subdomainOrRecord",
"type": "AAAA"
} }
] ]
}, },