From eba2396010aa991cd8b5fafb22aa0b5354490de8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Courtel?=
 <14078835+recrtl@users.noreply.github.com>
Date: Fri, 5 May 2023 12:40:23 +0200
Subject: [PATCH] fix 305: external images URLs are not properly escaped

---
 pkg/mark/markdown.go         | 5 ++++-
 pkg/mark/testdata/links.html | 2 +-
 pkg/mark/testdata/links.md   | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkg/mark/markdown.go b/pkg/mark/markdown.go
index c0da166..7119396 100644
--- a/pkg/mark/markdown.go
+++ b/pkg/mark/markdown.go
@@ -482,6 +482,9 @@ func (r *ConfluenceRenderer) renderImage(writer util.BufWriter, source []byte, n
 
 	// We were unable to resolve it locally, treat as URL
 	if err != nil {
+		escapedURL := string(n.Destination)
+		escapedURL = strings.ReplaceAll(escapedURL, "&", "&amp;")
+
 		err = r.Stdlib.Templates.ExecuteTemplate(
 			writer,
 			"ac:image",
@@ -498,7 +501,7 @@ func (r *ConfluenceRenderer) renderImage(writer util.BufWriter, source []byte, n
 				string(n.Title),
 				string(nodeToHTMLText(n, source)),
 				"",
-				string(n.Destination),
+				escapedURL,
 			},
 		)
 	} else {
diff --git a/pkg/mark/testdata/links.html b/pkg/mark/testdata/links.html
index 743676d..82fd040 100644
--- a/pkg/mark/testdata/links.html
+++ b/pkg/mark/testdata/links.html
@@ -5,7 +5,7 @@
 <p>Use <ac:link><ri:page ri:content-title="Another Page"/><ac:plain-text-link-body><![CDATA[Another Page]]></ac:plain-text-link-body></ac:link></p>
 <p>Use <ac:link><ri:page ri:content-title="Page With Space"/><ac:plain-text-link-body><![CDATA[page link with spaces]]></ac:plain-text-link-body></ac:link></p>
 <p><ac:image ac:alt="My Image"><ri:attachment ri:filename="test.png"/></ac:image></p>
-<p><ac:image ac:alt="My External Image"><ri:url ri:value="http://confluence.atlassian.com/images/logo/confluence_48_trans.png"/></ac:image></p>
+<p><ac:image ac:alt="My External Image"><ri:url ri:value="http://confluence.atlassian.com/images/logo/confluence_48_trans.png?key1=value1&amp;key2=value2"/></ac:image></p>
 <p>Use footnotes link <sup id="fnref:1"><a href="#fn:1" class="footnote-ref" role="doc-noteref">1</a></sup></p>
 <div class="footnotes" role="doc-endnotes">
 <hr />
diff --git a/pkg/mark/testdata/links.md b/pkg/mark/testdata/links.md
index bee9e3e..855b0af 100644
--- a/pkg/mark/testdata/links.md
+++ b/pkg/mark/testdata/links.md
@@ -12,7 +12,7 @@ Use [page link with spaces](<ac:Page With Space>)
 
 ![My Image](test.png)
 
-![My External Image](http://confluence.atlassian.com/images/logo/confluence_48_trans.png)
+![My External Image](http://confluence.atlassian.com/images/logo/confluence_48_trans.png?key1=value1&key2=value2)
 
 Use footnotes link [^1]  
 [^1]: a footnote link