A Q&A platform software for teams at any scales. Whether it's a community forum, help center, or knowledge management platform, you can always count on Apache Answer.
feat(converter): update markdown converter
LinkinStar08206346b0e8
diff --git a/go.mod b/go.modindex 7e4559df..33c4a499 100644--- a/go.mod+++ b/go.mod@@ -15,7 +15,6 @@ require (github.com/go-sql-driver/mysql v1.6.0github.com/goccy/go-json v0.9.11github.com/golang/mock v1.4.4- github.com/gomarkdown/markdown v0.0.0-20221013030248-663e2500819cgithub.com/google/uuid v1.3.0github.com/google/wire v0.5.0github.com/gosimple/slug v1.13.1@@ -24,6 +23,7 @@ require (github.com/jinzhu/now v1.1.5github.com/lib/pq v1.10.7github.com/mattn/go-sqlite3 v1.14.16+ github.com/microcosm-cc/bluemonday v1.0.21github.com/mojocn/base64Captcha v1.3.5github.com/ory/dockertest/v3 v3.9.1github.com/robfig/cron/v3 v3.0.1@@ -55,6 +55,7 @@ require (github.com/Microsoft/go-winio v0.5.2 // indirectgithub.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirectgithub.com/andybalholm/brotli v1.0.4 // indirect+ github.com/aymerick/douceur v0.2.0 // indirectgithub.com/cenkalti/backoff/v4 v4.1.3 // indirectgithub.com/containerd/continuity v0.3.0 // indirectgithub.com/docker/cli v20.10.14+incompatible // indirect@@ -71,6 +72,7 @@ require (github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirectgithub.com/golang/snappy v0.0.4 // indirectgithub.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect+ github.com/gorilla/css v1.0.0 // indirectgithub.com/gosimple/unidecode v1.0.1 // indirectgithub.com/hashicorp/hcl v1.0.0 // indirectgithub.com/imdario/mergo v0.3.12 // indirectdiff --git a/go.sum b/go.sumindex cfb81da7..a808586a 100644--- a/go.sum+++ b/go.sum@@ -82,6 +82,8 @@ github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lgithub.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU=github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=+github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=+github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=@@ -256,8 +258,6 @@ github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lgithub.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=-github.com/gomarkdown/markdown v0.0.0-20221013030248-663e2500819c h1:iyaGYbCmcYK0Ja9a3OUa2Fo+EaN0cbLu0eKpBwPFzc8=-github.com/gomarkdown/markdown v0.0.0-20221013030248-663e2500819c/go.mod h1:JDGcbDT52eL4fju3sZ4TeHGsQwhG9nbDV21aMyhwPoA=github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=@@ -301,6 +301,8 @@ github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mgithub.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=+github.com/gorilla/css v1.0.0 h1:BQqNyPTi50JCFMTw/b67hByjMVXZRwGha6wxVGkeihY=+github.com/gorilla/css v1.0.0/go.mod h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl60c=github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=@@ -476,6 +478,8 @@ github.com/mattn/go-sqlite3 v1.14.9/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4Agithub.com/mattn/go-sqlite3 v1.14.16 h1:yOQRA0RpS5PFz/oikGwBEqvAWhWg5ufRz4ETLjwpU1Y=github.com/mattn/go-sqlite3 v1.14.16/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=+github.com/microcosm-cc/bluemonday v1.0.21 h1:dNH3e4PSyE4vNX+KlRGHT5KrSvjeUkoNPwEORjffHJg=+github.com/microcosm-cc/bluemonday v1.0.21/go.mod h1:ytNkv4RrDrLJ2pqlsSI46O6IVXmZOBBD4SaJyDwwTkM=github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=diff --git a/pkg/converter/markdown.go b/pkg/converter/markdown.goindex c69a042c..d302c1be 100644--- a/pkg/converter/markdown.go+++ b/pkg/converter/markdown.go@@ -3,22 +3,26 @@ package converterimport ("bytes"+ "github.com/microcosm-cc/bluemonday""github.com/segmentfault/pacman/log""github.com/yuin/goldmark"+ "github.com/yuin/goldmark/ast""github.com/yuin/goldmark/extension""github.com/yuin/goldmark/parser"- "github.com/yuin/goldmark/renderer/html"+ "github.com/yuin/goldmark/renderer"+ goldmarkHTML "github.com/yuin/goldmark/renderer/html"+ "github.com/yuin/goldmark/util")// Markdown2HTML convert markdown to htmlfunc Markdown2HTML(source string) string {mdConverter := goldmark.New(- goldmark.WithExtensions(extension.GFM),+ goldmark.WithExtensions(&DangerousHTMLFilterExtension{}, extension.GFM),goldmark.WithParserOptions(parser.WithAutoHeadingID(),),goldmark.WithRendererOptions(- html.WithHardWraps(),+ goldmarkHTML.WithHardWraps(),),)var buf bytes.Buffer@@ -28,3 +32,56 @@ func Markdown2HTML(source string) string {}return buf.String()}++type DangerousHTMLFilterExtension struct {+}++func (e *DangerousHTMLFilterExtension) Extend(m goldmark.Markdown) {+ m.Renderer().AddOptions(renderer.WithNodeRenderers(+ util.Prioritized(&DangerousHTMLRenderer{+ Config: goldmarkHTML.NewConfig(),+ Filter: bluemonday.UGCPolicy(),+ }, 1),+ ))+}++type DangerousHTMLRenderer struct {+ goldmarkHTML.Config+ Filter *bluemonday.Policy+}++// RegisterFuncs implements renderer.NodeRenderer.RegisterFuncs.+func (r *DangerousHTMLRenderer) RegisterFuncs(reg renderer.NodeRendererFuncRegisterer) {+ reg.Register(ast.KindHTMLBlock, r.renderHTMLBlock)+ reg.Register(ast.KindRawHTML, r.renderRawHTML)+}++func (r *DangerousHTMLRenderer) renderRawHTML(w util.BufWriter, source []byte, node ast.Node, entering bool) (ast.WalkStatus, error) {+ if !entering {+ return ast.WalkSkipChildren, nil+ }+ n := node.(*ast.RawHTML)+ l := n.Segments.Len()+ for i := 0; i < l; i++ {+ segment := n.Segments.At(i)+ _, _ = w.Write(r.Filter.SanitizeBytes(segment.Value(source)))+ }+ return ast.WalkSkipChildren, nil+}++func (r *DangerousHTMLRenderer) renderHTMLBlock(w util.BufWriter, source []byte, node ast.Node, entering bool) (ast.WalkStatus, error) {+ n := node.(*ast.HTMLBlock)+ if entering {+ l := n.Lines().Len()+ for i := 0; i < l; i++ {+ line := n.Lines().At(i)+ r.Writer.SecureWrite(w, r.Filter.SanitizeBytes(line.Value(source)))+ }+ } else {+ if n.HasClosure() {+ closure := n.ClosureLine+ r.Writer.SecureWrite(w, closure.Value(source))+ }+ }+ return ast.WalkContinue, nil+}