Iter21

.gitignore

@@ -10,6 +10,7 @@
 
 # Output of the go coverage tool, specifically when used with LiteIDE
 *.out
+coverage.html
 
 # Binaries
 cmd/agent/main

Makefile

@@ -1,13 +1,19 @@
 .PHONY: build test clean
 
 build: 
-	go clean -testcache
 	GOOS=linux GOARCH=amd64 go build -buildvcs=false -o=cmd/server ./cmd/server/...
 	GOOS=linux GOARCH=amd64 go build -buildvcs=false -ldflags "-X main.buildVersion=v1.0.1 -X main.buildDate=$(shell date +'%Y-%m-%d') -X main.buildCommit=$(shell git rev-parse HEAD)" -o=cmd/agent ./cmd/agent/...
+	GOOS=linux GOARCH=amd64 go build -buildvcs=false -o=cmd/keygen ./cmd/keygen/...
 
 test: build
 	GOOS=linux GOARCH=amd64 go build -buildvcs=false -o=cmd/staticlint ./cmd/staticlint/...
 	cmd/staticlint/staticlint ./...
 	go mod tidy
-	go mod vendor
-	go test ./...
+	go clean -testcache
+	go test ./... -coverprofile cover.out.tmp
+	cat cover.out.tmp | grep -v "mocks" > cover.out
+	rm cover.out.tmp
+
+cover: test
+	go tool cover -html=cover.out -o coverage.html
+	firefox coverage.html &

cmd/agent/agent.go

@@ -9,7 +9,6 @@ import (
 	"syscall"
 
 	"github.com/StasMerzlyakov/go-metrics/internal/agent"
-	"github.com/StasMerzlyakov/go-metrics/internal/agent/retriable"
 	"github.com/StasMerzlyakov/go-metrics/internal/config"
 )
 
