Skip to content

[WIP] Test SVG sanitize #8024

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.

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

Closed
wants to merge 12 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
46 changes: 46 additions & 0 deletions modules/image/svg.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
// Copyright 2020 The Gitea Authors. All rights reserved.
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file.

package image

import (
"io"
"regexp"
"strings"

"github.com/microcosm-cc/bluemonday"
)

// SanitizeSVG remove potential malicious dom elements
func SanitizeSVG(svgData io.Reader) string {
//TODO init policy at start-up and keep it
p := bluemonday.NewPolicy()
p.AllowElements("svg", "title", "path", "desc", "g", "a", "line")
p.AllowNoAttrs().OnElements("svg", "title", "desc", "g", "a")
p.AllowAttrs("id", "viewBox", "role", "aria-labelledby", "xmlns", "xmlns:xlink", "xml:space").OnElements("svg")
p.AllowAttrs("version").Matching(regexp.MustCompile(`^\d+(\.\d+)?$`)).OnElements("svg")
p.AllowAttrs("id").OnElements("title", "desc")
p.AllowAttrs("id", "data-name", "class", "aria-label").OnElements("g")
p.AllowAttrs("id", "data-name", "class", "d", "transform", "aria-haspopup").OnElements("path")
p.AllowAttrs("x", "y", "width", "height").OnElements("rect", "svg")
p.AllowAttrs("x1", "y1", "x2", "y2").Matching(regexp.MustCompile(`^\d+(\.\d+)?$`)).OnElements("line")
p.AllowAttrs("stroke-miterlimit").Matching(regexp.MustCompile(`^\d+$`)).OnElements("line")
p.AllowAttrs("stroke", "fill").Matching(regexp.MustCompile(`^(#\d+)|(\w+)$`)).OnElements("line", "rect")
p.AllowAttrs("href", "xlink:href").Matching(regexp.MustCompile(`^#\w+$`)).OnElements("a")

//TODO find a good way to allow relative url import
//var invalidID = regexp.MustCompile(`((http|ftp)s?)|(url *\( *' *//)`)
//var validID = regexp.MustCompile(`(?!((http|ftp)s?)|(url *\( *' *//))`) //not supported
//p.AllowAttrs("fill").Matching(regexp.MustCompile(`^(\w+)|(url\(#\w+\))$`)).OnElements("rect")

p.SkipElementsContent("this", "script")
cleanedSVG := p.SanitizeReader(svgData).String()

//Remove empty lines
cleanedSVG = strings.TrimSpace(cleanedSVG)
r := regexp.MustCompile("\n+") //TODO move this somewhere else
cleanedSVG = r.ReplaceAllString(cleanedSVG, "\n")

return cleanedSVG
}
Loading