aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2019-02-24 19:13:46 +0000
committerWilliam Pitcock <nenolod@dereferenced.org>2019-03-04 18:31:49 +0000
commitd38d537beebd1efe61778b2a26ecab0bed84d1c1 (patch)
tree026c6ed39cdb2bc23ca8fb58bb7e891c1e6feecb /lib
parentd45dbdce5a478a004711baad963d7134988402ed (diff)
downloadpleroma-d38d537beebd1efe61778b2a26ecab0bed84d1c1.tar.gz
rich media: don't crawl bogus URIs
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/rich_media/helpers.ex7
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/pleroma/web/rich_media/helpers.ex b/lib/pleroma/web/rich_media/helpers.ex
index abb1cf7f2..fc9cbc868 100644
--- a/lib/pleroma/web/rich_media/helpers.ex
+++ b/lib/pleroma/web/rich_media/helpers.ex
@@ -8,10 +8,17 @@ defmodule Pleroma.Web.RichMedia.Helpers do
alias Pleroma.HTML
alias Pleroma.Web.RichMedia.Parser
+ 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
+
def fetch_data_for_activity(%Activity{} = activity) do
with true <- Pleroma.Config.get([:rich_media, :enabled]),
%Object{} = object <- Object.normalize(activity.data["object"]),
{:ok, page_url} <- HTML.extract_first_external_url(object, object.data["content"]),
+ :ok <- validate_page_url(page_url),
{:ok, rich_media} <- Parser.parse(page_url) do
%{page_url: page_url, rich_media: rich_media}
else