Merge pull request #831 from caisi35/dev

fix duplicate user and attempts
0xJacky · Jan 31, 2025 · 80f01e6 · 80f01e6
2 parents 76ea178 + 8ffe29d
commit 80f01e6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/api/user/user.go b/api/user/user.go
@@ -57,6 +57,14 @@ func AddUser(c *gin.Context) {
 		Password: json.Password,
 	}
 
+	// duplicate name
+	_, err = u.Where(u.Name.Eq(json.Name)).First()
+	if !(err != nil && err.Error() == "record not found") {
+		c.JSON(http.StatusConflict, gin.H{
+			"message": "name already exists",
+		})
+	}
+
 	err = u.Create(&user)
 
 	if err != nil {

diff --git a/internal/user/login.go b/internal/user/login.go
@@ -36,6 +36,7 @@ func BanIP(ip string) {
 			Attempts:  1,
 			ExpiredAt: time.Now().Unix() + int64(settings.AuthSettings.BanThresholdMinutes*60),
 		})
+		return
 	}
 	_, _ = b.Where(b.IP.Eq(ip)).UpdateSimple(b.Attempts.Add(1))
 }