fix: captcha checks after post validation now

This commit is contained in:
Yanislav Igonin 2021-11-02 11:10:59 +02:00
parent 384bb10f0d
commit ff10a54cdd

View File

@ -101,17 +101,6 @@ func CreateThread(c *gin.Context) {
return
}
captchaID := form.Value["captchaId"][0]
captchaString := form.Value["captcha"][0]
isCaptchaValid := captcha.VerifyString(captchaID, captchaString)
if !isCaptchaValid {
errorHtmlData := Repositories.BadRequestHtmlData{
Message: Repositories.InvalidCaptchaErrorMessage,
}
c.HTML(http.StatusInternalServerError, "400.html", errorHtmlData)
return
}
// TODO: dat shit crashes if no fields in request
text := form.Value["text"][0]
title := form.Value["title"][0]
@ -125,6 +114,17 @@ func CreateThread(c *gin.Context) {
return
}
captchaID := form.Value["captchaId"][0]
captchaString := form.Value["captcha"][0]
isCaptchaValid := captcha.VerifyString(captchaID, captchaString)
if !isCaptchaValid {
errorHtmlData := Repositories.BadRequestHtmlData{
Message: Repositories.InvalidCaptchaErrorMessage,
}
c.HTML(http.StatusInternalServerError, "400.html", errorHtmlData)
return
}
conn, err := Db.Pool.Acquire(context.TODO())
if err != nil {
log.Println("error:", err)
@ -225,17 +225,6 @@ func UpdateThread(c *gin.Context) {
return
}
captchaID := form.Value["captchaId"][0]
captchaString := form.Value["captcha"][0]
isCaptchaValid := captcha.VerifyString(captchaID, captchaString)
if !isCaptchaValid {
errorHtmlData := Repositories.BadRequestHtmlData{
Message: Repositories.InvalidCaptchaErrorMessage,
}
c.HTML(http.StatusInternalServerError, "400.html", errorHtmlData)
return
}
// TODO: dat shit crashes if no fields in request
text := form.Value["text"][0]
filesInRequest := form.File["files"]
@ -248,6 +237,17 @@ func UpdateThread(c *gin.Context) {
return
}
captchaID := form.Value["captchaId"][0]
captchaString := form.Value["captcha"][0]
isCaptchaValid := captcha.VerifyString(captchaID, captchaString)
if !isCaptchaValid {
errorHtmlData := Repositories.BadRequestHtmlData{
Message: Repositories.InvalidCaptchaErrorMessage,
}
c.HTML(http.StatusInternalServerError, "400.html", errorHtmlData)
return
}
isSageField := form.Value["sage"]
var isSageString string
if len(isSageField) != 0 {