Merge remote-tracking branch 'origin/develop' into hashtag-search

test/pleroma/http_test.exs

@@ -25,6 +25,9 @@ defmodule Pleroma.HTTPTest do
 
       %{method: :post, url: "http://example.com/world"} ->
         %Tesla.Env{status: 200, body: "world"}
+
+      %{method: :get, url: "https://example.com/emoji/Pack%201/koronebless.png?foo=bar+baz"} ->
+        %Tesla.Env{status: 200, body: "emoji data"}
     end)
 
     :ok
@@ -67,4 +70,20 @@ defmodule Pleroma.HTTPTest do
              }
     end
   end
+
+  test "URL encoding properly encodes URLs with spaces" do
+    clear_config(:test_url_encoding, true)
+
+    url_with_space = "https://example.com/emoji/Pack 1/koronebless.png?foo=bar baz"
+
+    {:ok, result} = HTTP.get(url_with_space)
+
+    assert result.status == 200
+
+    properly_encoded_url = "https://example.com/emoji/Pack%201/koronebless.png?foo=bar+baz"
+
+    {:ok, result} = HTTP.get(properly_encoded_url)
+
+    assert result.status == 200
+  end
 end

test/pleroma/reverse_proxy_test.exs

@@ -395,4 +395,40 @@ defmodule Pleroma.ReverseProxyTest do
       assert Conn.get_resp_header(conn, "content-type") == ["application/octet-stream"]
     end
   end
+
+  # Hackey is used for Reverse Proxy when Hackney or Finch is the Tesla Adapter
+  # Gun is able to proxy through Tesla, so it does not need testing as the
+  # test cases in the Pleroma.HTTPTest module are sufficient
+  describe "Hackney URL encoding:" do
+    setup do
+      ClientMock
+      |> expect(:request, fn :get,
+                             "https://example.com/emoji/Pack%201/koronebless.png?foo=bar+baz",
+                             _headers,
+                             _body,
+                             _opts ->
+        {:ok, 200, [{"content-type", "image/png"}], "It works!"}
+      end)
+      |> stub(:stream_body, fn _ -> :done end)
+      |> stub(:close, fn _ -> :ok end)
+
+      :ok
+    end
+
+    test "properly encodes URLs with spaces", %{conn: conn} do
+      url_with_space = "https://example.com/emoji/Pack 1/koronebless.png?foo=bar baz"
+
+      result = ReverseProxy.call(conn, url_with_space)
+
+      assert result.status == 200
+    end
+
+    test "properly encoded URL should not be altered", %{conn: conn} do
+      properly_encoded_url = "https://example.com/emoji/Pack%201/koronebless.png?foo=bar+baz"
+
+      result = ReverseProxy.call(conn, properly_encoded_url)
+
+      assert result.status == 200
+    end
+  end
 end

test/pleroma/search/qdrant_search_test.exs

@@ -51,7 +51,7 @@ defmodule Pleroma.Search.QdrantSearchTest do
         })
 
       Config
-      |> expect(:get, 3, fn
+      |> expect(:get, 4, fn
         [Pleroma.Search, :module], nil ->
           QdrantSearch
 
@@ -93,7 +93,7 @@ defmodule Pleroma.Search.QdrantSearchTest do
         })
 
       Config
