zlei6/openserp
1
0
Fork 0
mirror of https://github.com/karust/openserp.git synced 2026-08-15 21:15:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(captcha): exit non-zero on misconfig, tighten solver gate tests

Browse Source
This commit is contained in:
Rustem Kamalov
2026-04-20 20:12:19 +03:00
parent 1842c4bb07
commit 08edec5779
14 changed files with 453 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
google/search.go
View File

@@ -73,7 +73,7 @@ func (gogl *Google) getTotalResults(page *rod.Page) (int, error) {
return total, nil
}
func (gogl *Google) solveCaptcha(page *rod.Page, sitekey, datas string) bool {
func (gogl *Google) solveCaptcha(page *rod.Page, sitekey, datas, proxyURL string) bool {
gogl.logger.Debug("Solve captcha: sitekey=%s", sitekey)
if gogl.CaptchaSolver == nil {
@@ -91,7 +91,7 @@ func (gogl *Google) solveCaptcha(page *rod.Page, sitekey, datas string) bool {
return false
}
resp, _, err := gogl.CaptchaSolver.SolveReCaptcha2(sitekey, info.URL, datas)
resp, _, err := gogl.CaptchaSolver.SolveReCaptcha2(sitekey, info.URL, datas, proxyURL)
if err != nil {
gogl.logger.Error("Captcha solve failed: %s", err)
return false
@@ -107,7 +107,7 @@ func (gogl *Google) solveCaptcha(page *rod.Page, sitekey, datas string) bool {
return true
}
func (gogl *Google) checkCaptcha(page *rod.Page) bool {
func (gogl *Google) checkCaptcha(page *rod.Page, queryProxyURL string) bool {
captchaDiv, err := page.Timeout(gogl.GetSelectorTimeout()).Search("div[data-sitekey]")
if err != nil {
return false
@@ -125,8 +125,12 @@ func (gogl *Google) checkCaptcha(page *rod.Page) bool {
return false
}
if gogl.IsSolveCaptcha {
return !gogl.solveCaptcha(page, *sitekey, *dataS)
if gogl.IsSolveCaptcha && gogl.CaptchaSolverEnabled {
proxyURL := queryProxyURL
if strings.TrimSpace(proxyURL) == "" {
proxyURL = gogl.ProxyURL
}
return !gogl.solveCaptcha(page, *sitekey, *dataS, proxyURL)
}
return true
}
@@ -184,7 +188,7 @@ func (gogl *Google) Search(ctx context.Context, query core.Query) ([]core.Search
gogl.preparePage(page)
// Check first if there captcha
if gogl.checkCaptcha(page) {
if gogl.checkCaptcha(page, query.ProxyURL) {
gogl.logger.Error("Captcha detected: %s", url)
return nil, core.ErrCaptcha
}
@@ -417,7 +421,7 @@ func (gogl *Google) SearchImage(ctx context.Context, query core.Query) ([]core.S
// Check why no results
if results == nil {
if gogl.checkCaptcha(page) {
if gogl.checkCaptcha(page, query.ProxyURL) {
gogl.logger.Error("Captcha detected: %s", url)
return *core.ConvertSearchResultsMap(searchResultsMap), core.ErrCaptcha
}

2
google/search_test.go
View File

@@ -235,7 +235,7 @@ func TestParseSourceImageURL(t *testing.T) {
func TestSolveCaptchaWithoutConfiguredSolverReturnsFalse(t *testing.T) {
gogl := New(core.Browser{}, core.SearchEngineOptions{})
if got := gogl.solveCaptcha(nil, "sitekey", "datas"); got {
if got := gogl.solveCaptcha(nil, "sitekey", "datas", ""); got {
t.Fatal("expected solveCaptcha to fail without solver/page context")
}
}