feat:#36 added real ip for proxy, extended error logging

services/ical/main.go

@@ -18,18 +18,25 @@ package main
 
 import (
 	"github.com/gofiber/fiber/v3"
-	"github.com/gofiber/fiber/v3/log"
 	"github.com/gofiber/fiber/v3/middleware/logger"
 	"htwkalender/ical/model"
 	"htwkalender/ical/service"
 	"htwkalender/ical/service/connector/grpc"
+	"log/slog"
+	"os"
 )
 
 // main function for the ical service
 // uses rest api to get the data from the data-manager
 // exposes rest api endpoints with fiber to serve the data for clients
 func main() {
-	const host = "htwkalender-data-manager"
+
+	// get host from env if this is not set use default value 127.0.0.1
+
+	host := os.Getenv("DATA_MANAGER_URL")
+	if host == "" {
+		host = "127.0.0.1"
+	}
 
 	grpcClient := grpc.ConnectGRPCServer(host)
 	defer grpc.CloseGRPCServer(grpcClient)
@@ -38,11 +45,14 @@ func main() {
 	webdavRequestMethods := []string{"PROPFIND", "MKCOL", "COPY", "MOVE"}
 
 	fiberApp := fiber.New(fiber.Config{
-		CaseSensitive:  true,
-		StrictRouting:  true,
-		ServerHeader:   "Fiber",
-		AppName:        "App Name",
-		RequestMethods: append(fiber.DefaultMethods[:], webdavRequestMethods...),
+		CaseSensitive:           true,
+		StrictRouting:           true,
+		ServerHeader:            "HTWKalender iCal Service",
+		AppName:                 "HTWKalender iCal Service",
+		RequestMethods:          append(fiber.DefaultMethods[:], webdavRequestMethods...),
+		EnableTrustedProxyCheck: true,
+		TrustedProxies:          []string{"172.16.0.0/12", "172.18.0.5", "172.18.0.1"},
+		ProxyHeader:             "X-Forwarded-For",
 	})
 
 	var app = model.AppType{
@@ -57,5 +67,5 @@ func main() {
 	// Add routes to the app instance for the data-manager ical service
 	service.AddFeedRoutes(app)
 
-	log.Fatal(fiberApp.Listen(":8091"))
+	slog.Info("Starting ical service", fiberApp.Listen(":8091"))
 }

services/ical/service/connector/feedConnector.go

@@ -14,6 +14,7 @@ func GetFeedByToken(host string, token string) (model.FeedRecord, error) {
 
 	response, err := RequestApi(host, "/api/collections/feeds/records/"+token)
 	if err != nil {
+		slog.Error("Failed to get feed record", "error", err)
 		return model.FeedRecord{}, err
 	}
 

services/ical/service/routes.go

@@ -3,7 +3,6 @@ package service
 import (
 	"encoding/json"
 	"github.com/gofiber/fiber/v3"
-	"github.com/gofiber/fiber/v3/log"
 	"htwkalender/ical/model"
 	"htwkalender/ical/service/ical"
 	"log/slog"
@@ -21,8 +20,8 @@ func AddFeedRoutes(app model.AppType) {
 		results, err := ical.Feed(app, token)
 
 		if err != nil {
-			slog.Error("Failed to get feed", "error", err)
-			return c.SendStatus(fiber.StatusInternalServerError)
+			slog.Error("Failed to get feed", "error", err, "token", token)
+			return c.SendStatus(fiber.StatusBadRequest)
 		}
 		c.Response().Header.Set("Content-type", "text/calendar")
 		c.Response().Header.Set("charset", "utf-8")
@@ -38,7 +37,7 @@ func AddFeedRoutes(app model.AppType) {
 		//obtain the body of the request
 		err := json.Unmarshal(c.Body(), &modules)
 		if err != nil {
-			log.Error("Failed to unmarshal request body", "error", err)
+			slog.Error("Failed to parse request body", "error", err, "body", string(c.Body()))
 			return c.SendStatus(fiber.StatusBadRequest)
 		}
 
@@ -46,8 +45,8 @@ func AddFeedRoutes(app model.AppType) {
 		token, err := ical.CreateFeed(app, modules)
 		if err != nil {
 			println(err)
-			log.Error("Failed to create feed", "error", err)
-			return c.SendStatus(fiber.StatusInternalServerError)
+			slog.Error("Failed to create feed", "error", err)
+			return c.SendStatus(fiber.StatusBadRequest)
 		}
 
 		return c.JSON(token)
@@ -60,8 +59,8 @@ func AddFeedRoutes(app model.AppType) {
 		results, err := ical.FeedRecord(app, token)
 
 		if err != nil {
-			slog.Error("Failed to get feed", "error", err)
-			return c.SendStatus(fiber.StatusInternalServerError)
+			slog.Error("Failed to get feed", "error", err, "token", token)
+			return c.SendStatus(fiber.StatusBadRequest)
 		}
 		c.Response().Header.Set("Content-type", "application/json; charset=UTF-8")
 
@@ -73,7 +72,7 @@ func AddFeedRoutes(app model.AppType) {
 		token := c.Query("token")
 		err := ical.DeleteFeedRecord(app, token)
 		if err != nil {
-			slog.Error("Feed could not be deleted", "error", err)
+			slog.Error("Feed could not be deleted", "error", err, "token", token)
 			return c.JSON(http.StatusNotFound, "Feed could not be deleted")
 		} else {
 			return c.JSON(http.StatusOK, "Feed deleted")