-      |> expect(:get, 3, fn
+      |> expect(:get, 4, fn
         [Pleroma.Search, :module], nil ->
           QdrantSearch
 
@@ -158,7 +158,7 @@ defmodule Pleroma.Search.QdrantSearchTest do
       end)
 
       Config
-      |> expect(:get, 6, fn
+      |> expect(:get, 7, fn
         [Pleroma.Search, :module], nil ->
           QdrantSearch
 

test/pleroma/web/activity_pub/activity_pub_controller_test.exs

@@ -923,23 +923,6 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do
       assert Activity.get_by_ap_id(data["id"])
     end
 
-    test "it rejects an invalid incoming activity", %{conn: conn, data: data} do
-      user = insert(:user, is_active: false)
-
-      data =
-        data
-        |> Map.put("bcc", [user.ap_id])
-        |> Kernel.put_in(["object", "bcc"], [user.ap_id])
-
-      conn =
-        conn
-        |> assign(:valid_signature, true)
-        |> put_req_header("content-type", "application/activity+json")
-        |> post("/users/#{user.nickname}/inbox", data)
-
-      assert "Invalid request." == json_response(conn, 400)
-    end
-
     test "it accepts messages with to as string instead of array", %{conn: conn, data: data} do
       user = insert(:user)
 
@@ -1305,6 +1288,50 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do
       ObanHelpers.perform(all_enqueued(worker: ReceiverWorker))
       assert Activity.get_by_ap_id(data["id"])
     end
+
+    test "it returns an error when receiving an activity sent to a deactivated user", %{
+      conn: conn,
+      data: data
+    } do
+      user = insert(:user)
+      {:ok, _} = User.set_activation(user, false)
+
+      data =
+        data
+        |> Map.put("bcc", [user.ap_id])
+        |> Kernel.put_in(["object", "bcc"], [user.ap_id])
+
+      conn =
+        conn
+        |> assign(:valid_signature, true)
+        |> put_req_header("content-type", "application/activity+json")
+        |> post("/users/#{user.nickname}/inbox", data)
+
+      assert "User deactivated" == json_response(conn, 404)
+    end
+
+    test "it returns an error when receiving an activity sent from a deactivated user", %{
+      conn: conn,
+      data: data
+    } do
+      sender = insert(:user)
+      user = insert(:user)
+      {:ok, _} = User.set_activation(sender, false)
+
+      data =
+        data
+        |> Map.put("bcc", [user.ap_id])
+        |> Map.put("actor", sender.ap_id)
+        |> Kernel.put_in(["object", "bcc"], [user.ap_id])
+
+      conn =
+        conn
+        |> assign(:valid_signature, true)
+        |> put_req_header("content-type", "application/activity+json")
+        |> post("/users/#{user.nickname}/inbox", data)
+
+      assert "Sender deactivated" == json_response(conn, 404)
+    end
   end
 
   describe "GET /users/:nickname/outbox" do

test/pleroma/web/plugs/cache_test.exs

@@ -5,7 +5,8 @@
 defmodule Pleroma.Web.Plugs.CacheTest do
   # Relies on Cachex, has to stay synchronous
   use Pleroma.DataCase
-  use Plug.Test
+  import Plug.Conn
+  import Plug.Test
 
   alias Pleroma.Web.Plugs.Cache
 

test/pleroma/web/plugs/digest_plug_test.exs

@@ -4,7 +4,8 @@
 
 defmodule Pleroma.Web.Plugs.DigestPlugTest do
   use ExUnit.Case, async: true
-  use Plug.Test
+  import Plug.Conn
+  import Plug.Test
 
   test "digest algorithm is taken from digest header" do
     body = "{\"hello\": \"world\"}"

test/pleroma/web/plugs/idempotency_plug_test.exs

@@ -5,7 +5,8 @@
 defmodule Pleroma.Web.Plugs.IdempotencyPlugTest do
   # Relies on Cachex, has to stay synchronous
   use Pleroma.DataCase
-  use Plug.Test
+  import Plug.Conn
+  import Plug.Test
 
   alias Pleroma.Web.Plugs.IdempotencyPlug
   alias Plug.Conn

test/pleroma/web/plugs/remote_ip_test.exs

@@ -4,7 +4,8 @@
 
 defmodule Pleroma.Web.Plugs.RemoteIpTest do
   use ExUnit.Case
-  use Plug.Test
+  import Plug.Conn
+  import Plug.Test
 
   alias Pleroma.Web.Plugs.RemoteIp
 

test/pleroma/web/plugs/set_format_plug_test.exs

@@ -4,7 +4,8 @@
 
 defmodule Pleroma.Web.Plugs.SetFormatPlugTest do
   use ExUnit.Case, async: true
-  use Plug.Test
+  import Plug.Conn
+  import Plug.Test
 
   alias Pleroma.Web.Plugs.SetFormatPlug
 

test/pleroma/web/plugs/set_locale_plug_test.exs

@@ -4,7 +4,7 @@
 
 defmodule Pleroma.Web.Plugs.SetLocalePlugTest do
   use ExUnit.Case, async: true
-  use Plug.Test
+  import Plug.Test
 
   alias Pleroma.Web.Plugs.SetLocalePlug
   alias Plug.Conn