refactor: Add Go 1.22 HTTP method matching

This commit is contained in:
Bendodroid 2024-08-03 17:55:28 +02:00
parent bd94b295ac
commit 74a8db7d2b
3 changed files with 7 additions and 15 deletions

2
go.mod
View file

@ -1,3 +1,3 @@
module git.hamburg.ccc.de/ccchh/spaceapid
go 1.21
go 1.22

View file

@ -10,8 +10,7 @@ import (
"git.hamburg.ccc.de/ccchh/spaceapid/util"
)
// updateEndpointValidator checks BasicAuth credentials,
// checks for correct HTTP method and then returns the request body
// updateEndpointValidator checks BasicAuth credentials and then returns the request body
func updateEndpointValidator(
authDB config.HTTPBACredentials, validCredentials []config.HTTPBACredentialID,
w http.ResponseWriter, r *http.Request,
@ -24,13 +23,6 @@ func updateEndpointValidator(
return []byte{}, errors.New(fmt.Sprintf("Unauthorized request from %s Username: %s Password: %s", r.RemoteAddr, username, password))
}
// Check if PUT method
if r.Method != http.MethodPut {
w.Header().Set("Allow", http.MethodPut)
http.Error(w, "", http.StatusMethodNotAllowed)
return []byte{}, errors.New(fmt.Sprintf("Wrong Method: %s from %s at %s", r.Method, r.RemoteAddr, r.RequestURI))
}
// Read request body
body, err := io.ReadAll(r.Body)
if err != nil {

10
main.go
View file

@ -51,20 +51,20 @@ func main() {
}(&conf.Response)
// Register HTTP handlers
http.HandleFunc("/",
http.HandleFunc("GET /{$}",
handlers.Root(&conf.Response),
)
http.HandleFunc("/state/open",
http.HandleFunc("PUT /state/open",
handlers.StateOpen(conf.Credentials, conf.Dynamic.State.Open.AllowedCredentials, &conf.Response.State),
)
// Register handlers for environmental sensors
// Register handler for environmental sensors
for sensorType, envSensorConfigs := range conf.Dynamic.Sensors {
for i, envSensorConfig := range envSensorConfigs {
urlPath := util.GetSensorURLPath(
urlPattern := "PUT " + util.GetSensorURLPath(
sensorType, envSensorConfig.SensorData.Location, envSensorConfig.SensorData.Name,
)
http.HandleFunc(
urlPath,
urlPattern,
handlers.EnvironmentSensor(
conf.Credentials, envSensorConfig.AllowedCredentials, &conf.Response.Sensors[sensorType][i],
),