wip: captcha

api/docs.go

@@ -491,6 +491,22 @@ const docTemplate = `{
                 "responses": {}
             }
         },
+        "/configs/captcha": {
+            "get": {
+                "description": "Captcha 配置查询",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "Config"
+                ],
+                "summary": "Captcha 配置查询",
+                "responses": {}
+            }
+        },
         "/games/": {
             "get": {
                 "security": [
@@ -2408,6 +2424,10 @@ const docTemplate = `{
                     "description": "The user's password. Crypt.",
                     "type": "string"
                 },
+                "remote_ip": {
+                    "description": "The user's remote ip.",
+                    "type": "string"
+                },
                 "teams": {
                     "description": "The user's teams.",
                     "type": "array",

api/swagger.json

@@ -482,6 +482,22 @@
                 "responses": {}
             }
         },
+        "/configs/captcha": {
+            "get": {
+                "description": "Captcha 配置查询",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "Config"
+                ],
+                "summary": "Captcha 配置查询",
+                "responses": {}
+            }
+        },
         "/games/": {
             "get": {
                 "security": [
@@ -2399,6 +2415,10 @@
                     "description": "The user's password. Crypt.",
                     "type": "string"
                 },
+                "remote_ip": {
+                    "description": "The user's remote ip.",
+                    "type": "string"
+                },
                 "teams": {
                     "description": "The user's teams.",
                     "type": "array",

api/swagger.yaml

@@ -381,6 +381,9 @@ definitions:
       password:
         description: The user's password. Crypt.
         type: string
+      remote_ip:
+        description: The user's remote ip.
+        type: string
       teams:
         description: The user's teams.
         items:
@@ -1082,6 +1085,17 @@ paths:
       summary: 更新配置
       tags:
       - Config
+  /configs/captcha:
+    get:
+      consumes:
+      - application/json
+      description: Captcha 配置查询
+      produces:
+      - application/json
+      responses: {}
+      summary: Captcha 配置查询
+      tags:
+      - Config
   /games/:
     get:
       consumes:

internal/app/config/application.go

@@ -54,7 +54,7 @@ type ApplicationCfg struct {
 			SiteKey   string  `yaml:"site_key" json:"site_key" mapstructure:"site_key"`
 			SecretKey string  `yaml:"secret_key" json:"secret_key" mapstructure:"secret_key"`
 			Threshold float64 `yaml:"threshold" json:"threshold" mapstructure:"threshold"`
-		} `yaml:"re_captcha" json:"re_captcha" mapstructure:"re_captcha"`
+		} `yaml:"recaptcha" json:"recaptcha" mapstructure:"recaptcha"`
 		Turnstile struct {
 			URL       string `yaml:"url" json:"url" mapstructure:"url"`
 			SiteKey   string `yaml:"site_key" json:"site_key" mapstructure:"site_key"`

internal/controller/config.go

@@ -1,6 +1,7 @@
 package controller
 
 import (
+	"github.com/elabosak233/cloudsdale/internal/app/config"
 	"github.com/elabosak233/cloudsdale/internal/model/request"
 	"github.com/elabosak233/cloudsdale/internal/service"
 	"github.com/elabosak233/cloudsdale/internal/utils/validator"
@@ -11,6 +12,7 @@ import (
 type IConfigController interface {
 	Find(ctx *gin.Context)
 	Update(ctx *gin.Context)
+	FindCaptcha(ctx *gin.Context)
 }
 
 type ConfigController struct {
@@ -33,7 +35,7 @@ func NewConfigController(appService *service.Service) IConfigController {
 func (c *ConfigController) Find(ctx *gin.Context) {
 	ctx.JSON(http.StatusOK, gin.H{
 		"code": http.StatusOK,
-		"data": c.configService.FindAll(),
+		"data": *(config.PltCfg()),
 	})
 }
 
@@ -68,3 +70,26 @@ func (c *ConfigController) Update(ctx *gin.Context) {
 		})
 	}
 }
+
+// FindCaptcha
+// @Summary Captcha 配置查询
+// @Description	Captcha 配置查询
+// @Tags Config
+// @Accept json
+// @Produce json
+// @Router /configs/captcha [get]
+func (c *ConfigController) FindCaptcha(ctx *gin.Context) {
+	ctx.JSON(http.StatusOK, gin.H{
+		"code": http.StatusOK,
+		"data": map[string]any{
+			"enabled":  config.AppCfg().Captcha.Enabled,
+			"provider": config.AppCfg().Captcha.Provider,
+			"turnstile": map[string]any{
+				"site_key": config.AppCfg().Captcha.Turnstile.SiteKey,
+			},
+			"recaptcha": map[string]any{
+				"site_key": config.AppCfg().Captcha.ReCaptcha.SiteKey,
+			},
+		},
+	})
+}

internal/controller/user.go

@@ -70,6 +70,10 @@ func (c *UserController) Login(ctx *gin.Context) {
 		zap.L().Warn(fmt.Sprintf("User %s login failed", user.Username), zap.Uint("user_id", user.ID))
 		return
 	}
+	_ = c.userService.Update(request.UserUpdateRequest{
+		ID:       user.ID,
+		RemoteIP: ctx.RemoteIP(),
+	})
 	tokenString, err := c.userService.GetJwtTokenByID(user)
 	if err != nil {
 		ctx.JSON(http.StatusInternalServerError, gin.H{

internal/extension/casbin/policy.go

@@ -43,7 +43,7 @@ func initDefaultPolicy() {
 		{"user", "/api/pods/{id}", "DELETE"},
 
 		{"guest", "/api/", "GET"},
-		{"guest", "/api/configs/", "GET"},
+		{"guest", "/api/configs/*", "GET"},
 		{"guest", "/api/categories/", "GET"},
 		{"guest", "/api/users/", "GET"},
 		{"guest", "/api/users/register", "POST"},

internal/middleware/frontend.go

@@ -1,16 +1,35 @@
 package middleware
 
 import (
+	"github.com/elabosak233/cloudsdale/internal/app/config"
+	"github.com/elabosak233/cloudsdale/internal/utils"
 	"github.com/gin-gonic/gin"
 	"net/http"
 	"os"
 	"path/filepath"
 	"strings"
 )
 
+func index(ctx *gin.Context) {
+	filePath := filepath.Join(utils.FrontendPath, "index.html")
+	indexContent, err := os.ReadFile(filePath)
+	if err != nil {
+		ctx.JSON(http.StatusInternalServerError, gin.H{
+			"code": http.StatusInternalServerError,
+			"msg":  "Error reading index.html",
+		})
+		ctx.Abort()
+		return
+	}
+	indexContentStr := string(indexContent)
+	indexContentStr = strings.ReplaceAll(indexContentStr, "{{ Cloudsdale.Title }}", config.PltCfg().Site.Title)
+	ctx.Header("Content-Type", "text/html; charset=utf-8")
+	ctx.String(http.StatusOK, indexContentStr)
+	ctx.Abort()
+}
+
 func Frontend(urlPrefix string) gin.HandlerFunc {
-	root := "./dist"
-	fileServer := http.FileServer(http.Dir(root))
+	fileServer := http.FileServer(http.Dir(utils.FrontendPath))
 	if !strings.HasSuffix(urlPrefix, "/") {
 		urlPrefix = urlPrefix + "/"
 	}
@@ -20,14 +39,17 @@ func Frontend(urlPrefix string) gin.HandlerFunc {
 			ctx.Next()
 		} else {
 			ctx.Set("skip_logging", true)
-			filePath := filepath.Join(root, ctx.Request.URL.Path)
+			filePath := filepath.Join(utils.FrontendPath, ctx.Request.URL.Path)
 			_, err := os.Stat(filePath)
 			if err == nil {
-				http.StripPrefix(staticServerPrefix, fileServer).ServeHTTP(ctx.Writer, ctx.Request)
-				ctx.Abort()
+				if ctx.Request.URL.Path == "/" || ctx.Request.URL.Path == "/index.html" {
+					index(ctx)
+				} else {
+					http.StripPrefix(staticServerPrefix, fileServer).ServeHTTP(ctx.Writer, ctx.Request)
+					ctx.Abort()
+				}
 			} else if os.IsNotExist(err) {
-				http.ServeFile(ctx.Writer, ctx.Request, filepath.Join(root, "index.html"))
-				ctx.Abort()
+				index(ctx)
 			} else {
 				ctx.Next()
 			}

internal/model/request/user_request.go

@@ -41,6 +41,7 @@ type UserUpdateRequest struct {
 	Password string `binding:"omitempty,min=6" json:"password,omitempty"`
 	Email    string `binding:"omitempty,email" json:"email,omitempty"`
 	Group    string `json:"group"`
+	RemoteIP string `json:"-"`
 }
 
 type UserDeleteRequest struct {

internal/model/user.go

@@ -17,6 +17,7 @@ type User struct {
 	Avatar      *File   `gorm:"-" json:"avatar"`                                                         // The user's avatar.
 	Group       string  `gorm:"column:group;varchar(16);not null;" json:"group,omitempty"`               // The user's group.
 	Password    string  `gorm:"column:password;type:varchar(255);not null" json:"password,omitempty"`    // The user's password. Crypt.
+	RemoteIP    string  `gorm:"column:remote_ip;type:varchar(32)" json:"remote_ip,omitempty"`            // The user's remote ip.
 	CreatedAt   int64   `gorm:"autoUpdateTime:milli" json:"created_at,omitempty"`                        // The user's creation time.
 	UpdatedAt   int64   `gorm:"autoUpdateTime:milli" json:"updated_at,omitempty"`                        // The user's last update time.
 	Teams       []*Team `gorm:"many2many:user_teams;" json:"teams,omitempty"`                            // The user's teams.

internal/router/config.go

@@ -24,4 +24,5 @@ func NewConfigRouter(configRouter *gin.RouterGroup, configController controller.
 func (c *ConfigRouter) Register() {
 	c.router.GET("/", c.controller.Find)
 	c.router.PUT("/", c.controller.Update)
+	c.router.GET("/captcha", c.controller.FindCaptcha)
 }

internal/service/config.go

@@ -7,7 +7,6 @@ import (
 )
 
 type IConfigService interface {
-	FindAll() (cfg config.PlatformCfg)
 	Update(req request.ConfigUpdateRequest) (err error)
 }
 
@@ -18,10 +17,6 @@ func NewConfigService(appRepository *repository.Repository) IConfigService {
 	return &ConfigService{}
 }
 
-func (c *ConfigService) FindAll() (cfg config.PlatformCfg) {
-	return *(config.PltCfg())
-}
-
 func (c *ConfigService) Update(req request.ConfigUpdateRequest) (err error) {
 	config.PltCfg().Site.Title = req.Site.Title
 	config.PltCfg().Site.Description = req.Site.Description

internal/utils/const.go

@@ -12,4 +12,5 @@ const (
 	MediaPath    = "./media"
 	FilesPath    = "./files"
 	CapturesPath = "./captures"
+	FrontendPath = "./dist"
 )

web/index.html

@@ -4,7 +4,7 @@
 		<meta charset="UTF-8" />
 		<link rel="icon" type="image/svg+xml" href="/favicon.ico" />
 		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
-		<title>Cloudsdale</title>
+		<title>{{ Cloudsdale.Title }}</title>
 	</head>
 	<body>
 		<div id="root"></div>

web/package.json

@@ -36,7 +36,9 @@
 		"prismjs": "^1.29.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
+		"react-google-recaptcha": "^3.1.0",
 		"react-router-dom": "^6.23.1",
+		"react-turnstile": "^1.1.3",
 		"sass": "^1.77.1",
 		"vite-plugin-pages": "^0.32.1",
 		"zod": "^3.23.8",
@@ -48,6 +50,7 @@
 		"@types/prismjs": "^1.26.4",
 		"@types/react": "^18.2.66",
 		"@types/react-dom": "^18.2.22",
+		"@types/react-google-recaptcha": "^2.1.9",
 		"@typescript-eslint/eslint-plugin": "^7.2.0",
 		"@typescript-eslint/parser": "^7.2.0",
 		"@vitejs/plugin-react": "^4.2.1",

web/src/App.tsx

@@ -34,6 +34,14 @@ function App() {
 			});
 	}, [configStore.refresh]);
 
+	// Get captcha config
+	useEffect(() => {
+		configApi.getCaptchaCfg().then((res) => {
+			const r = res.data;
+			configStore.setCaptchaCfg(r.data);
+		});
+	}, []);
+
 	// Get exists categories
 	useEffect(() => {
 		categoryApi.getCategories().then((res) => {

web/src/api/config.ts

@@ -12,8 +12,13 @@ export function useConfigApi() {
 		return auth.put("/configs/", request);
 	};
 
+	const getCaptchaCfg = () => {
+		return auth.get("/configs/captcha");
+	};
+
 	return {
 		getPltCfg,
 		updatePltCfg,
+		getCaptchaCfg,
 	};
 }

web/src/api/user.ts

@@ -2,6 +2,8 @@ import {
 	UserCreateRequest,
 	UserDeleteRequest,
 	UserFindRequest,
+	UserLoginRequest,
+	UserRegisterRequest,
 	UserUpdateRequest,
 } from "@/types/user";
 import { useApi, useAuth } from "@/utils/axios";
@@ -11,25 +13,12 @@ export function useUserApi() {
 	const api = useApi();
 	const auth = useAuth();
 
-	const login = (username: string, password: string) => {
-		return api.post("/users/login", {
-			username,
-			password,
-		});
+	const login = (request: UserLoginRequest) => {
+		return api.post("/users/login", request);
 	};
 
-	const register = (
-		username: string,
-		nickname: string,
-		email: string,
-		password: string
-	) => {
-		return api.post("/users/register", {
-			username,
-			nickname,
-			email,
-			password,
-		});
+	const register = (request: UserRegisterRequest) => {
+		return api.post("/users/register", request);
 	};
 
 	const getUsers = (request: UserFindRequest) => {