Merge branch 'main' of https://github.com/EliasDeHondt/K10s

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
 	}
 

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)
-}
+}

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)
 	}