From ea2a1730a469669d71d198986c2ddf268c9cecb7802a7f939f5a46c50f7f6260 Mon Sep 17 00:00:00 2001 From: DaanSelen Date: Thu, 23 Apr 2026 14:57:02 +0200 Subject: [PATCH] chore: add readme edits --- README.md | 12 ++++++++++-- cmd/server/main.go | 2 +- internal/api/api.go | 3 ++- internal/api/{ => middleware}/middleware.go | 16 ++++++++++++++-- 4 files changed, 27 insertions(+), 6 deletions(-) rename internal/api/{ => middleware}/middleware.go (68%) diff --git a/README.md b/README.md index 2d05b61..516340a 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,11 @@ -# Eden +# Orbits -Environmental Display & Engagement Network (EDEN) \ No newline at end of file +Orchestrated Remote Broadcast Integrated Terminal System (ORBITS) + +Orbit + Bits + +```sh +root@ubuntu01:~# systemctl --user --machine=dselen@ stop kiosk-firefox^C +root@ubuntu01:~# systemctl --user --machine=dselen@ daemon-reload +root@ubuntu01:~# systemctl --user --machine=dselen@ start kiosk-firefox +``` diff --git a/cmd/server/main.go b/cmd/server/main.go index 2280878..e7f0b1c 100644 --- a/cmd/server/main.go +++ b/cmd/server/main.go @@ -20,7 +20,7 @@ func main() { slog.SetDefault(logger) // print our running environment variable set - slog.Debug("displaying environment", "env", env) + slog.Debug("displaying environment variables", "environment", env) // TO DO, allow cmd args parsing diff --git a/internal/api/api.go b/internal/api/api.go index e8bf9e5..cf8a7fa 100644 --- a/internal/api/api.go +++ b/internal/api/api.go @@ -3,6 +3,7 @@ package api import ( "fmt" "log/slog" + "orbits-server/internal/api/middleware" "orbits-server/internal/utility" "github.com/gin-gonic/gin" @@ -29,7 +30,7 @@ func KickoffApi(logger *slog.Logger, env utility.Environment, db *gorm.DB) { // r := gin.Default() // JSON logger: https://gin-gonic.com/en/docs/logging/structured-logging/ r := gin.New() - r.Use(slogGinMiddleware(logger)) + r.Use(middleware.SlogMiddleware(logger)) r.Use(gin.Recovery()) api := r.Group("/api") diff --git a/internal/api/middleware.go b/internal/api/middleware/middleware.go similarity index 68% rename from internal/api/middleware.go rename to internal/api/middleware/middleware.go index 677693a..98f1ff9 100644 --- a/internal/api/middleware.go +++ b/internal/api/middleware/middleware.go @@ -1,13 +1,14 @@ -package api +package middleware import ( "log/slog" + "net/http" "time" "github.com/gin-gonic/gin" ) -func slogGinMiddleware(logger *slog.Logger) gin.HandlerFunc { +func SlogMiddleware(logger *slog.Logger) gin.HandlerFunc { return func(c *gin.Context) { start := time.Now() path := c.Request.URL.Path @@ -32,3 +33,14 @@ func slogGinMiddleware(logger *slog.Logger) gin.HandlerFunc { } } } + +func AuthMiddleware() gin.HandlerFunc { + return func(c *gin.Context) { + orbitsKey := c.GetHeader("orbits-key") + if len(orbitsKey) == 0 { + c.AbortWithStatus(http.StatusUnauthorized) + return + } + + } +}