Sprint 10

.gitignore

@@ -20,4 +20,4 @@ vendor/
 
 # IDEs directories
 .idea
-.vscode
+.vscode

go.mod

@@ -4,44 +4,36 @@ go 1.17
 
 require (
 	github.com/caarlos0/env/v6 v6.9.1
+	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/go-chi/chi/v5 v5.0.7
 	github.com/go-resty/resty/v2 v2.7.0
 	github.com/google/uuid v1.3.0
+	github.com/gostaticanalysis/sqlrows v0.0.0-20200307153552-ea5697937269
+	github.com/jackc/pgerrcode v0.0.0-20220416144525-469b46aa5efa
 	github.com/lib/pq v1.10.6
+	github.com/reillywatson/lintservemux v0.0.0-20191102120836-0e75fcfb6a46
 	github.com/stretchr/testify v1.8.0
 	golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4
+	golang.org/x/tools v0.1.12
+	google.golang.org/grpc v1.49.0
+	google.golang.org/protobuf v1.27.1
+	honnef.co/go/tools v0.3.3
 )
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
-	github.com/go-critic/go-critic v0.6.4 // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/google/go-cmp v0.5.8 // indirect
 	github.com/gostaticanalysis/analysisutil v0.7.1 // indirect
 	github.com/gostaticanalysis/comment v1.4.2 // indirect
-	github.com/gostaticanalysis/sqlrows v0.0.0-20200307153552-ea5697937269 // indirect
-	github.com/jackc/chunkreader/v2 v2.0.1 // indirect
-	github.com/jackc/pgconn v1.13.0 // indirect
-	github.com/jackc/pgerrcode v0.0.0-20220416144525-469b46aa5efa // indirect
-	github.com/jackc/pgio v1.0.0 // indirect
-	github.com/jackc/pgpassfile v1.0.0 // indirect
-	github.com/jackc/pgproto3/v2 v2.3.1 // indirect
-	github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect
-	github.com/jackc/pgtype v1.12.0 // indirect
-	github.com/jackc/pgx/v4 v4.17.0 // indirect
-	github.com/jgautheron/goconst v1.5.1 // indirect
 	github.com/kr/pretty v0.1.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/quasilyte/go-ruleguard/dsl v0.3.21 // indirect
-	github.com/reillywatson/lintservemux v0.0.0-20191102120836-0e75fcfb6a46 // indirect
-	github.com/stretchr/objx v0.4.0 // indirect
-	golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa // indirect
 	golang.org/x/exp/typeparams v0.0.0-20220428152302-39d4317da171 // indirect
 	golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
 	golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
 	golang.org/x/sys v0.0.0-20220818161305-2296e01440c6 // indirect
 	golang.org/x/text v0.3.7 // indirect
-	golang.org/x/tools v0.1.12 // indirect
+	google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect
 	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	honnef.co/go/tools v0.3.3 // indirect
 )

internal/app/app.go

