moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MastodonAPI.StatusView: Do not use site_name 

site_name allow to spoof the origin of the domain and so hacks like:

<!-- served on https://hacktivis.me/tmp/joinmastodon.org.html -->
<meta property="og:image" content="https://hacktivis.me/datalove/img/meme/pleroma/mastodon%2C%20forbidden%20amuse%20yourself.jpeg" />
<meta property="og:title" content="Mastodon: Forbidden Amuse Yourself" />
<meta property="og:site_name" content="joinmastodon.org" />
<meta http-equiv="refresh" content="0; url=http://joinmastodon.org/">
This commit is contained in:
Haelwenn (lanodan) Monnier 2020-02-15 00:35:46 +01:00
parent 5fcee577f9
commit 1257331291
No known key found for this signature in database
GPG Key ID: D5B7A8E43C997DEE
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/pleroma/web/mastodon_api/views/status_view.ex
View File

@ -321,11 +321,9 @@ def render("card.json", %{rich_media: rich_media, page_url: page_url}) do
nil nil
end end
site_name = rich_media[:site_name] || page_url_data.host
%{ %{
type: "link", type: "link",
provider_name: site_name, provider_name: page_url_data.host,
provider_url: page_url_data.scheme <> "://" <> page_url_data.host, provider_url: page_url_data.scheme <> "://" <> page_url_data.host,
url: page_url, url: page_url,
image: image_url |> MediaProxy.url(), image: image_url |> MediaProxy.url(),

4
test/web/mastodon_api/views/status_view_test.exs
View File

@ -491,7 +491,7 @@ test "a rich media card without an image renders correctly" do
title: "Example website" title: "Example website"
} }
%{provider_name: "Example site name"} = %{provider_name: "example.com"} =
StatusView.render("card.json", %{page_url: page_url, rich_media: card}) StatusView.render("card.json", %{page_url: page_url, rich_media: card})
end end
@ -506,7 +506,7 @@ test "a rich media card with all relevant data renders correctly" do
description: "Example description" description: "Example description"
} }
%{provider_name: "Example site name"} = %{provider_name: "example.com"} =
StatusView.render("card.json", %{page_url: page_url, rich_media: card}) StatusView.render("card.json", %{page_url: page_url, rich_media: card})
end end
end end