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
Fix sharedlink (#6449)
Cenk Kücük63929d339231
diff --git a/lib/plausible/site/shared_link.ex b/lib/plausible/site/shared_link.exindex ba540c7128..7e4df1399e 100644--- a/lib/plausible/site/shared_link.ex+++ b/lib/plausible/site/shared_link.ex@@ -1,4 +1,7 @@defmodule Plausible.Site.SharedLink do+ @moduledoc """+ Schema for shared links.+ """use Ecto.Schemaimport Ecto.Changeset@@ -17,7 +20,7 @@ defmodule Plausible.Site.SharedLink dodef changeset(link, attrs \\ %{}, opts \\ []) dolink- |> cast(attrs, [:slug, :password, :name, :segment_id])+ |> cast(attrs, [:password, :name])|> validate_required([:slug, :name])|> validate_special_name(opts)|> unique_constraint(:slug)diff --git a/lib/plausible/sites.ex b/lib/plausible/sites.exindex ab13d9db2a..6268c4efd5 100644--- a/lib/plausible/sites.ex+++ b/lib/plausible/sites.ex@@ -415,7 +415,6 @@ defmodule Plausible.Sites dodef create_shared_link(site, name, opts \\ []) dopassword = Keyword.get(opts, :password)- segment_id = Keyword.get(opts, :segment_id)site = Plausible.Repo.preload(site, :team)skip_feature_check? = Keyword.get(opts, :skip_feature_check?, false)@@ -423,15 +422,41 @@ defmodule Plausible.Sites doif not skip_feature_check? and SharedLinks.check_availability(site.team) != :ok do{:error, :upgrade_required}else+ segment_id = fetch_segment_id_for_site(Keyword.get(opts, :segment_id), site)+%SharedLink{site_id: site.id, slug: Nanoid.generate()}|> SharedLink.changeset(- %{name: name, password: password, segment_id: segment_id},+ %{name: name, password: password},Keyword.take(opts, [:skip_special_name_check?]))+ |> Ecto.Changeset.put_change(:segment_id, segment_id)|> Repo.insert()endend+ def update_shared_link(shared_link, site, params) do+ # Set segment_id via put_change, not cast, to enforce site-scoped ownership.+ segment_id = fetch_segment_id_for_site(params["segment_id"], site)+ link_params = Map.drop(params, ["segment_id"])++ shared_link+ |> SharedLink.changeset(link_params)+ |> Ecto.Changeset.put_change(:segment_id, segment_id)+ |> Repo.update()+ end++ defp fetch_segment_id_for_site(id, _site) when id in [nil, ""], do: nil++ defp fetch_segment_id_for_site(id, site) do+ with {int, ""} when int > 0 <- Integer.parse(to_string(id)),+ %{id: segment_id} <-+ Repo.get_by(Plausible.Segments.Segment, id: int, site_id: site.id) do+ segment_id+ else+ _ -> nil+ end+ end+def shared_link_url(site, link) dobase = PlausibleWeb.Endpoint.url()domain = "/share/#{URI.encode_www_form(site.domain)}"diff --git a/lib/plausible_web/live/shared_link_settings/form.ex b/lib/plausible_web/live/shared_link_settings/form.exindex 0adf0c1c43..22ea886104 100644--- a/lib/plausible_web/live/shared_link_settings/form.ex+++ b/lib/plausible_web/live/shared_link_settings/form.ex@@ -204,15 +204,10 @@ defmodule PlausibleWeb.Live.SharedLinkSettings.Form dodef handle_event("save-shared-link",%{"shared_link" => shared_link_params},- %{assigns: %{shared_link: %Plausible.Site.SharedLink{} = shared_link}} = socket+ %{assigns: %{shared_link: %Plausible.Site.SharedLink{} = shared_link, site: site}} =+ socket) do- changeset =- Plausible.Site.SharedLink.changeset(- shared_link,- shared_link_params- )-- case Plausible.Repo.update(changeset) do+ case Sites.update_shared_link(shared_link, site, shared_link_params) do{:ok, updated_shared_link} ->socket = socket.assigns.on_save_shared_link.(updated_shared_link, socket){:noreply, socket}diff --git a/test/plausible_web/live/shared_link_settings/form_test.exs b/test/plausible_web/live/shared_link_settings/form_test.exsindex 04b5a8063d..c78d7cf546 100644--- a/test/plausible_web/live/shared_link_settings/form_test.exs+++ b/test/plausible_web/live/shared_link_settings/form_test.exs@@ -261,6 +261,180 @@ defmodule PlausibleWeb.Live.SharedLinkSettings.FormTest doassert html =~ "can't be blank"end+ test "attaches a valid same-site segment when editing a shared link", %{+ conn: conn,+ site: site,+ session: session+ } do+ segment = insert(:segment, type: :site, site: site, name: "Scandinavia")+ shared_link = insert(:shared_link, site: site, name: "My Link")++ lv = get_liveview(conn, session)++ lv+ |> element(~s/button[phx-click="edit-shared-link"][phx-value-slug="#{shared_link.slug}"]/)+ |> render_click()++ lv+ |> find_form()+ |> render_submit(%{shared_link: %{name: "My Link", segment_id: segment.id}})++ html = render(lv)+ assert html =~ "Shared link saved"++ updated = Plausible.Repo.reload!(shared_link)+ assert updated.segment_id == segment.id+ end++ test "clears a segment when editing a shared link with segment_id empty", %{+ conn: conn,+ site: site,+ session: session+ } do+ segment = insert(:segment, type: :site, site: site, name: "Scandinavia")+ shared_link = insert(:shared_link, site: site, name: "My Link", segment: segment)++ lv = get_liveview(conn, session)++ lv+ |> element(~s/button[phx-click="edit-shared-link"][phx-value-slug="#{shared_link.slug}"]/)+ |> render_click()++ # Toggle off → ComboBox submits segment_id: ""+ lv+ |> find_form()+ |> render_submit(%{shared_link: %{name: "My Link", segment_id: ""}})++ html = render(lv)+ assert html =~ "Shared link saved"++ updated = Plausible.Repo.reload!(shared_link)+ assert is_nil(updated.segment_id)+ end++ test "does not associate a segment from another site when creating a shared link", %{+ conn: conn,+ site: site,+ session: session+ } do+ victim_site = insert(:site)+ victim_segment = insert(:segment, type: :site, site: victim_site, name: "Victim Segment")++ lv = get_liveview(conn, session)++ lv |> element("button#add-shared-link-button") |> render_click()++ lv+ |> find_form()+ |> render_submit(%{+ shared_link: %{name: "Attacker Link", segment_id: victim_segment.id}+ })++ html = render(lv)+ assert html =~ "Attacker Link"+ assert html =~ "Shared link saved"++ # The shared link must NOT reference the foreign segment+ shared_link =+ Plausible.Repo.get_by(Plausible.Site.SharedLink,+ name: "Attacker Link",+ site_id: site.id+ )++ assert shared_link+ assert is_nil(shared_link.segment_id)+ end++ test "does not associate a segment from another site when editing a shared link", %{+ conn: conn,+ site: site,+ session: session+ } do+ own_segment = insert(:segment, type: :site, site: site, name: "Own Segment")+ shared_link = insert(:shared_link, site: site, name: "My Link", segment: own_segment)++ victim_site = insert(:site)+ victim_segment = insert(:segment, type: :site, site: victim_site, name: "Victim Segment")++ lv = get_liveview(conn, session)++ lv+ |> element(~s/button[phx-click="edit-shared-link"][phx-value-slug="#{shared_link.slug}"]/)+ |> render_click()++ lv+ |> find_form()+ |> render_submit(%{+ shared_link: %{name: "My Link", segment_id: victim_segment.id}+ })++ html = render(lv)+ assert html =~ "Shared link saved"++ # The shared link must NOT be updated to reference the foreign segment+ updated = Plausible.Repo.reload!(shared_link)+ assert is_nil(updated.segment_id)+ end++ test "keeps the segment when editing a link whose segment was downgraded to personal", %{+ conn: conn,+ site: site,+ session: session+ } do+ # A site segment is attached, then later downgraded to personal. Editing the+ # link (e.g. renaming) must NOT detach the now-personal segment.+ segment = insert(:segment, type: :site, site: site, name: "Scandinavia")+ shared_link = insert(:shared_link, site: site, name: "My Link", segment: segment)++ Plausible.Repo.update!(Ecto.Changeset.change(segment, type: :personal))++ lv = get_liveview(conn, session)++ lv+ |> element(~s/button[phx-click="edit-shared-link"][phx-value-slug="#{shared_link.slug}"]/)+ |> render_click()++ lv+ |> find_form()+ |> render_submit(%{shared_link: %{name: "Renamed Link", segment_id: segment.id}})++ html = render(lv)+ assert html =~ "Shared link saved"++ updated = Plausible.Repo.reload!(shared_link)+ assert updated.name == "Renamed Link"++ assert updated.segment_id == segment.id,+ "Downgraded segment must stay attached to the shared link"+ end++ test "cannot overwrite the shared link slug via form params", %{+ conn: conn,+ site: site,+ session: session+ } do+ shared_link = insert(:shared_link, site: site, name: "Original Link")+ original_slug = shared_link.slug++ lv = get_liveview(conn, session)++ lv+ |> element(~s/button[phx-click="edit-shared-link"][phx-value-slug="#{original_slug}"]/)+ |> render_click()++ # Attempt to inject a custom slug through the form params+ lv+ |> find_form()+ |> render_submit(%{shared_link: %{name: "Original Link", slug: "evil-custom-slug"}})++ html = render(lv)+ assert html =~ "Shared link saved"++ updated = Plausible.Repo.reload!(shared_link)+ assert updated.slug == original_slug, "Slug must remain unchanged after update"+ refute updated.slug == "evil-custom-slug"+ end+test "shows upgrade required error when subscription doesn't include Shared Links", %{conn: conn,site: site,