Многопоточная обработка

.github/workflows/shortenertest.yml

@@ -54,7 +54,7 @@ jobs:
       - name: Build server binary
         run: |
           cd cmd/shortener
-          go build -o shortener
+          go build -buildvcs=false -o shortener
 
       - name: "Code increment #1"
         if: |

cmd/shortener/main.go

@@ -12,10 +12,9 @@ import (
 
 func main() {
 	cfg := config.NewConfiguration()
-
 	ctx := context.Background()
 
-	str := storage.NewStorage(cfg.FileStoragePath, cfg.DatabaseDSN, ctx)
+	str := storage.NewStorage(ctx, cfg.FileStoragePath, cfg.DatabaseDSN)
 	if closeFunc := str.CloseFunc(); closeFunc != nil {
 		defer closeFunc()
 	}

internal/auth/auth.go

@@ -21,7 +21,7 @@ type authentication struct {
 }
 
 type Authenticator interface {
-	Authenticate(http.HandlerFunc) http.HandlerFunc
+	Authenticate(http.Handler) http.Handler
 	GetUserID() string
 }
 
@@ -81,7 +81,7 @@ func (a *authentication) authExisting(cookie string) error {
 	}
 	log.Println("Cookie расшифрованы в следующие байты:", data)
 
-	if userIDLength*2 < len(cookie) {
+	if len(cookie) < userIDLength*2 {
 		return errors.New("неправильная длина cookie")
 	}
 	id := cookie[:userIDLength*2]
@@ -110,16 +110,17 @@ func (a *authentication) authExisting(cookie string) error {
 	return nil
 }
 
-func (a *authentication) Authenticate(next http.HandlerFunc) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
+func (a *authentication) Authenticate(next http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		if a == nil {
 			return
 		}
 
+		a.userID = ""
+		a.cookieFull = ""
+
 		cookie, err := r.Cookie(cookieAuthentication)
 		if err != nil {
-			a.cookieFull = ""
-			a.userID = ""
 			log.Println("Cookie '" + cookieAuthentication + "' не переданы")
 		}
 
@@ -128,7 +129,7 @@ func (a *authentication) Authenticate(next http.HandlerFunc) http.HandlerFunc {
 			err = a.authExisting(cookie.Value)
 		}
 		if err != nil {
-			log.Println("Ошибка при чтении cookie:", err)
+			log.Println("Ошибка при аутентификации пользователя через cookie 'authentication':", err)
 		}
 
 		err = nil
@@ -143,8 +144,8 @@ func (a *authentication) Authenticate(next http.HandlerFunc) http.HandlerFunc {
 			http.SetCookie(w, &http.Cookie{Name: cookieAuthentication, Value: a.cookieFull})
 		}
 
-		next(w, r)
-	}
+		next.ServeHTTP(w, r)
+	})
 }
 
 func (a *authentication) GetUserID() string {

internal/config/config.go

@@ -67,4 +67,4 @@ func (c *Configuration) fillFromEnvironment() error {
 	log.Println("Environment config:", c)
 
 	return nil
-}
+}