knova/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity

Escape HTML instead of discarding it.

Browse source
This commit is contained in:
eal 2017-11-18 14:43:41 +02:00
parent 4647bcd6e6
commit 66e78c3ec4
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/pleroma/web/common_api/utils.ex
View file

@ -58,7 +58,8 @@ def add_attachments(text, attachments) do
end end
def format_input(text, mentions, tags) do def format_input(text, mentions, tags) do
HtmlSanitizeEx.strip_tags(text) Phoenix.HTML.html_escape(text)
|> elem(1)
|> Formatter.linkify |> Formatter.linkify
|> String.replace("\n", "<br>\n") |> String.replace("\n", "<br>\n")
|> add_user_links(mentions) |> add_user_links(mentions)

2
test/web/twitter_api/twitter_api_test.exs
View file

@ -34,7 +34,7 @@ test "create a status" do
{ :ok, activity = %Activity{} } = TwitterAPI.create_status(user, input) { :ok, activity = %Activity{} } = TwitterAPI.create_status(user, input)
assert get_in(activity.data, ["object", "content"]) == "Hello again, <a href='shp'>@shp</a>.<br>\nThis is on another line. #2hu #epic #phantasmagoric<br>\n<a href=\"http://example.org/image.jpg\" class='attachment'>image.jpg</a>" assert get_in(activity.data, ["object", "content"]) == "Hello again, <a href='shp'>@shp</a>.&lt;script&gt;&lt;/script&gt;<br>\nThis is on another line. #2hu #epic #phantasmagoric<br>\n<a href=\"http://example.org/image.jpg\" class='attachment'>image.jpg</a>"
assert get_in(activity.data, ["object", "type"]) == "Note" assert get_in(activity.data, ["object", "type"]) == "Note"
assert get_in(activity.data, ["object", "actor"]) == user.ap_id assert get_in(activity.data, ["object", "actor"]) == user.ap_id
assert get_in(activity.data, ["actor"]) == user.ap_id assert get_in(activity.data, ["actor"]) == user.ap_id