more security
This commit is contained in:
parent
8d51aae70c
commit
5e582e1990
|
@ -21,7 +21,15 @@ defmodule Pleroma.Web.ActivityPub.MRF.StealEmojiPolicy do
|
||||||
!has_emojo(installed_emoji, emojo_shortcode) do
|
!has_emojo(installed_emoji, emojo_shortcode) do
|
||||||
Logger.debug("HANDLING EMOJO")
|
Logger.debug("HANDLING EMOJO")
|
||||||
|
|
||||||
|
cond do
|
||||||
|
String.contains?(emojo_shortcode, "/") ->
|
||||||
|
Logger.error("BAD EMOJO SHORTCODE: #{emojo_shortcode}")
|
||||||
|
|
||||||
|
String.starts_with?(emojo_url, "https://") ->
|
||||||
|
try do
|
||||||
remote_emojo = HTTPoison.get!(emojo_url)
|
remote_emojo = HTTPoison.get!(emojo_url)
|
||||||
|
|
||||||
|
if remote_emojo.status_code == 200 do
|
||||||
with {:ok, current_dir} <- File.cwd() do
|
with {:ok, current_dir} <- File.cwd() do
|
||||||
new_file = current_dir <> "/priv/static/emoji/stolen/" <> emojo_shortcode <> Path.extname(emojo_url)
|
new_file = current_dir <> "/priv/static/emoji/stolen/" <> emojo_shortcode <> Path.extname(emojo_url)
|
||||||
|
|
||||||
|
@ -32,6 +40,16 @@ defmodule Pleroma.Web.ActivityPub.MRF.StealEmojiPolicy do
|
||||||
new_file
|
new_file
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
rescue
|
||||||
|
e in RuntimeError -> Logger.error("FAILED TO QUERY REMOTE EMOJO #{emojo_url} #{e}")
|
||||||
|
end
|
||||||
|
|
||||||
|
true ->
|
||||||
|
Logger.error("EMOJO COND FAIL #{emojo_shortcode} #{emojo_url}")
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
|
end
|
||||||
|
|
||||||
Logger.debug("EMOJI FILES: #{inspect(new_files)}")
|
Logger.debug("EMOJI FILES: #{inspect(new_files)}")
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue