Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-11 05:06:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GODT-1833: Fix gobinsec cache.

Browse Source
This commit is contained in:
Jakub
2022-08-29 13:36:08 +02:00
parent 1ec05e8a6c
commit d421b5aa5a
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.gitlab-ci.yml
View File

@ -108,7 +108,8 @@ test-integration:
dependency-updates: dependency-updates:
stage: test stage: test
script: 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 # Stage: BUILD
@ -246,10 +247,11 @@ check-gobinsec:
before_script: before_script:
- mkdir build - mkdir build
- tar -xzf bridge_linux_*.tgz -C build - tar -xzf bridge_linux_*.tgz -C build
- "echo api-key: \"${GOBINSEC_NVD_API_KEY}\" >> utils/gobinsec_conf.yml"
script: script:
- "[ ! -f ./gobinsec-cache.yml ] && wget bridgeteam.protontech.ch/bridgeteam/gobinsec-cache.yml" - "[ ! -f ./gobinsec-cache.yml ] && wget bridgeteam.protontech.ch/bridgeteam/gobinsec-cache.yml"
- cat ./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

2
Makefile
View File

@ -166,7 +166,7 @@ update-qt-docs:
LINTVER:="v1.39.0" LINTVER:="v1.39.0"
LINTSRC:="https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh" 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 install-devel-tools: check-has-go
go get -v github.com/golang/mock/gomock go get -v github.com/golang/mock/gomock

6
internal/api/api.go
View File

@ -24,6 +24,7 @@ package api
import ( import (
"fmt" "fmt"
"net/http" "net/http"
"time"
"github.com/ProtonMail/proton-bridge/v2/internal/bridge" "github.com/ProtonMail/proton-bridge/v2/internal/bridge"
"github.com/ProtonMail/proton-bridge/v2/internal/config/settings" "github.com/ProtonMail/proton-bridge/v2/internal/config/settings"
@ -57,8 +58,9 @@ func (api *apiServer) ListenAndServe() {
addr := api.getAddress() addr := api.getAddress()
server := &http.Server{ server := &http.Server{
Addr: addr, Addr: addr,
Handler: mux, 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) log.Info("API listening at ", addr)