southfox/miniflux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Add missing check in followTheOnlyLink() that leads to a panic

Browse source 
Bug introduced in PR #1290. Fixes #1631.
This commit is contained in:
Frédéric Guillot 2022-11-14 16:34:02 -08:00
parent bfebf946c2
commit de1a06e3e8
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
reader/scraper/scraper.go
View file

@ -118,11 +118,17 @@ func followTheOnlyLink(websiteURL, content string, rules, userAgent string, cook
if err != nil {
return "", err
}
if len(document.Find("body").Nodes) == 0 {
return content, nil
}
body := document.Find("body").Nodes[0]
if body.FirstChild.NextSibling != nil ||
body.FirstChild.Data != "a" {
return content, nil
}
// the body has only one child of <a>
var href string
for _, attr := range body.FirstChild.Attr {
@ -131,16 +137,20 @@ func followTheOnlyLink(websiteURL, content string, rules, userAgent string, cook
break
}
}
if href == "" {
return content, nil
}
href, err = url.AbsoluteURL(websiteURL, href)
if err != nil {
return "", err
}
sameSite := url.Domain(websiteURL) == url.Domain(href)
if sameSite {
return fetchURL(href, rules, userAgent, cookie, allowSelfSignedCertificates, useProxy)
}
return fetchURL(href, rules, userAgent, "", false, false)
}