fix: HTTP fetch crash when modified request extra via extension (#832)

This commit is contained in:
Levi authored and GitHub committed 2024-12-08 12:07:08 +08:00
1 parent 35a3625b11
commit f4876c8a0e
2 files changed
+20 -11

No files matched your search

+6 -3
View File
@@ -162,9 +162,6 @@ func (f *Fetcher) Resolve(req *base.Request) error {
func (f *Fetcher) Create(opts *base.Options) error { func (f *Fetcher) Create(opts *base.Options) error {
f.meta.Opts = opts f.meta.Opts = opts
if err := base.ParseReqExtra[fhttp.ReqExtra](f.meta.Req); err != nil {
return err
}
if err := base.ParseOptsExtra[fhttp.OptsExtra](f.meta.Opts); err != nil { if err := base.ParseOptsExtra[fhttp.OptsExtra](f.meta.Opts); err != nil {
return err return err
} }
@@ -198,6 +195,12 @@ func (f *Fetcher) Start() (err error) {
if err != nil { if err != nil {
return err return err
} }
// Avoid request extra modified by extension
if err = base.ParseReqExtra[fhttp.ReqExtra](f.meta.Req); err != nil {
return err
}
if f.chunks == nil { if f.chunks == nil {
f.chunks = f.splitChunk() f.chunks = f.splitChunk()
} }
+14 -8
View File
@@ -703,31 +703,37 @@ type OnDoneContext struct {
} }
type ExtensionTask struct { type ExtensionTask struct {
*Task
download *Downloader download *Downloader
task *Task
Meta *ExtensionTaskMeta `json:"meta"`
}
// ExtensionTaskMeta restricts extension scripts to only modify request info
type ExtensionTaskMeta struct {
Req *base.Request `json:"req"`
} }
func NewExtensionTask(download *Downloader, task *Task) *ExtensionTask { func NewExtensionTask(download *Downloader, task *Task) *ExtensionTask {
newTask := task.clone() newTask := task.clone()
// Assign the pointer of the properties that the extension supports modification
newTask.Meta = task.Meta
newTask.Status = task.Status
return &ExtensionTask{ return &ExtensionTask{
Task: newTask, task: newTask,
download: download, download: download,
Meta: &ExtensionTaskMeta{
Req: task.Meta.Req,
},
} }
} }
func (t *ExtensionTask) Continue() error { func (t *ExtensionTask) Continue() error {
return t.download.Continue(&TaskFilter{ return t.download.Continue(&TaskFilter{
IDs: []string{t.ID}, IDs: []string{t.task.ID},
}) })
} }
func (t *ExtensionTask) Pause() error { func (t *ExtensionTask) Pause() error {
return t.download.Pause(&TaskFilter{ return t.download.Pause(&TaskFilter{
IDs: []string{t.ID}, IDs: []string{t.task.ID},
}) })
} }