From d421b5aa5ab82af93f38c112b1e05936dae5dfe1 Mon Sep 17 00:00:00 2001
From: Jakub <jakub@cuth.sk>
Date: Mon, 29 Aug 2022 13:36:08 +0200
Subject: [PATCH] GODT-1833: Fix gobinsec cache.

---
 .gitlab-ci.yml      | 6 ++++--
 Makefile            | 2 +-
 internal/api/api.go | 6 ++++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4a9d0801..b8e7426a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -108,7 +108,8 @@ test-integration:
 dependency-updates:
   stage: test
   script:
-    - make updates
+    - "echo 'NOTE: Do not run on go1.15 ( 'if...' can be removed once fully updated to go1.18)'"
+    - if [ 18 -le $(go version | cut -d. -f2 | cut -d " " -f1) ]; then make updates; fi
 
 # Stage: BUILD
 
@@ -246,10 +247,11 @@ check-gobinsec:
   before_script:
     - mkdir build
     - tar -xzf bridge_linux_*.tgz -C build
+    - "echo api-key: \"${GOBINSEC_NVD_API_KEY}\" >> utils/gobinsec_conf.yml"
   script:
     - "[ ! -f ./gobinsec-cache.yml ] && wget bridgeteam.protontech.ch/bridgeteam/gobinsec-cache.yml"
     - cat ./gobinsec-cache.yml
-    - gobinsec -cache -config utils/gobinsec_conf.yml build/proton-bridge
+    - gobinsec -wait -cache -config utils/gobinsec_conf.yml build/proton-bridge
 
 
 
diff --git a/Makefile b/Makefile
index 289b0c60..2a219990 100644
--- a/Makefile
+++ b/Makefile
@@ -166,7 +166,7 @@ update-qt-docs:
 LINTVER:="v1.39.0"
 LINTSRC:="https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh"
 
-install-dev-dependencies: install-devel-tools install-linter install-go-mod-outdated
+install-dev-dependencies: install-devel-tools install-linter
 
 install-devel-tools: check-has-go
 	go get -v github.com/golang/mock/gomock
diff --git a/internal/api/api.go b/internal/api/api.go
index 1a64a025..1d17a20a 100644
--- a/internal/api/api.go
+++ b/internal/api/api.go
@@ -24,6 +24,7 @@ package api
 import (
 	"fmt"
 	"net/http"
+	"time"
 
 	"github.com/ProtonMail/proton-bridge/v2/internal/bridge"
 	"github.com/ProtonMail/proton-bridge/v2/internal/config/settings"
@@ -57,8 +58,9 @@ func (api *apiServer) ListenAndServe() {
 
 	addr := api.getAddress()
 	server := &http.Server{
-		Addr:    addr,
-		Handler: mux,
+		Addr:              addr,
+		Handler:           mux,
+		ReadHeaderTimeout: 5 * time.Second, // fix gosec G112 (vulnerability to [Slowloris](https://www.cloudflare.com/en-gb/learning/ddos/ddos-attack-tools/slowloris/) attack).
 	}
 
 	log.Info("API listening at ", addr)