logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: c46490b1999dd0ddb3d3b23409ba725c21811a96
parent: d120aa63f0b2e688b292af5a9afe45ab45c8e10b
Author: rinpatch <rinpatch@sdf.org>
Date:   Tue,  5 Feb 2019 21:01:20 +0000

Merge branch 'bugfix/rich-media-non-unicode-nuclear-option' into 'develop'

rich media: parser: reject any data which cannot be explicitly encoded into JSON

Closes #596

See merge request pleroma/pleroma!779

Diffstat:

Mlib/pleroma/web/rich_media/parser.ex18++++--------------
1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/lib/pleroma/web/rich_media/parser.ex b/lib/pleroma/web/rich_media/parser.ex @@ -54,22 +54,12 @@ defmodule Pleroma.Web.RichMedia.Parser do {:error, "Found metadata was invalid or incomplete: #{inspect(data)}"} end - defp string_is_valid_unicode(data) when is_binary(data) do - data - |> :unicode.characters_to_binary() - |> clean_string() - end - - defp string_is_valid_unicode(data), do: {:ok, data} - - defp clean_string({:error, _, _}), do: {:error, "Invalid data"} - defp clean_string(data), do: {:ok, data} - defp clean_parsed_data(data) do data - |> Enum.reject(fn {_, val} -> - case string_is_valid_unicode(val) do - {:ok, _} -> false + |> Enum.reject(fn {key, val} -> + with {:ok, _} <- Jason.encode(%{key => val}) do + false + else _ -> true end end)