Add wifi config formatter. Add hooks to API

api/system.go

@@ -6,6 +6,7 @@ import (
 	"time"
 
 	"github.com/danesparza/appliance-monitor/data"
+	"github.com/danesparza/appliance-monitor/network"
 	"github.com/spf13/viper"
 )
 
@@ -17,6 +18,17 @@ type CurrentState struct {
 	DeviceID           string    `json:"deviceId"`
 }
 
+// WifiUpdateRequest describes the request to update the Wifi credentials
+type WifiUpdateRequest struct {
+	SSID       string `json:"ssid"`
+	Passphrase string `json:"passphrase"`
+}
+
+type WifiUpdateResponse struct {
+	Status      int    `json:"status"`
+	Description string `json:"description"`
+}
+
 // GetCurrentState gets the current running state of the application
 func GetCurrentState(rw http.ResponseWriter, req *http.Request) {
 
@@ -42,3 +54,26 @@ func GetCurrentState(rw http.ResponseWriter, req *http.Request) {
 	rw.Header().Set("Content-Type", "application/json; charset=utf-8")
 	json.NewEncoder(rw).Encode(currentState)
 }
+
+// UpdateWifi updates the wifi credentials for the machine
+func UpdateWifi(rw http.ResponseWriter, req *http.Request) {
+
+	//	Decode the request if it was a POST:
+	request := WifiUpdateRequest{}
+	err := json.NewDecoder(req.Body).Decode(&request)
+	if err != nil {
+		sendErrorResponse(rw, err, http.StatusBadRequest)
+		return
+	}
+
+	//	Send the request to the wifi helper:
+	response := WifiUpdateResponse{Status: 200, Description: "Successful"}
+	err = network.UpdateWifiCredentials(request.SSID, request.Passphrase)
+	if err != nil {
+		sendErrorResponse(rw, err, http.StatusInternalServerError)
+	}
+
+	//	Serialize to JSON & return the response:
+	rw.Header().Set("Content-Type", "application/json; charset=utf-8")
+	json.NewEncoder(rw).Encode(response)
+}

cmd/start.go

@@ -57,9 +57,6 @@ func start(cmd *cobra.Command, args []string) {
 			log.Printf("[ERROR] There was a problem resetting the host name: %v", err)
 			return
 		}
-		log.Println("Rebooting...")
-		syscall.Sync()
-		syscall.Reboot(syscall.LINUX_REBOOT_CMD_RESTART)
 	}
 
 	//	Get a reference to the config database
@@ -108,7 +105,7 @@ func start(cmd *cobra.Command, args []string) {
 
 	//	System information
 	Router.HandleFunc("/system/state", api.GetCurrentState).Methods("GET")
-	Router.HandleFunc("/system/wifi", nil)
+	Router.HandleFunc("/system/wifi", api.UpdateWifi).Methods("POST")
 
 	//	System resets
 	Router.HandleFunc("/reset/network", nil)

network/configformatter.go

@@ -0,0 +1,40 @@
+package network
+
+import (
+	"bytes"
+	"html/template"
+)
+
+var wifiSupplicant = []byte(`country=US
+	
+network={
+	ssid="{{.SSID}}"
+	psk="{{.Passphrase}}"
+	key_mgmt=WPA-PSK
+}
+
+`)
+
+// WifiInfo describes the information needed to configure the wifi client
+type WifiInfo struct {
+	SSID       string
+	Passphrase string
+}
+
+// FormatWifiCredentials formats the given credentials as a new wifi supplicant config file
+func FormatWifiCredentials(ssid, password string) (string, error) {
+
+	credentials := WifiInfo{ssid, password}
+	tmpl, err := template.New("wifisupp").Parse(string(wifiSupplicant))
+	if err != nil {
+		return "", err
+	}
+
+	var tpl bytes.Buffer
+	err = tmpl.Execute(&tpl, credentials)
+	if err != nil {
+		return "", err
+	}
+
+	return tpl.String(), nil
+}

network/configformatter_test.go

@@ -0,0 +1,36 @@
+package network_test
+
+import (
+	"testing"
+
+	"github.com/danesparza/appliance-monitor/network"
+)
+
+//	The formatting utility should format the wifi supplicant file
+func TestFormatWifiCredentials_WithValidParams_ShouldReturnProperFormat(t *testing.T) {
+
+	//	Arrange
+	ssid := "testssid"
+	passphrase := "testpassphrase"
+	expectedconfig := `country=US
+	
+network={
+	ssid="testssid"
+	psk="testpassphrase"
+	key_mgmt=WPA-PSK
+}
+
+`
+
+	//	Act
+	retval, err := network.FormatWifiCredentials(ssid, passphrase)
+
+	//	Assert
+	if err != nil {
+		t.Errorf("An error occured while formatting the wifi config: %v", err)
+	}
+
+	if retval != expectedconfig {
+		t.Errorf("Configuration doesn't match what we expect.  Here's what we got:\n%v", retval)
+	}
+}

network/hostname_linux_arm.go

@@ -5,6 +5,7 @@ import (
 	"log"
 	"os"
 	"strings"
+	"syscall"
 )
 
 // ResetHostname changes the hostname for the local machine
@@ -44,5 +45,9 @@ func ResetHostname(newname string) error {
 		return err
 	}
 
+	log.Println("Rebooting...")
+	syscall.Sync()
+	syscall.Reboot(syscall.LINUX_REBOOT_CMD_RESTART)
+
 	return nil
 }

network/wifi.go

@@ -3,12 +3,10 @@
 package network
 
 import (
-	"log"
+	"fmt"
 )
 
-// ResetHostname changes the hostname for the local machine
+// UpdateWifiCredentials changes the hostname for the local machine
 func UpdateWifiCredentials(ssid, password string) error {
-	log.Println("[INFO] Not running on Linux/ARM, so wifi can't be changed...")
-
-	return nil
+	return fmt.Errorf("Not running on Linux/ARM, so wifi can't be changed")
 }