From: William Pitcock <nenolod@dereferenced.org>
Date: Sat, 2 Mar 2019 12:22:02 +0000 (+0000)
Subject: helpers: use AutoLinker to validate URIs as well as the other tests
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=9f3cb38012281c596d1aa8c479f07362fa58dacb;p=akkoma

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

diff --git a/lib/pleroma/web/rich_media/helpers.ex b/lib/pleroma/web/rich_media/helpers.ex
index fc9cbc868..ba57171d3 100644
--- a/lib/pleroma/web/rich_media/helpers.ex
+++ b/lib/pleroma/web/rich_media/helpers.ex
@@ -12,7 +12,10 @@ defmodule Pleroma.Web.RichMedia.Helpers do
   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]),
diff --git a/test/web/rich_media/helpers_test.exs b/test/web/rich_media/helpers_test.exs
index 9285f078d..60d93768f 100644
--- a/test/web/rich_media/helpers_test.exs
+++ b/test/web/rich_media/helpers_test.exs
@@ -20,7 +20,27 @@ defmodule Pleroma.Web.RichMedia.HelpersTest 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