Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances

# Conflicts:
#	lib/pleroma/web/feed/user_controller.ex
#	lib/pleroma/web/o_status/o_status_controller.ex
#	lib/pleroma/web/router.ex
#	lib/pleroma/web/static_fe/static_fe_controller.ex

1 files changed, 0 insertions, 108 deletions

diff --git a/test/plugs/remote_ip_test.exs b/test/plugs/remote_ip_test.exs
deleted file mode 100644
index 6d01c812d..000000000
--- a/test/plugs/remote_ip_test.exs
+++ /dev/null
@@ -1,108 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.Plugs.RemoteIpTest do
-  use ExUnit.Case
-  use Plug.Test
-
-  alias Pleroma.Plugs.RemoteIp
-
-  import Pleroma.Tests.Helpers, only: [clear_config: 2]
-
-  setup do:
-          clear_config(RemoteIp,
-            enabled: true,
-            headers: ["x-forwarded-for"],
-            proxies: [],
-            reserved: [
-              "127.0.0.0/8",
-              "::1/128",
-              "fc00::/7",
-              "10.0.0.0/8",
-              "172.16.0.0/12",
-              "192.168.0.0/16"
-            ]
-          )
-
-  test "disabled" do
-    Pleroma.Config.put(RemoteIp, enabled: false)
-
-    %{remote_ip: remote_ip} = conn(:get, "/")
-
-    conn =
-      conn(:get, "/")
-      |> put_req_header("x-forwarded-for", "1.1.1.1")
-      |> RemoteIp.call(nil)
-
-    assert conn.remote_ip == remote_ip
-  end
-
-  test "enabled" do
-    conn =
-      conn(:get, "/")
-      |> put_req_header("x-forwarded-for", "1.1.1.1")
-      |> RemoteIp.call(nil)
-
-    assert conn.remote_ip == {1, 1, 1, 1}
-  end
-
-  test "custom headers" do
-    Pleroma.Config.put(RemoteIp, enabled: true, headers: ["cf-connecting-ip"])
-
-    conn =
-      conn(:get, "/")
-      |> put_req_header("x-forwarded-for", "1.1.1.1")
-      |> RemoteIp.call(nil)
-
-    refute conn.remote_ip == {1, 1, 1, 1}
-
-    conn =
-      conn(:get, "/")
-      |> put_req_header("cf-connecting-ip", "1.1.1.1")
-      |> RemoteIp.call(nil)
-
-    assert conn.remote_ip == {1, 1, 1, 1}
-  end
-
-  test "custom proxies" do
-    conn =
-      conn(:get, "/")
-      |> put_req_header("x-forwarded-for", "173.245.48.1, 1.1.1.1, 173.245.48.2")
-      |> RemoteIp.call(nil)
-
-    refute conn.remote_ip == {1, 1, 1, 1}
-
-    Pleroma.Config.put([RemoteIp, :proxies], ["173.245.48.0/20"])
-
-    conn =
-      conn(:get, "/")
-      |> put_req_header("x-forwarded-for", "173.245.48.1, 1.1.1.1, 173.245.48.2")
-      |> RemoteIp.call(nil)
-
-    assert conn.remote_ip == {1, 1, 1, 1}
-  end
-
-  test "proxies set without CIDR format" do
-    Pleroma.Config.put([RemoteIp, :proxies], ["173.245.48.1"])
-
-    conn =
-      conn(:get, "/")
-      |> put_req_header("x-forwarded-for", "173.245.48.1, 1.1.1.1")
-      |> RemoteIp.call(nil)
-
-    assert conn.remote_ip == {1, 1, 1, 1}
-  end
-
-  test "proxies set `nonsensical` CIDR" do
-    Pleroma.Config.put([RemoteIp, :reserved], ["127.0.0.0/8"])
-    Pleroma.Config.put([RemoteIp, :proxies], ["10.0.0.3/24"])
-
-    conn =
-      conn(:get, "/")
-      |> put_req_header("x-forwarded-for", "10.0.0.3, 1.1.1.1")
-      |> RemoteIp.call(nil)
-
-    assert conn.remote_ip == {1, 1, 1, 1}
-  end
-end