@@ -46,7 +45,7 @@ func main() {
 	resultSender := agent.NewHTTPResultSender(agentCfg)
 
 	// Отвечает за повтор отправки
-	retryCfg := retriable.DefaultConf(syscall.ECONNREFUSED)
+	retryCfg := agent.DefaultConf(syscall.ECONNREFUSED)
 	retryableResultSender := agent.NewHTTPRetryableResultSender(*retryCfg, resultSender)
 
 	// Отвечает за пулы отправки

cmd/keygen/main.go

@@ -0,0 +1,32 @@
+// Package main contains utility for key generation
+package main
+
+import (
+	"os"
+
+	"github.com/StasMerzlyakov/go-metrics/internal/keygen"
+)
+
+const (
+	publicKeyFileName  = "./public.key"
+	privateKeyFileName = "./private.key"
+)
+
+func main() {
+
+	privKeyFile, err := os.Create(privateKeyFileName)
+	if err != nil {
+		panic(err)
+	}
+	defer privKeyFile.Close()
+
+	pubKeyFile, err := os.Create(publicKeyFileName)
+	if err != nil {
+		panic(err)
+	}
+	defer privKeyFile.Close()
+
+	if err := keygen.Create(pubKeyFile, privKeyFile); err != nil {
+		panic(err)
+	}
+}

cmd/server/server.go

@@ -10,10 +10,12 @@ import (
 	"time"
 
 	"github.com/StasMerzlyakov/go-metrics/internal/config"
+	"github.com/StasMerzlyakov/go-metrics/internal/keygen"
 	"github.com/StasMerzlyakov/go-metrics/internal/server/adapter/fs/backup"
 	"github.com/StasMerzlyakov/go-metrics/internal/server/adapter/http/handler"
 	"github.com/StasMerzlyakov/go-metrics/internal/server/adapter/http/middleware"
 	"github.com/StasMerzlyakov/go-metrics/internal/server/adapter/http/middleware/compress"
+	"github.com/StasMerzlyakov/go-metrics/internal/server/adapter/http/middleware/cryptomw"
 	"github.com/StasMerzlyakov/go-metrics/internal/server/adapter/http/middleware/digest"
 	"github.com/StasMerzlyakov/go-metrics/internal/server/adapter/http/middleware/logging"
 	"github.com/StasMerzlyakov/go-metrics/internal/server/adapter/http/middleware/retry"
@@ -24,7 +26,6 @@ import (
 	"github.com/go-chi/chi/v5"
 	"github.com/jackc/pgerrcode"
 	"github.com/jackc/pgx/v5/pgconn"
-
 	"go.uber.org/zap"
 )
 
@@ -33,10 +34,15 @@ type Server interface {
 	Shutdown(ctx context.Context)
 }
 
+const (
+	maxRetryCount = 4
+)
+
 func createMiddleWareList(srvConf *config.ServerConfiguration) []func(http.Handler) http.Handler {
 	var mwList []func(http.Handler) http.Handler
 	mwList = append(mwList, logging.EncrichWithRequestIDMW())
 	mwList = append(mwList, logging.NewLoggingResponseMW())
+
 	if srvConf.Key != "" {
 		mwList = append(mwList, digest.NewWriteHashDigestResponseHeaderMW(srvConf.Key))
 	}
@@ -66,7 +72,10 @@ func createMiddleWareList(srvConf *config.ServerConfiguration) []func(http.Handl
 		return err
 	}
 	mwList = append(mwList, retry.NewRetriableRequestMWConf(
-		time.Duration(time.Second), time.Duration(2*time.Second), 4, pgErrPreProcFn,
+		time.Duration(time.Second),
+		time.Duration(2*time.Second),
+		maxRetryCount,
+		pgErrPreProcFn,
 	))
 
 	return mwList
@@ -157,12 +166,22 @@ func main() {
 
 	// мидлы
 	mwList := createMiddleWareList(srvConf)
-	middleware.Add(httpHandler, mwList...)
+
+	httpHandler.Use(mwList...)
 
 	// операции с метриками
 	metricApp := app.NewMetrics(storage)
 
-	var updateMWList []func(http.Handler) http.Handler
+	var updateMWList []middleware.Middleware
+
+	if srvConf.CryptoKey != "" {
+		privKey, err := keygen.ReadPrivKey(srvConf.CryptoKey)
+		if err != nil {
+			panic(err)
+		}
+		updateMWList = append(updateMWList, cryptomw.NewDecrytpMw(privKey))
+	}
+
 	if srvConf.Key != "" {
 		updateMWList = append(updateMWList, digest.NewCheckHashDigestRequestMW(srvConf.Key))
 	}

go.mod

@@ -1,28 +1,27 @@
 module github.com/StasMerzlyakov/go-metrics
 
-go 1.21
-
-toolchain go1.22.2
+go 1.22.2
 
 require (
 	github.com/caarlos0/env v3.5.0+incompatible
-	github.com/go-chi/chi/v5 v5.0.11
-	github.com/go-resty/resty/v2 v2.11.0
+	github.com/go-chi/chi/v5 v5.0.12
+	github.com/go-resty/resty/v2 v2.13.1
 	github.com/golang/mock v1.6.0
 	github.com/google/uuid v1.6.0
-	github.com/jackc/pgerrcode v0.0.0-20220416144525-469b46aa5efa
-	github.com/jackc/pgx/v5 v5.5.4
+	github.com/jackc/pgerrcode v0.0.0-20240316143900-6e2875d9b438
+	github.com/jackc/pgx/v5 v5.6.0
 	github.com/jingyugao/rowserrcheck v1.1.1
 	github.com/kisielk/errcheck v1.7.0
 	github.com/pkg/errors v0.9.1
-	github.com/shirou/gopsutil/v3 v3.24.2
+	github.com/shirou/gopsutil/v3 v3.24.5
 	github.com/sirupsen/logrus v1.9.3
 	github.com/stretchr/testify v1.9.0
 	github.com/testcontainers/testcontainers-go v0.31.0
 	github.com/testcontainers/testcontainers-go/modules/postgres v0.31.0
 	github.com/ungerik/go-pool v0.0.0-20140720100922-d102a2c7872a
 	go.uber.org/zap v1.27.0
-	golang.org/x/tools v0.21.1-0.20240514024235-59d9797072e7
+	golang.org/x/tools v0.22.0
+	gotest.tools/v3 v3.5.0
 	honnef.co/go/tools v0.4.7
 )
 
@@ -46,6 +45,7 @@ require (
 	github.com/go-ole/go-ole v1.2.6 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
 	github.com/jackc/puddle/v2 v2.2.1 // indirect
@@ -61,7 +61,6 @@ require (
 	github.com/opencontainers/image-spec v1.1.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
-	github.com/rogpeppe/go-internal v1.12.0 // indirect
 	github.com/shoenig/go-m1cpu v0.1.6 // indirect
 	github.com/tklauser/go-sysconf v0.3.12 // indirect
 	github.com/tklauser/numcpus v0.6.1 // indirect
@@ -71,13 +70,13 @@ require (
 	go.opentelemetry.io/otel/metric v1.24.0 // indirect
 	go.opentelemetry.io/otel/trace v1.24.0 // indirect
 	go.uber.org/multierr v1.10.0 // indirect
-	golang.org/x/crypto v0.23.0 // indirect
+	golang.org/x/crypto v0.24.0 // indirect
 	golang.org/x/exp/typeparams v0.0.0-20221208152030-732eee02a75a // indirect
-	golang.org/x/mod v0.17.0 // indirect
-	golang.org/x/net v0.25.0 // indirect
+	golang.org/x/mod v0.18.0 // indirect
+	golang.org/x/net v0.26.0 // indirect
 	golang.org/x/sync v0.7.0 // indirect
-	golang.org/x/sys v0.20.0 // indirect
-	golang.org/x/text v0.15.0 // indirect
+	golang.org/x/sys v0.21.0 // indirect
+	golang.org/x/text v0.16.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20230731190214-cbb8c96f2d6d // indirect
 	google.golang.org/grpc v1.58.3 // indirect
 	google.golang.org/protobuf v1.33.0 // indirect