From 52cebf8d0a54cf1aa522eae94315f24e466bff74 Mon Sep 17 00:00:00 2001
From: Jonas Plum <git@jonasplum.de>
Date: Thu, 29 Sep 2022 23:30:22 +0200
Subject: [PATCH] Add server timeout

---
 .golangci.yml            | 2 +-
 cmd/catalyst-dev/main.go | 8 +++++++-
 cmd/catalyst/main.go     | 8 +++++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index 8cf57f8..5abcf23 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -28,7 +28,6 @@ linters:
     - goprintffuncname
     - gosec
     - grouper
-    - ifshort
     - importas
     - ireturn
     - misspell
@@ -50,6 +49,7 @@ linters:
     - bodyclose
     - contextcheck
     - gosimple
+    - ifshort
     - nilerr
     - noctx
     - rowserrcheck
diff --git a/cmd/catalyst-dev/main.go b/cmd/catalyst-dev/main.go
index 8e6acad..ed902fd 100644
--- a/cmd/catalyst-dev/main.go
+++ b/cmd/catalyst-dev/main.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"log"
 	"net/http"
+	"time"
 
 	"github.com/arangodb/go-driver"
 
@@ -68,7 +69,12 @@ func main() {
 		api.Proxy("http://localhost:8080/")(writer, request)
 	})
 
-	if err := http.ListenAndServe(fmt.Sprintf(":%d", config.Port), theCatalyst.Server); err != nil {
+	server := &http.Server{
+		Addr:              fmt.Sprintf(":%d", config.Port),
+		ReadHeaderTimeout: 3 * time.Second,
+		Handler:           theCatalyst.Server,
+	}
+	if err := server.ListenAndServe(); err != nil {
 		log.Fatal(err)
 	}
 }
diff --git a/cmd/catalyst/main.go b/cmd/catalyst/main.go
index 4f8993d..6f1a2a5 100644
--- a/cmd/catalyst/main.go
+++ b/cmd/catalyst/main.go
@@ -5,6 +5,7 @@ import (
 	"io/fs"
 	"log"
 	"net/http"
+	"time"
 
 	"github.com/SecurityBrewery/catalyst"
 	"github.com/SecurityBrewery/catalyst/cmd"
@@ -30,7 +31,12 @@ func main() {
 	staticHandlerFunc := http.HandlerFunc(api.VueStatic(fsys))
 	theCatalyst.Server.Get("/ui/*", http.StripPrefix("/ui", staticHandlerFunc).ServeHTTP)
 
-	if err := http.ListenAndServe(fmt.Sprintf(":%d", config.Port), theCatalyst.Server); err != nil {
+	server := &http.Server{
+		Addr:              fmt.Sprintf(":%d", config.Port),
+		ReadHeaderTimeout: 3 * time.Second,
+		Handler:           theCatalyst.Server,
+	}
+	if err := server.ListenAndServe(); err != nil {
 		log.Fatal(err)
 	}
 }