diff --git a/.github/workflows/lab7-stand.yml b/.github/workflows/lab7-stand.yml index 04e0bcc..44d022d 100644 --- a/.github/workflows/lab7-stand.yml +++ b/.github/workflows/lab7-stand.yml @@ -38,7 +38,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version-file: go.mod + go-version: "1.26.11" - name: cwebp для теста варианта optimized run: sudo apt-get update -qq && sudo apt-get install -y -qq webp > /dev/null && cwebp -version - name: go test @@ -113,7 +113,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version-file: go.mod + go-version: "1.26.11" - name: govulncheck (достижимые уязвимости Go-кода) run: | mkdir -p evidence/scan diff --git a/Dockerfile b/Dockerfile index 6fefc38..e3239f8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,8 @@ # ============================================================ # Stage 1: builder — компилируем статический бинарник # ============================================================ -FROM golang:1.26-alpine@sha256:27f2d3b83cfc5803c8078f8e730af0f7c431bf067afaec8f60a36fb763187cba AS builder +# Go 1.26.11 (патчи stdlib, см. REPORT.md: govulncheck). Тег с полной версией. +FROM golang:1.26.11-alpine AS builder WORKDIR /src diff --git a/go.mod b/go.mod index 9d2e2f7..6940f15 100644 --- a/go.mod +++ b/go.mod @@ -2,6 +2,10 @@ module github.com/charawein/mtusi2026lab7 go 1.26.0 +// Сборка и govulncheck — Go 1.26.11: в 1.26.0 govulncheck нашёл 38 достижимых +// уязвимостей стандартной библиотеки (net/http, crypto/tls, crypto/x509 …). +toolchain go1.26.11 + require ( github.com/exaring/otelpgx v0.13.0 github.com/google/uuid v1.6.0 @@ -63,7 +67,7 @@ require ( go.opentelemetry.io/proto/otlp v1.11.0 // indirect go.uber.org/atomic v1.12.0 // indirect go.yaml.in/yaml/v3 v3.0.5 // indirect - golang.org/x/net v0.60.0 // indirect + golang.org/x/net v0.62.0 // indirect golang.org/x/sys v0.49.0 // indirect golang.org/x/text v0.43.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20260928230214-8a89bd6388cc // indirect diff --git a/go.sum b/go.sum index 29fbfe1..e4f2bbb 100644 --- a/go.sum +++ b/go.sum @@ -146,6 +146,8 @@ golang.org/x/image v0.47.0 h1:za/8gVz++PPZqmZJBNSISICN5Rrj5zixP/8K++fgmqo= golang.org/x/image v0.47.0/go.mod h1:IkN5o4A7vq55vXN8FWjjnhg9Rs2GOtffqsSi9mWAKYE= golang.org/x/net v0.60.0 h1:79p50tfZlm0J9YfoDsSi639qSXNGVwEzOPLCxM2FsYU= golang.org/x/net v0.60.0/go.mod h1:2DA/G1UfVbCpQPeWTmMPGY7Cs2PkBkwu743bVX5PIVg= +golang.org/x/net v0.62.0 h1:18ELalfM5+XNRwzM2nYqXsZQ9ByS1uhj2O/U7+5jqRY= +golang.org/x/net v0.62.0/go.mod h1:WgDCOTH8iwtB66T4/GfI94AHo/hhdb7Hah9NDseQfiI= golang.org/x/sync v0.25.0 h1:dJnifr0nMV8/SBnBvdo4eSGGnrc3O4FFx6IqvtLcmRs= golang.org/x/sync v0.25.0/go.mod h1:sUUOizhqBxiL6pEWpqNLUiaJn1ShEbZ6BBqskPbjZm0= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=