Fix tests

This commit is contained in:
Taras Kushnir
2025-12-03 11:07:13 +01:00
parent cbab265d85
commit 008c5bea0f
2 changed files with 13 additions and 5 deletions

View File

@@ -44,16 +44,24 @@ var (
headersContentPlain = map[string][]string{
http.CanonicalHeaderKey(common.HeaderContentType): []string{common.ContentTypePlain},
}
invalidPropertyResponse []byte
invalidPropertyResponse []byte
invalidPropertyRecaptchaResponse []byte
)
func init() {
var err error
vr := &VerificationResponse{
invalidPropertyResponse, err = json.Marshal(&VerificationResponse{
Success: false,
Code: puzzle.InvalidPropertyError,
})
if err != nil {
panic(err)
}
invalidPropertyResponse, err = json.Marshal(vr)
invalidPropertyRecaptchaResponse, err = json.Marshal(&VerifyResponseRecaptchaV2{
Success: false,
ErrorCodes: []string{puzzle.InvalidPropertyError.String()},
})
if err != nil {
panic(err)
}
@@ -296,7 +304,7 @@ func (s *Server) recaptchaVerifyHandler(w http.ResponseWriter, r *http.Request)
propertyID := payload.Puzzle().PropertyID()
if propertyExternalID := db.UUIDFromSiteKey(sitekey); !bytes.Equal(propertyExternalID.Bytes[:], propertyID[:]) {
slog.WarnContext(ctx, "Expected property ID does not match", "expected", sitekey, "actual", hex.EncodeToString(propertyID[:]))
common.SendReponse(ctx, w, invalidPropertyResponse, common.JSONContentHeaders, common.NoCacheHeaders, s.APIHeaders)
common.SendReponse(ctx, w, invalidPropertyRecaptchaResponse, common.JSONContentHeaders, common.NoCacheHeaders, s.APIHeaders)
return
}
}

View File

@@ -186,7 +186,7 @@ func TestVerifyPuzzleWrongExpectedSitekey(t *testing.T) {
t.Fatal(err)
}
if err := checkSiteVerifyError(resp, puzzle.InvalidPropertyError); err != nil {
if err := checkVerifyError(resp, puzzle.InvalidPropertyError); err != nil {
t.Fatal(err)
}
}