@@ -10,6 +10,7 @@ import (
 	"github.com/zhel1/yandex-practicum-go/internal/storage/inmemory"
 	"github.com/zhel1/yandex-practicum-go/internal/storage/inpsql"
 	"log"
+	"net"
 	nethttp "net/http"
 	"os"
 	"os/signal"
@@ -50,38 +51,59 @@ func Run() {
 		log.Fatal(err)
 	}
 
+	var ipnet *net.IPNet = nil
+	if cfg.TrustedSubnet != "" {
+		_, ipnet, err = net.ParseCIDR(cfg.TrustedSubnet)
+		if err != nil {
+			log.Fatal(err)
+		}
+	}
+
 	deps := service.Deps{
-		Storage:      strg,
-		BaseURL:      cfg.BaseURL,
-		TokenManager: tokenManager,
+		Storage:       strg,
+		BaseURL:       cfg.BaseURL,
+		TokenManager:  tokenManager,
+		TrustedSubnet: ipnet,
 	}
 
 	services := service.NewServices(deps)
+
+	// HTTP server
 	handlers := http.NewHandler(services)
+	httpSrv := server.NewHTTPServer(&cfg, handlers.Init())
+
+	//GRPC server
+	grpcSrv := server.NewGRPCServer(&cfg, services)
 
-	// HTTP Server
-	srv := server.NewServer(&cfg, handlers.Init())
 	connectionsClosed := make(chan struct{})
 	interrupt := make(chan os.Signal, 1)
-
 	signal.Notify(interrupt, syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT)
 
 	go func() {
 		<-interrupt
-		if err := srv.Stop(context.Background()); err != nil {
+		if err := httpSrv.Stop(context.Background()); err != nil {
 			log.Printf("HTTP server shutdown: %v", err)
 		}
 
+		grpcSrv.Stop()
+
 		if err := strg.Close(); err != nil {
 			log.Printf("Storage shutdown: %v", err)
 		}
 
 		close(connectionsClosed)
 	}()
 
-	if err := srv.Run(); err != nethttp.ErrServerClosed {
-		log.Fatalf("HTTP server ListenAndServe: %v", err)
-	}
+	go func() {
+		if err := httpSrv.Run(); err != nethttp.ErrServerClosed {
+			log.Fatalf("HTTP server ListenAndServe: %v", err)
+		}
+	}()
+
+	go func() {
+		grpcSrv.Run()
+	}()
+
 	<-connectionsClosed
 	log.Println("Server shutdown gracefully")
 }

internal/config/config.go

@@ -19,6 +19,7 @@ type Config struct {
 	UserKey         string `env:"USER_KEY" envDefault:"PaSsW0rD" json:"user_key"`
 	DatabaseDSN     string `env:"DATABASE_DSN"       json:"database_dsn"`
 	EnableHTTPS     bool   `env:"ENABLE_HTTPS"       json:"enable_https"`
+	TrustedSubnet   string `env:"TRUSTED_SUBNET"     json:"trusted_subnet"`
 	Config          string `env:"CONFIG"             json:"-"`
 }
 
@@ -47,6 +48,7 @@ func (c *Config) Parse() error {
 	flag.StringVar(&tempConf.UserKey, "p", "", "UserKey for encryption cookie")
 	flag.StringVar(&tempConf.DatabaseDSN, "d", "", "The line with the address to connect to the database")
 	flag.BoolVar(&tempConf.EnableHTTPS, "s", false, "Enable HTTPS mode in web-server")
+	flag.StringVar(&tempConf.TrustedSubnet, "t", "192.168.1.0/24", "Trusted subnet")
 	flag.StringVar(&tempConf.Config, "config", "", "Config file")
 	flag.StringVar(&tempConf.Config, "c", "", "Config file")
 	flag.Parse()
@@ -82,6 +84,9 @@ func (c *Config) Parse() error {
 	if isFlagPassed("s") {
 		c.EnableHTTPS = tempConf.EnableHTTPS
 	}
+	if isFlagPassed("t") {
+		c.TrustedSubnet = tempConf.TrustedSubnet
+	}
 
 	// settings redefinition from evn
 	err := env.Parse(c)

internal/dto/errors.go

@@ -3,9 +3,10 @@ package dto
 import "errors"
 
 var (
-	ErrNotFound      = errors.New("not found")
-	ErrDeleted       = errors.New("marked as deleted")
-	ErrAlreadyExists = errors.New("already exists")
-	ErrExecutionPSQL = errors.New("execution PSQL error")
-	ErrStatementPSQL = errors.New("statement PSQL error")
+	ErrNotFound        = errors.New("not found")
+	ErrDeleted         = errors.New("marked as deleted")
+	ErrAlreadyExists   = errors.New("already exists")
+	ErrExecutionPSQL   = errors.New("execution PSQL error")
+	ErrStatementPSQL   = errors.New("statement PSQL error")
+	ErrInvalidArgument = errors.New("bad userID")
 )

internal/dto/internal.go

@@ -0,0 +1,7 @@
+package dto
+
+//Statistic struct
+type Statistic struct {
+	URLsCount  int `json:"urls"`
+	UsersCount int `json:"users"`
+}

internal/http/handler.go

@@ -9,6 +9,7 @@ import (
 	"github.com/zhel1/yandex-practicum-go/internal/http/middleware"
 	v1 "github.com/zhel1/yandex-practicum-go/internal/http/v1"
 	"github.com/zhel1/yandex-practicum-go/internal/service"
+	"github.com/zhel1/yandex-practicum-go/internal/utils"
 	"io"
 	"net/http"
 )
@@ -47,7 +48,7 @@ func (h *Handler) initAPI(router chi.Router) {
 // AddLink accepts a URL string in the request body for shortening.
 func (h *Handler) AddLink() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		userID, err := middleware.TakeUserID(r.Context())
+		userID, err := utils.ExtractValueFromContext(r.Context(), dto.UserIDCtxName)
 		if err != nil {
 			http.Error(w, err.Error(), http.StatusBadRequest)
 			return

internal/http/handlers_test.go

@@ -83,22 +83,22 @@ func (ht *HandlersTestSuite) TestGetLink() {
 			wantCode: http.StatusTemporaryRedirect,
 		},
 		{
-			name:     "Positive test #1",
+			name:     "Positive test #2",
 			value:    "1234568",
 			wantCode: http.StatusTemporaryRedirect,
 		},
 		{
-			name:     "Negative test #2. No link in database.",
+			name:     "Negative test #3. No link in database.",
 			value:    "1234569",
 			wantCode: http.StatusBadRequest,
 		},
 		{
-			name:     "Negative test #3 . Not existing path.",
+			name:     "Negative test #4 . Not existing path.",
 			value:    "1234567/1234567",
 			wantCode: http.StatusNotFound,
 		},
 		{
-			name:     "Negative test #4. Empty path (redirection test).",
+			name:     "Negative test #5. Empty path (redirection test).",
 			value:    "",
 			wantCode: http.StatusNotFound,
 		},
@@ -186,3 +186,17 @@ func (ht *HandlersTestSuite) TestAddLink() {
 		})
 	}
 }
+
+func (ht *HandlersTestSuite) TestPing() {
+	ht.router.Use(ht.cookieHandler.CookieHandler)
+	ht.router.Get("/ping", ht.handler.Ping())
+	defer ht.ts.Close()
+
+	ht.T().Run("Ping", func(t *testing.T) {
+		client := resty.New()
+		resp, err := client.R().Get(ht.ts.URL + "/ping")
+		require.NoError(t, err)
+
+		assert.Equal(t, http.StatusOK, resp.StatusCode())
+	})
+}

internal/http/middleware/cookie.go

@@ -33,13 +33,13 @@ func (h *CookieHandler) CookieHandler(next http.Handler) http.Handler {
 		var userID string
 		if errors.Is(err, http.ErrNoCookie) { //no cookie
 			userID = uuid.New().String()
-			http.SetCookie(w, h.CreateNewCookie(r.Context(), userID))
+			http.SetCookie(w, h.createNewCookie(r.Context(), userID))
 		} else if err != nil {
 			http.Error(w, "Cookie crumbled", http.StatusInternalServerError)
 		} else { //cookie found
 			userID, err = h.services.Users.CheckToken(r.Context(), userIDCookie.Value)
 			if err != nil {
-				http.SetCookie(w, h.CreateNewCookie(r.Context(), userID))
+				http.SetCookie(w, h.createNewCookie(r.Context(), userID))
 			}
 		}
 
@@ -48,21 +48,7 @@ func (h *CookieHandler) CookieHandler(next http.Handler) http.Handler {
 	})
 }
 
-func TakeUserID(context context.Context) (string, error) {
-	userIDCtx := ""
-	if id := context.Value(dto.UserIDCtxName); id != nil {
-		userIDCtx = id.(string)
-	}
-
-	if userIDCtx == "" {
-		return "", errors.New("empty user id")
-	}
-	return userIDCtx, nil
-}
-
-//**********************************************************************************************************************
-
-func (h *CookieHandler) CreateNewCookie(ctx context.Context, userID string) *http.Cookie {
+func (h *CookieHandler) createNewCookie(ctx context.Context, userID string) *http.Cookie {
 	token, err := h.services.Users.CreateNewToken(ctx, userID)
 	if err != nil {
 		panic(err.Error())

internal/http/v1/handler.go

@@ -19,4 +19,5 @@ func NewHandler(services *service.Services) *Handler {
 func (h *Handler) Init(r chi.Router) {
 	h.initShortenRoutes(r)
 	h.initUserRoutes(r)
+	h.initInternalRoutes(r)
 }

internal/http/v1/internal.go

@@ -0,0 +1,52 @@
+package v1
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"github.com/go-chi/chi/v5"
+	"net/http"
+)
+
+func (h *Handler) initInternalRoutes(r chi.Router) {
+	r.Route("/internal", func(r chi.Router) {
+		r.Get("/stats", h.GetStats())
+	})
+}
+
+// GetUserLinks returns to the user all links ever saved by him.
+func (h *Handler) GetStats() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		ipStr := r.Header.Get("X-Real-IP")
+
+		//TODO move it in middleware
+		trusted, err := h.services.Security.IsIpAddrTrusted(r.Context(), ipStr)
+		if err != nil {
+			http.Error(w, err.Error(), http.StatusInternalServerError)
+			return
+		}
+
+		if !trusted {
+			http.Error(w, "the ip address is not on a trusted network", http.StatusForbidden)
+			return
+		}
+
+		stat, err := h.services.Internal.GetStatistic(r.Context())
+		if err != nil {
+			http.Error(w, err.Error(), http.StatusNoContent)
+			return
+		}
+
+		buf := bytes.NewBuffer([]byte{})
+		encoder := json.NewEncoder(buf)
+		encoder.SetEscapeHTML(false)
+		if err = encoder.Encode(stat); err != nil {
+			http.Error(w, err.Error(), http.StatusInternalServerError)
+			return
+		}
+
+		w.Header().Set("content-type", "application/json; charset=utf-8")
+		w.WriteHeader(http.StatusOK)
+		fmt.Fprint(w, buf)
+	}
+}

internal/http/v1/shorten.go

@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"github.com/go-chi/chi/v5"
 	"github.com/zhel1/yandex-practicum-go/internal/dto"
-	"github.com/zhel1/yandex-practicum-go/internal/http/middleware"
+	"github.com/zhel1/yandex-practicum-go/internal/utils"
 	"net/http"
 )
 
@@ -22,7 +22,7 @@ func (h *Handler) initShortenRoutes(r chi.Router) {
 // AddLinkJSON accepts a JSON object in the request body and returning a JSON object in response.
 func (h *Handler) AddLinkJSON() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		userID, err := middleware.TakeUserID(r.Context())
+		userID, err := utils.ExtractValueFromContext(r.Context(), dto.UserIDCtxName)
 		if err != nil {
 			http.Error(w, err.Error(), http.StatusBadRequest)
 			return
@@ -62,7 +62,7 @@ func (h *Handler) AddLinkJSON() http.HandlerFunc {
 // AddLinkBatchJSON accepts in the request body a set of URLs for shortening in the format.
 func (h *Handler) AddLinkBatchJSON() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		userID, err := middleware.TakeUserID(r.Context())
+		userID, err := utils.ExtractValueFromContext(r.Context(), dto.UserIDCtxName)
 		if err != nil {
 			http.Error(w, err.Error(), http.StatusBadRequest)
 			return