PonyMirrors/philomena
1
0
Fork 0
mirror of https://github.com/philomena-dev/philomena.git synced 2024-11-30 14:57:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

guard against invalid complex filters

Browse source
This commit is contained in:
byte[] 2019-12-20 11:58:41 -05:00
parent 08e95e0a01
commit ffdddb3f68
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/philomena_web/plugs/image_filter_plug.ex
View file

@ -14,8 +14,8 @@ defmodule PhilomenaWeb.ImageFilterPlug do
filter = conn.assigns[:current_filter] filter = conn.assigns[:current_filter]
tag_exclusion = %{terms: %{tag_ids: filter.hidden_tag_ids}} tag_exclusion = %{terms: %{tag_ids: filter.hidden_tag_ids}}
{:ok, query_exclusion} = Query.compile(user, normalize(filter.hidden_complex_str)) query_exclusion = invalid_filter_guard(user, filter.hidden_complex_str)
{:ok, query_spoiler} = Query.compile(user, normalize(filter.spoilered_complex_str)) query_spoiler = invalid_filter_guard(user, filter.spoilered_complex_str)
query = %{ query = %{
bool: %{ bool: %{
@ -28,4 +28,11 @@ defmodule PhilomenaWeb.ImageFilterPlug do
|> assign(:compiled_complex_spoiler, query_spoiler) |> assign(:compiled_complex_spoiler, query_spoiler)
|> assign(:compiled_filter, query) |> assign(:compiled_filter, query)
end end
defp invalid_filter_guard(user, search_string) do
case Query.compile(user, normalize(search_string)) do
{:ok, query} -> query
_error -> %{match_all: %{}}
end
end
end end