sam/pleroma
sam/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

helpers: use AutoLinker to validate URIs as well as the other tests

Browse source
This commit is contained in:
William Pitcock 2019-03-02 12:22:02 +00:00
parent d7a278a733
commit 9f3cb38012
2 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/pleroma/web/rich_media/helpers.ex
View file

@ -12,7 +12,10 @@ defp validate_page_url(nil), do: :error
defp validate_page_url(%URI{authority: nil}), do: :error
defp validate_page_url(%URI{scheme: nil}), do: :error
defp validate_page_url(%URI{}), do: :ok
defp validate_page_url(page_url), do: URI.parse(page_url) |> validate_page_url
defp validate_page_url(page_url) do
AutoLinker.Parser.is_url?(page_url, true) && URI.parse(page_url) |> validate_page_url
end
def fetch_data_for_activity(%Activity{} = activity) do
with true <- Pleroma.Config.get([:rich_media, :enabled]),

20
test/web/rich_media/helpers_test.exs
View file

@ -20,7 +20,27 @@ test "refuses to crawl incomplete URLs" do
"content_type" => "text/markdown"
})
Pleroma.Config.put([:rich_media, :enabled], true)
assert %{} == Pleroma.Web.RichMedia.Helpers.fetch_data_for_activity(activity)
Pleroma.Config.put([:rich_media, :enabled], false)
end
test "refuses to crawl malformed URLs" do
user = insert(:user)
{:ok, activity} =
CommonAPI.post(user, %{
"status" => "[test](example.com[]/ogp)",
"content_type" => "text/markdown"
})
Pleroma.Config.put([:rich_media, :enabled], true)
assert %{} == Pleroma.Web.RichMedia.Helpers.fetch_data_for_activity(activity)
Pleroma.Config.put([:rich_media, :enabled], false)
end
test "crawls valid, complete URLs" do