diff options
| author | feld <feld@feld.me> | 2019-08-02 17:07:09 +0000 | 
|---|---|---|
| committer | feld <feld@feld.me> | 2019-08-02 17:07:09 +0000 | 
| commit | d93d7779151c811e991e99098e64c1da2c783d68 (patch) | |
| tree | f4e1af0a781f7fef4523122bafd1cf19ff95d6ba /test/web/mastodon_api/mastodon_api_controller_test.exs | |
| parent | 5ff8f07ca906d77a6ec1d5ba912a787f855364f9 (diff) | |
| download | pleroma-d93d7779151c811e991e99098e64c1da2c783d68.tar.gz pleroma-d93d7779151c811e991e99098e64c1da2c783d68.zip  | |
Fix/mediaproxy whitelist base url
Diffstat (limited to 'test/web/mastodon_api/mastodon_api_controller_test.exs')
| -rw-r--r-- | test/web/mastodon_api/mastodon_api_controller_test.exs | 34 | 
1 files changed, 0 insertions, 34 deletions
diff --git a/test/web/mastodon_api/mastodon_api_controller_test.exs b/test/web/mastodon_api/mastodon_api_controller_test.exs index 66016c886..e49c4cc22 100644 --- a/test/web/mastodon_api/mastodon_api_controller_test.exs +++ b/test/web/mastodon_api/mastodon_api_controller_test.exs @@ -1671,40 +1671,6 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do        object = Repo.get(Object, media["id"])        assert object.data["actor"] == User.ap_id(conn.assigns[:user])      end - -    test "returns proxied url when media proxy is enabled", %{conn: conn, image: image} do -      Pleroma.Config.put([Pleroma.Upload, :base_url], "https://media.pleroma.social") - -      proxy_url = "https://cache.pleroma.social" -      Pleroma.Config.put([:media_proxy, :enabled], true) -      Pleroma.Config.put([:media_proxy, :base_url], proxy_url) - -      media = -        conn -        |> post("/api/v1/media", %{"file" => image}) -        |> json_response(:ok) - -      assert String.starts_with?(media["url"], proxy_url) -    end - -    test "returns media url when proxy is enabled but media url is whitelisted", %{ -      conn: conn, -      image: image -    } do -      media_url = "https://media.pleroma.social" -      Pleroma.Config.put([Pleroma.Upload, :base_url], media_url) - -      Pleroma.Config.put([:media_proxy, :enabled], true) -      Pleroma.Config.put([:media_proxy, :base_url], "https://cache.pleroma.social") -      Pleroma.Config.put([:media_proxy, :whitelist], ["media.pleroma.social"]) - -      media = -        conn -        |> post("/api/v1/media", %{"file" => image}) -        |> json_response(:ok) - -      assert String.starts_with?(media["url"], media_url) -    end    end    describe "locked accounts" do  | 
