Skip to content

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.

update markdown url

aichy1262c366b865f40
diff --git a/docs/docs.go b/docs/docs.go
index 75d0a49d..24693e47 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -7510,6 +7510,11 @@ const docTemplate = `{
"type": "string",
"maxLength": 4096
},
+ "bio_html": {
+ "description": "bio",
+ "type": "string",
+ "maxLength": 4096
+ },
"display_name": {
"description": "display_name",
"type": "string",
diff --git a/docs/swagger.json b/docs/swagger.json
index 899de45a..fb2f297b 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -7498,6 +7498,11 @@
"type": "string",
"maxLength": 4096
},
+ "bio_html": {
+ "description": "bio",
+ "type": "string",
+ "maxLength": 4096
+ },
"display_name": {
"description": "display_name",
"type": "string",
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index aed8b3ea..fef405df 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -1589,6 +1589,10 @@ definitions:
description: bio
maxLength: 4096
type: string
+ bio_html:
+ description: bio
+ maxLength: 4096
+ type: string
display_name:
description: display_name
maxLength: 30
diff --git a/go.mod b/go.mod
index 33c4a499..7c7aac21 100644
--- a/go.mod
+++ b/go.mod
@@ -55,6 +55,7 @@ require (
github.com/Microsoft/go-winio v0.5.2 // indirect
github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
github.com/andybalholm/brotli v1.0.4 // indirect
+ github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
github.com/aymerick/douceur v0.2.0 // indirect
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
github.com/containerd/continuity v0.3.0 // indirect
diff --git a/go.sum b/go.sum
index a808586a..2d51e7be 100644
--- a/go.sum
+++ b/go.sum
@@ -79,6 +79,8 @@ github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hC
github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A=
+github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d h1:Byv0BzEl3/e6D5CLfI0j/7hiIEtvGVFPCZ7Ei2oq8iQ=
+github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
github.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=
diff --git a/pkg/converter/markdown.go b/pkg/converter/markdown.go
index d302c1be..4f4a3c41 100644
--- a/pkg/converter/markdown.go
+++ b/pkg/converter/markdown.go
@@ -3,6 +3,7 @@ package converter
import (
"bytes"
+ "github.com/asaskevich/govalidator"
"github.com/microcosm-cc/bluemonday"
"github.com/segmentfault/pacman/log"
"github.com/yuin/goldmark"
@@ -10,6 +11,7 @@ import (
"github.com/yuin/goldmark/extension"
"github.com/yuin/goldmark/parser"
"github.com/yuin/goldmark/renderer"
+ "github.com/yuin/goldmark/renderer/html"
goldmarkHTML "github.com/yuin/goldmark/renderer/html"
"github.com/yuin/goldmark/util"
)
@@ -54,6 +56,7 @@ type DangerousHTMLRenderer struct {
func (r *DangerousHTMLRenderer) RegisterFuncs(reg renderer.NodeRendererFuncRegisterer) {
reg.Register(ast.KindHTMLBlock, r.renderHTMLBlock)
reg.Register(ast.KindRawHTML, r.renderRawHTML)
+ reg.Register(ast.KindLink, r.renderLink)
}
func (r *DangerousHTMLRenderer) renderRawHTML(w util.BufWriter, source []byte, node ast.Node, entering bool) (ast.WalkStatus, error) {
@@ -85,3 +88,30 @@ func (r *DangerousHTMLRenderer) renderHTMLBlock(w util.BufWriter, source []byte,
}
return ast.WalkContinue, nil
}
+
+func (r *DangerousHTMLRenderer) renderLink(w util.BufWriter, source []byte, node ast.Node, entering bool) (ast.WalkStatus, error) {
+ n := node.(*ast.Link)
+ if entering && r.renderLinkIsUrl(string(n.Destination)) {
+ _, _ = w.WriteString("<a href=\"")
+ if r.Unsafe || !html.IsDangerousURL(n.Destination) {
+ _, _ = w.Write(util.EscapeHTML(util.URLEscape(n.Destination, true)))
+ }
+ _ = w.WriteByte('"')
+ if n.Title != nil {
+ _, _ = w.WriteString(` title="`)
+ r.Writer.Write(w, n.Title)
+ _ = w.WriteByte('"')
+ }
+ if n.Attributes() != nil {
+ html.RenderAttributes(w, n, html.LinkAttributeFilter)
+ }
+ _ = w.WriteByte('>')
+ } else {
+ _, _ = w.WriteString("</a>")
+ }
+ return ast.WalkContinue, nil
+}
+
+func (r *DangerousHTMLRenderer) renderLinkIsUrl(verifyUrl string) bool {
+ return govalidator.IsURL(verifyUrl)
+}