Merge pull request #388 from Plaenkler/fix-missing-pointer

[FIX] Use reflect

Author: Plaenkler

pkg/ddns/service.go

@@ -2,6 +2,7 @@ package ddns
 
 import (
 	"encoding/json"
+	"reflect"
 	"sync"
 	"time"
 
@@ -88,7 +89,7 @@ func updateDDNSEntries(db *gorm.DB, jobs []model.SyncJob, a model.IPAddress) {
 			log.Errorf("[ddns-updateDDNSEntries-2] failed to decrypt job params for job %v: %s", job.ID, err)
 			continue
 		}
-		request := updater.Request
+		request := reflect.New(reflect.TypeOf(updater.Request)).Interface()
 		err = json.Unmarshal(params, &request)
 		if err != nil {
 			log.Errorf("[ddns-updateDDNSEntries-3] failed to unmarshal job params for job %v: %s", job.ID, err)

pkg/server/routes/api/job.go

@@ -2,7 +2,9 @@ package api
 
 import (
 	"encoding/json"
+	"fmt"
 	"net/http"
+	"reflect"
 	"strconv"
 
 	"github.com/plaenkler/ddns-updater/pkg/cipher"
@@ -21,23 +23,16 @@ func CreateJob(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	provider := r.FormValue("provider")
-	updater, ok := ddns.GetUpdaters()[provider]
-	if !ok {
-		http.Error(w, "Invalid provider", http.StatusBadRequest)
-		log.Errorf("[api-CreateJob-2] provider is not valid")
-		return
-	}
-	jobModel := updater.Request
 	params := r.FormValue("params")
-	err = json.Unmarshal([]byte(params), &jobModel)
+	err = verifyJobModel(provider, params)
 	if err != nil {
-		log.Errorf("[api-CreateJob-3] could not unmarshal params: %s", err)
-		http.Error(w, http.StatusText(http.StatusBadRequest), http.StatusBadRequest)
+		http.Error(w, "Invalid values", http.StatusBadRequest)
+		log.Errorf("[api-UpdateJob-2] invalid values: %s", err)
 		return
 	}
 	encParams, err := cipher.Encrypt(params)
 	if err != nil {
-		log.Errorf("[api-CreateJob-4] could not encrypt params: %s", err)
+		log.Errorf("[api-CreateJob-3] could not encrypt params: %s", err)
 		http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
 		return
 	}
@@ -47,13 +42,13 @@ func CreateJob(w http.ResponseWriter, r *http.Request) {
 	}
 	db := database.GetDatabase()
 	if db == nil {
-		log.Errorf("[api-CreateJob-5] could not get database connection")
+		log.Errorf("[api-CreateJob-4] could not get database connection")
 		http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
 		return
 	}
 	err = db.Create(&job).Error
 	if err != nil {
-		log.Errorf("[api-CreateJob-6] could not create job: %s", err)
+		log.Errorf("[api-CreateJob-5] could not create job: %s", err)
 		http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
 		return
 	}
@@ -75,24 +70,17 @@ func UpdateJob(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	provider := r.FormValue("provider")
-	updater, ok := ddns.GetUpdaters()[provider]
-	if !ok {
-		http.Error(w, "Invalid provider", http.StatusBadRequest)
-		log.Errorf("[api-UpdateJob-3] provider is not valid")
-		return
-	}
-	jobModel := updater.Request
 	params := r.FormValue("params")
-	err = json.Unmarshal([]byte(params), &jobModel)
+	err = verifyJobModel(provider, params)
 	if err != nil {
-		http.Error(w, "Could not unmarshal params", http.StatusBadRequest)
-		log.Errorf("[api-UpdateJob-4] could not unmarshal params: %s", err)
+		http.Error(w, "Invalid values", http.StatusBadRequest)
+		log.Errorf("[api-UpdateJob-3] invalid values: %s", err)
 		return
 	}
 	encParams, err := cipher.Encrypt(params)
 	if err != nil {
 		http.Error(w, "Could not encrypt params", http.StatusInternalServerError)
-		log.Errorf("[api-UpdateJob-5] could not encrypt params: %s", err)
+		log.Errorf("[api-UpdateJob-4] could not encrypt params: %s", err)
 		return
 	}
 	job := model.SyncJob{
@@ -105,17 +93,17 @@ func UpdateJob(w http.ResponseWriter, r *http.Request) {
 	db := database.GetDatabase()
 	if db == nil {
 		http.Error(w, "Could not get database connection", http.StatusInternalServerError)
-		log.Errorf("[api-UpdateJob-6] could not get database connection")
+		log.Errorf("[api-UpdateJob-5] could not get database connection")
 		return
 	}
 	err = db.Save(&job).Error
 	if err != nil {
 		http.Error(w, "Could not update job", http.StatusInternalServerError)
-		log.Errorf("[api-UpdateJob-7] could not update job: %s", err)
+		log.Errorf("[api-UpdateJob-6] could not update job: %s", err)
 		return
 	}
 	http.Redirect(w, r, r.Header.Get("Referer"), http.StatusSeeOther)
-	log.Infof("[api-UpdateJob-8] updated job with ID %d", job.ID)
+	log.Infof("[api-UpdateJob-7] updated job with ID %d", job.ID)
 }
 
 func DeleteJob(w http.ResponseWriter, r *http.Request) {
@@ -150,3 +138,12 @@ func DeleteJob(w http.ResponseWriter, r *http.Request) {
 	http.Redirect(w, r, r.Header.Get("Referer"), http.StatusSeeOther)
 	log.Infof("[api-DeleteJob-5] deleted job with ID %d", job.ID)
 }
+
+func verifyJobModel(provider, params string) error {
+	updater, ok := ddns.GetUpdaters()[provider]
+	if !ok {
+		return fmt.Errorf("provider is not valid")
+	}
+	jobModel := reflect.New(reflect.TypeOf(updater.Request)).Interface()
+	return json.Unmarshal([]byte(params), &jobModel)
+}

pkg/server/routes/web/static/js/index.js

@@ -24,7 +24,7 @@ document.querySelector('table tbody').addEventListener('click', function(event)
   document.getElementById('edit-id').value = row.querySelector('td:nth-child(1)').textContent;
   document.getElementById('delete-button').href = `/api/job/delete?ID=${row.querySelector('td:nth-child(1)').textContent}`;
   document.getElementById('edit-provider-select').value = row.querySelector('td:nth-child(2)').textContent;
-  const params = JSON.parse(document.querySelector('td:nth-child(4)').getAttribute('json'));
+  const params = JSON.parse(row.querySelector('td:nth-child(4)').getAttribute('json'));
   let html = '';
   for (const key in params) {
     html += `