From 9415932af5829f2aa19e362076e0653dd1ce9c5a Mon Sep 17 00:00:00 2001
From: Aaron Tinio <aptinio@gmail.com>
Date: Sat, 25 May 2019 08:15:12 +0800
Subject: [PATCH] Keep nodeinfo available when not federating
---
.../web/nodeinfo/nodeinfo_controller.ex | 2 -
test/web/node_info_test.exs | 80 ++++---------------
2 files changed, 16 insertions(+), 66 deletions(-)
diff --git a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
index 3bf2a0fbc..45f90c579 100644
--- a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
+++ b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
@@ -12,8 +12,6 @@ defmodule Pleroma.Web.Nodeinfo.NodeinfoController do
alias Pleroma.Web.ActivityPub.MRF
alias Pleroma.Web.Federator.Publisher
- plug(Pleroma.Web.FederatingPlug)
-
def schemas(conn, _params) do
response = %{
links: [
diff --git a/test/web/node_info_test.exs b/test/web/node_info_test.exs
index 2fc42b7cc..be1173513 100644
--- a/test/web/node_info_test.exs
+++ b/test/web/node_info_test.exs
@@ -7,6 +7,22 @@ defmodule Pleroma.Web.NodeInfoTest do
import Pleroma.Factory
+ test "GET /.well-known/nodeinfo", %{conn: conn} do
+ links =
+ conn
+ |> get("/.well-known/nodeinfo")
+ |> json_response(200)
+ |> Map.fetch!("links")
+
+ Enum.each(links, fn link ->
+ href = Map.fetch!(link, "href")
+
+ conn
+ |> get(href)
+ |> json_response(200)
+ end)
+ end
+
test "nodeinfo shows staff accounts", %{conn: conn} do
moderator = insert(:user, %{local: true, info: %{is_moderator: true}})
admin = insert(:user, %{local: true, info: %{is_admin: true}})
@@ -32,70 +48,6 @@ test "nodeinfo shows restricted nicknames", %{conn: conn} do
result["metadata"]["restrictedNicknames"]
end
- test "returns 404 when federation is disabled", %{conn: conn} do
- instance =
- Application.get_env(:pleroma, :instance)
- |> Keyword.put(:federating, false)
-
- Application.put_env(:pleroma, :instance, instance)
-
- conn
- |> get("/.well-known/nodeinfo")
- |> json_response(404)
-
- conn
- |> get("/nodeinfo/2.1.json")
- |> json_response(404)
-
- instance =
- Application.get_env(:pleroma, :instance)
- |> Keyword.put(:federating, true)
-
- Application.put_env(:pleroma, :instance, instance)
- end
-
- test "returns 200 when federation is enabled", %{conn: conn} do
- conn
- |> get("/.well-known/nodeinfo")
- |> json_response(200)
-
- conn
- |> get("/nodeinfo/2.1.json")
- |> json_response(200)
- end
-
- test "returns 404 when federation is disabled (nodeinfo 2.0)", %{conn: conn} do
- instance =
- Application.get_env(:pleroma, :instance)
- |> Keyword.put(:federating, false)
-
- Application.put_env(:pleroma, :instance, instance)
-
- conn
- |> get("/.well-known/nodeinfo")
- |> json_response(404)
-
- conn
- |> get("/nodeinfo/2.0.json")
- |> json_response(404)
-
- instance =
- Application.get_env(:pleroma, :instance)
- |> Keyword.put(:federating, true)
-
- Application.put_env(:pleroma, :instance, instance)
- end
-
- test "returns 200 when federation is enabled (nodeinfo 2.0)", %{conn: conn} do
- conn
- |> get("/.well-known/nodeinfo")
- |> json_response(200)
-
- conn
- |> get("/nodeinfo/2.0.json")
- |> json_response(200)
- end
-
test "returns software.repository field in nodeinfo 2.1", %{conn: conn} do
conn
|> get("/.well-known/nodeinfo")