refactor(core): 🚧 rewrite from chi to gin

Author: IgorPolyakov

.vscode/settings.json

@@ -3,6 +3,7 @@
         "config",
         "api",
         "test",
-        "deps"
+        "deps",
+        "core"
     ]
 }

api/openapi.yaml

@@ -48,6 +48,8 @@ paths:
         Authenticates a user by user_name and password, starts a new session,
         and returns a session cookie.
       operationId: signInUser
+      security:
+        - sessionAuth: []
       requestBody:
         required: true
         content:
@@ -97,6 +99,8 @@ paths:
         Authenticates a user by user_name and password, starts a new session,
         and returns a session cookie.
       operationId: signOutUser
+      security:
+        - sessionAuth: []
       responses:
         '200':
           description: User logout successfully. A session cookie is remove.
@@ -162,6 +166,8 @@ paths:
         - Users
       summary: Create a new user
       operationId: createUser
+      security:
+        - sessionAuth: []
       parameters: []
       requestBody:
         content:
@@ -211,6 +217,8 @@ paths:
       tags:
         - Users
       summary: Update a user
+      security:
+        - sessionAuth: []
       operationId: updateUser
       parameters:
         - name: userId
@@ -240,6 +248,8 @@ paths:
         - Users
       summary: Delete a user
       operationId: deleteUser
+      security:
+        - sessionAuth: []
       parameters:
         - name: userId
           in: path
@@ -309,6 +319,8 @@ paths:
         - Games
       summary: Create a new game
       operationId: createGame
+      security:
+        - sessionAuth: []
       parameters: []
       requestBody:
         content:
@@ -358,6 +370,8 @@ paths:
       tags:
         - Games
       summary: Update a game
+      security:
+        - sessionAuth: []
       operationId: updateGame
       parameters:
         - name: gameId
@@ -392,6 +406,8 @@ paths:
       tags:
         - Games
       summary: Delete a game
+      security:
+        - sessionAuth: []
       operationId: deleteGame
       parameters:
         - name: gameId
@@ -442,6 +458,8 @@ paths:
         - Teams
       summary: Create a new team
       operationId: createTeam
+      security:
+        - sessionAuth: []
       parameters: []
       requestBody:
         content:
@@ -494,6 +512,8 @@ paths:
         - Teams
       summary: Update a team
       operationId: updateTeam
+      security:
+        - sessionAuth: []
       parameters:
         - name: teamId
           in: path
@@ -518,6 +538,8 @@ paths:
         - Teams
       summary: Delete a team
       operationId: deleteTeam
+      security:
+        - sessionAuth: []
       parameters:
         - name: teamId
           in: path
@@ -561,6 +583,8 @@ paths:
         - Teams
       summary: Connect user with team
       operationId: connectUserTeam
+      security:
+        - sessionAuth: []
       parameters:
         - in: path
           name: teamId
@@ -591,6 +615,8 @@ paths:
         - Teams
       summary: Approve connected user with team lead
       operationId: approveUserTeam
+      security:
+        - sessionAuth: []
       parameters:
         - in: path
           name: teamId
@@ -621,6 +647,8 @@ paths:
         - Teams
       summary: Leave user from team
       operationId: leaveUserFromTeam
+      security:
+        - sessionAuth: []
       parameters:
         - in: path
           name: teamId
@@ -659,6 +687,8 @@ paths:
             format: uuid
       summary: Create a new game result
       operationId: createResult
+      security:
+        - sessionAuth: []
       requestBody:
         content:
           application/json:
@@ -709,6 +739,8 @@ paths:
         - Results
       summary: Update a result
       operationId: updateResult
+      security:
+        - sessionAuth: []
       parameters:
         - in: path
           name: gameId
@@ -780,6 +812,8 @@ paths:
         - Services
       summary: Create a new service
       operationId: createService
+      security:
+        - sessionAuth: []
       parameters: []
       requestBody:
         content:
@@ -822,6 +856,8 @@ paths:
         - Services
       summary: Update a service
       operationId: updateService
+      security:
+        - sessionAuth: []
       parameters:
         - name: serviceId
           in: path
