refactor(captcha): update Cap to 2.0.0 (#2573)
* refactor(captcha): update Cap backend to 2.0.0 API format * feat(captcha): add Cap version config for 1.x/2.x compatibility * fix(captcha): change Cap default version to 1.x for backward compatibility * refactor(captcha): remove Cap 1.x compatibility, keep only 2.x support * feat(captcha): update field names to Cap 2.0 standard - Site Key and Secret Key * fix(captcha): update Cap field names in defaults configuration
This commit is contained in:
@@ -3,6 +3,12 @@ package middleware
|
||||
import (
|
||||
"bytes"
|
||||
"encoding/json"
|
||||
"io"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/cloudreve/Cloudreve/v4/application/dependency"
|
||||
"github.com/cloudreve/Cloudreve/v4/pkg/logging"
|
||||
"github.com/cloudreve/Cloudreve/v4/pkg/recaptcha"
|
||||
@@ -11,11 +17,6 @@ import (
|
||||
"github.com/cloudreve/Cloudreve/v4/pkg/setting"
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/mojocn/base64Captcha"
|
||||
"io"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"strings"
|
||||
"time"
|
||||
)
|
||||
|
||||
type req struct {
|
||||
@@ -133,7 +134,7 @@ func CaptchaRequired(enabled func(c *gin.Context) bool) gin.HandlerFunc {
|
||||
break
|
||||
case setting.CaptchaCap:
|
||||
captchaSetting := settings.CapCaptcha(c)
|
||||
if captchaSetting.InstanceURL == "" || captchaSetting.KeyID == "" || captchaSetting.KeySecret == "" {
|
||||
if captchaSetting.InstanceURL == "" || captchaSetting.SiteKey == "" || captchaSetting.SecretKey == "" {
|
||||
l.Warning("Cap verification failed: missing configuration")
|
||||
c.JSON(200, serializer.ErrWithDetails(c, serializer.CodeCaptchaError, "Captcha configuration error", nil))
|
||||
c.Abort()
|
||||
@@ -146,9 +147,10 @@ func CaptchaRequired(enabled func(c *gin.Context) bool) gin.HandlerFunc {
|
||||
request2.WithHeader(http.Header{"Content-Type": []string{"application/json"}}),
|
||||
)
|
||||
|
||||
capEndpoint := strings.TrimSuffix(captchaSetting.InstanceURL, "/") + "/" + captchaSetting.KeyID + "/siteverify"
|
||||
// Cap 2.0 API format: /{siteKey}/siteverify
|
||||
capEndpoint := strings.TrimSuffix(captchaSetting.InstanceURL, "/") + "/" + captchaSetting.SiteKey + "/siteverify"
|
||||
requestBody := map[string]string{
|
||||
"secret": captchaSetting.KeySecret,
|
||||
"secret": captchaSetting.SecretKey,
|
||||
"response": service.Ticket,
|
||||
}
|
||||
requestData, err := json.Marshal(requestBody)
|
||||
|
||||
Reference in New Issue
Block a user