8000 [pull] main from miniflux:main by pull[bot] · Pull Request #219 · suhaoGe/miniflux · GitHub
[go: up one dir, main page]
Skip to content

[pull] main from miniflux:main #219

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Jan 27, 2026
Merged
8000

[pull] main from miniflux:main #219

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8357e6d
refactor(sanitizer): don't process tags when len(blockedStack) != 0
jvoisin Jan 26, 2026
a5fb91e
refactor(sanitizer): rename isValidTag to isAllowedTag
jvoisin Jan 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions internal/reader/sanitizer/sanitizer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,10 @@ func SanitizeHTML(baseURL, rawHTML string, sanitizerOptions *SanitizerOptions) s

buffer.WriteString(token.String())
case html.StartTagToken:
if len(blockedStack) != 0 {
continue
}

parentTag = tagName

if isPixelTracker(tagName, token.Attr) {
Expand All @@ -264,7 +268,7 @@ func SanitizeHTML(baseURL, rawHTML string, sanitizerOptions *SanitizerOptions) s
continue
}

if len(blockedStack) == 0 && isValidTag(tagName) {
if isAllowedTag(tagName) {
attrNames, htmlAttributes := sanitizeAttributes(parsedBaseUrl, tagName, token.Attr, sanitizerOptions)
if hasRequiredAttributes(tagName, attrNames) {
if len(attrNames) > 0 {
Expand All @@ -280,7 +284,7 @@ func SanitizeHTML(baseURL, rawHTML string, sanitizerOptions *SanitizerOptions) s
}
case html.EndTagToken:
if len(blockedStack) == 0 {
if isValidTag(tagName) && slices.Contains(tagStack, tagName) {
if isAllowedTag(tagName) && slices.Contains(tagStack, tagName) {
buffer.WriteString("</" + tagName + ">")
}
} else {
Expand All @@ -292,7 +296,7 @@ func SanitizeHTML(baseURL, rawHTML string, sanitizerOptions *SanitizerOptions) s
if isPixelTracker(tagName, token.Attr) {
continue
}
if len(blockedStack) == 0 && isValidTag(tagName) {
if len(blockedStack) == 0 && isAllowedTag(tagName) {
attrNames, htmlAttributes := sanitizeAttributes(parsedBaseUrl, tagName, token.Attr, sanitizerOptions)
if hasRequiredAttributes(tagName, attrNames) {
if len(attrNames) > 0 {
Expand Down Expand Up @@ -440,7 +444,7 @@ func getExtraAttributes(tagName string, isYouTubeEmbed bool, sanitizerOptions *S
}
}

func isValidTag(tagName string) bool {
func isAllowedTag(tagName string) bool {
_, ok := allowedHTMLTagsAndAttributes[tagName]
return ok
}
Expand Down
Loading
0