1e99/wolbodge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

improve error handling

Browse source
This commit is contained in:
1e99 2025-03-22 14:27:28 +01:00
parent fd6a0b8722
commit 1bd0e71c8e
5 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
devices/libgpiod.go
View file

@ -7,6 +7,7 @@ import (
"time" "time"
) )
// TODO: Do not use subprocesses here, they are unreliable, provide hidden dependencies and are a common target for vulnerabilities.
func NewLibgpiod(gpiochip string, powerButtonPin int, powerLEDPin int) Device { func NewLibgpiod(gpiochip string, powerButtonPin int, powerLEDPin int) Device {
device := &libgpiod{ device := &libgpiod{
gpiochip: gpiochip, gpiochip: gpiochip,

6
routes/api.go
View file

@ -37,7 +37,11 @@ func APIEndSession(storage sessions.Storage) http.HandlerFunc {
sessionId := req.PathValue("session_id") sessionId := req.PathValue("session_id")
err := storage.EndSession(sessionId) err := storage.EndSession(sessionId)
if err != nil { switch {
case err == sessions.ErrUnknownSession:
http.Error(res, "", http.StatusNotFound)
return
case err != nil:
http.Error(res, "", http.StatusInternalServerError) http.Error(res, "", http.StatusInternalServerError)
return return
} }

6
routes/index.go
View file

@ -62,7 +62,11 @@ func EndSession(storage sessions.Storage) http.HandlerFunc {
sessionId := req.FormValue("session_id") sessionId := req.FormValue("session_id")
err = storage.EndSession(sessionId) err = storage.EndSession(sessionId)
if err != nil { switch {
case err == sessions.ErrUnknownSession:
http.Error(res, "", http.StatusNotFound)
return
case err != nil:
http.Error(res, "", http.StatusInternalServerError) http.Error(res, "", http.StatusInternalServerError)
return return
} }

2
sessions/mem.go
View file

@ -66,7 +66,7 @@ func (s *memStorage) EndSession(id string) error {
_, found := s.sessions[id] _, found := s.sessions[id]
if !found { if !found {
//return ErrNotFound return ErrUnknownSession
} }
delete(s.sessions, id) delete(s.sessions, id)

18
sessions/sessions.go
View file

@ -1,6 +1,9 @@
package sessions package sessions
import "time" import (
"errors"
"time"
)
type Session struct { type Session struct {
Id string Id string
@ -12,16 +15,21 @@ func (s *Session) ExistsFor() time.Duration {
return time.Now().Sub(s.CreatedAt) return time.Now().Sub(s.CreatedAt)
} }
var (
ErrUnknownSession = errors.New("unknown session")
)
type Storage interface { type Storage interface {
// Check if the storage contains any sessions // Check if the storage contains any sessions.
HasSessions() (bool, error) HasSessions() (bool, error)
// List all sessions // List all sessions.
GetSessions() ([]Session, error) GetSessions() ([]Session, error)
// Start a new session // Start a new session.
StartSession(description string, createdAt time.Time) (Session, error) StartSession(description string, createdAt time.Time) (Session, error)
// End an old session // End an old session.
// Should return [ErrUnknownSession] if the session couldn't be found.
EndSession(id string) error EndSession(id string) error
} }