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

🎨 format code

pull/548/head
微凉 2021-11-09 16:03:04 +08:00
parent ac8f5d5737
commit 1542878d66
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
server/down.go
View File

@ -12,12 +12,12 @@ import (
) )
func Down(ctx *fiber.Ctx) error { func Down(ctx *fiber.Ctx) error {
rawPath, err:= url.PathUnescape(ctx.Params("*")) rawPath, err := url.PathUnescape(ctx.Params("*"))
if err != nil { if err != nil {
return ErrorResp(ctx,err,500) return ErrorResp(ctx, err, 500)
} }
rawPath = utils.ParsePath(rawPath) rawPath = utils.ParsePath(rawPath)
log.Debugf("down: %s",rawPath) log.Debugf("down: %s", rawPath)
account, path, driver, err := ParsePath(rawPath) account, path, driver, err := ParsePath(rawPath)
if err != nil { if err != nil {
return ErrorResp(ctx, err, 500) return ErrorResp(ctx, err, 500)
@ -34,18 +34,18 @@ func Down(ctx *fiber.Ctx) error {
} }
func Proxy(ctx *fiber.Ctx) error { func Proxy(ctx *fiber.Ctx) error {
rawPath, err:= url.PathUnescape(ctx.Params("*")) rawPath, err := url.PathUnescape(ctx.Params("*"))
if err != nil { if err != nil {
return ErrorResp(ctx,err,500) return ErrorResp(ctx, err, 500)
} }
rawPath = utils.ParsePath(rawPath) rawPath = utils.ParsePath(rawPath)
log.Debugf("proxy: %s",rawPath) log.Debugf("proxy: %s", rawPath)
account, path, driver, err := ParsePath(rawPath) account, path, driver, err := ParsePath(rawPath)
if err != nil { if err != nil {
return ErrorResp(ctx, err, 500) return ErrorResp(ctx, err, 500)
} }
if !account.Proxy && utils.GetFileType(filepath.Ext(rawPath))!=conf.TEXT { if !account.Proxy && utils.GetFileType(filepath.Ext(rawPath)) != conf.TEXT {
return ErrorResp(ctx,fmt.Errorf("[%s] not allowed proxy",account.Name),403) return ErrorResp(ctx, fmt.Errorf("[%s] not allowed proxy", account.Name), 403)
} }
link, err := driver.Link(path, account) link, err := driver.Link(path, account)
if err != nil { if err != nil {
@ -55,6 +55,20 @@ func Proxy(ctx *fiber.Ctx) error {
return ctx.SendFile(link) return ctx.SendFile(link)
} else { } else {
driver.Proxy(ctx) driver.Proxy(ctx)
//ctx.Response().ImmediateHeaderFlush = true
//var ProxyNetHttp = fasthttpadaptor.NewFastHTTPHandlerFunc(func(w http.ResponseWriter, r *http.Request) {
// target, _ := url.Parse(link)
// protocol := "https://"
// if strings.HasPrefix(link, "http://") {
// protocol = "http://"
// }
// targetHost, _ := url.Parse(fmt.Sprintf("%s%s", protocol, target.Host))
// proxy := httputil.NewSingleHostReverseProxy(targetHost)
// r.URL = target
// r.Host = target.Host
// proxy.ServeHTTP(w, r)
//})
//ProxyNetHttp(ctx.Context())
if err := proxy.Do(ctx, link); err != nil { if err := proxy.Do(ctx, link); err != nil {
log.Errorf("proxy error: %s", err) log.Errorf("proxy error: %s", err)
return ErrorResp(ctx,err,500) return ErrorResp(ctx,err,500)