Fixing annoying assignment bug

Author: dschanoeh

hover-ddns.go

@@ -121,13 +121,14 @@ func main() {
 }
 
 func run(config *Config, provider publicip.LookupProvider, dryRun *bool, manualV4 *string, manualV6 *string) {
-	publicV4 := net.IP{}
-	publicV6 := net.IP{}
+	var publicV4 net.IP
+	var publicV6 net.IP
+	var err error
 
 	if !config.DisableV4 {
 		if *manualV4 == "" {
 			log.Info("Getting public IPv4...")
-			publicV4, err := provider.GetPublicIP()
+			publicV4, err = provider.GetPublicIP()
 
 			if err != nil {
 				log.Warn("Failed to get public ip: ", err)
@@ -154,7 +155,7 @@ func run(config *Config, provider publicip.LookupProvider, dryRun *bool, manualV
 			log.Info("Received current IPv4 " + currentV4.String())
 		}
 
-		if currentV4 != nil && currentV4.Equal(publicV4) {
+		if currentV4 != nil && publicV4 != nil && currentV4.Equal(publicV4) {
 			if !config.ForceUpdate {
 				log.Info("v4 DNS entry already up to date - nothing to do.")
 				publicV4 = nil
@@ -171,7 +172,7 @@ func run(config *Config, provider publicip.LookupProvider, dryRun *bool, manualV
 	if !config.DisableV6 {
 		if *manualV6 == "" {
 			log.Info("Getting public IPv6...")
-			publicV6, err := provider.GetPublicIPv6()
+			publicV6, err = provider.GetPublicIPv6()
 
 			if err != nil {
 				log.Warn("Failed to get public ip: ", err)
@@ -198,7 +199,7 @@ func run(config *Config, provider publicip.LookupProvider, dryRun *bool, manualV
 			log.Info("Received current IPv6 " + currentV6.String())
 		}
 
-		if currentV6 != nil && currentV6.Equal(publicV6) {
+		if currentV6 != nil && publicV6 != nil && currentV6.Equal(publicV6) {
 			if !config.ForceUpdate {
 				log.Info("v6 DNS entry already up to date - nothing to do.")
 				publicV6 = nil

hover/hover.go

@@ -69,15 +69,23 @@ func Update(user string, password string, domainName string, hostName string, ip
 	log.Info("Found domain ID: " + domainID)
 
 	if ip4 != nil {
-		err = updateSingleRecord(client, sessionCookie, authCookie, domainID, hostName, ip4.String(), "A")
-		if err != nil {
-			log.Error("Was not able to update IPv4 record:", err)
+		if ip4.To4() == nil {
+			log.Error(fmt.Sprintf("Not updating invalid address '%s'", ip4.String()))
+		} else {
+			err = updateSingleRecord(client, sessionCookie, authCookie, domainID, hostName, ip4.String(), "A")
+			if err != nil {
+				log.Error("Was not able to update IPv4 record:", err)
+			}
 		}
 	}
 	if ip6 != nil {
-		err = updateSingleRecord(client, sessionCookie, authCookie, domainID, hostName, ip6.String(), "AAAA")
-		if err != nil {
-			log.Error("Was not able to update IPv6 record:", err)
+		if ip6.To16() == nil {
+			log.Error(fmt.Sprintf("Not updating invalid address '%s'", ip4.String()))
+		} else {
+			err = updateSingleRecord(client, sessionCookie, authCookie, domainID, hostName, ip6.String(), "AAAA")
+			if err != nil {
+				log.Error("Was not able to update IPv6 record:", err)
+			}
 		}
 	}
 
@@ -103,7 +111,7 @@ func updateSingleRecord(client *http.Client, sessionCookie http.Cookie, authCook
 	}
 
 	// Create new record
-	log.Info("Creating new record...")
+	log.Info(fmt.Sprintf("Creating new record of type '%s' and IP '%s'...", recordType, ip))
 	err = createRecord(client, sessionCookie, authCookie, domainID, hostName, ip, recordType)
 	if err != nil {
 		log.Error("Was not able to create new record: ", err)
@@ -148,6 +156,10 @@ func getHoverAuthCookie(client *http.Client, username string, password string) (
 	req.Header.Set("Content-Type", "application/json")
 
 	resp, err = client.Do(req)
+	if err != nil {
+		return sessionCookie, authCookie, err
+	}
+	defer resp.Body.Close()
 
 	if resp.StatusCode != http.StatusOK {
 		bodyBytes, _ := ioutil.ReadAll(resp.Body)
@@ -278,6 +290,7 @@ func createRecord(client *http.Client, sessionCookie http.Cookie, authCookie htt
 	}
 
 	recordPostURL := "https://www.hover.com/api/domains/" + domainID + "/dns"
+	log.Debug("Creating record: " + string(jsonStr))
 
 	req, err := http.NewRequest("POST", recordPostURL, bytes.NewBuffer(jsonStr))
 	if err != nil {