From 1bd0e71c8e455da36a841c903e088fb00a3a1ff8 Mon Sep 17 00:00:00 2001
From: 1e99 <noemail@noemail>
Date: Sat, 22 Mar 2025 14:27:28 +0100
Subject: [PATCH] improve error handling

---
 devices/libgpiod.go  |  1 +
 routes/api.go        |  6 +++++-
 routes/index.go      |  6 +++++-
 sessions/mem.go      |  2 +-
 sessions/sessions.go | 18 +++++++++++++-----
 5 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/devices/libgpiod.go b/devices/libgpiod.go
index 3ac0dce..428a71f 100644
--- a/devices/libgpiod.go
+++ b/devices/libgpiod.go
@@ -7,6 +7,7 @@ import (
 	"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 {
 	device := &libgpiod{
 		gpiochip:       gpiochip,
diff --git a/routes/api.go b/routes/api.go
index 0883354..9a0055c 100644
--- a/routes/api.go
+++ b/routes/api.go
@@ -37,7 +37,11 @@ func APIEndSession(storage sessions.Storage) http.HandlerFunc {
 		sessionId := req.PathValue("session_id")
 
 		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)
 			return
 		}
diff --git a/routes/index.go b/routes/index.go
index 57fb8a8..87e5261 100644
--- a/routes/index.go
+++ b/routes/index.go
@@ -62,7 +62,11 @@ func EndSession(storage sessions.Storage) http.HandlerFunc {
 
 		sessionId := req.FormValue("session_id")
 		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)
 			return
 		}
diff --git a/sessions/mem.go b/sessions/mem.go
index a013159..c0e5865 100644
--- a/sessions/mem.go
+++ b/sessions/mem.go
@@ -66,7 +66,7 @@ func (s *memStorage) EndSession(id string) error {
 
 	_, found := s.sessions[id]
 	if !found {
-		//return ErrNotFound
+		return ErrUnknownSession
 	}
 
 	delete(s.sessions, id)
diff --git a/sessions/sessions.go b/sessions/sessions.go
index 12d23d0..eca373f 100644
--- a/sessions/sessions.go
+++ b/sessions/sessions.go
@@ -1,6 +1,9 @@
 package sessions
 
-import "time"
+import (
+	"errors"
+	"time"
+)
 
 type Session struct {
 	Id          string
@@ -12,16 +15,21 @@ func (s *Session) ExistsFor() time.Duration {
 	return time.Now().Sub(s.CreatedAt)
 }
 
+var (
+	ErrUnknownSession = errors.New("unknown session")
+)
+
 type Storage interface {
-	// Check if the storage contains any sessions
+	// Check if the storage contains any sessions.
 	HasSessions() (bool, error)
 
-	// List all sessions
+	// List all sessions.
 	GetSessions() ([]Session, error)
 
-	// Start a new session
+	// Start a new session.
 	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
 }