fix: captcha preview panic when clientId or clientSecret is empty (#824)

* fix: captcha preview panic when clientId or clientSecret is empty * return original errors from captcha
casdoor · Jun 26, 2022 · 477d386 · 477d386
1 parent 339c6c2
commit 477d386
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 6 deletions.
diff --git a/captcha/hcaptcha.go b/captcha/hcaptcha.go
@@ -16,9 +16,11 @@ package captcha
 
 import (
 	"encoding/json"
+	"errors"
 	"io/ioutil"
 	"net/http"
 	"net/url"
+	"strings"
 )
 
 const HCaptchaVerifyUrl = "https://hcaptcha.com/siteverify"
@@ -48,13 +50,18 @@ func (captcha *HCaptchaProvider) VerifyCaptcha(token, clientSecret string) (bool
 	}
 
 	type captchaResponse struct {
-		Success bool `json:"success"`
+		Success    bool     `json:"success"`
+		ErrorCodes []string `json:"error-codes"`
 	}
 	captchaResp := &captchaResponse{}
 	err = json.Unmarshal(body, captchaResp)
 	if err != nil {
 		return false, err
 	}
 
+	if len(captchaResp.ErrorCodes) > 0 {
+		return false, errors.New(strings.Join(captchaResp.ErrorCodes, ","))
+	}
+
 	return captchaResp.Success, nil
 }
diff --git a/captcha/recaptcha.go b/captcha/recaptcha.go
@@ -16,9 +16,11 @@ package captcha
 
 import (
 	"encoding/json"
+	"errors"
 	"io/ioutil"
 	"net/http"
 	"net/url"
+	"strings"
 )
 
 const ReCaptchaVerifyUrl = "https://recaptcha.net/recaptcha/api/siteverify"
@@ -48,13 +50,18 @@ func (captcha *ReCaptchaProvider) VerifyCaptcha(token, clientSecret string) (boo
 	}
 
 	type captchaResponse struct {
-		Success bool `json:"success"`
+		Success    bool     `json:"success"`
+		ErrorCodes []string `json:"error-codes"`
 	}
 	captchaResp := &captchaResponse{}
 	err = json.Unmarshal(body, captchaResp)
 	if err != nil {
 		return false, err
 	}
 
+	if len(captchaResp.ErrorCodes) > 0 {
+		return false, errors.New(strings.Join(captchaResp.ErrorCodes, ","))
+	}
+
 	return captchaResp.Success, nil
 }
diff --git a/controllers/verification.go b/controllers/verification.go
@@ -63,10 +63,10 @@ func (c *ApiController) SendVerificationCode() {
 		}
 		isHuman, err := captchaProvider.VerifyCaptcha(checkKey, checkId)
 		if err != nil {
-			c.ResponseError("Failed to verify captcha: %v", err)
+			c.ResponseError(err.Error())
 			return
 		}
-	
+
 		if !isHuman {
 			c.ResponseError("Turing test failed.")
 			return
@@ -209,7 +209,7 @@ func (c *ApiController) VerifyCaptcha() {
 
 	isValid, err := provider.VerifyCaptcha(captchaToken, clientSecret)
 	if err != nil {
-		c.ResponseError("Failed to verify captcha: %v", err)
+		c.ResponseError(err.Error())
 		return
 	}
 

diff --git a/web/src/common/CaptchaPreview.js b/web/src/common/CaptchaPreview.js
@@ -117,7 +117,7 @@ export const CaptchaPreview = ({ provider, providerName, clientSecret, captchaTy
 
   return (
     <React.Fragment>
-      <Button style={{ fontSize: 14 }} type={"primary"} onClick={clickPreview}>
+      <Button style={{ fontSize: 14 }} type={"primary"} onClick={clickPreview} disabled={captchaType !== "Default" && (!clientId || !clientSecret)}>
         {i18next.t("general:Preview")}
       </Button>
       <Modal