Merge remote-tracking branch 'philo/master'

furbooru · Mar 17, 2021 · a2e79c8 · a2e79c8
2 parents 256decb + 8c881da
commit a2e79c8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/lib/philomena/search/helpers.ex b/lib/philomena/search/helpers.ex
@@ -17,7 +17,10 @@ defmodule Philomena.Search.Helpers do
   def to_int(term) do
     {int, _} = :string.to_integer(term)
 
-    int
+    case int in -2_147_483_648..2_147_483_647 do
+      true -> int
+      _false -> 0
+    end
   end
 
   def range([center, deviation]) do

diff --git a/lib/philomena_web/plugs/content_security_policy_plug.ex b/lib/philomena_web/plugs/content_security_policy_plug.ex
@@ -32,6 +32,7 @@ defmodule PhilomenaWeb.ContentSecurityPolicyPlug do
         {:form_action, ["'self'"]},
         {:manifest_src, ["'self'"]},
         {:img_src, ["'self'", "data:", cdn_uri, camo_uri]},
+        {:media_src, ["'self'", "data:", cdn_uri, camo_uri]},
         {:block_all_mixed_content, []}
       ]