mirror of
https://github.com/go-gitea/gitea
synced 2024-08-26 17:23:57 +02:00
Make pasted "img" tag has the same behavior as markdown image (#31235)
Fix #31230 --------- Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
This commit is contained in:
parent
4ca65fabda
commit
9000811118
@ -372,7 +372,42 @@ func postProcess(ctx *RenderContext, procs []processor, input io.Reader, output
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func visitNode(ctx *RenderContext, procs []processor, node *html.Node) {
|
func handleNodeImg(ctx *RenderContext, img *html.Node) {
|
||||||
|
for i, attr := range img.Attr {
|
||||||
|
if attr.Key != "src" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
if attr.Val != "" && !IsFullURLString(attr.Val) && !strings.HasPrefix(attr.Val, "/") {
|
||||||
|
attr.Val = util.URLJoin(ctx.Links.ResolveMediaLink(ctx.IsWiki), attr.Val)
|
||||||
|
|
||||||
|
// By default, the "<img>" tag should also be clickable,
|
||||||
|
// because frontend use `<img>` to paste the re-scaled image into the markdown,
|
||||||
|
// so it must match the default markdown image behavior.
|
||||||
|
hasParentAnchor := false
|
||||||
|
for p := img.Parent; p != nil; p = p.Parent {
|
||||||
|
if hasParentAnchor = p.Type == html.ElementNode && p.Data == "a"; hasParentAnchor {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !hasParentAnchor {
|
||||||
|
imgA := &html.Node{Type: html.ElementNode, Data: "a", Attr: []html.Attribute{
|
||||||
|
{Key: "href", Val: attr.Val},
|
||||||
|
{Key: "target", Val: "_blank"},
|
||||||
|
}}
|
||||||
|
parent := img.Parent
|
||||||
|
imgNext := img.NextSibling
|
||||||
|
parent.RemoveChild(img)
|
||||||
|
parent.InsertBefore(imgA, imgNext)
|
||||||
|
imgA.AppendChild(img)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
attr.Val = camoHandleLink(attr.Val)
|
||||||
|
img.Attr[i] = attr
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func visitNode(ctx *RenderContext, procs []processor, node *html.Node) *html.Node {
|
||||||
// Add user-content- to IDs and "#" links if they don't already have them
|
// Add user-content- to IDs and "#" links if they don't already have them
|
||||||
for idx, attr := range node.Attr {
|
for idx, attr := range node.Attr {
|
||||||
val := strings.TrimPrefix(attr.Val, "#")
|
val := strings.TrimPrefix(attr.Val, "#")
|
||||||
@ -397,21 +432,14 @@ func visitNode(ctx *RenderContext, procs []processor, node *html.Node) {
|
|||||||
textNode(ctx, procs, node)
|
textNode(ctx, procs, node)
|
||||||
case html.ElementNode:
|
case html.ElementNode:
|
||||||
if node.Data == "img" {
|
if node.Data == "img" {
|
||||||
for i, attr := range node.Attr {
|
next := node.NextSibling
|
||||||
if attr.Key != "src" {
|
handleNodeImg(ctx, node)
|
||||||
continue
|
return next
|
||||||
}
|
|
||||||
if len(attr.Val) > 0 && !IsFullURLString(attr.Val) && !strings.HasPrefix(attr.Val, "data:image/") {
|
|
||||||
attr.Val = util.URLJoin(ctx.Links.ResolveMediaLink(ctx.IsWiki), attr.Val)
|
|
||||||
}
|
|
||||||
attr.Val = camoHandleLink(attr.Val)
|
|
||||||
node.Attr[i] = attr
|
|
||||||
}
|
|
||||||
} else if node.Data == "a" {
|
} else if node.Data == "a" {
|
||||||
// Restrict text in links to emojis
|
// Restrict text in links to emojis
|
||||||
procs = emojiProcessors
|
procs = emojiProcessors
|
||||||
} else if node.Data == "code" || node.Data == "pre" {
|
} else if node.Data == "code" || node.Data == "pre" {
|
||||||
return
|
return node.NextSibling
|
||||||
} else if node.Data == "i" {
|
} else if node.Data == "i" {
|
||||||
for _, attr := range node.Attr {
|
for _, attr := range node.Attr {
|
||||||
if attr.Key != "class" {
|
if attr.Key != "class" {
|
||||||
@ -434,11 +462,11 @@ func visitNode(ctx *RenderContext, procs []processor, node *html.Node) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for n := node.FirstChild; n != nil; n = n.NextSibling {
|
for n := node.FirstChild; n != nil; {
|
||||||
visitNode(ctx, procs, n)
|
n = visitNode(ctx, procs, n)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// ignore everything else
|
return node.NextSibling
|
||||||
}
|
}
|
||||||
|
|
||||||
// textNode runs the passed node through various processors, in order to handle
|
// textNode runs the passed node through various processors, in order to handle
|
||||||
@ -851,7 +879,7 @@ func issueIndexPatternProcessor(ctx *RenderContext, node *html.Node) {
|
|||||||
|
|
||||||
// FIXME: the use of "mode" is quite dirty and hacky, for example: what is a "document"? how should it be rendered?
|
// FIXME: the use of "mode" is quite dirty and hacky, for example: what is a "document"? how should it be rendered?
|
||||||
// The "mode" approach should be refactored to some other more clear&reliable way.
|
// The "mode" approach should be refactored to some other more clear&reliable way.
|
||||||
crossLinkOnly := (ctx.Metas["mode"] == "document" && !ctx.IsWiki)
|
crossLinkOnly := ctx.Metas["mode"] == "document" && !ctx.IsWiki
|
||||||
|
|
||||||
var (
|
var (
|
||||||
found bool
|
found bool
|
||||||
|
@ -18,8 +18,7 @@ import (
|
|||||||
|
|
||||||
const (
|
const (
|
||||||
TestAppURL = "http://localhost:3000/"
|
TestAppURL = "http://localhost:3000/"
|
||||||
TestOrgRepo = "gogits/gogs"
|
TestRepoURL = TestAppURL + "test-owner/test-repo/"
|
||||||
TestRepoURL = TestAppURL + TestOrgRepo + "/"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// externalIssueLink an HTML link to an alphanumeric-style issue
|
// externalIssueLink an HTML link to an alphanumeric-style issue
|
||||||
@ -64,8 +63,8 @@ var regexpMetas = map[string]string{
|
|||||||
|
|
||||||
// these values should match the TestOrgRepo const above
|
// these values should match the TestOrgRepo const above
|
||||||
var localMetas = map[string]string{
|
var localMetas = map[string]string{
|
||||||
"user": "gogits",
|
"user": "test-owner",
|
||||||
"repo": "gogs",
|
"repo": "test-repo",
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestRender_IssueIndexPattern(t *testing.T) {
|
func TestRender_IssueIndexPattern(t *testing.T) {
|
||||||
@ -362,12 +361,12 @@ func TestRender_FullIssueURLs(t *testing.T) {
|
|||||||
`Look here <a href="http://localhost:3000/person/repo/issues/4" class="ref-issue">person/repo#4</a>`)
|
`Look here <a href="http://localhost:3000/person/repo/issues/4" class="ref-issue">person/repo#4</a>`)
|
||||||
test("http://localhost:3000/person/repo/issues/4#issuecomment-1234",
|
test("http://localhost:3000/person/repo/issues/4#issuecomment-1234",
|
||||||
`<a href="http://localhost:3000/person/repo/issues/4#issuecomment-1234" class="ref-issue">person/repo#4 (comment)</a>`)
|
`<a href="http://localhost:3000/person/repo/issues/4#issuecomment-1234" class="ref-issue">person/repo#4 (comment)</a>`)
|
||||||
test("http://localhost:3000/gogits/gogs/issues/4",
|
test("http://localhost:3000/test-owner/test-repo/issues/4",
|
||||||
`<a href="http://localhost:3000/gogits/gogs/issues/4" class="ref-issue">#4</a>`)
|
`<a href="http://localhost:3000/test-owner/test-repo/issues/4" class="ref-issue">#4</a>`)
|
||||||
test("http://localhost:3000/gogits/gogs/issues/4 test",
|
test("http://localhost:3000/test-owner/test-repo/issues/4 test",
|
||||||
`<a href="http://localhost:3000/gogits/gogs/issues/4" class="ref-issue">#4</a> test`)
|
`<a href="http://localhost:3000/test-owner/test-repo/issues/4" class="ref-issue">#4</a> test`)
|
||||||
test("http://localhost:3000/gogits/gogs/issues/4?a=1&b=2#comment-123 test",
|
test("http://localhost:3000/test-owner/test-repo/issues/4?a=1&b=2#comment-123 test",
|
||||||
`<a href="http://localhost:3000/gogits/gogs/issues/4?a=1&b=2#comment-123" class="ref-issue">#4 (comment)</a> test`)
|
`<a href="http://localhost:3000/test-owner/test-repo/issues/4?a=1&b=2#comment-123" class="ref-issue">#4 (comment)</a> test`)
|
||||||
test("http://localhost:3000/testOrg/testOrgRepo/pulls/2/files#issuecomment-24",
|
test("http://localhost:3000/testOrg/testOrgRepo/pulls/2/files#issuecomment-24",
|
||||||
"http://localhost:3000/testOrg/testOrgRepo/pulls/2/files#issuecomment-24")
|
"http://localhost:3000/testOrg/testOrgRepo/pulls/2/files#issuecomment-24")
|
||||||
test("http://localhost:3000/testOrg/testOrgRepo/pulls/2/files",
|
test("http://localhost:3000/testOrg/testOrgRepo/pulls/2/files",
|
||||||
|
@ -120,8 +120,8 @@ func TestRender_CrossReferences(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
test(
|
test(
|
||||||
"gogits/gogs#12345",
|
"test-owner/test-repo#12345",
|
||||||
`<p><a href="`+util.URLJoin(markup.TestAppURL, "gogits", "gogs", "issues", "12345")+`" class="ref-issue" rel="nofollow">gogits/gogs#12345</a></p>`)
|
`<p><a href="`+util.URLJoin(markup.TestAppURL, "test-owner", "test-repo", "issues", "12345")+`" class="ref-issue" rel="nofollow">test-owner/test-repo#12345</a></p>`)
|
||||||
test(
|
test(
|
||||||
"go-gitea/gitea#12345",
|
"go-gitea/gitea#12345",
|
||||||
`<p><a href="`+util.URLJoin(markup.TestAppURL, "go-gitea", "gitea", "issues", "12345")+`" class="ref-issue" rel="nofollow">go-gitea/gitea#12345</a></p>`)
|
`<p><a href="`+util.URLJoin(markup.TestAppURL, "go-gitea", "gitea", "issues", "12345")+`" class="ref-issue" rel="nofollow">go-gitea/gitea#12345</a></p>`)
|
||||||
@ -530,43 +530,31 @@ func TestRender_ShortLinks(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestRender_RelativeImages(t *testing.T) {
|
func TestRender_RelativeImages(t *testing.T) {
|
||||||
setting.AppURL = markup.TestAppURL
|
render := func(input string, isWiki bool, links markup.Links) string {
|
||||||
|
|
||||||
test := func(input, expected, expectedWiki string) {
|
|
||||||
buffer, err := markdown.RenderString(&markup.RenderContext{
|
buffer, err := markdown.RenderString(&markup.RenderContext{
|
||||||
Ctx: git.DefaultContext,
|
Ctx: git.DefaultContext,
|
||||||
Links: markup.Links{
|
Links: links,
|
||||||
Base: markup.TestRepoURL,
|
|
||||||
BranchPath: "master",
|
|
||||||
},
|
|
||||||
Metas: localMetas,
|
Metas: localMetas,
|
||||||
|
IsWiki: isWiki,
|
||||||
}, input)
|
}, input)
|
||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
assert.Equal(t, strings.TrimSpace(expected), strings.TrimSpace(string(buffer)))
|
return strings.TrimSpace(string(buffer))
|
||||||
buffer, err = markdown.RenderString(&markup.RenderContext{
|
|
||||||
Ctx: git.DefaultContext,
|
|
||||||
Links: markup.Links{
|
|
||||||
Base: markup.TestRepoURL,
|
|
||||||
},
|
|
||||||
Metas: localMetas,
|
|
||||||
IsWiki: true,
|
|
||||||
}, input)
|
|
||||||
assert.NoError(t, err)
|
|
||||||
assert.Equal(t, strings.TrimSpace(expectedWiki), strings.TrimSpace(string(buffer)))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
rawwiki := util.URLJoin(markup.TestRepoURL, "wiki", "raw")
|
out := render(`<img src="LINK">`, false, markup.Links{Base: "/test-owner/test-repo"})
|
||||||
mediatree := util.URLJoin(markup.TestRepoURL, "media", "master")
|
assert.Equal(t, `<a href="/test-owner/test-repo/LINK" target="_blank" rel="nofollow noopener"><img src="/test-owner/test-repo/LINK"/></a>`, out)
|
||||||
|
|
||||||
test(
|
out = render(`<img src="LINK">`, true, markup.Links{Base: "/test-owner/test-repo"})
|
||||||
`<img src="Link">`,
|
assert.Equal(t, `<a href="/test-owner/test-repo/wiki/raw/LINK" target="_blank" rel="nofollow noopener"><img src="/test-owner/test-repo/wiki/raw/LINK"/></a>`, out)
|
||||||
`<img src="`+util.URLJoin(mediatree, "Link")+`"/>`,
|
|
||||||
`<img src="`+util.URLJoin(rawwiki, "Link")+`"/>`)
|
|
||||||
|
|
||||||
test(
|
out = render(`<img src="LINK">`, false, markup.Links{Base: "/test-owner/test-repo", BranchPath: "test-branch"})
|
||||||
`<img src="./icon.png">`,
|
assert.Equal(t, `<a href="/test-owner/test-repo/media/test-branch/LINK" target="_blank" rel="nofollow noopener"><img src="/test-owner/test-repo/media/test-branch/LINK"/></a>`, out)
|
||||||
`<img src="`+util.URLJoin(mediatree, "icon.png")+`"/>`,
|
|
||||||
`<img src="`+util.URLJoin(rawwiki, "icon.png")+`"/>`)
|
out = render(`<img src="LINK">`, true, markup.Links{Base: "/test-owner/test-repo", BranchPath: "test-branch"})
|
||||||
|
assert.Equal(t, `<a href="/test-owner/test-repo/wiki/raw/LINK" target="_blank" rel="nofollow noopener"><img src="/test-owner/test-repo/wiki/raw/LINK"/></a>`, out)
|
||||||
|
|
||||||
|
out = render(`<img src="/LINK">`, true, markup.Links{Base: "/test-owner/test-repo", BranchPath: "test-branch"})
|
||||||
|
assert.Equal(t, `<img src="/LINK"/>`, out)
|
||||||
}
|
}
|
||||||
|
|
||||||
func Test_ParseClusterFuzz(t *testing.T) {
|
func Test_ParseClusterFuzz(t *testing.T) {
|
||||||
@ -719,5 +707,6 @@ func TestIssue18471(t *testing.T) {
|
|||||||
func TestIsFullURL(t *testing.T) {
|
func TestIsFullURL(t *testing.T) {
|
||||||
assert.True(t, markup.IsFullURLString("https://example.com"))
|
assert.True(t, markup.IsFullURLString("https://example.com"))
|
||||||
assert.True(t, markup.IsFullURLString("mailto:test@example.com"))
|
assert.True(t, markup.IsFullURLString("mailto:test@example.com"))
|
||||||
|
assert.True(t, markup.IsFullURLString("data:image/11111"))
|
||||||
assert.False(t, markup.IsFullURLString("/foo:bar"))
|
assert.False(t, markup.IsFullURLString("/foo:bar"))
|
||||||
}
|
}
|
||||||
|
@ -74,7 +74,7 @@ type RenderContext struct {
|
|||||||
Type string
|
Type string
|
||||||
IsWiki bool
|
IsWiki bool
|
||||||
Links Links
|
Links Links
|
||||||
Metas map[string]string
|
Metas map[string]string // user, repo, mode(comment/document)
|
||||||
DefaultLink string
|
DefaultLink string
|
||||||
GitRepo *git.Repository
|
GitRepo *git.Repository
|
||||||
Repo gitrepo.Repository
|
Repo gitrepo.Repository
|
||||||
|
@ -100,13 +100,17 @@ async function handleClipboardImages(editor, dropzone, images, e) {
|
|||||||
const {uuid} = await uploadFile(img, uploadUrl);
|
const {uuid} = await uploadFile(img, uploadUrl);
|
||||||
const {width, dppx} = await imageInfo(img);
|
const {width, dppx} = await imageInfo(img);
|
||||||
|
|
||||||
const url = `/attachments/${uuid}`;
|
|
||||||
let text;
|
let text;
|
||||||
if (width > 0 && dppx > 1) {
|
if (width > 0 && dppx > 1) {
|
||||||
// Scale down images from HiDPI monitors. This uses the <img> tag because it's the only
|
// Scale down images from HiDPI monitors. This uses the <img> tag because it's the only
|
||||||
// method to change image size in Markdown that is supported by all implementations.
|
// method to change image size in Markdown that is supported by all implementations.
|
||||||
|
// Make the image link relative to the repo path, then the final URL is "/sub-path/owner/repo/attachments/{uuid}"
|
||||||
|
const url = `attachments/${uuid}`;
|
||||||
text = `<img width="${Math.round(width / dppx)}" alt="${htmlEscape(name)}" src="${htmlEscape(url)}">`;
|
text = `<img width="${Math.round(width / dppx)}" alt="${htmlEscape(name)}" src="${htmlEscape(url)}">`;
|
||||||
} else {
|
} else {
|
||||||
|
// Markdown always renders the image with a relative path, so the final URL is "/sub-path/owner/repo/attachments/{uuid}"
|
||||||
|
// TODO: it should also use relative path for consistency, because absolute is ambiguous for "/sub-path/attachments" or "/attachments"
|
||||||
|
const url = `/attachments/${uuid}`;
|
||||||
text = `![${name}](${url})`;
|
text = `![${name}](${url})`;
|
||||||
}
|
}
|
||||||
editor.replacePlaceholder(placeholder, text);
|
editor.replacePlaceholder(placeholder, text);
|
||||||
|
Loading…
Reference in New Issue
Block a user