Generate HTTP endpoints for environment sensors
- Move update request sanity checks to new method in handlers/util.go - Change EnvironmentSensor.Value type because ParseFloat returns float64
This commit is contained in:
parent
6e1a8ac0e6
commit
38710484f9
39
handlers/sensors.go
Normal file
39
handlers/sensors.go
Normal file
|
@ -0,0 +1,39 @@
|
||||||
|
package handlers
|
||||||
|
|
||||||
|
import (
|
||||||
|
"io"
|
||||||
|
"log"
|
||||||
|
"math"
|
||||||
|
"net/http"
|
||||||
|
"strconv"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"gitlab.hamburg.ccc.de/ccchh/spaceapid/config"
|
||||||
|
"gitlab.hamburg.ccc.de/ccchh/spaceapid/types"
|
||||||
|
)
|
||||||
|
|
||||||
|
func EnvironmentSensor(
|
||||||
|
authDB config.HTTPBACredentials, validCredentials []config.HTTPBACredentialID,
|
||||||
|
resp *types.EnvironmentSensor,
|
||||||
|
) func(http.ResponseWriter, *http.Request) {
|
||||||
|
return func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
body := updateEndpointValidator(authDB, validCredentials, w, r)
|
||||||
|
|
||||||
|
// Parse request body
|
||||||
|
newState, err := strconv.ParseFloat(string(body), 64)
|
||||||
|
if err != nil || math.IsInf(newState, 0) {
|
||||||
|
log.Println("Failed to parse request body from", r.RemoteAddr)
|
||||||
|
w.WriteHeader(http.StatusBadRequest)
|
||||||
|
_, _ = io.WriteString(w, "HTTP request body has to be a valid float64 value != +/-Inf")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Set SpaceAPI response values
|
||||||
|
resp.Value = newState
|
||||||
|
resp.LastChange = time.Now().Unix()
|
||||||
|
|
||||||
|
// Respond with OK
|
||||||
|
w.WriteHeader(http.StatusOK)
|
||||||
|
_, _ = io.WriteString(w, "Update Successful")
|
||||||
|
}
|
||||||
|
}
|
|
@ -9,7 +9,6 @@ import (
|
||||||
|
|
||||||
"gitlab.hamburg.ccc.de/ccchh/spaceapid/config"
|
"gitlab.hamburg.ccc.de/ccchh/spaceapid/config"
|
||||||
"gitlab.hamburg.ccc.de/ccchh/spaceapid/types"
|
"gitlab.hamburg.ccc.de/ccchh/spaceapid/types"
|
||||||
"gitlab.hamburg.ccc.de/ccchh/spaceapid/util"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func StateOpen(
|
func StateOpen(
|
||||||
|
@ -17,31 +16,7 @@ func StateOpen(
|
||||||
resp *types.SpaceAPIResponseV14,
|
resp *types.SpaceAPIResponseV14,
|
||||||
) func(http.ResponseWriter, *http.Request) {
|
) func(http.ResponseWriter, *http.Request) {
|
||||||
return func(w http.ResponseWriter, r *http.Request) {
|
return func(w http.ResponseWriter, r *http.Request) {
|
||||||
// Check BasicAuth credentials
|
body := updateEndpointValidator(authDB, validCredentials, w, r)
|
||||||
username, password, ok := r.BasicAuth()
|
|
||||||
if !ok || !util.CheckCredentials(authDB, validCredentials, username, password) {
|
|
||||||
log.Println("Unauthorized request from", r.RemoteAddr)
|
|
||||||
w.Header().Set("WWW-Authenticate", "Basic realm=\"space-api\"")
|
|
||||||
w.WriteHeader(http.StatusUnauthorized)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check if PUT method
|
|
||||||
if r.Method != http.MethodPut {
|
|
||||||
log.Println("Wrong METHOD from", r.RemoteAddr)
|
|
||||||
w.Header().Set("Allow", http.MethodPut)
|
|
||||||
w.WriteHeader(http.StatusMethodNotAllowed)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// Read request body
|
|
||||||
body, err := io.ReadAll(r.Body)
|
|
||||||
if err != nil {
|
|
||||||
log.Println("Failed to read request body from", r.RemoteAddr)
|
|
||||||
w.WriteHeader(http.StatusInternalServerError)
|
|
||||||
_, _ = io.WriteString(w, "Failed reading HTTP request body")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// Parse request body
|
// Parse request body
|
||||||
newState, err := strconv.ParseBool(string(body))
|
newState, err := strconv.ParseBool(string(body))
|
||||||
|
|
45
handlers/util.go
Normal file
45
handlers/util.go
Normal file
|
@ -0,0 +1,45 @@
|
||||||
|
package handlers
|
||||||
|
|
||||||
|
import (
|
||||||
|
"io"
|
||||||
|
"log"
|
||||||
|
"net/http"
|
||||||
|
|
||||||
|
"gitlab.hamburg.ccc.de/ccchh/spaceapid/config"
|
||||||
|
"gitlab.hamburg.ccc.de/ccchh/spaceapid/util"
|
||||||
|
)
|
||||||
|
|
||||||
|
// updateEndpointValidator checks BasicAuth credentials,
|
||||||
|
// checks for correct HTTP method and then returns the request body
|
||||||
|
func updateEndpointValidator(
|
||||||
|
authDB config.HTTPBACredentials, validCredentials []config.HTTPBACredentialID,
|
||||||
|
w http.ResponseWriter, r *http.Request,
|
||||||
|
) (body []byte) {
|
||||||
|
// Check BasicAuth credentials
|
||||||
|
username, password, ok := r.BasicAuth()
|
||||||
|
if !ok || !util.CheckCredentials(authDB, validCredentials, username, password) {
|
||||||
|
log.Println("Unauthorized request from", r.RemoteAddr)
|
||||||
|
w.Header().Set("WWW-Authenticate", "Basic realm=\"space-api\"")
|
||||||
|
w.WriteHeader(http.StatusUnauthorized)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if PUT method
|
||||||
|
if r.Method != http.MethodPut {
|
||||||
|
log.Println("Wrong Method: ", r.Method, "from", r.RemoteAddr, "at", r.RequestURI)
|
||||||
|
w.Header().Set("Allow", http.MethodPut)
|
||||||
|
w.WriteHeader(http.StatusMethodNotAllowed)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Read request body
|
||||||
|
body, err := io.ReadAll(r.Body)
|
||||||
|
if err != nil {
|
||||||
|
log.Println("Failed to read request body from", r.RemoteAddr)
|
||||||
|
w.WriteHeader(http.StatusInternalServerError)
|
||||||
|
_, _ = io.WriteString(w, "Failed reading HTTP request body")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
return
|
||||||
|
}
|
15
main.go
15
main.go
|
@ -1,10 +1,12 @@
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"fmt"
|
||||||
"log"
|
"log"
|
||||||
"net/http"
|
"net/http"
|
||||||
"os"
|
"os"
|
||||||
"os/signal"
|
"os/signal"
|
||||||
|
"strings"
|
||||||
"syscall"
|
"syscall"
|
||||||
|
|
||||||
"gitlab.hamburg.ccc.de/ccchh/spaceapid/config"
|
"gitlab.hamburg.ccc.de/ccchh/spaceapid/config"
|
||||||
|
@ -37,6 +39,19 @@ func main() {
|
||||||
http.HandleFunc("/state/open",
|
http.HandleFunc("/state/open",
|
||||||
handlers.StateOpen(conf.Credentials, conf.Dynamic.State.Open.AllowedCredentials, &conf.Response),
|
handlers.StateOpen(conf.Credentials, conf.Dynamic.State.Open.AllowedCredentials, &conf.Response),
|
||||||
)
|
)
|
||||||
|
// Register handlers for Environmental Sensors
|
||||||
|
for key, envSensorConfigs := range conf.Dynamic.Sensors {
|
||||||
|
for i, envSensorConfig := range envSensorConfigs {
|
||||||
|
http.HandleFunc(
|
||||||
|
strings.ToLower(fmt.Sprintf(
|
||||||
|
"/sensors/%s/%s/%s", key, envSensorConfig.SensorData.Location, envSensorConfig.SensorData.Name,
|
||||||
|
)),
|
||||||
|
handlers.EnvironmentSensor(
|
||||||
|
conf.Credentials, envSensorConfig.AllowedCredentials, &conf.Response.Sensors[key][i],
|
||||||
|
),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Start webserver
|
// Start webserver
|
||||||
log.Println("Starting HTTP server...")
|
log.Println("Starting HTTP server...")
|
||||||
|
|
|
@ -41,11 +41,12 @@ type SpaceAPIResponseV14 struct {
|
||||||
}
|
}
|
||||||
|
|
||||||
type EnvironmentSensor struct {
|
type EnvironmentSensor struct {
|
||||||
Value float32 `json:"value"`
|
Value float64 `json:"value"`
|
||||||
Unit string `json:"unit"`
|
Unit string `json:"unit"`
|
||||||
Location string `json:"location"`
|
Location string `json:"location"`
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
Description string `json:"description"`
|
Description string `json:"description"`
|
||||||
|
LastChange int64 `json:"lastchange"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type PersistentStateV14 struct {
|
type PersistentStateV14 struct {
|
||||||
|
|
Loading…
Reference in a new issue