Gitea-John71/Gitea
2
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-08-13 22:31:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: markup render (#38864)

Browse Source 
1. add missing CSP header to api & web render endpoints.
2. make jupyter render skip post-processors, nothing to process
3. make ShortLinkProcessor correctly validate URL schemes and respect
the CustomURLSchemes setting
This commit is contained in:
wxiaoguang
2026-08-12 00:01:02 +08:00
committed by GitHub
parent eeeb5d7c7b
commit 938cde959e
25 changed files with 255 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/markup/html_link.go
+11 -9
View File
@@ -33,10 +33,11 @@ func shortLinkProcessor(ctx *RenderContext, node *html.Node) {
// Of text and link contents
sl := strings.SplitSeq(content, "|")
for v := range sl {
if found := strings.Contains(v, "="); !found {
before, after, hasKeyValue := strings.Cut(v, "=")
if !hasKeyValue {
// There is no equal in this argument; this is a mandatory arg
if props["name"] == "" {
if IsFullURLString(v) {
if checkLink := common.CheckLinkURLScheme(v); checkLink.HasScheme {
// If we clearly see it is a link, we save it so
// But first we need to ensure, that if both mandatory args provided
@@ -53,9 +54,6 @@ func shortLinkProcessor(ctx *RenderContext, node *html.Node) {
props["link"] = strings.TrimSpace(v)
}
} else {
// There is an equal; optional argument.
before, after, _ := strings.Cut(v, "=")
key, val := before, html.UnescapeString(after)
// When parsing HTML, x/net/html will change all quotes which are
@@ -103,6 +101,11 @@ func shortLinkProcessor(ctx *RenderContext, node *html.Node) {
image = true
}
checkLink := common.CheckLinkURLScheme(link)
if !checkLink.AllowToLinkify {
return
}
childNode := &html.Node{}
linkNode := &html.Node{
FirstChild: childNode,
@@ -112,10 +115,9 @@ func shortLinkProcessor(ctx *RenderContext, node *html.Node) {
DataAtom: atom.A,
}
childNode.Parent = linkNode
absoluteLink := IsFullURLString(link)
// FIXME: it should be fully refactored in the future, it uses various hacky approaches to guess how to encode a path for wiki
// When a link contains "/", then we assume that the user has provided a well-encoded link.
if !absoluteLink && !strings.Contains(link, "/") {
if !checkLink.HasScheme && !strings.Contains(link, "/") {
// So only guess for links without "/".
if image {
link = strings.ReplaceAll(link, " ", "+")
@@ -165,7 +167,7 @@ func shortLinkProcessor(ctx *RenderContext, node *html.Node) {
func linkProcessor(ctx *RenderContext, node *html.Node) {
next := node.NextSibling
for node != nil && node != next {
m := common.GlobalVars().LinkRegex.FindStringIndex(node.Data)
m := common.GlobalVars().LinkifyRegex.FindStringIndex(node.Data)
if m == nil {
return
}
@@ -184,7 +186,7 @@ func linkProcessor(ctx *RenderContext, node *html.Node) {
func descriptionLinkProcessor(ctx *RenderContext, node *html.Node) {
next := node.NextSibling
for node != nil && node != next {
m := common.GlobalVars().LinkRegex.FindStringIndex(node.Data)
m := common.GlobalVars().LinkifyRegex.FindStringIndex(node.Data)
if m == nil {
return
}