@@ -846,6 +882,8 @@ paths:
         - Services
       summary: Delete a service
       operationId: deleteService
+      security:
+        - sessionAuth: []
       parameters:
         - name: serviceId
           in: path
@@ -864,6 +902,8 @@ paths:
       tags:
         - Services
       summary: Upload zip-archive
+      security:
+        - sessionAuth: []
       description: |
         Handler for upload zip-archive with checker
       operationId: uploadChecker
@@ -898,6 +938,8 @@ paths:
       tags:
         - Services
       operationId: uploadService
+      security:
+        - sessionAuth: []
       parameters:
         - in: path
           name: serviceId
@@ -1375,4 +1417,9 @@ components:
           format: uuid
   links: {}
   callbacks: {}
+  securitySchemes:
+    sessionAuth:
+      type: apiKey
+      in: cookie
+      name: session
 security: []

cmd/main.go

@@ -1,16 +1,21 @@
 package main
 
 import (
+	"context"
+	"log"
 	"log/slog"
-	"net/http"
 	"os"
 
 	"ctf01d/internal/config"
 	"ctf01d/internal/handler"
 	"ctf01d/internal/httpserver"
 	migration "ctf01d/internal/migrations/psql"
-	"github.com/go-chi/chi/v5"
-	"github.com/go-chi/cors"
+	"ctf01d/pkg/ginmiddleware"
+
+	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/getkin/kin-openapi/openapi3filter"
+	"github.com/gin-contrib/cors"
+	"github.com/gin-gonic/gin"
 	_ "github.com/lib/pq"
 	_ "go.uber.org/automaxprocs"
 )
