sati.ac
/
bridge
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 9 Wiki Activity

Compare commits

base: sati.ac:1f32db10326da5184233b983318ab4ec24488258
Branches Tags
sati.ac:master
sati.ac:v0.5
sati.ac:v0.4
sati.ac:v0.3.3
sati.ac:v0.3.2
sati.ac:v0.3.1
sati.ac:v0.3
sati.ac:v0.2.1
sati.ac:v0.2
sati.ac:v0.1
..
compare: sati.ac:bd24760d7d772d5d3e3cb84a14f314a03d3d0764
Branches Tags
sati.ac:master
sati.ac:v0.5
sati.ac:v0.4
sati.ac:v0.3.3
sati.ac:v0.3.2
sati.ac:v0.3.1
sati.ac:v0.3
sati.ac:v0.2.1
sati.ac:v0.2
sati.ac:v0.1

No commits in common. "1f32db10326da5184233b983318ab4ec24488258" and "bd24760d7d772d5d3e3cb84a14f314a03d3d0764" have entirely different histories.
1f32db1032 ... bd24760d7d

5 changed files with 16 additions and 175 deletions
Show Stats Expand all files Collapse all files

76
api/AntiGateV2.go
View File

@ -2,7 +2,6 @@ package api
import ( import (
"encoding/json" "encoding/json"
"fmt"
"io" "io"
"net/http" "net/http"
"reflect" "reflect"
@ -79,12 +78,6 @@ var (
ErrorCode: "ERROR_BAD_REQUEST", ErrorCode: "ERROR_BAD_REQUEST",
ErrorDescription: "Bad request", ErrorDescription: "Bad request",
} }
errorProxyConnectRefused = &antigateError{
ErrorId: 25,
ErrorCode: "ERROR_PROXY_CONNECT_REFUSED",
ErrorDescription: "Bad proxy",
}
) )
func (a *antigateV2Api) getTaskResult(request struct { func (a *antigateV2Api) getTaskResult(request struct {
@ -157,35 +150,6 @@ func (a *antigateV2Api) getTaskResult(request struct {
return response return response
} }
func collectAntiGateV2Proxy(task any) *string {
var proxy struct {
ProxyType string `json:"proxyType"`
ProxyAddress string `json:"proxyAddress"`
ProxyPort uint16 `json:"proxyPort"`
ProxyLogin *string `json:"proxyLogin"`
ProxyPassword *string `json:"proxyPassword"`
}
if err := mapstructure.Decode(task, proxy); err != nil {
return nil
}
if proxy.ProxyType == "" || proxy.ProxyAddress == "" || proxy.ProxyPort == 0 {
return nil
}
credentials := ""
if proxy.ProxyLogin != nil {
credentials += *proxy.ProxyLogin
if proxy.ProxyPassword != nil {
credentials += ":" + *proxy.ProxyPassword
}
credentials += "@"
}
proxyStr := fmt.Sprintf("%s://%s%s:%d", proxy.ProxyType, credentials, proxy.ProxyAddress, proxy.ProxyPort)
return &proxyStr
}
func (a *antigateV2Api) createTask(request struct { func (a *antigateV2Api) createTask(request struct {
Task map[string]any `json:"task"` Task map[string]any `json:"task"`
}) any { }) any {
@ -193,11 +157,10 @@ func (a *antigateV2Api) createTask(request struct {
if !ok { if !ok {
return errorTaskAbsent return errorTaskAbsent
} }
taskType = strings.ToLower(taskType)
var satiTask sati.AnyTask var id uint32
switch taskType { switch strings.ToLower(taskType) {
case "turnstiletask", "turnstiletaskproxyless": case "turnstiletask", "turnstiletaskproxyless":
var task struct { var task struct {
WebsiteURL string `json:"websiteURL"` WebsiteURL string `json:"websiteURL"`
@ -205,35 +168,21 @@ func (a *antigateV2Api) createTask(request struct {
Action *string `json:"action"` Action *string `json:"action"`
} }
mapstructure.Decode(request.Task, &task) mapstructure.Decode(request.Task, &task)
satiTask = &sati.TurnstileTask{ id = a.ctx.Registry.CreateTask(&sati.TurnstileTask{
PageUrl: task.WebsiteURL, PageUrl: task.WebsiteURL,
SiteKey: task.WebsiteKey, SiteKey: task.WebsiteKey,
Action: task.Action, Action: task.Action,
} })
if taskType == "turnstiletask" {
proxy := collectAntiGateV2Proxy(request.Task)
if proxy == nil {
return errorProxyConnectRefused
}
satiTask.(*sati.TurnstileTask).Proxy = proxy
}
case "recaptchav2task", "recaptchav2taskproxyless": case "recaptchav2task", "recaptchav2taskproxyless":
var task struct { var task struct {
WebsiteURL string `json:"websiteURL"` WebsiteURL string `json:"websiteURL"`
WebsiteKey string `json:"websiteKey"` WebsiteKey string `json:"websiteKey"`
} }
mapstructure.Decode(request.Task, &task) mapstructure.Decode(request.Task, &task)
satiTask = &sati.ReCaptcha2Task{ id = a.ctx.Registry.CreateTask(&sati.ReCaptcha2Task{
PageUrl: task.WebsiteURL, PageUrl: task.WebsiteURL,
SiteKey: task.WebsiteKey, SiteKey: task.WebsiteKey,
} })
if taskType == "funcaptchatask" {
proxy := collectAntiGateV2Proxy(request.Task)
if proxy == nil {
return errorProxyConnectRefused
}
satiTask.(*sati.ReCaptcha2Task).Proxy = proxy
}
case "funcaptchatask", "funcaptchataskproxyless": case "funcaptchatask", "funcaptchataskproxyless":
var task struct { var task struct {
WebsiteURL string `json:"websiteURL"` WebsiteURL string `json:"websiteURL"`
@ -241,24 +190,15 @@ func (a *antigateV2Api) createTask(request struct {
Data map[string]string `json:"data"` Data map[string]string `json:"data"`
} }
mapstructure.Decode(request.Task, &task) mapstructure.Decode(request.Task, &task)
satiTask = &sati.FunCaptchaTask{ id = a.ctx.Registry.CreateTask(&sati.FunCaptchaTask{
PageUrl: task.WebsiteURL, PageUrl: task.WebsiteURL,
SiteKey: task.WebsitePublicKey, SiteKey: task.WebsitePublicKey,
Data: task.Data, Data: task.Data,
} })
if taskType == "funcaptchatask" {
proxy := collectAntiGateV2Proxy(request.Task)
if proxy == nil {
return errorProxyConnectRefused
}
satiTask.(*sati.FunCaptchaTask).Proxy = proxy
}
default: default:
return errorTaskNotSupported return errorTaskNotSupported
} }
id := a.ctx.Registry.CreateTask(satiTask)
return &struct { return &struct {
ErrorId uint32 `json:"errorId"` ErrorId uint32 `json:"errorId"`
TaskId uint32 `json:"taskId"` TaskId uint32 `json:"taskId"`

74
api/CapSolver.go
View File

@ -5,7 +5,6 @@ import (
"fmt" "fmt"
"io" "io"
"net/http" "net/http"
"net/url"
"reflect" "reflect"
"strconv" "strconv"
"strings" "strings"
@ -131,42 +130,6 @@ func (a *capSolverApi) getTaskResult(request struct {
return response return response
} }
func collectCapSolverProxy(task any) *string {
antigateLike := collectAntiGateV2Proxy(task)
if antigateLike != nil {
return antigateLike
}
input, _ := task.(map[string]any)["proxy"].(string)
if input == "" {
return nil
}
isUrl := strings.Contains(input, "://")
if isUrl {
// validate it
url, err := url.Parse(input)
if err != nil {
return nil
}
output := url.String()
return &output
}
fragments := strings.Split(input, ":")
var output string
switch len(fragments) {
case 5: // proto:host:port:user:pwd
output = fmt.Sprintf("%s://%s:%s@%s:%s", fragments[0], fragments[3], fragments[4], fragments[1], fragments[2])
case 4: // host:port:user:pwd, http used by default
output = fmt.Sprintf("http://%s:%s@%s:%s", fragments[2], fragments[3], fragments[0], fragments[1])
default:
return nil
}
return &output
}
func (a *capSolverApi) createTask(request struct { func (a *capSolverApi) createTask(request struct {
Task map[string]any `json:"task"` Task map[string]any `json:"task"`
}) any { }) any {
@ -175,7 +138,7 @@ func (a *capSolverApi) createTask(request struct {
return csErrorInvalidTaskData return csErrorInvalidTaskData
} }
var satiTask sati.AnyTask var id uint32
switch strings.ToLower(taskType) { switch strings.ToLower(taskType) {
case "anticloudflaretask": case "anticloudflaretask":
@ -188,36 +151,22 @@ func (a *capSolverApi) createTask(request struct {
} `json:"metadata"` } `json:"metadata"`
} }
mapstructure.Decode(request.Task, &task) mapstructure.Decode(request.Task, &task)
id = a.ctx.Registry.CreateTask(&sati.TurnstileTask{
proxy := collectCapSolverProxy(request.Task)
if proxy == nil {
return csErrorInvalidTaskData
}
satiTask = &sati.TurnstileTask{
PageUrl: task.WebsiteURL, PageUrl: task.WebsiteURL,
SiteKey: task.WebsiteKey, SiteKey: task.WebsiteKey,
Action: task.Metadata.Action, Action: task.Metadata.Action,
CData: task.Metadata.CData, CData: task.Metadata.CData,
Proxy: proxy, })
}
case "recaptchav2task", "recaptchav2taskproxyless": case "recaptchav2task", "recaptchav2taskproxyless":
var task struct { var task struct {
WebsiteURL string `json:"websiteURL"` WebsiteURL string `json:"websiteURL"`
WebsiteKey string `json:"websiteKey"` WebsiteKey string `json:"websiteKey"`
} }
mapstructure.Decode(request.Task, &task) mapstructure.Decode(request.Task, &task)
satiTask = &sati.ReCaptcha2Task{ id = a.ctx.Registry.CreateTask(&sati.ReCaptcha2Task{
PageUrl: task.WebsiteURL, PageUrl: task.WebsiteURL,
SiteKey: task.WebsiteKey, SiteKey: task.WebsiteKey,
} })
if taskType == "recaptchav2task" {
proxy := collectCapSolverProxy(request.Task)
if proxy == nil {
return csErrorInvalidTaskData
}
satiTask.(*sati.ReCaptcha2Task).Proxy = proxy
}
case "funcaptchatask", "funcaptchataskproxyless": case "funcaptchatask", "funcaptchataskproxyless":
var task struct { var task struct {
WebsiteURL string `json:"websiteURL"` WebsiteURL string `json:"websiteURL"`
@ -225,24 +174,15 @@ func (a *capSolverApi) createTask(request struct {
Data map[string]string `json:"data"` Data map[string]string `json:"data"`
} }
mapstructure.Decode(request.Task, &task) mapstructure.Decode(request.Task, &task)
satiTask = &sati.FunCaptchaTask{ id = a.ctx.Registry.CreateTask(&sati.FunCaptchaTask{
PageUrl: task.WebsiteURL, PageUrl: task.WebsiteURL,
SiteKey: task.WebsitePublicKey, SiteKey: task.WebsitePublicKey,
Data: task.Data, Data: task.Data,
} })
if taskType == "funcaptchatask" {
proxy := collectCapSolverProxy(request.Task)
if proxy == nil {
return csErrorInvalidTaskData
}
satiTask.(*sati.FunCaptchaTask).Proxy = proxy
}
default: default:
return csErrorTaskNotSupported return csErrorTaskNotSupported
} }
id := a.ctx.Registry.CreateTask(satiTask)
return &struct { return &struct {
ErrorId uint32 `json:"errorId"` ErrorId uint32 `json:"errorId"`
TaskId string `json:"taskId"` TaskId string `json:"taskId"`

37
api/RuCaptcha.go
View File

@ -2,7 +2,6 @@ package api
import ( import (
"encoding/json" "encoding/json"
"fmt"
"net/http" "net/http"
"net/url" "net/url"
"strconv" "strconv"
@ -37,24 +36,6 @@ type ruCaptchaResponse interface{ text() string }
func (a *ruCaptchaApi) wrap(handler func(url.Values) ruCaptchaResponse) func(http.ResponseWriter, *http.Request) { func (a *ruCaptchaApi) wrap(handler func(url.Values) ruCaptchaResponse) func(http.ResponseWriter, *http.Request) {
return func(w http.ResponseWriter, r *http.Request) { return func(w http.ResponseWriter, r *http.Request) {
query := r.URL.Query() query := r.URL.Query()
if r.Method != "GET" {
switch strings.ToLower(r.Header.Get("Content-Type")) {
case "application/x-www-form-urlencoded":
r.ParseForm()
case "multipart/form-data":
r.ParseMultipartForm(0)
}
}
// merge form with url params
for key, values := range r.Form {
if _, ok := query[key]; ok {
query[key] = append(query[key], values...)
} else {
query[key] = values
}
}
useJson := false useJson := false
if val := query.Get("json"); val != "" && val != "0" { if val := query.Get("json"); val != "" && val != "0" {
useJson = true useJson = true
@ -109,21 +90,6 @@ func parsePhpAssociativeArray(values map[string][]string, arrayName string) map[
return result return result
} }
func extractRuCaptchaProxy(params url.Values) *string {
if !params.Has("proxytype") || !params.Has("proxy") {
return nil
}
proxyUrl := fmt.Sprintf("%s://%s", params.Get("proxytype"), params.Get("proxy"))
url, err := url.Parse(proxyUrl)
if err != nil {
return nil
}
formatted := url.String()
return &formatted
}
func (a *ruCaptchaApi) endpointIn(params url.Values) ruCaptchaResponse { func (a *ruCaptchaApi) endpointIn(params url.Values) ruCaptchaResponse {
var id uint32 var id uint32
switch params.Get("method") { switch params.Get("method") {
@ -152,7 +118,6 @@ func (a *ruCaptchaApi) endpointIn(params url.Values) ruCaptchaResponse {
id = a.ctx.Registry.CreateTask(&sati.ReCaptcha2Task{ id = a.ctx.Registry.CreateTask(&sati.ReCaptcha2Task{
PageUrl: pageUrl, PageUrl: pageUrl,
SiteKey: siteKey, SiteKey: siteKey,
Proxy: extractRuCaptchaProxy(params),
}) })
case "turnstile": case "turnstile":
pageUrl := params.Get("pageurl") pageUrl := params.Get("pageurl")
@ -177,7 +142,6 @@ func (a *ruCaptchaApi) endpointIn(params url.Values) ruCaptchaResponse {
PageUrl: pageUrl, PageUrl: pageUrl,
Action: action, Action: action,
CData: cData, CData: cData,
Proxy: extractRuCaptchaProxy(params),
}) })
case "funcaptcha": case "funcaptcha":
siteKey := params.Get("publickey") siteKey := params.Get("publickey")
@ -198,7 +162,6 @@ func (a *ruCaptchaApi) endpointIn(params url.Values) ruCaptchaResponse {
PageUrl: pageUrl, PageUrl: pageUrl,
ServiceUrl: serviceUrl, ServiceUrl: serviceUrl,
Data: data, Data: data,
Proxy: extractRuCaptchaProxy(params),
}) })
default: default:
return &simpleResponse{0, "ERROR_ZERO_CAPTCHA_FILESIZE"} return &simpleResponse{0, "ERROR_ZERO_CAPTCHA_FILESIZE"}

2
go.mod
View File

@ -2,7 +2,7 @@ module git.sati.ac/sati.ac/bridge
go 1.20 go 1.20
require git.sati.ac/sati.ac/sati-go v0.0.0-20230725102846-8e6b00348696 require git.sati.ac/sati.ac/sati-go v0.0.0-20230713145537-57719018ca00
require ( require (
github.com/gorilla/websocket v1.5.0 // indirect github.com/gorilla/websocket v1.5.0 // indirect

2
go.sum
View File

@ -6,8 +6,6 @@ git.sati.ac/sati.ac/sati-go v0.0.0-20230630184329-03a405a25122 h1:Uff2QZeRDk+3cm
git.sati.ac/sati.ac/sati-go v0.0.0-20230630184329-03a405a25122/go.mod h1:dsLvwV5+2YUjWRAuTYFf/EMvoH/twUu/NWA0t5Yl3pQ= git.sati.ac/sati.ac/sati-go v0.0.0-20230630184329-03a405a25122/go.mod h1:dsLvwV5+2YUjWRAuTYFf/EMvoH/twUu/NWA0t5Yl3pQ=
git.sati.ac/sati.ac/sati-go v0.0.0-20230713145537-57719018ca00 h1:emjsk5AubG3EiCbiG0WAG6xAZXoNNwO/yteYj/J0TqA= git.sati.ac/sati.ac/sati-go v0.0.0-20230713145537-57719018ca00 h1:emjsk5AubG3EiCbiG0WAG6xAZXoNNwO/yteYj/J0TqA=
git.sati.ac/sati.ac/sati-go v0.0.0-20230713145537-57719018ca00/go.mod h1:dsLvwV5+2YUjWRAuTYFf/EMvoH/twUu/NWA0t5Yl3pQ= git.sati.ac/sati.ac/sati-go v0.0.0-20230713145537-57719018ca00/go.mod h1:dsLvwV5+2YUjWRAuTYFf/EMvoH/twUu/NWA0t5Yl3pQ=
git.sati.ac/sati.ac/sati-go v0.0.0-20230725102846-8e6b00348696 h1:ld33XeJOBd1skmlVz/TQrcuZPaTIuBt+J1n52oRfPAo=
git.sati.ac/sati.ac/sati-go v0.0.0-20230725102846-8e6b00348696/go.mod h1:dsLvwV5+2YUjWRAuTYFf/EMvoH/twUu/NWA0t5Yl3pQ=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=