Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.
TypeScript analyticsanalytics-dashboardclickhouseelixirgoogle-analyticsmarketingopen-source-analyticsphoenixplausible-analyticspostgresqlprivacyprivacy-friendlyself-hostedsimple-analyticsstatisticstailwindcssweb-analyticswebsite-analyticswebsite-statswebsite-tracking
Auth updates
ruslandogace461b519273
diff --git a/lib/plausible/site/membership.ex b/lib/plausible/site/membership.exindex 52e7c94e83..61bdddaf19 100644--- a/lib/plausible/site/membership.ex+++ b/lib/plausible/site/membership.ex@@ -14,5 +14,11 @@ defmodule Plausible.Site.Membership doschema|> cast(attrs, [:user_id, :site_id, :role])|> validate_required([:user_id, :site_id])+ |> validate_inclusion(:role, valid_roles(schema.role))end++ defp valid_roles(_prev_role = nil), do: [:owner, :admin, :viewer]+ defp valid_roles(:owner), do: [:owner, :admin, :viewer]+ defp valid_roles(:admin), do: [:admin, :viewer]+ defp valid_roles(:viewer), do: [:viewer]enddiff --git a/lib/plausible_web/controllers/auth_controller.ex b/lib/plausible_web/controllers/auth_controller.exindex 554b6c86ae..29d9172a64 100644--- a/lib/plausible_web/controllers/auth_controller.ex+++ b/lib/plausible_web/controllers/auth_controller.ex@@ -482,6 +482,7 @@ defmodule PlausibleWeb.AuthController dodef create_api_key(conn, %{"api_key" => key_params}) doapi_key = %Auth.ApiKey{user_id: conn.assigns[:current_user].id}+ key_params = Map.delete(key_params, "user_id")changeset = Auth.ApiKey.changeset(api_key, key_params)case Repo.insert(changeset) do@@ -499,7 +500,12 @@ defmodule PlausibleWeb.AuthController doenddef delete_api_key(conn, %{"id" => id}) do- Repo.get_by(Auth.ApiKey, id: id)+ query =+ from k in Auth.ApiKey,+ where: k.id == ^id and k.user_id == ^conn.assigns[:current_user].id++ query+ |> Repo.one!()|> Repo.delete!()conndiff --git a/lib/plausible_web/plugs/authorize_site_access.ex b/lib/plausible_web/plugs/authorize_site_access.exindex 9d5987e862..37a62aba27 100644--- a/lib/plausible_web/plugs/authorize_site_access.ex+++ b/lib/plausible_web/plugs/authorize_site_access.ex@@ -6,7 +6,11 @@ defmodule PlausibleWeb.AuthorizeSiteAccess dodef init(allowed_roles), do: allowed_rolesdef call(conn, allowed_roles) do- site = Repo.get_by(Plausible.Site, domain: conn.params["domain"] || conn.params["website"])+ site =+ Repo.get_by(Plausible.Site,+ domain: conn.path_params["domain"] || conn.path_params["website"]+ )+shared_link_auth = conn.params["auth"]shared_link_record =diff --git a/test/plausible_web/controllers/auth_controller_test.exs b/test/plausible_web/controllers/auth_controller_test.exsindex 25ea5de2d7..3db257d4db 100644--- a/test/plausible_web/controllers/auth_controller_test.exs+++ b/test/plausible_web/controllers/auth_controller_test.exs@@ -628,4 +628,52 @@ defmodule PlausibleWeb.AuthControllerTest dorefute Repo.get(Plausible.Site, owner_site.id)endend++ describe "POST /settings/api-keys" do+ setup [:create_user, :log_in]+ import Ecto.Query++ test "can't create api key into another site", %{conn: conn, user: me} do+ my_site = insert(:site)+ insert(:site_membership, site: my_site, user: me, role: "owner")++ other_user = insert(:user)+ other_site = insert(:site)+ insert(:site_membership, site: other_site, user: other_user, role: "owner")++ conn =+ post(conn, "/settings/api-keys", %{+ "api_key" => %{+ "user_id" => other_user.id,+ "name" => "all your code are belong to us",+ "key" => "swordfish"+ }+ })++ assert conn.status == 302++ refute Plausible.Auth.ApiKey |> where(user_id: ^other_user.id) |> Repo.one()+ end+ end++ describe "DELETE /settings/api-keys/:id" do+ setup [:create_user, :log_in]+ alias Plausible.Auth.ApiKey++ test "can't delete api key that doesn't belong to me", %{conn: conn} do+ other_user = insert(:user)+ insert(:site_membership, site: insert(:site), user: other_user, role: "owner")++ assert {:ok, %ApiKey{} = api_key} =+ %ApiKey{user_id: other_user.id}+ |> ApiKey.changeset(%{"name" => "other user's key"})+ |> Repo.insert()++ assert_raise Ecto.NoResultsError, fn ->+ delete(conn, "/settings/api-keys/#{api_key.id}")+ end++ assert Repo.get(ApiKey, api_key.id)+ end+ endenddiff --git a/test/plausible_web/controllers/site/membership_controller_test.exs b/test/plausible_web/controllers/site/membership_controller_test.exsindex 81c7587c93..d1d4823c4e 100644--- a/test/plausible_web/controllers/site/membership_controller_test.exs+++ b/test/plausible_web/controllers/site/membership_controller_test.exs@@ -159,6 +159,28 @@ defmodule PlausibleWeb.Site.MembershipControllerTest doassert membership.role == :viewerassert redirected_to(conn) == "/#{site.domain}"end++ test "admin can't make themselves an owner", %{conn: conn, user: user} do+ admin = insert(:user)++ site =+ insert(:site,+ memberships: [+ build(:site_membership, user: user, role: :owner),+ build(:site_membership, user: admin, role: :admin)+ ]+ )++ membership = Repo.get_by(Plausible.Site.Membership, user_id: admin.id)++ assert_raise Ecto.InvalidChangesetError, fn ->+ put(conn, "/sites/#{site.domain}/memberships/#{membership.id}/role/owner")+ end++ membership = Repo.reload!(membership)++ assert membership.role == :admin+ endenddescribe "DELETE /sites/memberships/:id" dodiff --git a/test/plausible_web/plugs/authorise_site_access_test.exs b/test/plausible_web/plugs/authorise_site_access_test.exsnew file mode 100644index 0000000000..984c36ddf8--- /dev/null+++ b/test/plausible_web/plugs/authorise_site_access_test.exs@@ -0,0 +1,24 @@+defmodule PlausibleWeb.AuthorizeSiteAccessTest do+ use PlausibleWeb.ConnCase, async: true+ alias PlausibleWeb.AuthorizeSiteAccess++ import Plausible.TestUtils+ setup [:create_user, :log_in]++ test "doesn't allow :website bypass with :domain in body", %{conn: conn, user: me} do+ my_site = insert(:site, memberships: [build(:site_membership, user: me, role: :owner)])++ other_site =+ insert(:site, memberships: [build(:site_membership, user: insert(:user), role: :owner)])++ conn =+ conn+ |> bypass_through(PlausibleWeb.Router)+ |> get("/#{other_site.domain}/settings", %{"domain" => my_site.domain})+ |> AuthorizeSiteAccess.call(_allowed_roles = [:admin, :owner])++ assert conn.halted+ assert conn.status == 404+ assert conn.path_params == %{"website" => other_site.domain}+ end+end