@@ -33,36 +38,49 @@ func main() {
 	slog.Info("Config path is - " + path)
 	db, err := migration.InitDatabase(cfg)
 	if err != nil {
-		slog.Error("Error opening database connection: " + err.Error())
-		return
+		slog.Error("Database connection error: " + err.Error())
+		os.Exit(1)
 	}
-	slog.Info("Database connection established successfully")
 	defer db.Close()
-	router := chi.NewRouter()
+	slog.Info("Database connection established successfully")
+	router := gin.New()
+	router.Use(gin.Recovery(), gin.Logger())
 
 	// Добавление CORS middleware
-	corsMiddleware := cors.New(cors.Options{
-		AllowedOrigins:   []string{"*"},
-		AllowedMethods:   []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"},
-		AllowedHeaders:   []string{"Accept", "Authorization", "Content-Type", "X-CSRF-Token"},
-		ExposedHeaders:   []string{"Link"},
-		AllowCredentials: true,
-		MaxAge:           300,
+	router.Use(cors.Default())
+
+	// Загрузка спецификации OpenAPI
+	swagger, err := openapi3.NewLoader().LoadFromFile("api/openapi.yaml")
+	if err != nil {
+		log.Fatalf("Failed to load OpenAPI spec: %v", err)
+	}
+
+	// OpenAPI middleware валидации запросов
+	requestValidator := ginmiddleware.OapiRequestValidatorWithOptions(swagger, &ginmiddleware.Options{
+		Options: openapi3filter.Options{
+			AuthenticationFunc: func(_ context.Context, _ *openapi3filter.AuthenticationInput) error {
+				return nil
+			},
+		},
 	})
 
-	router.Use(corsMiddleware.Handler)
+	// OpenAPI middleware валидации ответов
+	responseValidator := ginmiddleware.OapiResponseValidator(swagger)
+	hndlr := &handler.Handler{DB: db}
 
-	hndlr := &handler.Handler{
-		DB: db,
-	}
-	svr := handler.NewServerInterfaceWrapper(hndlr)
+	// API-группа, к которой применяются валидаторы
+	apiGroup := router.Group("/", requestValidator, responseValidator)
+	httpserver.RegisterHandlers(apiGroup, hndlr)
 
-	router.Mount("/api/", httpserver.HandlerFromMux(svr, router))
-	router.Mount("/", http.HandlerFunc(httpserver.NewHtmlRouter))
+	// HTML маршрутизатор для корня
+	router.GET("/", httpserver.NewHtmlRouter())
+	router.NoRoute(httpserver.NewHtmlRouter())
 
-	slog.Info("Server run on", slog.String("host", cfg.HTTP.Host), slog.String("port", cfg.HTTP.Port))
-	err = http.ListenAndServe(cfg.HTTP.Host+":"+cfg.HTTP.Port, router)
-	if err != nil {
+	// Запуск сервера
+	addr := cfg.HTTP.Host + ":" + cfg.HTTP.Port
+	slog.Info("Server running on", slog.String("address", addr))
+	if err := router.Run(addr); err != nil {
 		slog.Error("Server error: " + err.Error())
+		os.Exit(1)
 	}
 }

go.mod

@@ -3,26 +3,65 @@ module ctf01d
 go 1.24.0
 
 require (
+	github.com/getkin/kin-openapi v0.131.0
+	github.com/gin-contrib/cors v1.7.4
+	github.com/gin-contrib/sessions v1.0.2
+	github.com/gin-gonic/gin v1.10.0
 	github.com/go-chi/chi/v5 v5.2.1
-	github.com/go-chi/cors v1.2.1
 	github.com/google/uuid v1.6.0
 	github.com/ilyakaznacheev/cleanenv v1.5.0
 	github.com/jaswdr/faker v1.19.1
 	github.com/jaswdr/faker/v2 v2.3.3
 	github.com/lib/pq v1.10.9
 	github.com/oapi-codegen/runtime v1.1.1
+	github.com/stretchr/testify v1.10.0
 	go.uber.org/automaxprocs v1.6.0
 	golang.org/x/crypto v0.36.0
 )
 
 require (
 	github.com/BurntSushi/toml v1.5.0 // indirect
 	github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
+	github.com/bytedance/sonic v1.13.2 // indirect
+	github.com/bytedance/sonic/loader v0.2.4 // indirect
+	github.com/cloudwego/base64x v0.1.5 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.8 // indirect
+	github.com/gin-contrib/sse v1.0.0 // indirect
+	github.com/go-openapi/jsonpointer v0.21.1 // indirect
+	github.com/go-openapi/swag v0.23.1 // indirect
+	github.com/go-playground/locales v0.14.1 // indirect
+	github.com/go-playground/universal-translator v0.18.1 // indirect
+	github.com/go-playground/validator/v10 v10.26.0 // indirect
+	github.com/goccy/go-json v0.10.5 // indirect
+	github.com/gomodule/redigo v1.9.2 // indirect
+	github.com/gorilla/context v1.1.2 // indirect
+	github.com/gorilla/mux v1.8.1 // indirect
+	github.com/gorilla/securecookie v1.1.2 // indirect
+	github.com/gorilla/sessions v1.4.0 // indirect
 	github.com/joho/godotenv v1.5.1 // indirect
-	github.com/kr/pretty v0.3.1 // indirect
-	github.com/rogpeppe/go-internal v1.12.0 // indirect
-	github.com/stretchr/testify v1.9.0 // indirect
-	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
+	github.com/josharian/intern v1.0.0 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.10 // indirect
+	github.com/leodido/go-urn v1.4.0 // indirect
+	github.com/mailru/easyjson v0.9.0 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
+	github.com/oasdiff/yaml v0.0.0-20250309154309-f31be36b4037 // indirect
+	github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90 // indirect
+	github.com/pelletier/go-toml/v2 v2.2.3 // indirect
+	github.com/perimeterx/marshmallow v1.1.5 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/snowdreamtech/redistore v0.0.0-20231007100540-6364ca2c97b4 // indirect
+	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
+	github.com/ugorji/go/codec v1.2.12 // indirect
+	golang.org/x/arch v0.15.0 // indirect
+	golang.org/x/net v0.38.0 // indirect
+	golang.org/x/sys v0.31.0 // indirect
+	golang.org/x/text v0.23.0 // indirect
+	google.golang.org/protobuf v1.36.6 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	olympos.io/encoding/edn v0.0.0-20201019073823-d3554ca0b0a3 // indirect
 )