v0.1.0-alpha

- Reorganize the directory
- Add Create New Announcement
- Add hashes to password and superusertoken
- Fix known bugs

Author: BretRen

handlers/announcement_handler.go

@@ -0,0 +1,77 @@
+package handlers
+
+import (
+	"errors"
+	"net/http"
+
+	"github.com/gin-gonic/gin"
+	"github.com/google/uuid"
+	"gorm.io/gorm"
+	"pdnode.com/website/models"
+	"pdnode.com/website/services"
+)
+
+type AnnouncementHandler struct {
+	Service *services.AnnouncementService
+}
+
+func (h *AnnouncementHandler) GetOne(c *gin.Context) {
+	id := c.Param("id")
+
+	a, err := h.Service.GetByID(id)
+	if err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			c.JSON(http.StatusNotFound, gin.H{"message": "Announcement not found"})
+			return
+		}
+		// 这里的打印可以保留，方便服务器排查
+		println("[Server Error] Query Error: " + err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"message": "Something went wrong"})
+		return
+	}
+
+	c.JSON(http.StatusOK, a)
+}
+
+func (h *AnnouncementHandler) GetAll(c *gin.Context) {
+	announcements, err := h.Service.GetAll()
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+		return
+	}
+
+	c.JSON(http.StatusOK, announcements)
+}
+
+func (h *AnnouncementHandler) Create(c *gin.Context) {
+	var input models.CreateAnnouncementRequest
+
+	if err := c.ShouldBindJSON(&input); err != nil {
+		c.JSON(400, gin.H{"error": err.Error()})
+		return
+	}
+
+	val, exists := c.Get("currentUserID")
+
+	if !exists {
+		c.JSON(500, gin.H{"error": "Unable to obtain current user information"})
+		return
+	}
+
+	announcement := models.Announcement{
+		Title:    input.Title,
+		Content:  input.Content,
+		AuthorID: val.(uuid.UUID),
+	}
+
+	if err := h.Service.Create(&announcement); err != nil {
+		c.JSON(400, gin.H{"error": err.Error()})
+		return
+	}
+
+	c.JSON(201, gin.H{
+		"message": "Created",
+		"data":    announcement,
+	})
+
+}

handlers/auth_handler.go

@@ -0,0 +1,49 @@
+package handlers
+
+import (
+	"github.com/gin-gonic/gin"
+	"pdnode.com/website/models"
+	"pdnode.com/website/services"
+	"pdnode.com/website/utils"
+)
+
+type AuthHandler struct {
+	Service *services.AuthService
+}
+
+func (h *AuthHandler) Login(c *gin.Context) {
+	var input models.LoginRequest
+	if err := c.ShouldBindJSON(&input); err != nil {
+		c.JSON(400, gin.H{"error": err.Error()})
+		return
+	}
+
+	user, token, err := h.Service.Login(input.Email, input.Password)
+	if err != nil {
+		c.JSON(401, gin.H{"error": err.Error()})
+		return
+	}
+
+	c.JSON(200, gin.H{"message": "success", "token": token, "user": user})
+}
+
+func (h *AuthHandler) Register(c *gin.Context) {
+	var input models.RegisterRequest
+	if err := c.ShouldBindJSON(&input); err != nil {
+		c.JSON(400, gin.H{"error": err.Error()})
+		return
+	}
+
+	// Handler 负责处理 Header 这种 HTTP 特有的东西
+	if c.GetHeader("X-Super-Token") != string(utils.GetSuperuserToken()) {
+		c.JSON(403, gin.H{"error": "Invalid token"})
+		return
+	}
+
+	if err := h.Service.Register(input); err != nil {
+		c.JSON(400, gin.H{"error": err.Error()})
+		return
+	}
+
+	c.JSON(201, gin.H{"message": "success"})
+}

main.go

@@ -1,31 +1,16 @@
 package main
 
 import (
-	"errors"
-
 	"github.com/gin-gonic/gin"
-	"golang.org/x/crypto/bcrypt"
 	"gorm.io/driver/sqlite"
 	"gorm.io/gorm"
+	"pdnode.com/website/models"
+	"pdnode.com/website/routes"
 )
 
 // Setup JWT Secret Key
-var jwtKey = []byte("your_secret_key_pdnode")
 
