github
/
alist
mirror of https://github.com/Xhofe/alist
1
0
Fork 0
Code Issues Releases Wiki Activity

🐛 fix 189 upload while filename contains &

pull/548/head
Xhofe 2022-02-12 13:08:46 +08:00
parent 5dca777caf
commit 387e8af422
4 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/189/driver.go
View File

@ -171,7 +171,12 @@ func (driver Cloud189) Link(args base.Args, account *model.Account) (*base.Link,
if err != nil { if err != nil {
return nil, err return nil, err
} }
link := base.Link{} link := base.Link{
Headers: []base.Header{
{Name: "User-Agent", Value: base.UserAgent},
{Name: "Authorization", Value: ""},
},
}
if res.StatusCode() == 302 { if res.StatusCode() == 302 {
link.Url = res.Header().Get("location") link.Url = res.Header().Get("location")
} else { } else {

2
drivers/189/util.go
View File

@ -115,7 +115,7 @@ func EncodeParam(v url.Values) string {
} }
buf.WriteString(k) buf.WriteString(k)
buf.WriteByte('=') buf.WriteByte('=')
buf.WriteString(v) buf.WriteString(strings.ReplaceAll(v, "&", "%26"))
} }
} }
return buf.String() return buf.String()

6
drivers/base/driver.go
View File

@ -160,6 +160,7 @@ func GetDrivers() map[string][]Item {
var NoRedirectClient *resty.Client var NoRedirectClient *resty.Client
var RestyClient = resty.New() var RestyClient = resty.New()
var HttpClient = &http.Client{} var HttpClient = &http.Client{}
var UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36"
func init() { func init() {
NoRedirectClient = resty.New().SetRedirectPolicy( NoRedirectClient = resty.New().SetRedirectPolicy(
@ -167,8 +168,7 @@ func init() {
return http.ErrUseLastResponse return http.ErrUseLastResponse
}), }),
) )
userAgent := "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36" NoRedirectClient.SetHeader("user-agent", UserAgent)
NoRedirectClient.SetHeader("user-agent", userAgent) RestyClient.SetHeader("user-agent", UserAgent)
RestyClient.SetHeader("user-agent", userAgent)
RestyClient.SetRetryCount(3) RestyClient.SetRetryCount(3)
} }

9
server/controllers/proxy.go
View File

@ -11,6 +11,7 @@ import (
"github.com/go-resty/resty/v2" "github.com/go-resty/resty/v2"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"io" "io"
"io/ioutil"
"net/http" "net/http"
"net/url" "net/url"
"os" "os"
@ -117,12 +118,14 @@ func Proxy(c *gin.Context) {
common.ErrorResp(c, err, 500) common.ErrorResp(c, err, 500)
return return
} }
log.Debugf("%+v", r.Header)
for h, val := range r.Header { for h, val := range r.Header {
req.Header[h] = val req.Header[h] = val
} }
for _, header := range link.Headers { for _, header := range link.Headers {
req.Header.Set(header.Name, header.Value) req.Header.Set(header.Name, header.Value)
} }
log.Debugf("%+v", req.Header)
res, err := HttpClient.Do(req) res, err := HttpClient.Do(req)
if err != nil { if err != nil {
common.ErrorResp(c, err, 500) common.ErrorResp(c, err, 500)
@ -133,6 +136,12 @@ func Proxy(c *gin.Context) {
}() }()
log.Debugf("proxy status: %d", res.StatusCode) log.Debugf("proxy status: %d", res.StatusCode)
w.WriteHeader(res.StatusCode) w.WriteHeader(res.StatusCode)
if res.StatusCode >= 400 {
all, _ := ioutil.ReadAll(res.Body)
log.Debugln(string(all))
common.ErrorStrResp(c, string(all), 500)
return
}
for h, v := range res.Header { for h, v := range res.Header {
w.Header()[h] = v w.Header()[h] = v
} }