From 5b6383b7a94557ea1051ba0d757d51cd12ca1b81 Mon Sep 17 00:00:00 2001 From: Vincent Verboven Date: Wed, 26 Feb 2025 19:02:10 +0100 Subject: [PATCH 1/2] Added logging for stats errors --- App/Backend/cmd/kubernetes/handlers/GetStats.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/App/Backend/cmd/kubernetes/handlers/GetStats.go b/App/Backend/cmd/kubernetes/handlers/GetStats.go index 3c99cdf..7b312af 100644 --- a/App/Backend/cmd/kubernetes/handlers/GetStats.go +++ b/App/Backend/cmd/kubernetes/handlers/GetStats.go @@ -5,6 +5,7 @@ package handlers import ( + "fmt" "github.com/gin-gonic/gin" "net/http" ) @@ -21,6 +22,7 @@ func GetStatsHandler(ctx *gin.Context) { func GetTotalStats(ctx *gin.Context) { metrics, err := c.GetTotalUsage() if err != nil { + fmt.Printf("GetTotalStats err: %v\n", err) ctx.JSON(http.StatusInternalServerError, gin.H{"error": "An error has occurred or the request has been timed out."}) return } @@ -30,8 +32,9 @@ func GetTotalStats(ctx *gin.Context) { func GetStatsForNode(ctx *gin.Context, name string) { metrics, err := c.GetUsageForNode(name) if err != nil { + fmt.Printf("GetStatsForNode err: %v\n", err) ctx.JSON(http.StatusInternalServerError, gin.H{"error": "An error has occurred or the request has been timed out."}) return } ctx.JSON(http.StatusOK, metrics) -} \ No newline at end of file +} From ca1fd5d03208c779baa5411628fbb695e732a3ff Mon Sep 17 00:00:00 2001 From: Vincent Verboven Date: Wed, 26 Feb 2025 20:13:55 +0100 Subject: [PATCH 2/2] adjusted isloggedin, added trusted proxies, added dev/prod mode --- App/Backend/cmd/auth/AuthHandlers.go | 2 +- App/Backend/cmd/main.go | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/App/Backend/cmd/auth/AuthHandlers.go b/App/Backend/cmd/auth/AuthHandlers.go index 1fdb541..c84f2d5 100644 --- a/App/Backend/cmd/auth/AuthHandlers.go +++ b/App/Backend/cmd/auth/AuthHandlers.go @@ -66,7 +66,7 @@ func IsLoggedIn(ctx *gin.Context) { }) if err != nil || !token.Valid { - ctx.AbortWithStatusJSON(http.StatusUnauthorized, gin.H{"error": "Invalid token"}) + ctx.JSON(http.StatusOK, false) return } diff --git a/App/Backend/cmd/main.go b/App/Backend/cmd/main.go index 22e6386..cd6523d 100644 --- a/App/Backend/cmd/main.go +++ b/App/Backend/cmd/main.go @@ -14,9 +14,21 @@ import ( func main() { frontendUrl := handlers.GetFrontendIP() + trustedProxies := []string{"10.0.0.0/8"} + + if frontendUrl == "http://localhost:4200" { + gin.SetMode(gin.DebugMode) + } else { + gin.SetMode(gin.ReleaseMode) + } r := gin.Default() + err := r.SetTrustedProxies(trustedProxies) + if err != nil { + panic(err) + } + r.Use(cors.New(cors.Config{ AllowOrigins: []string{frontendUrl}, AllowMethods: []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"}, @@ -43,7 +55,7 @@ func main() { secured.GET("/stats", handlers.GetStatsHandler) secured.POST("/createresources", handlers.CreateResourcesHandler) - err := r.Run(":8082") + err = r.Run(":8082") if err != nil { panic(err) }