media proxy: good enough wip

This commit is contained in:
href 2017-11-22 19:06:07 +01:00
parent 9d1c0ec18d
commit 5f35fdcf5d
No known key found for this signature in database
GPG Key ID: EE8296C1A152C325
7 changed files with 101 additions and 8 deletions

View File

@ -3,6 +3,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
alias Pleroma.User alias Pleroma.User
alias Pleroma.Web.MastodonAPI.AccountView alias Pleroma.Web.MastodonAPI.AccountView
alias Pleroma.Web.CommonAPI.Utils alias Pleroma.Web.CommonAPI.Utils
alias Pleroma.Web.MediaProxy
defp image_url(%{"url" => [ %{ "href" => href } | _ ]}), do: href defp image_url(%{"url" => [ %{ "href" => href } | _ ]}), do: href
defp image_url(_), do: nil defp image_url(_), do: nil
@ -12,10 +13,10 @@ def render("accounts.json", %{users: users} = opts) do
end end
def render("account.json", %{user: user}) do def render("account.json", %{user: user}) do
image = User.avatar_url(user) image = User.avatar_url(user) |> MediaProxy.url()
user_info = User.user_info(user) user_info = User.user_info(user)
header = image_url(user.info["banner"]) || "https://placehold.it/700x335" header = (image_url(user.info["banner"]) || "https://placehold.it/700x335") |> MediaProxy.url()
%{ %{
id: to_string(user.id), id: to_string(user.id),

View File

@ -3,6 +3,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
alias Pleroma.Web.MastodonAPI.{AccountView, StatusView} alias Pleroma.Web.MastodonAPI.{AccountView, StatusView}
alias Pleroma.{User, Activity} alias Pleroma.{User, Activity}
alias Pleroma.Web.CommonAPI.Utils alias Pleroma.Web.CommonAPI.Utils
alias Pleroma.Web.MediaProxy
def render("index.json", opts) do def render("index.json", opts) do
render_many(opts.activities, StatusView, "status.json", opts) render_many(opts.activities, StatusView, "status.json", opts)
@ -121,9 +122,9 @@ def render("attachment.json", %{attachment: attachment}) do
%{ %{
id: to_string(attachment["id"] || hash_id), id: to_string(attachment["id"] || hash_id),
url: href, url: MediaProxy.url(href),
remote_url: href, remote_url: href,
preview_url: href, preview_url: MediaProxy.url(href),
text_url: href, text_url: href,
type: type type: type
} }

View File

@ -0,0 +1,49 @@
defmodule Pleroma.Web.MediaProxy.MediaProxyController do
use Pleroma.Web, :controller
require Logger
def remote(conn, %{"sig" => sig, "url" => url}) do
{:ok, url} = Pleroma.MediaProxy.decode_url(sig, url)
url = url |> URI.encode()
case proxy_request(url) do
{:ok, content_type, body} ->
conn
|> put_resp_content_type(content_type)
|> set_cache_header(:default)
|> send_resp(200, body)
other ->
conn
|> set_cache_header(:error)
|> redirect(external: url)
end
end
defp proxy_request(link) do
instance = )
headers = [{"user-agent", "Pleroma/MediaProxy; #{Pleroma.Web.base_url()} <#{Application.get_env(:pleroma, :instance)[:email]}>"}]
options = [:insecure, {:follow_redirect, true}]
case :hackney.request(:get, link, headers, "", options) do
{:ok, 200, headers, client} ->
headers = Enum.into(headers, Map.new)
{:ok, body} = :hackney.body(client)
{:ok, headers["Content-Type"], body}
{:ok, status, _, _} ->
Logger.warn "MediaProxy: request failed, status #{status}, link: #{link}"
{:error, :bad_status}
{:error, error} ->
Logger.warn "MediaProxy: request failed, error #{inspect error}, link: #{link}"
{:error, error}
end
end
@cache_control %{
default: "public, max-age=1209600",
error: "public, must-revalidate, max-age=160",
}
defp set_cache_header(conn, true), do: set_cache_header(conn, :default)
defp set_cache_header(conn, false), do: set_cache_header(conn, :error)
defp set_cache_header(conn, key) when is_atom(key), do: set_cache_header(conn, @cache_control[key])
defp set_cache_header(conn, value) when is_binary(value), do: Plug.Conn.put_resp_header(conn, "cache-control", value)
end

View File

@ -0,0 +1,33 @@
defmodule Pleroma.Web.MediaProxy do
@base64_opts [padding: false]
@base64_key Application.get_env(:pleroma, Pleroma.Web.Endpoint)[:secret_key_base]
def url(nil), do: nil
def url(url) do
if String.starts_with?(url, Pleroma.Web.base_url) do
url
else
base64 = Base.url_encode64(url, @base64_opts)
sig = :crypto.hmac(:sha, @base64_key, base64)
sig64 = sig |> Base.url_encode64(@base64_opts)
cache_url("#{sig64}/#{base64}")
end
end
def decode_url(sig, url) do
sig = Base.url_decode64!(sig, @base64_opts)
local_sig = :crypto.hmac(:sha, @base64_key, url)
if local_sig == sig do
{:ok, Base.url_decode64!(url, @base64_opts)}
else
{:error, :invalid_signature}
end
end
defp cache_url(path) do
"/proxy/" <> path
end
end

View File

@ -233,6 +233,14 @@ def user_fetcher(username) do
delete "/auth/sign_out", MastodonAPIController, :logout delete "/auth/sign_out", MastodonAPIController, :logout
end end
pipeline :remote_media do
plug :accepts, ["html"]
end
scope "/proxy/", Pleroma.Web.MediaProxy do
pipe_through :remote_media
get "/:sig/:url", MediaProxyController, :remote
end
scope "/", Fallback do scope "/", Fallback do
get "/*path", RedirectController, :redirector get "/*path", RedirectController, :redirector
end end

View File

@ -6,7 +6,7 @@ def to_map(%Object{} = object, _opts) do
data = object.data data = object.data
url = List.first(data["url"]) url = List.first(data["url"])
%{ %{
url: url["href"], url: url["href"] |> Pleroma.Web.MediaProxy.url(),
mimetype: url["mediaType"], mimetype: url["mediaType"],
id: data["uuid"], id: data["uuid"],
oembed: false oembed: false

View File

@ -2,6 +2,7 @@ defmodule Pleroma.Web.TwitterAPI.UserView do
use Pleroma.Web, :view use Pleroma.Web, :view
alias Pleroma.User alias Pleroma.User
alias Pleroma.Web.CommonAPI.Utils alias Pleroma.Web.CommonAPI.Utils
alias Pleroma.Web.MediaProxy
def render("show.json", %{user: user = %User{}} = assigns) do def render("show.json", %{user: user = %User{}} = assigns) do
render_one(user, Pleroma.Web.TwitterAPI.UserView, "user.json", assigns) render_one(user, Pleroma.Web.TwitterAPI.UserView, "user.json", assigns)
@ -12,7 +13,7 @@ def render("index.json", %{users: users, for: user}) do
end end
def render("user.json", %{user: user = %User{}} = assigns) do def render("user.json", %{user: user = %User{}} = assigns) do
image = User.avatar_url(user) image = User.avatar_url(user) |> MediaProxy.url()
{following, follows_you, statusnet_blocking} = if assigns[:for] do {following, follows_you, statusnet_blocking} = if assigns[:for] do
{ {
User.following?(assigns[:for], user), User.following?(assigns[:for], user),
@ -44,8 +45,8 @@ def render("user.json", %{user: user = %User{}} = assigns) do
"screen_name" => user.nickname, "screen_name" => user.nickname,
"statuses_count" => user_info[:note_count], "statuses_count" => user_info[:note_count],
"statusnet_profile_url" => user.ap_id, "statusnet_profile_url" => user.ap_id,
"cover_photo" => image_url(user.info["banner"]), "cover_photo" => image_url(user.info["banner"]) |> MediaProxy.url(),
"background_image" => image_url(user.info["background"]) "background_image" => image_url(user.info["background"]) |> MediaProxy.url(),
} }
end end