feat: add funcaptcha support
All checks were successful
release-tag / release (push) Successful in 2m6s

This commit is contained in:
2023-07-13 19:38:05 +03:00
parent 197918a26d
commit 00b07f7e2b
4 changed files with 65 additions and 10 deletions

View File

@ -115,19 +115,20 @@ func (a *antigateV2Api) getTaskResult(request struct {
response.Status = "ready"
response.EndTime = &task.EndTime
response.Cost = task.Entity.Cost
switch task.Result.(type) {
switch result := task.Result.(type) {
case *sati.ReCaptcha2Result:
response.Solution = struct {
GRecaptchaResponse string `json:"gRecaptchaResponse"`
}{task.Result.(*sati.ReCaptcha2Result).Token}
}{result.Token}
case *sati.TurnstileResult:
response.Solution = struct {
Token string `json:"token"`
UserAgent string `json:"userAgent"`
}{
task.Result.(*sati.TurnstileResult).Token,
a.ctx.Config.AntiGateV2.TurnstileUserAgent,
}
}{result.Token, a.ctx.Config.AntiGateV2.TurnstileUserAgent}
case *sati.FunCaptchaResult:
response.Solution = struct {
Token string `json:"token"`
}{result.Token}
default:
return errorTaskNotSupported
}
@ -169,6 +170,18 @@ func (a *antigateV2Api) createTask(request struct {
PageUrl: task.WebsiteURL,
SiteKey: task.WebsiteKey,
})
case "FunCaptchaTask", "FunCaptchaTaskProxyless":
var task struct {
WebsiteURL string `json:"websiteURL"`
WebsitePublicKey string `json:"websitePublicKey"`
Data map[string]string `json:"data"`
}
mapstructure.Decode(request.Task, &task)
id = a.ctx.Registry.CreateTask(&sati.FunCaptchaTask{
PageUrl: task.WebsiteURL,
SiteKey: task.WebsitePublicKey,
Data: task.Data,
})
default:
return errorTaskNotSupported
}

View File

@ -72,6 +72,24 @@ type okResponse simpleResponse
func (r *okResponse) text() string { return "OK|" + r.Request }
func parsePhpAssociativeArray(values map[string][]string, arrayName string) map[string]string {
result := make(map[string]string)
prefix := arrayName + "["
suffix := "]"
for key, values := range values {
if strings.HasPrefix(key, prefix) && strings.HasSuffix(key, suffix) && len(values) > 0 {
result[key[len(prefix):len(key)-len(suffix)]] = values[0]
}
}
if len(result) == 0 {
return nil
}
return result
}
func (a *ruCaptchaApi) endpointIn(params url.Values) ruCaptchaResponse {
var id uint32
switch params.Get("method") {
@ -125,6 +143,26 @@ func (a *ruCaptchaApi) endpointIn(params url.Values) ruCaptchaResponse {
Action: action,
CData: cData,
})
case "funcaptcha":
siteKey := params.Get("publickey")
pageUrl := params.Get("pageurl")
data := parsePhpAssociativeArray(params, "data")
if siteKey == "" || pageUrl == "" {
return &simpleResponse{0, "ERROR_BAD_PARAMETERS"}
}
var serviceUrl *string
if params.Has("surl") {
val := params.Get("surl")
serviceUrl = &val
}
id = a.ctx.Registry.CreateTask(&sati.FunCaptchaTask{
SiteKey: siteKey,
PageUrl: pageUrl,
ServiceUrl: serviceUrl,
Data: data,
})
default:
return &simpleResponse{0, "ERROR_ZERO_CAPTCHA_FILESIZE"}
}
@ -143,11 +181,13 @@ func (r *get2Response) text() string {
}
func (a *ruCaptchaApi) convertTaskResult(task *Task) string {
switch task.Result.(type) {
switch result := task.Result.(type) {
case *sati.ReCaptcha2Result:
return task.Result.(*sati.ReCaptcha2Result).Token
return result.Token
case *sati.TurnstileResult:
return task.Result.(*sati.TurnstileResult).Token
return result.Token
case *sati.FunCaptchaResult:
return result.Token
}
a.ctx.Logger.WithFields(logrus.Fields{