Merge pull request #18 from stek29/feature-ipv6

IPv6 support

Author: hugomd

lib/providers/cloudflare/api.go

@@ -18,13 +18,20 @@ type CloudflareAPI struct {
 }
 
 type Record struct {
-	ID      string `json:"id"`
-	Type    string `json:"type"`
-	Content string `json:"content"`
-	Name    string `json:"name"`
-	Proxied bool   `json:"proxied"`
+	ID      string     `json:"id"`
+	Type    RecordType `json:"type"`
+	Content string     `json:"content"`
+	Name    string     `json:"name"`
+	Proxied bool       `json:"proxied"`
 }
 
+type RecordType = string
+
+const (
+	RecordTypeA    = RecordType("A")
+	RecordTypeAAAA = RecordType("AAAA")
+)
+
 type RecordResponse struct {
 	Result []Record `json:"result"`
 }
@@ -44,8 +51,8 @@ func NewCloudflareClient(token string, zoneID string, host string) (*CloudflareA
 	return &api, nil
 }
 
-func (api *CloudflareAPI) ListDNSRecords() ([]Record, error) {
-	uri := fmt.Sprintf("/zones/%s/dns_records?type=A&name=%s", api.ZoneID, api.Host)
+func (api *CloudflareAPI) ListDNSRecords(recType RecordType) ([]Record, error) {
+	uri := fmt.Sprintf("/zones/%s/dns_records?type=%s&name=%s", api.ZoneID, recType, api.Host)
 	resp, err := api.request("GET", uri, nil)
 	if err != nil {
 		return nil, err
@@ -90,7 +97,8 @@ func (api *CloudflareAPI) request(method string, uri string, body io.Reader) ([]
 	defer resp.Body.Close()
 
 	if resp.StatusCode != http.StatusOK {
-		panic("Status code not 200")
+		respBody, _ := ioutil.ReadAll(resp.Body)
+		return nil, fmt.Errorf("Status code not 200 but %v, body: %v", err, string(respBody))
 	}
 
 	respBody, err := ioutil.ReadAll(resp.Body)

lib/providers/cloudflare/cloudflare.go

@@ -2,9 +2,10 @@ package cloudflare
 
 import (
 	"errors"
-	"github.com/hugomd/cloudflare-ddns/lib/providers"
 	"log"
 	"os"
+
+	"github.com/hugomd/cloudflare-ddns/lib/providers"
 )
 
 type Cloudflare struct {
@@ -45,7 +46,7 @@ func NewProvider() (providers.Provider, error) {
 	}
 
 	api, err := NewCloudflareClient(APITOKEN, ZONEID, HOST)
-  
+
 	if err != nil {
 		return nil, err
 	}
@@ -58,7 +59,38 @@ func NewProvider() (providers.Provider, error) {
 }
 
 func (api *Cloudflare) UpdateRecord(ip string) error {
-	records, err := api.client.ListDNSRecords()
+	records, err := api.client.ListDNSRecords(RecordTypeA)
+	if err != nil {
+		return err
+	}
+
+	var record Record
+	for i := range records {
+		if records[i].Name == HOST {
+			record = records[i]
+		}
+	}
+
+	if record == (Record{}) {
+		return errors.New("Host not found")
+	}
+
+	if ip != record.Content {
+		record.Content = ip
+		err = api.client.UpdateDNSRecord(record)
+		if err != nil {
+			return err
+		}
+		log.Printf("IP changed, updated to %s", ip)
+	} else {
+		log.Print("No change in IP, not updating record")
+	}
+
+	return nil
+}
+
+func (api *Cloudflare) UpdateRecord6(ip string) error {
+	records, err := api.client.ListDNSRecords(RecordTypeAAAA)
 	if err != nil {
 		return err
 	}

lib/providers/providers.go

@@ -2,6 +2,7 @@ package providers
 
 type Provider interface {
 	UpdateRecord(ip string) error
+	UpdateRecord6(ip string) error
 }
 
 type ProviderInit func() (Provider, error)

main.go

@@ -3,14 +3,15 @@ package main
 import (
 	"bytes"
 	"flag"
-	"github.com/hugomd/cloudflare-ddns/lib/providers"
-	_ "github.com/hugomd/cloudflare-ddns/lib/providers/_all"
 	"io/ioutil"
 	"log"
 	"net/http"
 	"os"
 	"strings"
 	"time"
+
+	"github.com/hugomd/cloudflare-ddns/lib/providers"
+	_ "github.com/hugomd/cloudflare-ddns/lib/providers/_all"
 )
 
 func checkIP() (string, error) {
@@ -28,6 +29,22 @@ func checkIP() (string, error) {
 	return string(bytes.TrimSpace(buf)), nil
 }
 
+func checkIP6() (string, error) {
+	// has to be a service without A records (for ex api6.ipify.org cant be used)
+	rsp, err := http.Get("https://v6.ident.me")
+	if err != nil {
+		return "", err
+	}
+	defer rsp.Body.Close()
+
+	buf, err := ioutil.ReadAll(rsp.Body)
+	if err != nil {
+		return "", err
+	}
+
+	return string(bytes.TrimSpace(buf)), nil
+}
+
 func setEnvVarsFromConfig(filename *string) error {
 	contents, err := ioutil.ReadFile(*filename)
 	if err != nil {
@@ -51,6 +68,8 @@ func main() {
 
 	CheckDuration := flag.Duration("duration", 0, "update interval (ex. 15s, 1m, 6h); if not specified or set to 0s, run only once and exit")
 	ConfigFile := flag.String("config", "", "location of an (optional) config file to load environment variables from")
+	run4 := flag.Bool("ipv4", true, "update A record")
+	run6 := flag.Bool("ipv6", false, "update AAAA record")
 	flag.Parse()
 
 	if *CheckDuration == time.Duration(0) {
@@ -66,20 +85,20 @@ func main() {
 		}
 	}
 
-	runddns()
+	runddns(*run4, *run6)
 
 	if runonce {
 		os.Exit(0)
 	}
 
 	for range ticker.C {
-		runddns()
+		runddns(*run4, *run6)
 	}
 
 	return
 }
 
-func runddns() {
+func runddns(run4, run6 bool) {
 	PROVIDER := os.Getenv("PROVIDER")
 	if PROVIDER == "" {
 		log.Fatal("PROVIDER env. variable is required")
@@ -90,14 +109,29 @@ func runddns() {
 		panic(err)
 	}
 
-	ip, err := checkIP()
-	if err != nil {
-		panic(err)
+	if run4 {
+		ip, err := checkIP()
+		if err != nil {
+			panic(err)
+		}
+		log.Printf("IP is %s", ip)
+
+		err = provider.UpdateRecord(ip)
+		if err != nil {
+			panic(err)
+		}
 	}
-	log.Printf("IP is %s", ip)
 
-	err = provider.UpdateRecord(ip)
-	if err != nil {
-		panic(err)
+	if run6 {
+		ip, err := checkIP6()
+		if err != nil {
+			panic(err)
+		}
+		log.Printf("IPv6 is %s", ip)
+
+		err = provider.UpdateRecord6(ip)
+		if err != nil {
+			panic(err)
+		}
 	}
 }