From a8590d971ad87fc5057e05157ae69678322d2cd0 Mon Sep 17 00:00:00 2001 From: Adam Rutkowski Date: Mon, 27 Nov 2023 13:06:53 +0100 Subject: [PATCH] Disable super-admin checks on small build --- extra/lib/plausible/superadmin.ex | 8 ++++++++ lib/plausible/auth/auth.ex | 13 +++++++++---- test/plausible/site/sites_test.exs | 1 + .../api/external_stats_controller/auth_test.exs | 1 + .../api/internal_controller/sync_test.exs | 1 + .../controllers/stats_controller_test.exs | 1 + 6 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 extra/lib/plausible/superadmin.ex diff --git a/extra/lib/plausible/superadmin.ex b/extra/lib/plausible/superadmin.ex new file mode 100644 index 000000000..c68767b92 --- /dev/null +++ b/extra/lib/plausible/superadmin.ex @@ -0,0 +1,8 @@ +defmodule Plausible.Auth.SuperAdmin do + def is?(nil), do: false + def is?(%Plausible.Auth.User{id: id}), do: is?(id) + + def is?(user_id) when is_integer(user_id) do + user_id in Application.get_env(:plausible, :super_admin_user_ids) + end +end diff --git a/lib/plausible/auth/auth.ex b/lib/plausible/auth/auth.ex index 4248826c5..41cc124f8 100644 --- a/lib/plausible/auth/auth.ex +++ b/lib/plausible/auth/auth.ex @@ -1,4 +1,5 @@ defmodule Plausible.Auth do + use Plausible use Plausible.Repo alias Plausible.Auth @@ -56,11 +57,15 @@ defmodule Plausible.Auth do ) end - def is_super_admin?(nil), do: false - def is_super_admin?(%Plausible.Auth.User{id: id}), do: is_super_admin?(id) + on_full_build do + def is_super_admin?(nil), do: false + def is_super_admin?(%Plausible.Auth.User{id: id}), do: is_super_admin?(id) - def is_super_admin?(user_id) when is_integer(user_id) do - user_id in Application.get_env(:plausible, :super_admin_user_ids) + def is_super_admin?(user_id) when is_integer(user_id) do + user_id in Application.get_env(:plausible, :super_admin_user_ids) + end + else + def is_super_admin?(_), do: false end def enterprise_configured?(nil), do: false diff --git a/test/plausible/site/sites_test.exs b/test/plausible/site/sites_test.exs index 7e5d489b4..7406d2e85 100644 --- a/test/plausible/site/sites_test.exs +++ b/test/plausible/site/sites_test.exs @@ -69,6 +69,7 @@ defmodule Plausible.SitesTest do end describe "get_for_user/2" do + @tag :full_build_only test "get site for super_admin" do user1 = insert(:user) user2 = insert(:user) diff --git a/test/plausible_web/controllers/api/external_stats_controller/auth_test.exs b/test/plausible_web/controllers/api/external_stats_controller/auth_test.exs index a88968e9a..0a8837310 100644 --- a/test/plausible_web/controllers/api/external_stats_controller/auth_test.exs +++ b/test/plausible_web/controllers/api/external_stats_controller/auth_test.exs @@ -67,6 +67,7 @@ defmodule PlausibleWeb.Api.ExternalStatsController.AuthTest do end describe "super admin access" do + @describetag :full_build_only setup %{user: user} do patch_env(:super_admin_user_ids, [user.id]) end diff --git a/test/plausible_web/controllers/api/internal_controller/sync_test.exs b/test/plausible_web/controllers/api/internal_controller/sync_test.exs index 6f32589af..f5d3b883b 100644 --- a/test/plausible_web/controllers/api/internal_controller/sync_test.exs +++ b/test/plausible_web/controllers/api/internal_controller/sync_test.exs @@ -5,6 +5,7 @@ defmodule PlausibleWeb.Api.InternalController.SyncTest do describe "PUT /api/:domain/disable-feature" do setup [:create_user, :log_in] + @tag :full_build_only test "when the logged-in user is an super-admin", %{conn: conn, user: user} do site = insert(:site) patch_env(:super_admin_user_ids, [user.id]) diff --git a/test/plausible_web/controllers/stats_controller_test.exs b/test/plausible_web/controllers/stats_controller_test.exs index cf3ef2382..50f818b0f 100644 --- a/test/plausible_web/controllers/stats_controller_test.exs +++ b/test/plausible_web/controllers/stats_controller_test.exs @@ -72,6 +72,7 @@ defmodule PlausibleWeb.StatsControllerTest do end describe "GET /:website - as a super admin" do + @describetag :full_build_only setup [:create_user, :make_user_super_admin, :log_in] test "can view a private dashboard with stats", %{conn: conn} do