-// HashPassword 1. 加密密码（注册时使用）
-func HashPassword(password string) (string, error) {
-	// 强度系数默认为 10，数值越大越慢（越安全）
-	combined := append([]byte(password), GetSuperuserToken()...)
-	bytes, err := bcrypt.GenerateFromPassword(combined, bcrypt.DefaultCost)
-	return string(bytes), err
-}
-
-// CheckPasswordHash 2. 比对密码（登录时使用）
-func CheckPasswordHash(password, hash string) bool {
-	combined := append([]byte(password), GetSuperuserToken()...)
-	err := bcrypt.CompareHashAndPassword([]byte(hash), combined)
-	return err == nil
-}
+// HashPassword 改进版（带 Pre-hash）
 
 func main() {
 
@@ -36,149 +21,13 @@ func main() {
 		panic("failed to connect database")
 	}
 
-	err = db.AutoMigrate(&Announcement{}, &User{})
+	err = db.AutoMigrate(&models.Announcement{}, &models.User{})
 	if err != nil {
 		panic("failed to migrate database: " + err.Error())
 	}
 
 	gin.ForceConsoleColor()
-	r := gin.Default()
-
-	r.GET("/", func(c *gin.Context) {
-		c.JSON(200, gin.H{
-			"msg": "Pdnode Website API is running",
-		})
-	})
-
-	r.GET("/announcements/:id", func(c *gin.Context) {
-		id := c.Param("id")
-
-		var a Announcement
-
-		result := db.First(&a, id)
-
-		if result.Error != nil {
-
-			if errors.Is(result.Error, gorm.ErrRecordNotFound) {
-				c.JSON(404, gin.H{
-					"message": "Announcement not found",
-				})
-			}
-
-			c.JSON(500, gin.H{
-				"message": "Something went wrong",
-			})
-
-			println("[Server Error] Query Error: " + result.Error.Error())
-
-			return
-		}
-
-		c.JSON(200, a)
-		return
-
-	})
-
-	r.GET("/announcements", func(c *gin.Context) {
-		var a []Announcement
-		result := db.Order("created_at desc").Find(&a)
-		if result.Error != nil {
-			c.JSON(500, gin.H{
-				"error": result.Error.Error(),
-			})
-			return
-		}
-
-		c.JSON(200, a)
-
-	})
-
-	r.POST("/login", func(c *gin.Context) {
-		var input LoginRequest
-
-		if err := c.ShouldBind(&input); err != nil {
-			c.JSON(400, gin.H{
-				"error": err.Error(),
-			})
-			return
-		}
-
-		var user User
-		const fakeBCryptHash = "$2a$10$N9qo8uLOickgx2ZMRZoMyeIjZAgNIhp.qfTMvYeJLvAbpE52EPIvG"
-
-		result := db.Where("email = ?", input.Email).First(&user)
-
-		if result.Error != nil {
-			CheckPasswordHash(input.Password, fakeBCryptHash)
-			c.JSON(404, gin.H{"error": "Incorrect credentials"})
-			return
-		}
-
-		isMatch := CheckPasswordHash(input.Password, user.Password)
-
-		if !isMatch {
-			c.JSON(401, gin.H{"error": "Incorrect credentials"})
-			return
-		}
-
-		token, err := GenerateToken(user.ID)
-		if err != nil {
-			c.JSON(500, gin.H{"error": "Your credentials are correct, but the access key generation is incorrect."})
-			return
-		}
-
-		c.JSON(200, gin.H{
-			"message": "success",
-			"token":   token, // 把这个发给前端
-		})
-
-	})
-
-	r.POST("/register", func(c *gin.Context) {
-		var input RegisterRequest
-
-		if err := c.ShouldBind(&input); err != nil {
-			c.JSON(400, gin.H{
-				"error": err.Error(),
-			})
-			return
-		}
-
-		superUserToken := c.GetHeader("X-Super-Token")
-
-		if superUserToken == "" {
-			c.JSON(403, gin.H{"error": "Missing token"})
-			return
-		}
-
-		if string(GetSuperuserToken()) != superUserToken {
-			c.JSON(403, gin.H{"error": "Invalid token"})
-			return
-		}
-
-		var count int64
-		// 只统计数量，不查询具体内容，速度更快
-		db.Model(&User{}).Where("email = ?", input.Email).Count(&count)
-
-		if count > 0 {
-			c.JSON(400, gin.H{"error": "Email already taken"})
-			return
-		}
-
-		newUser := User{
-			Name:     input.Name,
-			Email:    input.Email,
-			Password: input.Password, // 记得用你之前的加密逻辑
-		}
-
-		db.Create(&newUser)
-
-		c.JSON(201, gin.H{
-			"message": "success",
-		})
-		return
-
-	})
+	r := routes.SetupRouter(db)
 
 	SetUpSuperuser()
 

middleware/auth.go

@@ -0,0 +1,60 @@
+package middleware
+
+import (
+	"strings"
+
+	"github.com/gin-gonic/gin"
+	"pdnode.com/website/utils"
+)
+
+func SuperuserAuth() gin.HandlerFunc {
+	return func(c *gin.Context) {
+		token := c.GetHeader("X-Super-Token")
+
+		// 校验 Token
+		if token == "" || token != string(utils.GetSuperuserToken()) {
+			c.JSON(401, gin.H{"error": "X-Super-Token does not provide or has an incorrect token."})
+
+			c.Abort()
+			return
+		}
+
+		c.Next()
+	}
+}
+
+func LoginAuth() gin.HandlerFunc {
+	return func(c *gin.Context) {
+		token := c.GetHeader("Authorization")
+
+		if !strings.HasPrefix(token, "Bearer ") || token == "" {
+			c.JSON(401, gin.H{
+				"error": "A Bearer type token is required.",
+			})
+			c.Abort()
+			return
+		}
+
+		token = strings.TrimSpace(strings.TrimPrefix(token, "Bearer "))
+
+		if token == "" {
+			c.JSON(401, gin.H{"error": "Token is empty."})
+			c.Abort()
+			return
+		}
+
+		userID, err := utils.VerifyToken(token)
+
+		if err != nil {
+			// 如果有错误，说明验证失败
+			c.JSON(401, gin.H{
+				"error": err.Error(), // 这里的 err.Error() 会得到 "invalid token" 等信息
+			})
+			c.Abort()
+			return
+		}
+
+		c.Set("currentUserID", userID)
+		c.Next()
+	}
+}