TODO: 处理遇到cloudflare页面拿cookie时候的5妙

This commit is contained in:
eson 2020-11-24 19:54:52 +08:00
parent 38d369bb58
commit 7b5c3717ba
7 changed files with 19 additions and 5 deletions

View File

@ -2,4 +2,5 @@ rm build/ -rf
mkdir -p ./build mkdir -p ./build
cd proxyserver && go build && mv proxyserver ../build/ && cd .. cd proxyserver && go build && mv proxyserver ../build/ && cd ..
cp start.sh build/start.sh cp start.sh build/start.sh
cp stop.sh build/stop.sh
cp proxyserver/config.yaml build/config.yaml cp proxyserver/config.yaml build/config.yaml

View File

@ -62,6 +62,7 @@ function FinishTask(sender, content) {
var formdata = new FormData(); var formdata = new FormData();
formdata.append("taskid", task.data.taskid); formdata.append("taskid", task.data.taskid);
formdata.append("content", content); formdata.append("content", content);
delete task_manager[sender.tab.id]; delete task_manager[sender.tab.id];
chrome.tabs.remove(sender.tab.id); chrome.tabs.remove(sender.tab.id);
fetch(FinishTaskUrl, { method: "POST", body: formdata }).then(function (response) { fetch(FinishTaskUrl, { method: "POST", body: formdata }).then(function (response) {

View File

@ -19,7 +19,6 @@ func CallbackServer(task *Task) {
defer task.lock.Unlock() defer task.lock.Unlock()
if callback, ok := task.data["callback"]; ok { if callback, ok := task.data["callback"]; ok {
cburl := callback.(string) cburl := callback.(string)
// log.Println(cburl)
_, err := requests.NewSession().Post(cburl).SetBodyAuto(task.data, requests.TypeFormData).Execute() _, err := requests.NewSession().Post(cburl).SetBodyAuto(task.data, requests.TypeFormData).Execute()
if err != nil { if err != nil {
log.Println(err) log.Println(err)

View File

@ -4,7 +4,7 @@ go 1.15
require ( require (
github.com/474420502/focus v0.12.0 github.com/474420502/focus v0.12.0
github.com/474420502/requests v1.10.0 github.com/474420502/requests v1.10.1
github.com/bwmarrin/snowflake v0.3.0 github.com/bwmarrin/snowflake v0.3.0
github.com/gin-gonic/gin v1.6.3 github.com/gin-gonic/gin v1.6.3
github.com/go-playground/validator/v10 v10.4.1 // indirect github.com/go-playground/validator/v10 v10.4.1 // indirect

View File

@ -3,6 +3,8 @@ github.com/474420502/focus v0.12.0 h1:+icbmj7IEOefvTegHt5EpcHt6WFbe2miIrceUJx2Ev
github.com/474420502/focus v0.12.0/go.mod h1:d0PMjtMxFz1a9HIhwyFPkWa+JF+0LgOrEUfd8iZka6s= github.com/474420502/focus v0.12.0/go.mod h1:d0PMjtMxFz1a9HIhwyFPkWa+JF+0LgOrEUfd8iZka6s=
github.com/474420502/requests v1.10.0 h1:Oz7+Nx+1iuJJUjbBH3cVmkDVosF2tyq5d72TMAoQH8I= github.com/474420502/requests v1.10.0 h1:Oz7+Nx+1iuJJUjbBH3cVmkDVosF2tyq5d72TMAoQH8I=
github.com/474420502/requests v1.10.0/go.mod h1:SB8/RIUVWF3AGotuq/mATUwAjXzzlV7iWaBNM3+c06c= github.com/474420502/requests v1.10.0/go.mod h1:SB8/RIUVWF3AGotuq/mATUwAjXzzlV7iWaBNM3+c06c=
github.com/474420502/requests v1.10.1 h1:k5qK8ZWPIdrG0EurJuK2hhoYFbJ9GJTe0xvrzESMFLo=
github.com/474420502/requests v1.10.1/go.mod h1:SB8/RIUVWF3AGotuq/mATUwAjXzzlV7iWaBNM3+c06c=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/Pallinder/go-randomdata v1.1.0/go.mod h1:yHmJgulpD2Nfrm0cR9tI/+oAgRqCQQixsA8HyRZfV9Y= github.com/Pallinder/go-randomdata v1.1.0/go.mod h1:yHmJgulpD2Nfrm0cR9tI/+oAgRqCQQixsA8HyRZfV9Y=
github.com/bwmarrin/snowflake v0.3.0 h1:xm67bEhkKh6ij1790JB83OujPR5CzNe8QuQqAgISZN0= github.com/bwmarrin/snowflake v0.3.0 h1:xm67bEhkKh6ij1790JB83OujPR5CzNe8QuQqAgISZN0=

View File

@ -70,14 +70,21 @@ func PutTask(c *gin.Context) {
now := time.Now() now := time.Now()
tid := snowNode.Generate().Base64() tid := snowNode.Generate().Base64()
label := c.PostForm("label") label := c.PostForm("label")
if carrayhash := c.PostForm("carrayhash"); carrayhash != "" {
data.Store("carrayhash", carrayhash)
}
if callback := c.PostForm("callback"); callback != "" {
data.Store("callback", callback)
}
data.Store("taskid", tid) data.Store("taskid", tid)
data.Store("url", u) data.Store("url", u)
data.Store("ts", now.UnixNano()) data.Store("ts", now.UnixNano())
data.Store("label", label) data.Store("label", label)
data.Store("content_condition", c.PostForm("content_condition")) data.Store("content_condition", c.PostForm("content_condition"))
if callback := c.PostForm("callback"); callback != "" {
data.Store("callback", callback)
}
taskQueue.Push(tid, data) taskQueue.Push(tid, data)
oplog.Write(data) oplog.Write(data)
c.JSON(http.StatusOK, Response{Code: 200, Message: "ok", Data: data}) c.JSON(http.StatusOK, Response{Code: 200, Message: "ok", Data: data})

4
stop.sh Normal file
View File

@ -0,0 +1,4 @@
for quitlist in google-chrome-web proxyserver
do
screen -S $quitlist -X quit
done