Commit f8c93246 authored by Alex Gleason's avatar Alex Gleason Committed by feld
Browse files

Refactor Earmark code, fix tests

parent b2548cfc
......@@ -121,6 +121,10 @@ def mentions_escape(text, options \\ []) do
end
end
def markdown_to_html(text) do
Earmark.as_html!(text)
end
def html_escape({text, mentions, hashtags}, type) do
{html_escape(text, type), mentions, hashtags}
end
......
......@@ -95,7 +95,7 @@ defp fix_content(%{"mediaType" => "text/markdown", "content" => content} = data)
when is_binary(content) do
content =
content
|> Earmark.as_html!()
|> Pleroma.Formatter.markdown_to_html()
|> Pleroma.HTML.filter_tags()
Map.put(data, "content", content)
......
......@@ -294,7 +294,7 @@ def format_input(text, "text/html", options) do
def format_input(text, "text/markdown", options) do
text
|> Formatter.mentions_escape(options)
|> Earmark.as_html!()
|> Formatter.markdown_to_html()
|> Formatter.linkify(options)
|> Formatter.minify("text/html")
|> Formatter.html_escape("text/html")
......
......@@ -59,6 +59,8 @@ defmodule Pleroma.HTML.Scrubber.Default do
Meta.allow_tag_with_this_attribute_values(:span, "class", ["h-card"])
Meta.allow_tag_with_these_attributes(:span, [])
Meta.allow_tag_with_this_attribute_values(:code, "class", ["inline"])
@allow_inline_images Pleroma.Config.get([:markup, :allow_inline_images])
if @allow_inline_images do
......
......@@ -178,13 +178,13 @@ test "Paragraph" do
test "raw HTML" do
code = ~s[<a href="http://example.org/">OwO</a><!-- what's this?-->]
{result, [], []} = Utils.format_input(code, "text/markdown")
assert result == "<p>#{code}</p>"
assert result == ~s[<a href="http://example.org/">OwO</a>]
end
test "rulers" do
code = ~s[before\n\n-----\n\nafter]
{result, [], []} = Utils.format_input(code, "text/markdown")
assert result == "<p>before</p><hr /><p>after</p>"
assert result == "<p>before</p><hr/><p>after</p>"
end
test "blockquote" do
......@@ -204,7 +204,7 @@ test "code" do
code = ~s[```\nputs "Hello World"\n```]
{result, [], []} = Utils.format_input(code, "text/markdown")
assert result == ~s[<pre><code class="">puts &quot;Hello World&quot;</code></pre>]
assert result == ~s[<pre><code>puts &quot;Hello World&quot;</code></pre>]
end
test "lists" do
......@@ -227,9 +227,9 @@ test "delegated renderers" do
assert result == ~s[<p><strong>aaaa~</strong></p>]
# strikethrough
code = ~s[<del>aaaa~</del>]
code = ~s[~~aaaa~~~]
{result, [], []} = Utils.format_input(code, "text/markdown")
assert result == ~s[<p><del>aaaa~</del></p>]
assert result == ~s[<p><del>aaaa</del>~</p>]
end
end
......
......@@ -558,7 +558,7 @@ test "it filters out obviously bad tags when accepting a post as Markdown" do
object = Object.normalize(activity)
assert object.data["content"] == "<p><b>2hu</b></p>alert(&#39;xss&#39;)"
assert object.data["content"] == "<p><b>2hu</b></p>"
assert object.data["source"] == post
end
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment