浏览代码

Simplify. We will always have a result from Upload.base_url/0, so just add it to the list

groups
Mark Felder 3 年前
父节点
当前提交
ef59d99833
共有 1 个文件被更改,包括 2 次插入10 次删除
  1. +2
    -10
      lib/pleroma/web/media_proxy.ex

+ 2
- 10
lib/pleroma/web/media_proxy.ex 查看文件

@@ -73,22 +73,14 @@ defmodule Pleroma.Web.MediaProxy do

def whitelisted?(url) do
%{host: domain} = URI.parse(url)
%{host: web_domain} = Web.base_url() |> URI.parse()
%{host: upload_domain} = Upload.base_url() |> URI.parse()

mediaproxy_whitelist_domains =
[:media_proxy, :whitelist]
|> Config.get()
|> Kernel.++(["#{Upload.base_url()}"])
|> Enum.map(&maybe_get_domain_from_url/1)

whitelist_domains =
if web_domain == upload_domain do
mediaproxy_whitelist_domains
else
[upload_domain | mediaproxy_whitelist_domains]
end

domain in whitelist_domains
domain in mediaproxy_whitelist_domains
end

defp maybe_get_domain_from_url("http" <> _ = url) do


正在加载...
取消
保存