mirror of
https://github.com/OpenListTeam/OpenList.git
synced 2025-09-19 20:26:26 +08:00
fix(123&&123_share): fix link request header referer (#915)
This commit is contained in:
@ -64,14 +64,6 @@ func (d *Pan123) List(ctx context.Context, dir model.Obj, args model.ListArgs) (
|
|||||||
|
|
||||||
func (d *Pan123) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
|
func (d *Pan123) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
|
||||||
if f, ok := file.(File); ok {
|
if f, ok := file.(File); ok {
|
||||||
//var resp DownResp
|
|
||||||
var headers map[string]string
|
|
||||||
if !utils.IsLocalIPAddr(args.IP) {
|
|
||||||
headers = map[string]string{
|
|
||||||
//"X-Real-IP": "1.1.1.1",
|
|
||||||
"X-Forwarded-For": args.IP,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
data := base.Json{
|
data := base.Json{
|
||||||
"driveId": 0,
|
"driveId": 0,
|
||||||
"etag": f.Etag,
|
"etag": f.Etag,
|
||||||
@ -83,25 +75,27 @@ func (d *Pan123) Link(ctx context.Context, file model.Obj, args model.LinkArgs)
|
|||||||
}
|
}
|
||||||
resp, err := d.Request(DownloadInfo, http.MethodPost, func(req *resty.Request) {
|
resp, err := d.Request(DownloadInfo, http.MethodPost, func(req *resty.Request) {
|
||||||
|
|
||||||
req.SetBody(data).SetHeaders(headers)
|
req.SetBody(data)
|
||||||
}, nil)
|
}, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
downloadUrl := utils.Json.Get(resp, "data", "DownloadUrl").ToString()
|
downloadUrl := utils.Json.Get(resp, "data", "DownloadUrl").ToString()
|
||||||
u, err := url.Parse(downloadUrl)
|
ou, err := url.Parse(downloadUrl)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
nu := u.Query().Get("params")
|
u_ := ou.String()
|
||||||
|
nu := ou.Query().Get("params")
|
||||||
if nu != "" {
|
if nu != "" {
|
||||||
du, _ := base64.StdEncoding.DecodeString(nu)
|
du, _ := base64.StdEncoding.DecodeString(nu)
|
||||||
u, err = url.Parse(string(du))
|
u, err := url.Parse(string(du))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
u_ = u.String()
|
||||||
}
|
}
|
||||||
u_ := u.String()
|
|
||||||
log.Debug("download url: ", u_)
|
log.Debug("download url: ", u_)
|
||||||
res, err := base.NoRedirectClient.R().SetHeader("Referer", "https://www.123pan.com/").Get(u_)
|
res, err := base.NoRedirectClient.R().SetHeader("Referer", "https://www.123pan.com/").Get(u_)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -118,7 +112,7 @@ func (d *Pan123) Link(ctx context.Context, file model.Obj, args model.LinkArgs)
|
|||||||
link.URL = utils.Json.Get(res.Body(), "data", "redirect_url").ToString()
|
link.URL = utils.Json.Get(res.Body(), "data", "redirect_url").ToString()
|
||||||
}
|
}
|
||||||
link.Header = http.Header{
|
link.Header = http.Header{
|
||||||
"Referer": []string{"https://www.123pan.com/"},
|
"Referer": []string{fmt.Sprintf("%s://%s/", ou.Scheme, ou.Host)},
|
||||||
}
|
}
|
||||||
return &link, nil
|
return &link, nil
|
||||||
} else {
|
} else {
|
||||||
|
@ -70,14 +70,6 @@ func (d *Pan123Share) List(ctx context.Context, dir model.Obj, args model.ListAr
|
|||||||
func (d *Pan123Share) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
|
func (d *Pan123Share) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
|
||||||
// TODO return link of file, required
|
// TODO return link of file, required
|
||||||
if f, ok := file.(File); ok {
|
if f, ok := file.(File); ok {
|
||||||
//var resp DownResp
|
|
||||||
var headers map[string]string
|
|
||||||
if !utils.IsLocalIPAddr(args.IP) {
|
|
||||||
headers = map[string]string{
|
|
||||||
//"X-Real-IP": "1.1.1.1",
|
|
||||||
"X-Forwarded-For": args.IP,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
data := base.Json{
|
data := base.Json{
|
||||||
"shareKey": d.ShareKey,
|
"shareKey": d.ShareKey,
|
||||||
"SharePwd": d.SharePwd,
|
"SharePwd": d.SharePwd,
|
||||||
@ -87,25 +79,27 @@ func (d *Pan123Share) Link(ctx context.Context, file model.Obj, args model.LinkA
|
|||||||
"size": f.Size,
|
"size": f.Size,
|
||||||
}
|
}
|
||||||
resp, err := d.request(DownloadInfo, http.MethodPost, func(req *resty.Request) {
|
resp, err := d.request(DownloadInfo, http.MethodPost, func(req *resty.Request) {
|
||||||
req.SetBody(data).SetHeaders(headers)
|
req.SetBody(data)
|
||||||
}, nil)
|
}, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
downloadUrl := utils.Json.Get(resp, "data", "DownloadURL").ToString()
|
downloadUrl := utils.Json.Get(resp, "data", "DownloadURL").ToString()
|
||||||
u, err := url.Parse(downloadUrl)
|
ou, err := url.Parse(downloadUrl)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
nu := u.Query().Get("params")
|
u_ := ou.String()
|
||||||
|
nu := ou.Query().Get("params")
|
||||||
if nu != "" {
|
if nu != "" {
|
||||||
du, _ := base64.StdEncoding.DecodeString(nu)
|
du, _ := base64.StdEncoding.DecodeString(nu)
|
||||||
u, err = url.Parse(string(du))
|
u, err := url.Parse(string(du))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
u_ = u.String()
|
||||||
}
|
}
|
||||||
u_ := u.String()
|
|
||||||
log.Debug("download url: ", u_)
|
log.Debug("download url: ", u_)
|
||||||
res, err := base.NoRedirectClient.R().SetHeader("Referer", "https://www.123pan.com/").Get(u_)
|
res, err := base.NoRedirectClient.R().SetHeader("Referer", "https://www.123pan.com/").Get(u_)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -122,7 +116,7 @@ func (d *Pan123Share) Link(ctx context.Context, file model.Obj, args model.LinkA
|
|||||||
link.URL = utils.Json.Get(res.Body(), "data", "redirect_url").ToString()
|
link.URL = utils.Json.Get(res.Body(), "data", "redirect_url").ToString()
|
||||||
}
|
}
|
||||||
link.Header = http.Header{
|
link.Header = http.Header{
|
||||||
"Referer": []string{"https://www.123pan.com/"},
|
"Referer": []string{fmt.Sprintf("%s://%s/", ou.Scheme, ou.Host)},
|
||||||
}
|
}
|
||||||
return &link, nil
|
return &link, nil
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user