mirror of
https://github.com/GopeedLab/gopeed.git
synced 2026-11-06 00:25:43 +00:00
fix: resolve http non encode attachment filename (#975)
This commit is contained in:
4 files changed
+39
-2
No files matched your search
@@ -24,8 +24,10 @@ type DefaultFileController struct {
|
||||
|
||||
func NewController() *Controller {
|
||||
return &Controller{
|
||||
GetConfig: func(v any) {},
|
||||
GetProxy: func(requestProxy *base.RequestProxy) func(*http.Request) (*url.URL, error) { return nil },
|
||||
GetConfig: func(v any) {},
|
||||
GetProxy: func(requestProxy *base.RequestProxy) func(*http.Request) (*url.URL, error) {
|
||||
return requestProxy.ToHandler()
|
||||
},
|
||||
FileController: &DefaultFileController{},
|
||||
}
|
||||
}
|
||||
|
||||
@@ -174,6 +174,12 @@ func (f *Fetcher) Resolve(req *base.Request) error {
|
||||
} else {
|
||||
file.Name = filename
|
||||
}
|
||||
} else {
|
||||
substr := "attachment; filename="
|
||||
index := strings.Index(contentDisposition, substr)
|
||||
if index != -1 {
|
||||
file.Name = contentDisposition[index+len(substr):]
|
||||
}
|
||||
}
|
||||
}
|
||||
// get file filePath by URL
|
||||
@@ -610,6 +616,14 @@ func (f *Fetcher) buildClient() *http.Client {
|
||||
}
|
||||
}
|
||||
|
||||
func decodeMangledString(mangled string) string {
|
||||
rawBytes := make([]byte, 0, len(mangled)*3)
|
||||
for _, r := range mangled {
|
||||
rawBytes = append(rawBytes, byte(r))
|
||||
}
|
||||
return string(rawBytes)
|
||||
}
|
||||
|
||||
type fetcherData struct {
|
||||
Connections []*connection
|
||||
}
|
||||
|
||||
@@ -47,6 +47,16 @@ func TestFetcher_Resolve(t *testing.T) {
|
||||
},
|
||||
},
|
||||
}, t)
|
||||
testResolve(test.StartTestCustomServer, "no-encode", &base.Resource{
|
||||
Size: test.BuildSize,
|
||||
Range: false,
|
||||
Files: []*base.FileInfo{
|
||||
{
|
||||
Name: "测试.zip",
|
||||
Size: test.BuildSize,
|
||||
},
|
||||
},
|
||||
}, t)
|
||||
testResolve(test.StartTestCustomServer, "%E6%B5%8B%E8%AF%95.zip", &base.Resource{
|
||||
Size: 0,
|
||||
Range: false,
|
||||
|
||||
@@ -102,6 +102,17 @@ func StartTestCustomServer() net.Listener {
|
||||
defer file.Close()
|
||||
io.Copy(writer, file)
|
||||
})
|
||||
mux.HandleFunc("/no-encode", func(writer http.ResponseWriter, request *http.Request) {
|
||||
writer.Header().Set("Content-Disposition", "attachment; filename=测试.zip")
|
||||
writer.Header().Set("Content-Type", "application/octet-stream")
|
||||
writer.Header().Set("Content-Length", fmt.Sprintf("%d", BuildSize))
|
||||
file, err := os.Open(BuildFile)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
defer file.Close()
|
||||
io.Copy(writer, file)
|
||||
})
|
||||
return mux
|
||||
})
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user