No OneTemporary
Actions

Size

140 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/CHANGELOG.md b/CHANGELOG.md
	index 25e3cb285..2d59639bd 100644
	--- a/CHANGELOG.md
	+++ b/CHANGELOG.md
	@@ -1,198 +1,199 @@
	# Changelog
	All notable changes to this project will be documented in this file.

	The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

	## [Unreleased]
	### Added
	- MRF: Support for priming the mediaproxy cache (`Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy`)
	Configuration: `federation_incoming_replies_max_depth` option
	- Mastodon API: Support for the [`tagged` filter](https://github.com/tootsuite/mastodon/pull/9755) in [`GET /api/v1/accounts/:id/statuses`](https://docs.joinmastodon.org/api/rest/accounts/#get-api-v1-accounts-id-statuses)
	- Admin API: Return users' tags when querying reports
	- Admin API: Return avatar and display name when querying users
	-- Added synchtonization following/followers counters for external users
	+- Mastodon API, streaming: Add support for passing the token in the `Sec-WebSocket-Protocol` header
	+- Added synchronization of following/followers counters for external users

	### Fixed
	- Not being able to pin unlisted posts
	- Metadata rendering errors resulting in the entire page being inaccessible
	- Mastodon API: Handling of search timeouts (`/api/v1/search` and `/api/v2/search`)
	- Mastodon API: Embedded relationships not being properly rendered in the Account entity of Status entity

	### Changed
	- Configuration: OpenGraph and TwitterCard providers enabled by default
	- Configuration: Filter.AnonymizeFilename added ability to retain file extension with custom text

	### Changed
	- NodeInfo: Return `skipThreadContainment` in `metadata` for the `skip_thread_containment` option

	## [1.0.0] - 2019-06-29
	### Security
	- Mastodon API: Fix display names not being sanitized
	- Rich media: Do not crawl private IP ranges

	### Added
	- Add a generic settings store for frontends / clients to use.
	- Explicit addressing option for posting.
	- Optional SSH access mode. (Needs `erlang-ssh` package on some distributions).
	- [MongooseIM](https://github.com/esl/MongooseIM) http authentication support.
	- LDAP authentication
	- External OAuth provider authentication
	- Support for building a release using [`mix release`](https://hexdocs.pm/mix/master/Mix.Tasks.Release.html)
	- A [job queue](https://git.pleroma.social/pleroma/pleroma_job_queue) for federation, emails, web push, etc.
	- [Prometheus](https://prometheus.io/) metrics
	- Support for Mastodon's remote interaction
	- Mix Tasks: `mix pleroma.database bump_all_conversations`
	- Mix Tasks: `mix pleroma.database remove_embedded_objects`
	- Mix Tasks: `mix pleroma.database update_users_following_followers_counts`
	- Mix Tasks: `mix pleroma.user toggle_confirmed`
	- Mix Tasks: `mix pleroma.config migrate_to_db`
	- Mix Tasks: `mix pleroma.config migrate_from_db`
	- Federation: Support for `Question` and `Answer` objects
	- Federation: Support for reports
	- Configuration: `poll_limits` option
	- Configuration: `pack_extensions` option
	- Configuration: `safe_dm_mentions` option
	- Configuration: `link_name` option
	- Configuration: `fetch_initial_posts` option
	- Configuration: `notify_email` option
	- Configuration: Media proxy `whitelist` option
	- Configuration: `report_uri` option
	- Configuration: `limit_to_local_content` option
	- Pleroma API: User subscriptions
	- Pleroma API: Healthcheck endpoint
	- Pleroma API: `/api/v1/pleroma/mascot` per-user frontend mascot configuration endpoints
	- Admin API: Endpoints for listing/revoking invite tokens
	- Admin API: Endpoints for making users follow/unfollow each other
	- Admin API: added filters (role, tags, email, name) for users endpoint
	- Admin API: Endpoints for managing reports
	- Admin API: Endpoints for deleting and changing the scope of individual reported statuses
	- Admin API: Endpoints to view and change config settings.
	- AdminFE: initial release with basic user management accessible at /pleroma/admin/
	- Mastodon API: Add chat token to `verify_credentials` response
	- Mastodon API: Add background image setting to `update_credentials`
	- Mastodon API: [Scheduled statuses](https://docs.joinmastodon.org/api/rest/scheduled-statuses/)
	- Mastodon API: `/api/v1/notifications/destroy_multiple` (glitch-soc extension)
	- Mastodon API: `/api/v1/pleroma/accounts/:id/favourites` (API extension)
	- Mastodon API: [Reports](https://docs.joinmastodon.org/api/rest/reports/)
	- Mastodon API: `POST /api/v1/accounts` (account creation API)
	- Mastodon API: [Polls](https://docs.joinmastodon.org/api/rest/polls/)
	- ActivityPub C2S: OAuth endpoints
	- Metadata: RelMe provider
	- OAuth: added support for refresh tokens
	- Emoji packs and emoji pack manager
	- Object pruning (`mix pleroma.database prune_objects`)
	- OAuth: added job to clean expired access tokens
	- MRF: Support for rejecting reports from specific instances (`mrf_simple`)
	- MRF: Support for stripping avatars and banner images from specific instances (`mrf_simple`)
	- MRF: Support for running subchains.
	- Configuration: `skip_thread_containment` option
	- Configuration: `rate_limit` option. See `Pleroma.Plugs.RateLimiter` documentation for details.
	- MRF: Support for filtering out likely spam messages by rejecting posts from new users that contain links.
	- Configuration: `ignore_hosts` option
	- Configuration: `ignore_tld` option
	- Configuration: default syslog tag "Pleroma" is now lowercased to "pleroma"

	### Changed
	- Breaking: bind to 127.0.0.1 instead of 0.0.0.0 by default
	- Breaking: Configuration: move from Pleroma.Mailer to Pleroma.Emails.Mailer
	- Thread containment / test for complete visibility will be skipped by default.
	- Enforcement of OAuth scopes
	- Add multiple use/time expiring invite token
	- Restyled OAuth pages to fit with Pleroma's default theme
	- Link/mention/hashtag detection is now handled by [auto_linker](https://git.pleroma.social/pleroma/auto_linker)
	- NodeInfo: Return `safe_dm_mentions` feature flag
	- Federation: Expand the audience of delete activities to all recipients of the deleted object
	- Federation: Removed `inReplyToStatusId` from objects
	- Configuration: Dedupe enabled by default
	- Configuration: Default log level in `prod` environment is now set to `warn`
	- Configuration: Added `extra_cookie_attrs` for setting non-standard cookie attributes. Defaults to ["SameSite=Lax"] so that remote follows work.
	- Timelines: Messages involving people you have blocked will be excluded from the timeline in all cases instead of just repeats.
	- Admin API: Move the user related API to `api/pleroma/admin/users`
	- Pleroma API: Support for emoji tags in `/api/pleroma/emoji` resulting in a breaking API change
	- Mastodon API: Support for `exclude_types`, `limit` and `min_id` in `/api/v1/notifications`
	- Mastodon API: Add `languages` and `registrations` to `/api/v1/instance`
	- Mastodon API: Provide plaintext versions of cw/content in the Status entity
	- Mastodon API: Add `pleroma.conversation_id`, `pleroma.in_reply_to_account_acct` fields to the Status entity
	- Mastodon API: Add `pleroma.tags`, `pleroma.relationship{}`, `pleroma.is_moderator`, `pleroma.is_admin`, `pleroma.confirmation_pending`, `pleroma.hide_followers`, `pleroma.hide_follows`, `pleroma.hide_favorites` fields to the User entity
	- Mastodon API: Add `pleroma.show_role`, `pleroma.no_rich_text` fields to the Source subentity
	- Mastodon API: Add support for updating `no_rich_text`, `hide_followers`, `hide_follows`, `hide_favorites`, `show_role` in `PATCH /api/v1/update_credentials`
	- Mastodon API: Add `pleroma.is_seen` to the Notification entity
	- Mastodon API: Add `pleroma.local` to the Status entity
	- Mastodon API: Add `preview` parameter to `POST /api/v1/statuses`
	- Mastodon API: Add `with_muted` parameter to timeline endpoints
	- Mastodon API: Actual reblog hiding instead of a dummy
	- Mastodon API: Remove attachment limit in the Status entity
	- Mastodon API: Added support max_id & since_id for bookmark timeline endpoints.
	- Deps: Updated Cowboy to 2.6
	- Deps: Updated Ecto to 3.0.7
	- Don't ship finmoji by default, they can be installed as an emoji pack
	- Hide deactivated users and their statuses
	- Posts which are marked sensitive or tagged nsfw no longer have link previews.
	- HTTP connection timeout is now set to 10 seconds.
	- Respond with a 404 Not implemented JSON error message when requested API is not implemented
	- Rich Media: crawl only https URLs.

	### Fixed
	- Follow requests don't get 'stuck' anymore.
	- Added an FTS index on objects. Running `vacuum analyze` and setting a larger `work_mem` is recommended.
	- Followers counter not being updated when a follower is blocked
	- Deactivated users being able to request an access token
	- Limit on request body in rich media/relme parsers being ignored resulting in a possible memory leak
	- Proper Twitter Card generation instead of a dummy
	- Deletions failing for users with a large number of posts
	- NodeInfo: Include admins in `staffAccounts`
	- ActivityPub: Crashing when requesting empty local user's outbox
	- Federation: Handling of objects without `summary` property
	- Federation: Add a language tag to activities as required by ActivityStreams 2.0
	- Federation: Do not federate avatar/banner if set to default allowing other servers/clients to use their defaults
	- Federation: Cope with missing or explicitly nulled address lists
	- Federation: Explicitly ensure activities addressed to `as:Public` become addressed to the followers collection
	- Federation: Better cope with actors which do not declare a followers collection and use `as:Public` with these semantics
	- Federation: Follow requests from remote users who have been blocked will be automatically rejected if appropriate
	- MediaProxy: Parse name from content disposition headers even for non-whitelisted types
	- MediaProxy: S3 link encoding
	- Rich Media: Reject any data which cannot be explicitly encoded into JSON
	- Pleroma API: Importing follows from Mastodon 2.8+
	- Twitter API: Exposing default scope, `no_rich_text` of the user to anyone
	- Twitter API: Returning the `role` object in user entity despite `show_role = false`
	- Mastodon API: `/api/v1/favourites` serving only public activities
	- Mastodon API: Reblogs having `in_reply_to_id` - `null` even when they are replies
	- Mastodon API: Streaming API broadcasting wrong activity id
	- Mastodon API: 500 errors when requesting a card for a private conversation
	- Mastodon API: Handling of `reblogs` in `/api/v1/accounts/:id/follow`
	- Mastodon API: Correct `reblogged`, `favourited`, and `bookmarked` values in the reblog status JSON
	- Mastodon API: Exposing default scope of the user to anyone
	- Mastodon API: Make `irreversible` field default to `false` [`POST /api/v1/filters`]
	- Mastodon API: Replace missing non-nullable Card attributes with empty strings
	- User-Agent is now sent correctly for all HTTP requests.
	- MRF: Simple policy now properly delists imported or relayed statuses

	## Removed
	- Configuration: `config :pleroma, :fe` in favor of the more flexible `config :pleroma, :frontend_configurations`

	## [0.9.99999] - 2019-05-31
	### Security
	- Mastodon API: Fix lists leaking private posts

	## [0.9.9999] - 2019-04-05
	### Security
	- Mastodon API: Fix content warnings skipping HTML sanitization

	## [0.9.999] - 2019-03-13
	Frontend changes only.
	### Added
	- Added floating action button for posting status on mobile
	### Changed
	- Changed user-settings icon to a pencil
	### Fixed
	- Keyboard shortcuts activating when typing a message
	- Gaps when scrolling down on a timeline after showing new

	## [0.9.99] - 2019-03-08
	### Changed
	- Update the frontend to the 0.9.99 tag
	### Fixed
	- Sign the date header in federation to fix Mastodon federation.

	## [0.9.9] - 2019-02-22
	This is our first stable release.
	diff --git a/config/test.exs b/config/test.exs
	index 012021f2a..63443dde0 100644
	--- a/config/test.exs
	+++ b/config/test.exs
	@@ -1,85 +1,87 @@
	use Mix.Config

	# We don't run a server during test. If one is required,
	# you can enable the server option below.
	config :pleroma, Pleroma.Web.Endpoint,
	http: [port: 4001],
	url: [port: 4001],
	server: true

	# Disable captha for tests
	config :pleroma, Pleroma.Captcha,
	# It should not be enabled for automatic tests
	enabled: false,
	# A fake captcha service for tests
	method: Pleroma.Captcha.Mock

	# Print only warnings and errors during test
	config :logger, level: :warn

	config :pleroma, :auth, oauth_consumer_strategies: []

	config :pleroma, Pleroma.Upload, filters: [], link_name: false

	config :pleroma, Pleroma.Uploaders.Local, uploads: "test/uploads"

	config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Test

	config :pleroma, :instance,
	email: "admin@example.com",
	notify_email: "noreply@example.com",
	skip_thread_containment: false,
	federating: false

	# Configure your database
	config :pleroma, Pleroma.Repo,
	adapter: Ecto.Adapters.Postgres,
	username: "postgres",
	password: "postgres",
	database: "pleroma_test",
	hostname: System.get_env("DB_HOST") \|\| "localhost",
	pool: Ecto.Adapters.SQL.Sandbox

	# Reduce hash rounds for testing
	config :pbkdf2_elixir, rounds: 1

	config :tesla, adapter: Tesla.Mock

	config :pleroma, :rich_media,
	enabled: false,
	ignore_hosts: [],
	ignore_tld: ["local", "localdomain", "lan"]

	config :web_push_encryption, :vapid_details,
	subject: "mailto:administrator@example.com",
	public_key:
	"BLH1qVhJItRGCfxgTtONfsOKDc9VRAraXw-3NsmjMngWSh7NxOizN6bkuRA7iLTMPS82PjwJAr3UoK9EC1IFrz4",
	private_key: "_-XZ0iebPrRfZ_o0-IatTdszYa8VCH1yLN-JauK7HHA"

	config :web_push_encryption, :http_client, Pleroma.Web.WebPushHttpClientMock

	config :pleroma_job_queue, disabled: true

	config :pleroma, Pleroma.ScheduledActivity,
	daily_user_limit: 2,
	total_user_limit: 3,
	enabled: false

	config :pleroma, :rate_limit, app_account_creation: {10_000, 5}

	config :pleroma, :http_security, report_uri: "https://endpoint.com"

	config :pleroma, :http, send_user_agent: false

	rum_enabled = System.get_env("RUM_ENABLED") == "true"
	config :pleroma, :database, rum_enabled: rum_enabled
	IO.puts("RUM enabled: #{rum_enabled}")

	+config :pleroma, Pleroma.ReverseProxy.Client, Pleroma.ReverseProxy.ClientMock
	+
	try do
	import_config "test.secret.exs"
	rescue
	_ ->
	IO.puts(
	"You may want to create test.secret.exs to declare custom database connection parameters."
	)
	end
	diff --git a/lib/mix/tasks/pleroma/ecto/ecto.ex b/lib/mix/tasks/pleroma/ecto/ecto.ex
	index 324f57fdd..b66f63376 100644
	--- a/lib/mix/tasks/pleroma/ecto/ecto.ex
	+++ b/lib/mix/tasks/pleroma/ecto/ecto.ex
	@@ -1,49 +1,50 @@
	# Pleroma: A lightweight social networking server
	# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/>
	# SPDX-License-Identifier: AGPL-3.0-onl
	+
	defmodule Mix.Tasks.Pleroma.Ecto do
	@doc """
	Ensures the given repository's migrations path exists on the file system.
	"""
	@spec ensure_migrations_path(Ecto.Repo.t(), Keyword.t()) :: String.t()
	def ensure_migrations_path(repo, opts) do
	path = opts[:migrations_path] \|\| Path.join(source_repo_priv(repo), "migrations")

	path =
	case Path.type(path) do
	:relative ->
	Path.join(Application.app_dir(:pleroma), path)

	:absolute ->
	path
	end

	if not File.dir?(path) do
	raise_missing_migrations(Path.relative_to_cwd(path), repo)
	end

	path
	end

	@doc """
	Returns the private repository path relative to the source.
	"""
	def source_repo_priv(repo) do
	config = repo.config()
	priv = config[:priv] \|\| "priv/#{repo \|> Module.split() \|> List.last() \|> Macro.underscore()}"
	Path.join(Application.app_dir(:pleroma), priv)
	end

	defp raise_missing_migrations(path, repo) do
	raise("""
	Could not find migrations directory #{inspect(path)}
	for repo #{inspect(repo)}.
	This may be because you are in a new project and the
	migration directory has not been created yet. Creating an
	empty directory at the path above will fix this error.
	If you expected existing migrations to be found, please
	make sure your repository has been properly configured
	and the configured path exists.
	""")
	end
	end
	diff --git a/lib/pleroma/reverse_proxy/client.ex b/lib/pleroma/reverse_proxy/client.ex
	new file mode 100644
	index 000000000..57c2d2cfd
	--- /dev/null
	+++ b/lib/pleroma/reverse_proxy/client.ex
	@@ -0,0 +1,24 @@
	+defmodule Pleroma.ReverseProxy.Client do
	+ @callback request(atom(), String.t(), [tuple()], String.t(), list()) ::
	+ {:ok, pos_integer(), [tuple()], reference() \| map()}
	+ \| {:ok, pos_integer(), [tuple()]}
	+ \| {:ok, reference()}
	+ \| {:error, term()}
	+
	+ @callback stream_body(reference() \| pid() \| map()) ::
	+ {:ok, binary()} \| :done \| {:error, String.t()}
	+
	+ @callback close(reference() \| pid() \| map()) :: :ok
	+
	+ def request(method, url, headers, "", opts \\ []) do
	+ client().request(method, url, headers, "", opts)
	+ end
	+
	+ def stream_body(ref), do: client().stream_body(ref)
	+
	+ def close(ref), do: client().close(ref)
	+
	+ defp client do
	+ Pleroma.Config.get([Pleroma.ReverseProxy.Client], :hackney)
	+ end
	+end
	diff --git a/lib/pleroma/reverse_proxy.ex b/lib/pleroma/reverse_proxy/reverse_proxy.ex
	similarity index 97%
	rename from lib/pleroma/reverse_proxy.ex
	rename to lib/pleroma/reverse_proxy/reverse_proxy.ex
	index de0f6e1bc..bf31e9cba 100644
	--- a/lib/pleroma/reverse_proxy.ex
	+++ b/lib/pleroma/reverse_proxy/reverse_proxy.ex
	@@ -1,382 +1,382 @@
	# Pleroma: A lightweight social networking server
	# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
	# SPDX-License-Identifier: AGPL-3.0-only

	defmodule Pleroma.ReverseProxy do
	alias Pleroma.HTTP

	@keep_req_headers ~w(accept user-agent accept-encoding cache-control if-modified-since) ++
	~w(if-unmodified-since if-none-match if-range range)
	@resp_cache_headers ~w(etag date last-modified cache-control)
	@keep_resp_headers @resp_cache_headers ++
	~w(content-type content-disposition content-encoding content-range) ++
	~w(accept-ranges vary)
	@default_cache_control_header "public, max-age=1209600"
	@valid_resp_codes [200, 206, 304]
	@max_read_duration :timer.seconds(30)
	@max_body_length :infinity
	@methods ~w(GET HEAD)

	@moduledoc """
	A reverse proxy.

	Pleroma.ReverseProxy.call(conn, url, options)

	It is not meant to be added into a plug pipeline, but to be called from another plug or controller.

	Supports `#{inspect(@methods)}` HTTP methods, and only allows `#{inspect(@valid_resp_codes)}` status codes.

	Responses are chunked to the client while downloading from the upstream.

	Some request / responses headers are preserved:

	* request: `#{inspect(@keep_req_headers)}`
	* response: `#{inspect(@keep_resp_headers)}`

	If no caching headers (`#{inspect(@resp_cache_headers)}`) are returned by upstream, `cache-control` will be
	set to `#{inspect(@default_cache_control_header)}`.

	Options:

	* `redirect_on_failure` (default `false`). Redirects the client to the real remote URL if there's any HTTP
	errors. Any error during body processing will not be redirected as the response is chunked. This may expose
	remote URL, clients IPs, ….

	* `max_body_length` (default `#{inspect(@max_body_length)}`): limits the content length to be approximately the
	specified length. It is validated with the `content-length` header and also verified when proxying.

	* `max_read_duration` (default `#{inspect(@max_read_duration)}` ms): the total time the connection is allowed to
	read from the remote upstream.

	* `inline_content_types`:
	* `true` will not alter `content-disposition` (up to the upstream),
	* `false` will add `content-disposition: attachment` to any request,
	* a list of whitelisted content types

	* `keep_user_agent` will forward the client's user-agent to the upstream. This may be useful if the upstream is
	doing content transformation (encoding, …) depending on the request.

	* `req_headers`, `resp_headers` additional headers.

	* `http`: options for [hackney](https://github.com/benoitc/hackney).

	"""
	@default_hackney_options []

	@inline_content_types [
	"image/gif",
	"image/jpeg",
	"image/jpg",
	"image/png",
	"image/svg+xml",
	"audio/mpeg",
	"audio/mp3",
	"video/webm",
	"video/mp4",
	"video/quicktime"
	]

	require Logger
	import Plug.Conn

	@type option() ::
	{:keep_user_agent, boolean}
	\| {:max_read_duration, :timer.time() \| :infinity}
	\| {:max_body_length, non_neg_integer() \| :infinity}
	\| {:http, []}
	\| {:req_headers, [{String.t(), String.t()}]}
	\| {:resp_headers, [{String.t(), String.t()}]}
	\| {:inline_content_types, boolean() \| [String.t()]}
	\| {:redirect_on_failure, boolean()}

	@spec call(Plug.Conn.t(), url :: String.t(), [option()]) :: Plug.Conn.t()
	def call(_conn, _url, _opts \\ [])

	def call(conn = %{method: method}, url, opts) when method in @methods do
	hackney_opts =
	@default_hackney_options
	\|> Keyword.merge(Keyword.get(opts, :http, []))
	\|> HTTP.process_request_options()

	req_headers = build_req_headers(conn.req_headers, opts)

	opts =
	if filename = Pleroma.Web.MediaProxy.filename(url) do
	Keyword.put_new(opts, :attachment_name, filename)
	else
	opts
	end

	with {:ok, code, headers, client} <- request(method, url, req_headers, hackney_opts),
	:ok <- header_length_constraint(headers, Keyword.get(opts, :max_body_length)) do
	response(conn, client, url, code, headers, opts)
	else
	{:ok, code, headers} ->
	head_response(conn, url, code, headers, opts)
	\|> halt()

	{:error, {:invalid_http_response, code}} ->
	Logger.error("#{__MODULE__}: request to #{inspect(url)} failed with HTTP status #{code}")

	conn
	\|> error_or_redirect(
	url,
	code,
	"Request failed: " <> Plug.Conn.Status.reason_phrase(code),
	opts
	)
	\|> halt()

	{:error, error} ->
	Logger.error("#{__MODULE__}: request to #{inspect(url)} failed: #{inspect(error)}")

	conn
	\|> error_or_redirect(url, 500, "Request failed", opts)
	\|> halt()
	end
	end

	def call(conn, _, _) do
	conn
	\|> send_resp(400, Plug.Conn.Status.reason_phrase(400))
	\|> halt()
	end

	defp request(method, url, headers, hackney_opts) do
	Logger.debug("#{__MODULE__} #{method} #{url} #{inspect(headers)}")
	method = method \|> String.downcase() \|> String.to_existing_atom()

	- case hackney().request(method, url, headers, "", hackney_opts) do
	+ case client().request(method, url, headers, "", hackney_opts) do
	{:ok, code, headers, client} when code in @valid_resp_codes ->
	{:ok, code, downcase_headers(headers), client}

	{:ok, code, headers} when code in @valid_resp_codes ->
	{:ok, code, downcase_headers(headers)}

	{:ok, code, _, _} ->
	{:error, {:invalid_http_response, code}}

	{:error, error} ->
	{:error, error}
	end
	end

	defp response(conn, client, url, status, headers, opts) do
	result =
	conn
	\|> put_resp_headers(build_resp_headers(headers, opts))
	\|> send_chunked(status)
	\|> chunk_reply(client, opts)

	case result do
	{:ok, conn} ->
	halt(conn)

	{:error, :closed, conn} ->
	- :hackney.close(client)
	+ client().close(client)
	halt(conn)

	{:error, error, conn} ->
	Logger.warn(
	"#{__MODULE__} request to #{url} failed while reading/chunking: #{inspect(error)}"
	)

	- :hackney.close(client)
	+ client().close(client)
	halt(conn)
	end
	end

	defp chunk_reply(conn, client, opts) do
	chunk_reply(conn, client, opts, 0, 0)
	end

	defp chunk_reply(conn, client, opts, sent_so_far, duration) do
	with {:ok, duration} <-
	check_read_duration(
	duration,
	Keyword.get(opts, :max_read_duration, @max_read_duration)
	),
	- {:ok, data} <- hackney().stream_body(client),
	+ {:ok, data} <- client().stream_body(client),
	{:ok, duration} <- increase_read_duration(duration),
	sent_so_far = sent_so_far + byte_size(data),
	:ok <- body_size_constraint(sent_so_far, Keyword.get(opts, :max_body_size)),
	{:ok, conn} <- chunk(conn, data) do
	chunk_reply(conn, client, opts, sent_so_far, duration)
	else
	:done -> {:ok, conn}
	{:error, error} -> {:error, error, conn}
	end
	end

	defp head_response(conn, _url, code, headers, opts) do
	conn
	\|> put_resp_headers(build_resp_headers(headers, opts))
	\|> send_resp(code, "")
	end

	defp error_or_redirect(conn, url, code, body, opts) do
	if Keyword.get(opts, :redirect_on_failure, false) do
	conn
	\|> Phoenix.Controller.redirect(external: url)
	\|> halt()
	else
	conn
	\|> send_resp(code, body)
	\|> halt
	end
	end

	defp downcase_headers(headers) do
	Enum.map(headers, fn {k, v} ->
	{String.downcase(k), v}
	end)
	end

	defp get_content_type(headers) do
	{_, content_type} =
	List.keyfind(headers, "content-type", 0, {"content-type", "application/octet-stream"})

	[content_type \| _] = String.split(content_type, ";")
	content_type
	end

	defp put_resp_headers(conn, headers) do
	Enum.reduce(headers, conn, fn {k, v}, conn ->
	put_resp_header(conn, k, v)
	end)
	end

	defp build_req_headers(headers, opts) do
	headers
	\|> downcase_headers()
	\|> Enum.filter(fn {k, _} -> k in @keep_req_headers end)
	\|> (fn headers ->
	headers = headers ++ Keyword.get(opts, :req_headers, [])

	if Keyword.get(opts, :keep_user_agent, false) do
	List.keystore(
	headers,
	"user-agent",
	0,
	{"user-agent", Pleroma.Application.user_agent()}
	)
	else
	headers
	end
	end).()
	end

	defp build_resp_headers(headers, opts) do
	headers
	\|> Enum.filter(fn {k, _} -> k in @keep_resp_headers end)
	\|> build_resp_cache_headers(opts)
	\|> build_resp_content_disposition_header(opts)
	\|> (fn headers -> headers ++ Keyword.get(opts, :resp_headers, []) end).()
	end

	defp build_resp_cache_headers(headers, _opts) do
	has_cache? = Enum.any?(headers, fn {k, _} -> k in @resp_cache_headers end)
	has_cache_control? = List.keymember?(headers, "cache-control", 0)

	cond do
	has_cache? && has_cache_control? ->
	headers

	has_cache? ->
	# There's caching header present but no cache-control -- we need to explicitely override it
	# to public as Plug defaults to "max-age=0, private, must-revalidate"
	List.keystore(headers, "cache-control", 0, {"cache-control", "public"})

	true ->
	List.keystore(
	headers,
	"cache-control",
	0,
	{"cache-control", @default_cache_control_header}
	)
	end
	end

	defp build_resp_content_disposition_header(headers, opts) do
	opt = Keyword.get(opts, :inline_content_types, @inline_content_types)

	content_type = get_content_type(headers)

	attachment? =
	cond do
	is_list(opt) && !Enum.member?(opt, content_type) -> true
	opt == false -> true
	true -> false
	end

	if attachment? do
	name =
	try do
	{{"content-disposition", content_disposition_string}, _} =
	List.keytake(headers, "content-disposition", 0)

	[name \| _] =
	Regex.run(
	~r/filename="((?:[^"\\]\|\\.)*)"/u,
	content_disposition_string \|\| "",
	capture: :all_but_first
	)

	name
	rescue
	MatchError -> Keyword.get(opts, :attachment_name, "attachment")
	end

	disposition = "attachment; filename=\"#{name}\""

	List.keystore(headers, "content-disposition", 0, {"content-disposition", disposition})
	else
	headers
	end
	end

	defp header_length_constraint(headers, limit) when is_integer(limit) and limit > 0 do
	with {_, size} <- List.keyfind(headers, "content-length", 0),
	{size, _} <- Integer.parse(size),
	true <- size <= limit do
	:ok
	else
	false ->
	{:error, :body_too_large}

	_ ->
	:ok
	end
	end

	defp header_length_constraint(_, _), do: :ok

	defp body_size_constraint(size, limit) when is_integer(limit) and limit > 0 and size >= limit do
	{:error, :body_too_large}
	end

	defp body_size_constraint(_, _), do: :ok

	defp check_read_duration(duration, max)
	when is_integer(duration) and is_integer(max) and max > 0 do
	if duration > max do
	{:error, :read_duration_exceeded}
	else
	{:ok, {duration, :erlang.system_time(:millisecond)}}
	end
	end

	defp check_read_duration(_, _), do: {:ok, :no_duration_limit, :no_duration_limit}

	defp increase_read_duration({previous_duration, started})
	when is_integer(previous_duration) and is_integer(started) do
	duration = :erlang.system_time(:millisecond) - started
	{:ok, previous_duration + duration}
	end

	defp increase_read_duration(_) do
	{:ok, :no_duration_limit, :no_duration_limit}
	end

	- defp hackney, do: Pleroma.Config.get(:hackney, :hackney)
	+ defp client, do: Pleroma.ReverseProxy.Client
	end
	diff --git a/lib/pleroma/uploaders/swift/keystone.ex b/lib/pleroma/uploaders/swift/keystone.ex
	deleted file mode 100644
	index dd44c7561..000000000
	--- a/lib/pleroma/uploaders/swift/keystone.ex
	+++ /dev/null
	@@ -1,51 +0,0 @@
	-# Pleroma: A lightweight social networking server
	-# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
	-# SPDX-License-Identifier: AGPL-3.0-only
	-
	-defmodule Pleroma.Uploaders.Swift.Keystone do
	- use HTTPoison.Base
	-
	- def process_url(url) do
	- Enum.join(
	- [Pleroma.Config.get!([Pleroma.Uploaders.Swift, :auth_url]), url],
	- "/"
	- )
	- end
	-
	- def process_response_body(body) do
	- body
	- \|> Jason.decode!()
	- end
	-
	- def get_token do
	- settings = Pleroma.Config.get(Pleroma.Uploaders.Swift)
	- username = Keyword.fetch!(settings, :username)
	- password = Keyword.fetch!(settings, :password)
	- tenant_id = Keyword.fetch!(settings, :tenant_id)
	-
	- case post(
	- "/tokens",
	- make_auth_body(username, password, tenant_id),
	- ["Content-Type": "application/json"],
	- hackney: [:insecure]
	- ) do
	- {:ok, %Tesla.Env{status: 200, body: body}} ->
	- body["access"]["token"]["id"]
	-
	- {:ok, %Tesla.Env{status: _}} ->
	- ""
	- end
	- end
	-
	- def make_auth_body(username, password, tenant) do
	- Jason.encode!(%{
	- :auth => %{
	- :passwordCredentials => %{
	- :username => username,
	- :password => password
	- },
	- :tenantId => tenant
	- }
	- })
	- end
	-end
	diff --git a/lib/pleroma/uploaders/swift/swift.ex b/lib/pleroma/uploaders/swift/swift.ex
	deleted file mode 100644
	index 2b0f2ad04..000000000
	--- a/lib/pleroma/uploaders/swift/swift.ex
	+++ /dev/null
	@@ -1,29 +0,0 @@
	-# Pleroma: A lightweight social networking server
	-# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
	-# SPDX-License-Identifier: AGPL-3.0-only
	-
	-defmodule Pleroma.Uploaders.Swift.Client do
	- use HTTPoison.Base
	-
	- def process_url(url) do
	- Enum.join(
	- [Pleroma.Config.get!([Pleroma.Uploaders.Swift, :storage_url]), url],
	- "/"
	- )
	- end
	-
	- def upload_file(filename, body, content_type) do
	- token = Pleroma.Uploaders.Swift.Keystone.get_token()
	-
	- case put("#{filename}", body, "X-Auth-Token": token, "Content-Type": content_type) do
	- {:ok, %Tesla.Env{status: 201}} ->
	- {:ok, {:file, filename}}
	-
	- {:ok, %Tesla.Env{status: 401}} ->
	- {:error, "Unauthorized, Bad Token"}
	-
	- {:error, _} ->
	- {:error, "Swift Upload Error"}
	- end
	- end
	-end
	diff --git a/lib/pleroma/uploaders/swift/uploader.ex b/lib/pleroma/uploaders/swift/uploader.ex
	deleted file mode 100644
	index d122b09e7..000000000
	--- a/lib/pleroma/uploaders/swift/uploader.ex
	+++ /dev/null
	@@ -1,19 +0,0 @@
	-# Pleroma: A lightweight social networking server
	-# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
	-# SPDX-License-Identifier: AGPL-3.0-only
	-
	-defmodule Pleroma.Uploaders.Swift do
	- @behaviour Pleroma.Uploaders.Uploader
	-
	- def get_file(name) do
	- {:ok, {:url, Path.join([Pleroma.Config.get!([__MODULE__, :object_url]), name])}}
	- end
	-
	- def put_file(upload) do
	- Pleroma.Uploaders.Swift.Client.upload_file(
	- upload.path,
	- File.read!(upload.tmpfile),
	- upload.content_type
	- )
	- end
	-end
	diff --git a/lib/pleroma/web/mastodon_api/websocket_handler.ex b/lib/pleroma/web/mastodon_api/websocket_handler.ex
	index 3299e1721..dbd3542ea 100644
	--- a/lib/pleroma/web/mastodon_api/websocket_handler.ex
	+++ b/lib/pleroma/web/mastodon_api/websocket_handler.ex
	@@ -1,126 +1,135 @@
	# Pleroma: A lightweight social networking server
	# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
	# SPDX-License-Identifier: AGPL-3.0-only

	defmodule Pleroma.Web.MastodonAPI.WebsocketHandler do
	require Logger

	alias Pleroma.Repo
	alias Pleroma.User
	alias Pleroma.Web.OAuth.Token

	@behaviour :cowboy_websocket

	@streams [
	"public",
	"public:local",
	"public:media",
	"public:local:media",
	"user",
	"user:notification",
	"direct",
	"list",
	"hashtag"
	]
	@anonymous_streams ["public", "public:local", "hashtag"]

	# Handled by periodic keepalive in Pleroma.Web.Streamer.
	@timeout :infinity

	def init(%{qs: qs} = req, state) do
	with params <- :cow_qs.parse_qs(qs),
	+ sec_websocket <- :cowboy_req.header("sec-websocket-protocol", req, nil),
	access_token <- List.keyfind(params, "access_token", 0),
	{_, stream} <- List.keyfind(params, "stream", 0),
	- {:ok, user} <- allow_request(stream, access_token),
	+ {:ok, user} <- allow_request(stream, [access_token, sec_websocket]),
	topic when is_binary(topic) <- expand_topic(stream, params) do
	{:cowboy_websocket, req, %{user: user, topic: topic}, %{idle_timeout: @timeout}}
	else
	{:error, code} ->
	Logger.debug("#{__MODULE__} denied connection: #{inspect(code)} - #{inspect(req)}")
	{:ok, req} = :cowboy_req.reply(code, req)
	{:ok, req, state}

	error ->
	Logger.debug("#{__MODULE__} denied connection: #{inspect(error)} - #{inspect(req)}")
	{:ok, req} = :cowboy_req.reply(400, req)
	{:ok, req, state}
	end
	end

	def websocket_init(state) do
	send(self(), :subscribe)
	{:ok, state}
	end

	# We never receive messages.
	def websocket_handle(_frame, state) do
	{:ok, state}
	end

	def websocket_info(:subscribe, state) do
	Logger.debug(
	"#{__MODULE__} accepted websocket connection for user #{
	(state.user \|\| %{id: "anonymous"}).id
	}, topic #{state.topic}"
	)

	Pleroma.Web.Streamer.add_socket(state.topic, streamer_socket(state))
	{:ok, state}
	end

	def websocket_info({:text, message}, state) do
	{:reply, {:text, message}, state}
	end

	def terminate(reason, _req, state) do
	Logger.debug(
	"#{__MODULE__} terminating websocket connection for user #{
	(state.user \|\| %{id: "anonymous"}).id
	}, topic #{state.topic \|\| "?"}: #{inspect(reason)}"
	)

	Pleroma.Web.Streamer.remove_socket(state.topic, streamer_socket(state))
	:ok
	end

	# Public streams without authentication.
	- defp allow_request(stream, nil) when stream in @anonymous_streams do
	+ defp allow_request(stream, [nil, nil]) when stream in @anonymous_streams do
	{:ok, nil}
	end

	# Authenticated streams.
	- defp allow_request(stream, {"access_token", access_token}) when stream in @streams do
	- with %Token{user_id: user_id} <- Repo.get_by(Token, token: access_token),
	+ defp allow_request(stream, [access_token, sec_websocket]) when stream in @streams do
	+ token =
	+ with {"access_token", token} <- access_token do
	+ token
	+ else
	+ _ -> sec_websocket
	+ end
	+
	+ with true <- is_bitstring(token),
	+ %Token{user_id: user_id} <- Repo.get_by(Token, token: token),
	user = %User{} <- User.get_cached_by_id(user_id) do
	{:ok, user}
	else
	_ -> {:error, 403}
	end
	end

	# Not authenticated.
	defp allow_request(stream, _) when stream in @streams, do: {:error, 403}

	# No matching stream.
	defp allow_request(_, _), do: {:error, 404}

	defp expand_topic("hashtag", params) do
	case List.keyfind(params, "tag", 0) do
	{_, tag} -> "hashtag:#{tag}"
	_ -> nil
	end
	end

	defp expand_topic("list", params) do
	case List.keyfind(params, "list", 0) do
	{_, list} -> "list:#{list}"
	_ -> nil
	end
	end

	defp expand_topic(topic, _), do: topic

	defp streamer_socket(state) do
	%{transport_pid: self(), assigns: state}
	end
	end
	diff --git a/mix.exs b/mix.exs
	index 22d3d50df..8f64562ef 100644
	--- a/mix.exs
	+++ b/mix.exs
	@@ -1,249 +1,249 @@
	defmodule Pleroma.Mixfile do
	use Mix.Project

	def project do
	[
	app: :pleroma,
	version: version("1.0.0"),
	elixir: "~> 1.7",
	elixirc_paths: elixirc_paths(Mix.env()),
	compilers: [:phoenix, :gettext] ++ Mix.compilers(),
	elixirc_options: [warnings_as_errors: true],
	xref: [exclude: [:eldap]],
	start_permanent: Mix.env() == :prod,
	aliases: aliases(),
	deps: deps(),
	test_coverage: [tool: ExCoveralls],

	# Docs
	name: "Pleroma",
	homepage_url: "https://pleroma.social/",
	source_url: "https://git.pleroma.social/pleroma/pleroma",
	docs: [
	source_url_pattern:
	"https://git.pleroma.social/pleroma/pleroma/blob/develop/%{path}#L%{line}",
	logo: "priv/static/static/logo.png",
	extras: ["README.md", "CHANGELOG.md"] ++ Path.wildcard("docs/*/.md"),
	groups_for_extras: [
	"Installation manuals": Path.wildcard("docs/installation/*.md"),
	Configuration: Path.wildcard("docs/config/*.md"),
	Administration: Path.wildcard("docs/admin/*.md"),
	"Pleroma's APIs and Mastodon API extensions": Path.wildcard("docs/api/*.md")
	],
	main: "readme",
	output: "priv/static/doc"
	],
	releases: [
	pleroma: [
	include_executables_for: [:unix],
	applications: [ex_syslogger: :load, syslog: :load],
	steps: [:assemble, &copy_files/1, &copy_nginx_config/1]
	]
	]
	]
	end

	def copy_files(%{path: target_path} = release) do
	File.cp_r!("./rel/files", target_path)
	release
	end

	def copy_nginx_config(%{path: target_path} = release) do
	File.cp!(
	"./installation/pleroma.nginx",
	Path.join([target_path, "installation", "pleroma.nginx"])
	)

	release
	end

	# Configuration for the OTP application.
	#
	# Type `mix help compile.app` for more information.
	def application do
	[
	mod: {Pleroma.Application, []},
	extra_applications: [:logger, :runtime_tools, :comeonin, :quack],
	included_applications: [:ex_syslogger]
	]
	end

	# Specifies which paths to compile per environment.
	defp elixirc_paths(:test), do: ["lib", "test/support"]
	defp elixirc_paths(_), do: ["lib"]

	# Specifies OAuth dependencies.
	defp oauth_deps do
	oauth_strategy_packages =
	System.get_env("OAUTH_CONSUMER_STRATEGIES")
	\|> to_string()
	\|> String.split()
	\|> Enum.map(fn strategy_entry ->
	with [_strategy, dependency] <- String.split(strategy_entry, ":") do
	dependency
	else
	[strategy] -> "ueberauth_#{strategy}"
	end
	end)

	for s <- oauth_strategy_packages, do: {String.to_atom(s), ">= 0.0.0"}
	end

	# Specifies your project dependencies.
	#
	# Type `mix help deps` for examples and options.
	defp deps do
	[
	{:phoenix, "~> 1.4.8"},
	{:plug_cowboy, "~> 2.0"},
	{:phoenix_pubsub, "~> 1.1"},
	{:phoenix_ecto, "~> 4.0"},
	{:ecto_sql, "~> 3.1"},
	{:postgrex, ">= 0.13.5"},
	{:gettext, "~> 0.15"},
	{:comeonin, "~> 4.1.1"},
	{:pbkdf2_elixir, "~> 0.12.3"},
	{:trailing_format_plug, "~> 0.0.7"},
	{:html_sanitize_ex, "~> 1.3.0"},
	{:html_entities, "~> 0.4"},
	{:phoenix_html, "~> 2.10"},
	{:calendar, "~> 0.17.4"},
	{:cachex, "~> 3.0.2"},
	- {:httpoison, "~> 1.2.0"},
	{:poison, "~> 3.0", override: true},
	{:tesla, "~> 1.2"},
	{:jason, "~> 1.0"},
	{:mogrify, "~> 0.6.1"},
	{:ex_aws, "~> 2.0"},
	{:ex_aws_s3, "~> 2.0"},
	{:earmark, "~> 1.3"},
	{:bbcode, "~> 0.1.1"},
	{:ex_machina, "~> 2.3", only: :test},
	{:credo, "~> 0.9.3", only: [:dev, :test]},
	{:mock, "~> 0.3.3", only: :test},
	{:crypt,
	git: "https://github.com/msantos/crypt", ref: "1f2b58927ab57e72910191a7ebaeff984382a1d3"},
	{:cors_plug, "~> 1.5"},
	{:ex_doc, "~> 0.20.2", only: :dev, runtime: false},
	{:web_push_encryption, "~> 0.2.1"},
	{:swoosh, "~> 0.20"},
	{:gen_smtp, "~> 0.13"},
	{:websocket_client, git: "https://github.com/jeremyong/websocket_client.git", only: :test},
	{:floki, "~> 0.20.0"},
	{:ex_syslogger, github: "slashmili/ex_syslogger", tag: "1.4.0"},
	{:timex, "~> 3.5"},
	{:ueberauth, "~> 0.4"},
	{:auto_linker,
	git: "https://git.pleroma.social/pleroma/auto_linker.git",
	ref: "95e8188490e97505c56636c1379ffdf036c1fdde"},
	{:http_signatures,
	git: "https://git.pleroma.social/pleroma/http_signatures.git",
	ref: "9789401987096ead65646b52b5a2ca6bf52fc531"},
	{:pleroma_job_queue, "~> 0.2.0"},
	{:telemetry, "~> 0.3"},
	{:prometheus_ex, "~> 3.0"},
	{:prometheus_plugs, "~> 1.1"},
	{:prometheus_phoenix, "~> 1.2"},
	{:prometheus_ecto, "~> 1.4"},
	{:recon, github: "ferd/recon", tag: "2.4.0"},
	{:quack, "~> 0.1.1"},
	{:benchee, "~> 1.0"},
	{:esshd, "~> 0.1.0", runtime: Application.get_env(:esshd, :enabled, false)},
	{:ex_rated, "~> 1.3"},
	{:plug_static_index_html, "~> 1.0.0"},
	- {:excoveralls, "~> 0.11.1", only: :test}
	+ {:excoveralls, "~> 0.11.1", only: :test},
	+ {:mox, "~> 0.5", only: :test}
	] ++ oauth_deps()
	end

	# Aliases are shortcuts or tasks specific to the current project.
	# For example, to create, migrate and run the seeds file at once:
	#
	# $ mix ecto.setup
	#
	# See the documentation for `Mix` for more info on aliases.
	defp aliases do
	[
	"ecto.migrate": ["pleroma.ecto.migrate"],
	"ecto.rollback": ["pleroma.ecto.rollback"],
	"ecto.setup": ["ecto.create", "ecto.migrate", "run priv/repo/seeds.exs"],
	"ecto.reset": ["ecto.drop", "ecto.setup"],
	test: ["ecto.create --quiet", "ecto.migrate", "test"]
	]
	end

	# Builds a version string made of:
	# * the application version
	# * a pre-release if ahead of the tag: the describe string (-count-commithash)
	# * branch name
	# * build metadata:
	# * a build name if `PLEROMA_BUILD_NAME` or `:pleroma, :build_name` is defined
	# * the mix environment if different than prod
	defp version(version) do
	identifier_filter = ~r/[^0-9a-z\-]+/i

	# Pre-release version, denoted from patch version with a hyphen
	{git_tag, git_pre_release} =
	with {tag, 0} <-
	System.cmd("git", ["describe", "--tags", "--abbrev=0"], stderr_to_stdout: true),
	tag = String.trim(tag),
	{describe, 0} <- System.cmd("git", ["describe", "--tags", "--abbrev=8"]),
	describe = String.trim(describe),
	ahead <- String.replace(describe, tag, "") do
	{String.replace_prefix(tag, "v", ""), if(ahead != "", do: String.trim(ahead))}
	else
	_ ->
	{commit_hash, 0} = System.cmd("git", ["rev-parse", "--short", "HEAD"])
	{nil, "-0-g" <> String.trim(commit_hash)}
	end

	if git_tag && version != git_tag do
	Mix.shell().error(
	"Application version #{inspect(version)} does not match git tag #{inspect(git_tag)}"
	)
	end

	# Branch name as pre-release version component, denoted with a dot
	branch_name =
	with {branch_name, 0} <- System.cmd("git", ["rev-parse", "--abbrev-ref", "HEAD"]),
	branch_name <- System.get_env("PLEROMA_BUILD_BRANCH") \|\| branch_name,
	true <- branch_name != "master" do
	branch_name =
	branch_name
	\|> String.trim()
	\|> String.replace(identifier_filter, "-")

	"." <> branch_name
	end

	build_name =
	cond do
	name = Application.get_env(:pleroma, :build_name) -> name
	name = System.get_env("PLEROMA_BUILD_NAME") -> name
	true -> nil
	end

	env_name = if Mix.env() != :prod, do: to_string(Mix.env())
	env_override = System.get_env("PLEROMA_BUILD_ENV")

	env_name =
	case env_override do
	nil -> env_name
	env_override when env_override in ["", "prod"] -> nil
	env_override -> env_override
	end

	# Build metadata, denoted with a plus sign
	build_metadata =
	[build_name, env_name]
	\|> Enum.filter(fn string -> string && string != "" end)
	\|> Enum.join(".")
	\|> (fn
	"" -> nil
	string -> "+" <> String.replace(string, identifier_filter, "-")
	end).()

	[version, git_pre_release, branch_name, build_metadata]
	\|> Enum.filter(fn string -> string && string != "" end)
	\|> Enum.join()
	end
	end
	diff --git a/mix.lock b/mix.lock
	index cae8d7d84..e711be635 100644
	--- a/mix.lock
	+++ b/mix.lock
	@@ -1,92 +1,91 @@
	%{
	"accept": {:hex, :accept, "0.3.5", "b33b127abca7cc948bbe6caa4c263369abf1347cfa9d8e699c6d214660f10cd1", [:rebar3], [], "hexpm"},
	"auto_linker": {:git, "https://git.pleroma.social/pleroma/auto_linker.git", "95e8188490e97505c56636c1379ffdf036c1fdde", [ref: "95e8188490e97505c56636c1379ffdf036c1fdde"]},
	"base64url": {:hex, :base64url, "0.0.1", "36a90125f5948e3afd7be97662a1504b934dd5dac78451ca6e9abf85a10286be", [:rebar], [], "hexpm"},
	"bbcode": {:hex, :bbcode, "0.1.1", "0023e2c7814119b2e620b7add67182e3f6019f92bfec9a22da7e99821aceba70", [:mix], [{:nimble_parsec, "~> 0.5", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm"},
	"benchee": {:hex, :benchee, "1.0.1", "66b211f9bfd84bd97e6d1beaddf8fc2312aaabe192f776e8931cb0c16f53a521", [:mix], [{:deep_merge, "~> 1.0", [hex: :deep_merge, repo: "hexpm", optional: false]}], "hexpm"},
	"bunt": {:hex, :bunt, "0.2.0", "951c6e801e8b1d2cbe58ebbd3e616a869061ddadcc4863d0a2182541acae9a38", [:mix], [], "hexpm"},
	"cachex": {:hex, :cachex, "3.0.2", "1351caa4e26e29f7d7ec1d29b53d6013f0447630bbf382b4fb5d5bad0209f203", [:mix], [{:eternal, "~> 1.2", [hex: :eternal, repo: "hexpm", optional: false]}, {:unsafe, "~> 1.0", [hex: :unsafe, repo: "hexpm", optional: false]}], "hexpm"},
	"calendar": {:hex, :calendar, "0.17.4", "22c5e8d98a4db9494396e5727108dffb820ee0d18fed4b0aa8ab76e4f5bc32f1", [:mix], [{:tzdata, "~> 0.5.8 or ~> 0.1.201603", [hex: :tzdata, repo: "hexpm", optional: false]}], "hexpm"},
	"certifi": {:hex, :certifi, "2.5.1", "867ce347f7c7d78563450a18a6a28a8090331e77fa02380b4a21962a65d36ee5", [:rebar3], [{:parse_trans, "~>3.3", [hex: :parse_trans, repo: "hexpm", optional: false]}], "hexpm"},
	"combine": {:hex, :combine, "0.10.0", "eff8224eeb56498a2af13011d142c5e7997a80c8f5b97c499f84c841032e429f", [:mix], [], "hexpm"},
	"comeonin": {:hex, :comeonin, "4.1.1", "c7304fc29b45b897b34142a91122bc72757bc0c295e9e824999d5179ffc08416", [:mix], [{:argon2_elixir, "~> 1.2", [hex: :argon2_elixir, repo: "hexpm", optional: true]}, {:bcrypt_elixir, "~> 0.12.1 or ~> 1.0", [hex: :bcrypt_elixir, repo: "hexpm", optional: true]}, {:pbkdf2_elixir, "~> 0.12", [hex: :pbkdf2_elixir, repo: "hexpm", optional: true]}], "hexpm"},
	"connection": {:hex, :connection, "1.0.4", "a1cae72211f0eef17705aaededacac3eb30e6625b04a6117c1b2db6ace7d5976", [:mix], [], "hexpm"},
	"cors_plug": {:hex, :cors_plug, "1.5.2", "72df63c87e4f94112f458ce9d25800900cc88608c1078f0e4faddf20933eda6e", [:mix], [{:plug, "~> 1.3 or ~> 1.4 or ~> 1.5", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"},
	"cowboy": {:hex, :cowboy, "2.6.3", "99aa50e94e685557cad82e704457336a453d4abcb77839ad22dbe71f311fcc06", [:rebar3], [{:cowlib, "~> 2.7.3", [hex: :cowlib, repo: "hexpm", optional: false]}, {:ranch, "~> 1.7.1", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm"},
	"cowlib": {:hex, :cowlib, "2.7.3", "a7ffcd0917e6d50b4d5fb28e9e2085a0ceb3c97dea310505f7460ff5ed764ce9", [:rebar3], [], "hexpm"},
	"credo": {:hex, :credo, "0.9.3", "76fa3e9e497ab282e0cf64b98a624aa11da702854c52c82db1bf24e54ab7c97a", [:mix], [{:bunt, "~> 0.2.0", [hex: :bunt, repo: "hexpm", optional: false]}, {:poison, ">= 0.0.0", [hex: :poison, repo: "hexpm", optional: false]}], "hexpm"},
	"crypt": {:git, "https://github.com/msantos/crypt", "1f2b58927ab57e72910191a7ebaeff984382a1d3", [ref: "1f2b58927ab57e72910191a7ebaeff984382a1d3"]},
	"db_connection": {:hex, :db_connection, "2.0.6", "bde2f85d047969c5b5800cb8f4b3ed6316c8cb11487afedac4aa5f93fd39abfa", [:mix], [{:connection, "~> 1.0.2", [hex: :connection, repo: "hexpm", optional: false]}], "hexpm"},
	"decimal": {:hex, :decimal, "1.7.0", "30d6b52c88541f9a66637359ddf85016df9eb266170d53105f02e4a67e00c5aa", [:mix], [], "hexpm"},
	"deep_merge": {:hex, :deep_merge, "1.0.0", "b4aa1a0d1acac393bdf38b2291af38cb1d4a52806cf7a4906f718e1feb5ee961", [:mix], [], "hexpm"},
	"earmark": {:hex, :earmark, "1.3.2", "b840562ea3d67795ffbb5bd88940b1bed0ed9fa32834915125ea7d02e35888a5", [:mix], [], "hexpm"},
	"ecto": {:hex, :ecto, "3.1.4", "69d852da7a9f04ede725855a35ede48d158ca11a404fe94f8b2fb3b2162cd3c9", [:mix], [{:decimal, "~> 1.6", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm"},
	"ecto_sql": {:hex, :ecto_sql, "3.1.3", "2c536139190492d9de33c5fefac7323c5eaaa82e1b9bf93482a14649042f7cd9", [:mix], [{:db_connection, "~> 2.0", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.1.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:mariaex, "~> 0.9.1", [hex: :mariaex, repo: "hexpm", optional: true]}, {:myxql, "~> 0.2.0", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.14.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm"},
	"esshd": {:hex, :esshd, "0.1.0", "6f93a2062adb43637edad0ea7357db2702a4b80dd9683482fe00f5134e97f4c1", [:mix], [], "hexpm"},
	"eternal": {:hex, :eternal, "1.2.0", "e2a6b6ce3b8c248f7dc31451aefca57e3bdf0e48d73ae5043229380a67614c41", [:mix], [], "hexpm"},
	"ex2ms": {:hex, :ex2ms, "1.5.0", "19e27f9212be9a96093fed8cdfbef0a2b56c21237196d26760f11dfcfae58e97", [:mix], [], "hexpm"},
	"ex_aws": {:hex, :ex_aws, "2.1.0", "b92651527d6c09c479f9013caa9c7331f19cba38a650590d82ebf2c6c16a1d8a", [:mix], [{:configparser_ex, "~> 2.0", [hex: :configparser_ex, repo: "hexpm", optional: true]}, {:hackney, "1.6.3 or 1.6.5 or 1.7.1 or 1.8.6 or ~> 1.9", [hex: :hackney, repo: "hexpm", optional: true]}, {:jsx, "~> 2.8", [hex: :jsx, repo: "hexpm", optional: true]}, {:poison, ">= 1.2.0", [hex: :poison, repo: "hexpm", optional: true]}, {:sweet_xml, "~> 0.6", [hex: :sweet_xml, repo: "hexpm", optional: true]}, {:xml_builder, "~> 0.1.0", [hex: :xml_builder, repo: "hexpm", optional: true]}], "hexpm"},
	"ex_aws_s3": {:hex, :ex_aws_s3, "2.0.1", "9e09366e77f25d3d88c5393824e613344631be8db0d1839faca49686e99b6704", [:mix], [{:ex_aws, "~> 2.0", [hex: :ex_aws, repo: "hexpm", optional: false]}, {:sweet_xml, ">= 0.0.0", [hex: :sweet_xml, repo: "hexpm", optional: true]}], "hexpm"},
	"ex_doc": {:hex, :ex_doc, "0.20.2", "1bd0dfb0304bade58beb77f20f21ee3558cc3c753743ae0ddbb0fd7ba2912331", [:mix], [{:earmark, "~> 1.3", [hex: :earmark, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.10", [hex: :makeup_elixir, repo: "hexpm", optional: false]}], "hexpm"},
	"ex_machina": {:hex, :ex_machina, "2.3.0", "92a5ad0a8b10ea6314b876a99c8c9e3f25f4dde71a2a835845b136b9adaf199a", [:mix], [{:ecto, "~> 2.2 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}, {:ecto_sql, "~> 3.0", [hex: :ecto_sql, repo: "hexpm", optional: true]}], "hexpm"},
	"ex_rated": {:hex, :ex_rated, "1.3.3", "30ecbdabe91f7eaa9d37fa4e81c85ba420f371babeb9d1910adbcd79ec798d27", [:mix], [{:ex2ms, "~> 1.5", [hex: :ex2ms, repo: "hexpm", optional: false]}], "hexpm"},
	"ex_syslogger": {:git, "https://github.com/slashmili/ex_syslogger.git", "f3963399047af17e038897c69e20d552e6899e1d", [tag: "1.4.0"]},
	"excoveralls": {:hex, :excoveralls, "0.11.1", "dd677fbdd49114fdbdbf445540ec735808250d56b011077798316505064edb2c", [:mix], [{:hackney, "~> 1.0", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm"},
	"floki": {:hex, :floki, "0.20.4", "be42ac911fece24b4c72f3b5846774b6e61b83fe685c2fc9d62093277fb3bc86", [:mix], [{:html_entities, "~> 0.4.0", [hex: :html_entities, repo: "hexpm", optional: false]}, {:mochiweb, "~> 2.15", [hex: :mochiweb, repo: "hexpm", optional: false]}], "hexpm"},
	"gen_smtp": {:hex, :gen_smtp, "0.13.0", "11f08504c4bdd831dc520b8f84a1dce5ce624474a797394e7aafd3c29f5dcd25", [:rebar3], [], "hexpm"},
	"gettext": {:hex, :gettext, "0.15.0", "40a2b8ce33a80ced7727e36768499fc9286881c43ebafccae6bab731e2b2b8ce", [:mix], [], "hexpm"},
	"hackney": {:hex, :hackney, "1.15.1", "9f8f471c844b8ce395f7b6d8398139e26ddca9ebc171a8b91342ee15a19963f4", [:rebar3], [{:certifi, "2.5.1", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "6.0.0", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "1.0.1", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "~>1.1", [hex: :mimerl, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "1.1.4", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}], "hexpm"},
	"html_entities": {:hex, :html_entities, "0.4.0", "f2fee876858cf6aaa9db608820a3209e45a087c5177332799592142b50e89a6b", [:mix], [], "hexpm"},
	"html_sanitize_ex": {:hex, :html_sanitize_ex, "1.3.0", "f005ad692b717691203f940c686208aa3d8ffd9dd4bb3699240096a51fa9564e", [:mix], [{:mochiweb, "~> 2.15", [hex: :mochiweb, repo: "hexpm", optional: false]}], "hexpm"},
	"http_signatures": {:git, "https://git.pleroma.social/pleroma/http_signatures.git", "9789401987096ead65646b52b5a2ca6bf52fc531", [ref: "9789401987096ead65646b52b5a2ca6bf52fc531"]},
	"httpoison": {:hex, :httpoison, "1.2.0", "2702ed3da5fd7a8130fc34b11965c8cfa21ade2f232c00b42d96d4967c39a3a3", [:mix], [{:hackney, "~> 1.8", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm"},
	"idna": {:hex, :idna, "6.0.0", "689c46cbcdf3524c44d5f3dde8001f364cd7608a99556d8fbd8239a5798d4c10", [:rebar3], [{:unicode_util_compat, "0.4.1", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm"},
	"jason": {:hex, :jason, "1.1.2", "b03dedea67a99223a2eaf9f1264ce37154564de899fd3d8b9a21b1a6fd64afe7", [:mix], [{:decimal, "~> 1.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm"},
	"jose": {:hex, :jose, "1.8.4", "7946d1e5c03a76ac9ef42a6e6a20001d35987afd68c2107bcd8f01a84e75aa73", [:mix, :rebar3], [{:base64url, "~> 0.0.1", [hex: :base64url, repo: "hexpm", optional: false]}], "hexpm"},
	"makeup": {:hex, :makeup, "0.8.0", "9cf32aea71c7fe0a4b2e9246c2c4978f9070257e5c9ce6d4a28ec450a839b55f", [:mix], [{:nimble_parsec, "~> 0.5.0", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm"},
	"makeup_elixir": {:hex, :makeup_elixir, "0.13.0", "be7a477997dcac2e48a9d695ec730b2d22418292675c75aa2d34ba0909dcdeda", [:mix], [{:makeup, "~> 0.8", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm"},
	"meck": {:hex, :meck, "0.8.13", "ffedb39f99b0b99703b8601c6f17c7f76313ee12de6b646e671e3188401f7866", [:rebar3], [], "hexpm"},
	"metrics": {:hex, :metrics, "1.0.1", "25f094dea2cda98213cecc3aeff09e940299d950904393b2a29d191c346a8486", [:rebar3], [], "hexpm"},
	"mime": {:hex, :mime, "1.3.1", "30ce04ab3175b6ad0bdce0035cba77bba68b813d523d1aac73d9781b4d193cf8", [:mix], [], "hexpm"},
	"mimerl": {:hex, :mimerl, "1.2.0", "67e2d3f571088d5cfd3e550c383094b47159f3eee8ffa08e64106cdf5e981be3", [:rebar3], [], "hexpm"},
	"mochiweb": {:hex, :mochiweb, "2.15.0", "e1daac474df07651e5d17cc1e642c4069c7850dc4508d3db7263a0651330aacc", [:rebar3], [], "hexpm"},
	"mock": {:hex, :mock, "0.3.3", "42a433794b1291a9cf1525c6d26b38e039e0d3a360732b5e467bfc77ef26c914", [:mix], [{:meck, "~> 0.8.13", [hex: :meck, repo: "hexpm", optional: false]}], "hexpm"},
	"mogrify": {:hex, :mogrify, "0.6.1", "de1b527514f2d95a7bbe9642eb556061afb337e220cf97adbf3a4e6438ed70af", [:mix], [], "hexpm"},
	+ "mox": {:hex, :mox, "0.5.1", "f86bb36026aac1e6f924a4b6d024b05e9adbed5c63e8daa069bd66fb3292165b", [:mix], [], "hexpm"},
	"nimble_parsec": {:hex, :nimble_parsec, "0.5.0", "90e2eca3d0266e5c53f8fbe0079694740b9c91b6747f2b7e3c5d21966bba8300", [:mix], [], "hexpm"},
	"parse_trans": {:hex, :parse_trans, "3.3.0", "09765507a3c7590a784615cfd421d101aec25098d50b89d7aa1d66646bc571c1", [:rebar3], [], "hexpm"},
	"pbkdf2_elixir": {:hex, :pbkdf2_elixir, "0.12.3", "6706a148809a29c306062862c803406e88f048277f6e85b68faf73291e820b84", [:mix], [], "hexpm"},
	"phoenix": {:hex, :phoenix, "1.4.8", "c72dc3adeb49c70eb963a0ea24f7a064ec1588e651e84e1b7ad5ed8253c0b4a2", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 1.1", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:plug, "~> 1.8.1 or ~> 1.9", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 1.0 or ~> 2.0", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm"},
	"phoenix_ecto": {:hex, :phoenix_ecto, "4.0.0", "c43117a136e7399ea04ecaac73f8f23ee0ffe3e07acfcb8062fe5f4c9f0f6531", [:mix], [{:ecto, "~> 3.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.9", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"},
	"phoenix_html": {:hex, :phoenix_html, "2.13.1", "fa8f034b5328e2dfa0e4131b5569379003f34bc1fafdaa84985b0b9d2f12e68b", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"},
	"phoenix_pubsub": {:hex, :phoenix_pubsub, "1.1.2", "496c303bdf1b2e98a9d26e89af5bba3ab487ba3a3735f74bf1f4064d2a845a3e", [:mix], [], "hexpm"},
	"pleroma_job_queue": {:hex, :pleroma_job_queue, "0.2.0", "879e660aa1cebe8dc6f0aaaa6aa48b4875e89cd961d4a585fd128e0773b31a18", [:mix], [], "hexpm"},
	"plug": {:hex, :plug, "1.8.2", "0bcce1daa420f189a6491f3940cc77ea7fb1919761175c9c3b59800d897440fc", [:mix], [{:mime, "~> 1.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: true]}], "hexpm"},
	"plug_cowboy": {:hex, :plug_cowboy, "2.0.2", "6055f16868cc4882b24b6e1d63d2bada94fb4978413377a3b32ac16c18dffba2", [:mix], [{:cowboy, "~> 2.5", [hex: :cowboy, repo: "hexpm", optional: false]}, {:plug, "~> 1.7", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"},
	"plug_crypto": {:hex, :plug_crypto, "1.0.0", "18e49317d3fa343f24620ed22795ec29d4a5e602d52d1513ccea0b07d8ea7d4d", [:mix], [], "hexpm"},
	"plug_static_index_html": {:hex, :plug_static_index_html, "1.0.0", "840123d4d3975585133485ea86af73cb2600afd7f2a976f9f5fd8b3808e636a0", [:mix], [{:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"},
	"poison": {:hex, :poison, "3.1.0", "d9eb636610e096f86f25d9a46f35a9facac35609a7591b3be3326e99a0484665", [:mix], [], "hexpm"},
	- "poolboy": {:hex, :poolboy, "1.5.2", "392b007a1693a64540cead79830443abf5762f5d30cf50bc95cb2c1aaafa006b", [:rebar3], [], "hexpm"},
	"postgrex": {:hex, :postgrex, "0.14.3", "5754dee2fdf6e9e508cbf49ab138df964278700b764177e8f3871e658b345a1e", [:mix], [{:connection, "~> 1.0", [hex: :connection, repo: "hexpm", optional: false]}, {:db_connection, "~> 2.0", [hex: :db_connection, repo: "hexpm", optional: false]}, {:decimal, "~> 1.5", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm"},
	"prometheus": {:hex, :prometheus, "4.2.2", "a830e77b79dc6d28183f4db050a7cac926a6c58f1872f9ef94a35cd989aceef8", [:mix, :rebar3], [], "hexpm"},
	"prometheus_ecto": {:hex, :prometheus_ecto, "1.4.1", "6c768ea9654de871e5b32fab2eac348467b3021604ebebbcbd8bcbe806a65ed5", [:mix], [{:ecto, "~> 2.0 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:prometheus_ex, "~> 1.1 or ~> 2.0 or ~> 3.0", [hex: :prometheus_ex, repo: "hexpm", optional: false]}], "hexpm"},
	"prometheus_ex": {:hex, :prometheus_ex, "3.0.5", "fa58cfd983487fc5ead331e9a3e0aa622c67232b3ec71710ced122c4c453a02f", [:mix], [{:prometheus, "~> 4.0", [hex: :prometheus, repo: "hexpm", optional: false]}], "hexpm"},
	"prometheus_phoenix": {:hex, :prometheus_phoenix, "1.2.1", "964a74dfbc055f781d3a75631e06ce3816a2913976d1df7830283aa3118a797a", [:mix], [{:phoenix, "~> 1.3", [hex: :phoenix, repo: "hexpm", optional: false]}, {:prometheus_ex, "~> 1.3 or ~> 2.0 or ~> 3.0", [hex: :prometheus_ex, repo: "hexpm", optional: false]}], "hexpm"},
	"prometheus_plugs": {:hex, :prometheus_plugs, "1.1.5", "25933d48f8af3a5941dd7b621c889749894d8a1082a6ff7c67cc99dec26377c5", [:mix], [{:accept, "~> 0.1", [hex: :accept, repo: "hexpm", optional: false]}, {:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: false]}, {:prometheus_ex, "~> 1.1 or ~> 2.0 or ~> 3.0", [hex: :prometheus_ex, repo: "hexpm", optional: false]}, {:prometheus_process_collector, "~> 1.1", [hex: :prometheus_process_collector, repo: "hexpm", optional: true]}], "hexpm"},
	- "prometheus_process_collector": {:hex, :prometheus_process_collector, "1.4.0", "6dbd39e3165b9ef1c94a7a820e9ffe08479f949dcdd431ed4aaea7b250eebfde", [:rebar3], [{:prometheus, "~> 4.0", [hex: :prometheus, repo: "hexpm", optional: false]}], "hexpm"},
	"quack": {:hex, :quack, "0.1.1", "cca7b4da1a233757fdb44b3334fce80c94785b3ad5a602053b7a002b5a8967bf", [:mix], [{:poison, ">= 1.0.0", [hex: :poison, repo: "hexpm", optional: false]}, {:tesla, "~> 1.2.0", [hex: :tesla, repo: "hexpm", optional: false]}], "hexpm"},
	"ranch": {:hex, :ranch, "1.7.1", "6b1fab51b49196860b733a49c07604465a47bdb78aa10c1c16a3d199f7f8c881", [:rebar3], [], "hexpm"},
	"recon": {:git, "https://github.com/ferd/recon.git", "75d70c7c08926d2f24f1ee6de14ee50fe8a52763", [tag: "2.4.0"]},
	"ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.4", "f0eafff810d2041e93f915ef59899c923f4568f4585904d010387ed74988e77b", [:make, :mix, :rebar3], [], "hexpm"},
	"swoosh": {:hex, :swoosh, "0.20.0", "9a6c13822c9815993c03b6f8fccc370fcffb3c158d9754f67b1fdee6b3a5d928", [:mix], [{:cowboy, "~> 1.0.1 or ~> 1.1 or ~> 2.4", [hex: :cowboy, repo: "hexpm", optional: true]}, {:gen_smtp, "~> 0.12", [hex: :gen_smtp, repo: "hexpm", optional: true]}, {:hackney, "~> 1.9", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:mime, "~> 1.1", [hex: :mime, repo: "hexpm", optional: false]}, {:plug, "~> 1.4", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm"},
	"syslog": {:git, "https://github.com/Vagabond/erlang-syslog.git", "4a6c6f2c996483e86c1320e9553f91d337bcb6aa", [tag: "1.0.5"]},
	"telemetry": {:hex, :telemetry, "0.4.0", "8339bee3fa8b91cb84d14c2935f8ecf399ccd87301ad6da6b71c09553834b2ab", [:rebar3], [], "hexpm"},
	"tesla": {:hex, :tesla, "1.2.1", "864783cc27f71dd8c8969163704752476cec0f3a51eb3b06393b3971dc9733ff", [:mix], [{:exjsx, ">= 3.0.0", [hex: :exjsx, repo: "hexpm", optional: true]}, {:fuse, "~> 2.4", [hex: :fuse, repo: "hexpm", optional: true]}, {:hackney, "~> 1.6", [hex: :hackney, repo: "hexpm", optional: true]}, {:ibrowse, "~> 4.4.0", [hex: :ibrowse, repo: "hexpm", optional: true]}, {:jason, ">= 1.0.0", [hex: :jason, repo: "hexpm", optional: true]}, {:mime, "~> 1.0", [hex: :mime, repo: "hexpm", optional: false]}, {:poison, ">= 1.0.0", [hex: :poison, repo: "hexpm", optional: true]}], "hexpm"},
	"timex": {:hex, :timex, "3.5.0", "b0a23167da02d0fe4f1a4e104d1f929a00d348502b52432c05de875d0b9cffa5", [:mix], [{:combine, "~> 0.10", [hex: :combine, repo: "hexpm", optional: false]}, {:gettext, "~> 0.10", [hex: :gettext, repo: "hexpm", optional: false]}, {:tzdata, "~> 0.1.8 or ~> 0.5", [hex: :tzdata, repo: "hexpm", optional: false]}], "hexpm"},
	"trailing_format_plug": {:hex, :trailing_format_plug, "0.0.7", "64b877f912cf7273bed03379936df39894149e35137ac9509117e59866e10e45", [:mix], [{:plug, "> 0.12.0", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"},
	"tzdata": {:hex, :tzdata, "0.5.20", "304b9e98a02840fb32a43ec111ffbe517863c8566eb04a061f1c4dbb90b4d84c", [:mix], [{:hackney, "~> 1.0", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm"},
	"ueberauth": {:hex, :ueberauth, "0.6.1", "9e90d3337dddf38b1ca2753aca9b1e53d8a52b890191cdc55240247c89230412", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"},
	"unicode_util_compat": {:hex, :unicode_util_compat, "0.4.1", "d869e4c68901dd9531385bb0c8c40444ebf624e60b6962d95952775cac5e90cd", [:rebar3], [], "hexpm"},
	"unsafe": {:hex, :unsafe, "1.0.0", "7c21742cd05380c7875546b023481d3a26f52df8e5dfedcb9f958f322baae305", [:mix], [], "hexpm"},
	"web_push_encryption": {:hex, :web_push_encryption, "0.2.1", "d42cecf73420d9dc0053ba3299cc8c8d6ff2be2487d67ca2a57265868e4d9a98", [:mix], [{:httpoison, "~> 1.0", [hex: :httpoison, repo: "hexpm", optional: false]}, {:jose, "~> 1.8", [hex: :jose, repo: "hexpm", optional: false]}, {:poison, "~> 3.0", [hex: :poison, repo: "hexpm", optional: false]}], "hexpm"},
	"websocket_client": {:git, "https://github.com/jeremyong/websocket_client.git", "9a6f65d05ebf2725d62fb19262b21f1805a59fbf", []},
	}
	diff --git a/priv/templates/sample_config.eex b/priv/templates/sample_config.eex
	index 2d4a49328..5cc31c604 100644
	--- a/priv/templates/sample_config.eex
	+++ b/priv/templates/sample_config.eex
	@@ -1,86 +1,69 @@
	# Pleroma instance configuration

	# NOTE: This file should not be committed to a repo or otherwise made public
	# without removing sensitive information.

	<%= if Code.ensure_loaded?(Config) or not Code.ensure_loaded?(Mix.Config) do
	"import Config"
	else
	"use Mix.Config"
	end %>

	config :pleroma, Pleroma.Web.Endpoint,
	url: [host: "<%= domain %>", scheme: "https", port: <%= port %>],
	secret_key_base: "<%= secret %>",
	signing_salt: "<%= signing_salt %>"

	config :pleroma, :instance,
	name: "<%= name %>",
	email: "<%= email %>",
	notify_email: "<%= notify_email %>",
	limit: 5000,
	registrations_open: true,
	dynamic_configuration: <%= db_configurable? %>

	config :pleroma, :media_proxy,
	enabled: false,
	redirect_on_failure: true
	#base_url: "https://cache.pleroma.social"

	config :pleroma, Pleroma.Repo,
	adapter: Ecto.Adapters.Postgres,
	username: "<%= dbuser %>",
	password: "<%= dbpass %>",
	database: "<%= dbname %>",
	hostname: "<%= dbhost %>",
	pool_size: 10

	# Configure web push notifications
	config :web_push_encryption, :vapid_details,
	subject: "mailto:<%= email %>",
	public_key: "<%= web_push_public_key %>",
	private_key: "<%= web_push_private_key %>"

	config :pleroma, :database, rum_enabled: <%= rum_enabled %>
	config :pleroma, :instance, static_dir: "<%= static_dir %>"
	config :pleroma, Pleroma.Uploaders.Local, uploads: "<%= uploads_dir %>"

	# Enable Strict-Transport-Security once SSL is working:
	# config :pleroma, :http_security,
	# sts: true

	# Configure S3 support if desired.
	# The public S3 endpoint is different depending on region and provider,
	# consult your S3 provider's documentation for details on what to use.
	#
	# config :pleroma, Pleroma.Uploaders.S3,
	# bucket: "some-bucket",
	# public_endpoint: "https://s3.amazonaws.com"
	#
	# Configure S3 credentials:
	# config :ex_aws, :s3,
	# access_key_id: "xxxxxxxxxxxxx",
	# secret_access_key: "yyyyyyyyyyyy",
	# region: "us-east-1",
	# scheme: "https://"
	#
	# For using third-party S3 clones like wasabi, also do:
	# config :ex_aws, :s3,
	# host: "s3.wasabisys.com"
	-
	-
	-# Configure Openstack Swift support if desired.
	-#
	-# Many openstack deployments are different, so config is left very open with
	-# no assumptions made on which provider you're using. This should allow very
	-# wide support without needing separate handlers for OVH, Rackspace, etc.
	-#
	-# config :pleroma, Pleroma.Uploaders.Swift,
	-# container: "some-container",
	-# username: "api-username-yyyy",
	-# password: "api-key-xxxx",
	-# tenant_id: "<openstack-project/tenant-id>",
	-# auth_url: "https://keystone-endpoint.provider.com",
	-# storage_url: "https://swift-endpoint.prodider.com/v1/AUTH_<tenant>/<container>",
	-# object_url: "https://cdn-endpoint.provider.com/<container>"
	-#
	diff --git a/test/fixtures/httpoison_mock/7369654.atom b/test/fixtures/tesla_mock/7369654.atom
	similarity index 100%
	rename from test/fixtures/httpoison_mock/7369654.atom
	rename to test/fixtures/tesla_mock/7369654.atom
	diff --git a/test/fixtures/httpoison_mock/7369654.html b/test/fixtures/tesla_mock/7369654.html
	similarity index 100%
	rename from test/fixtures/httpoison_mock/7369654.html
	rename to test/fixtures/tesla_mock/7369654.html
	diff --git a/test/fixtures/httpoison_mock/7even.json b/test/fixtures/tesla_mock/7even.json
	similarity index 100%
	rename from test/fixtures/httpoison_mock/7even.json
	rename to test/fixtures/tesla_mock/7even.json
	diff --git a/test/fixtures/httpoison_mock/admin@mastdon.example.org.json b/test/fixtures/tesla_mock/admin@mastdon.example.org.json
	similarity index 100%
	rename from test/fixtures/httpoison_mock/admin@mastdon.example.org.json
	rename to test/fixtures/tesla_mock/admin@mastdon.example.org.json
	diff --git a/test/fixtures/httpoison_mock/atarifrosch_feed.xml b/test/fixtures/tesla_mock/atarifrosch_feed.xml
	similarity index 100%
	rename from test/fixtures/httpoison_mock/atarifrosch_feed.xml
	rename to test/fixtures/tesla_mock/atarifrosch_feed.xml
	diff --git a/test/fixtures/httpoison_mock/atarifrosch_webfinger.xml b/test/fixtures/tesla_mock/atarifrosch_webfinger.xml
	similarity index 100%
	rename from test/fixtures/httpoison_mock/atarifrosch_webfinger.xml
	rename to test/fixtures/tesla_mock/atarifrosch_webfinger.xml
	diff --git a/test/fixtures/httpoison_mock/baptiste.gelex.xyz-article.json b/test/fixtures/tesla_mock/baptiste.gelex.xyz-article.json
	similarity index 100%
	rename from test/fixtures/httpoison_mock/baptiste.gelex.xyz-article.json
	rename to test/fixtures/tesla_mock/baptiste.gelex.xyz-article.json
	diff --git a/test/fixtures/httpoison_mock/baptiste.gelex.xyz-user.json b/test/fixtures/tesla_mock/baptiste.gelex.xyz-user.json
	similarity index 100%
	rename from test/fixtures/httpoison_mock/baptiste.gelex.xyz-user.json
	rename to test/fixtures/tesla_mock/baptiste.gelex.xyz-user.json
	diff --git a/test/fixtures/httpoison_mock/eal_sakamoto.xml b/test/fixtures/tesla_mock/eal_sakamoto.xml
	similarity index 100%
	rename from test/fixtures/httpoison_mock/eal_sakamoto.xml
	rename to test/fixtures/tesla_mock/eal_sakamoto.xml
	diff --git a/test/fixtures/httpoison_mock/emelie.atom b/test/fixtures/tesla_mock/emelie.atom
	similarity index 100%
	rename from test/fixtures/httpoison_mock/emelie.atom
	rename to test/fixtures/tesla_mock/emelie.atom
	diff --git a/test/fixtures/httpoison_mock/emelie.json b/test/fixtures/tesla_mock/emelie.json
	similarity index 100%
	rename from test/fixtures/httpoison_mock/emelie.json
	rename to test/fixtures/tesla_mock/emelie.json
	diff --git a/test/fixtures/httpoison_mock/framasoft@framatube.org.json b/test/fixtures/tesla_mock/framasoft@framatube.org.json
	similarity index 100%
	rename from test/fixtures/httpoison_mock/framasoft@framatube.org.json
	rename to test/fixtures/tesla_mock/framasoft@framatube.org.json
	diff --git a/test/fixtures/httpoison_mock/framatube.org_host_meta b/test/fixtures/tesla_mock/framatube.org_host_meta
	similarity index 100%
	rename from test/fixtures/httpoison_mock/framatube.org_host_meta
	rename to test/fixtures/tesla_mock/framatube.org_host_meta
	diff --git a/test/fixtures/httpoison_mock/gerzilla.de_host_meta b/test/fixtures/tesla_mock/gerzilla.de_host_meta
	similarity index 100%
	rename from test/fixtures/httpoison_mock/gerzilla.de_host_meta
	rename to test/fixtures/tesla_mock/gerzilla.de_host_meta
	diff --git a/test/fixtures/httpoison_mock/gnusocial.de_host_meta b/test/fixtures/tesla_mock/gnusocial.de_host_meta
	similarity index 100%
	rename from test/fixtures/httpoison_mock/gnusocial.de_host_meta
	rename to test/fixtures/tesla_mock/gnusocial.de_host_meta
	diff --git a/test/fixtures/httpoison_mock/gs.example.org_host_meta b/test/fixtures/tesla_mock/gs.example.org_host_meta
	similarity index 100%
	rename from test/fixtures/httpoison_mock/gs.example.org_host_meta
	rename to test/fixtures/tesla_mock/gs.example.org_host_meta
	diff --git a/test/fixtures/httpoison_mock/hellpie.json b/test/fixtures/tesla_mock/hellpie.json
	similarity index 100%
	rename from test/fixtures/httpoison_mock/hellpie.json
	rename to test/fixtures/tesla_mock/hellpie.json
	diff --git a/test/fixtures/httpoison_mock/http___gs.example.org_4040_index.php_user_1.xml b/test/fixtures/tesla_mock/http___gs.example.org_4040_index.php_user_1.xml
	similarity index 100%
	rename from test/fixtures/httpoison_mock/http___gs.example.org_4040_index.php_user_1.xml
	rename to test/fixtures/tesla_mock/http___gs.example.org_4040_index.php_user_1.xml
	diff --git a/test/fixtures/httpoison_mock/http___mastodon.example.org_users_admin_status_1234.json b/test/fixtures/tesla_mock/http___mastodon.example.org_users_admin_status_1234.json
	similarity index 100%
	rename from test/fixtures/httpoison_mock/http___mastodon.example.org_users_admin_status_1234.json
	rename to test/fixtures/tesla_mock/http___mastodon.example.org_users_admin_status_1234.json
	diff --git a/test/fixtures/httpoison_mock/http__gs.example.org_index.php_api_statuses_user_timeline_1.atom.xml b/test/fixtures/tesla_mock/http__gs.example.org_index.php_api_statuses_user_timeline_1.atom.xml
	similarity index 100%
	rename from test/fixtures/httpoison_mock/http__gs.example.org_index.php_api_statuses_user_timeline_1.atom.xml
	rename to test/fixtures/tesla_mock/http__gs.example.org_index.php_api_statuses_user_timeline_1.atom.xml
	diff --git a/test/fixtures/httpoison_mock/https___info.pleroma.site_actor.json b/test/fixtures/tesla_mock/https___info.pleroma.site_actor.json
	similarity index 100%
	rename from test/fixtures/httpoison_mock/https___info.pleroma.site_actor.json
	rename to test/fixtures/tesla_mock/https___info.pleroma.site_actor.json
	diff --git a/test/fixtures/httpoison_mock/https___mamot.fr_users_Skruyb.atom b/test/fixtures/tesla_mock/https___mamot.fr_users_Skruyb.atom
	similarity index 100%
	rename from test/fixtures/httpoison_mock/https___mamot.fr_users_Skruyb.atom
	rename to test/fixtures/tesla_mock/https___mamot.fr_users_Skruyb.atom
	diff --git a/test/fixtures/httpoison_mock/https___mastodon.social_users_lambadalambda.atom b/test/fixtures/tesla_mock/https___mastodon.social_users_lambadalambda.atom
	similarity index 100%
	rename from test/fixtures/httpoison_mock/https___mastodon.social_users_lambadalambda.atom
	rename to test/fixtures/tesla_mock/https___mastodon.social_users_lambadalambda.atom
	diff --git a/test/fixtures/httpoison_mock/https___mastodon.social_users_lambadalambda.xml b/test/fixtures/tesla_mock/https___mastodon.social_users_lambadalambda.xml
	similarity index 100%
	rename from test/fixtures/httpoison_mock/https___mastodon.social_users_lambadalambda.xml
	rename to test/fixtures/tesla_mock/https___mastodon.social_users_lambadalambda.xml
	diff --git a/test/fixtures/httpoison_mock/https___osada.macgirvin.com_channel_mike.json b/test/fixtures/tesla_mock/https___osada.macgirvin.com_channel_mike.json
	similarity index 100%
	rename from test/fixtures/httpoison_mock/https___osada.macgirvin.com_channel_mike.json
	rename to test/fixtures/tesla_mock/https___osada.macgirvin.com_channel_mike.json
	diff --git a/test/fixtures/httpoison_mock/https___pawoo.net_users_aqidaqidaqid.xml b/test/fixtures/tesla_mock/https___pawoo.net_users_aqidaqidaqid.xml
	similarity index 100%
	rename from test/fixtures/httpoison_mock/https___pawoo.net_users_aqidaqidaqid.xml
	rename to test/fixtures/tesla_mock/https___pawoo.net_users_aqidaqidaqid.xml
	diff --git a/test/fixtures/httpoison_mock/https___pawoo.net_users_pekorino.atom b/test/fixtures/tesla_mock/https___pawoo.net_users_pekorino.atom
	similarity index 100%
	rename from test/fixtures/httpoison_mock/https___pawoo.net_users_pekorino.atom
	rename to test/fixtures/tesla_mock/https___pawoo.net_users_pekorino.atom
	diff --git a/test/fixtures/httpoison_mock/https___pawoo.net_users_pekorino.xml b/test/fixtures/tesla_mock/https___pawoo.net_users_pekorino.xml
	similarity index 100%
	rename from test/fixtures/httpoison_mock/https___pawoo.net_users_pekorino.xml
	rename to test/fixtures/tesla_mock/https___pawoo.net_users_pekorino.xml
	diff --git a/test/fixtures/httpoison_mock/https___pleroma.soykaf.com_users_lain.xml b/test/fixtures/tesla_mock/https___pleroma.soykaf.com_users_lain.xml
	similarity index 100%
	rename from test/fixtures/httpoison_mock/https___pleroma.soykaf.com_users_lain.xml
	rename to test/fixtures/tesla_mock/https___pleroma.soykaf.com_users_lain.xml
	diff --git a/test/fixtures/httpoison_mock/https___pleroma.soykaf.com_users_lain_feed.atom.xml b/test/fixtures/tesla_mock/https___pleroma.soykaf.com_users_lain_feed.atom.xml
	similarity index 100%
	rename from test/fixtures/httpoison_mock/https___pleroma.soykaf.com_users_lain_feed.atom.xml
	rename to test/fixtures/tesla_mock/https___pleroma.soykaf.com_users_lain_feed.atom.xml
	diff --git a/test/fixtures/httpoison_mock/https___prismo.news__mxb.json b/test/fixtures/tesla_mock/https___prismo.news__mxb.json
	similarity index 100%
	rename from test/fixtures/httpoison_mock/https___prismo.news__mxb.json
	rename to test/fixtures/tesla_mock/https___prismo.news__mxb.json
	diff --git a/test/fixtures/httpoison_mock/https___shitposter.club_api_statuses_show_2827873.atom.xml b/test/fixtures/tesla_mock/https___shitposter.club_api_statuses_show_2827873.atom.xml
	similarity index 100%
	rename from test/fixtures/httpoison_mock/https___shitposter.club_api_statuses_show_2827873.atom.xml
	rename to test/fixtures/tesla_mock/https___shitposter.club_api_statuses_show_2827873.atom.xml
	diff --git a/test/fixtures/httpoison_mock/https___shitposter.club_api_statuses_user_timeline_1.atom.xml b/test/fixtures/tesla_mock/https___shitposter.club_api_statuses_user_timeline_1.atom.xml
	similarity index 100%
	rename from test/fixtures/httpoison_mock/https___shitposter.club_api_statuses_user_timeline_1.atom.xml
	rename to test/fixtures/tesla_mock/https___shitposter.club_api_statuses_user_timeline_1.atom.xml
	diff --git a/test/fixtures/httpoison_mock/https___shitposter.club_notice_2827873.html b/test/fixtures/tesla_mock/https___shitposter.club_notice_2827873.html
	similarity index 100%
	rename from test/fixtures/httpoison_mock/https___shitposter.club_notice_2827873.html
	rename to test/fixtures/tesla_mock/https___shitposter.club_notice_2827873.html
	diff --git a/test/fixtures/httpoison_mock/https___shitposter.club_user_1.xml b/test/fixtures/tesla_mock/https___shitposter.club_user_1.xml
	similarity index 100%
	rename from test/fixtures/httpoison_mock/https___shitposter.club_user_1.xml
	rename to test/fixtures/tesla_mock/https___shitposter.club_user_1.xml
	diff --git a/test/fixtures/httpoison_mock/https___social.heldscal.la_api_statuses_user_timeline_23211.atom.xml b/test/fixtures/tesla_mock/https___social.heldscal.la_api_statuses_user_timeline_23211.atom.xml
	similarity index 100%
	rename from test/fixtures/httpoison_mock/https___social.heldscal.la_api_statuses_user_timeline_23211.atom.xml
	rename to test/fixtures/tesla_mock/https___social.heldscal.la_api_statuses_user_timeline_23211.atom.xml
	diff --git a/test/fixtures/httpoison_mock/https___social.heldscal.la_api_statuses_user_timeline_29191.atom.xml b/test/fixtures/tesla_mock/https___social.heldscal.la_api_statuses_user_timeline_29191.atom.xml
	similarity index 100%
	rename from test/fixtures/httpoison_mock/https___social.heldscal.la_api_statuses_user_timeline_29191.atom.xml
	rename to test/fixtures/tesla_mock/https___social.heldscal.la_api_statuses_user_timeline_29191.atom.xml
	diff --git a/test/fixtures/httpoison_mock/https___social.heldscal.la_user_23211.xml b/test/fixtures/tesla_mock/https___social.heldscal.la_user_23211.xml
	similarity index 100%
	rename from test/fixtures/httpoison_mock/https___social.heldscal.la_user_23211.xml
	rename to test/fixtures/tesla_mock/https___social.heldscal.la_user_23211.xml
	diff --git a/test/fixtures/httpoison_mock/https___social.heldscal.la_user_29191.xml b/test/fixtures/tesla_mock/https___social.heldscal.la_user_29191.xml
	similarity index 100%
	rename from test/fixtures/httpoison_mock/https___social.heldscal.la_user_29191.xml
	rename to test/fixtures/tesla_mock/https___social.heldscal.la_user_29191.xml
	diff --git a/test/fixtures/httpoison_mock/https__info.pleroma.site_activity.json b/test/fixtures/tesla_mock/https__info.pleroma.site_activity.json
	similarity index 100%
	rename from test/fixtures/httpoison_mock/https__info.pleroma.site_activity.json
	rename to test/fixtures/tesla_mock/https__info.pleroma.site_activity.json
	diff --git a/test/fixtures/httpoison_mock/https__info.pleroma.site_activity2.json b/test/fixtures/tesla_mock/https__info.pleroma.site_activity2.json
	similarity index 100%
	rename from test/fixtures/httpoison_mock/https__info.pleroma.site_activity2.json
	rename to test/fixtures/tesla_mock/https__info.pleroma.site_activity2.json
	diff --git a/test/fixtures/httpoison_mock/https__info.pleroma.site_activity3.json b/test/fixtures/tesla_mock/https__info.pleroma.site_activity3.json
	similarity index 100%
	rename from test/fixtures/httpoison_mock/https__info.pleroma.site_activity3.json
	rename to test/fixtures/tesla_mock/https__info.pleroma.site_activity3.json
	diff --git a/test/fixtures/httpoison_mock/https__info.pleroma.site_activity4.json b/test/fixtures/tesla_mock/https__info.pleroma.site_activity4.json
	similarity index 100%
	rename from test/fixtures/httpoison_mock/https__info.pleroma.site_activity4.json
	rename to test/fixtures/tesla_mock/https__info.pleroma.site_activity4.json
	diff --git a/test/fixtures/httpoison_mock/kaniini@gerzilla.de.json b/test/fixtures/tesla_mock/kaniini@gerzilla.de.json
	similarity index 100%
	rename from test/fixtures/httpoison_mock/kaniini@gerzilla.de.json
	rename to test/fixtures/tesla_mock/kaniini@gerzilla.de.json
	diff --git a/test/fixtures/httpoison_mock/kaniini@hubzilla.example.org.json b/test/fixtures/tesla_mock/kaniini@hubzilla.example.org.json
	similarity index 100%
	rename from test/fixtures/httpoison_mock/kaniini@hubzilla.example.org.json
	rename to test/fixtures/tesla_mock/kaniini@hubzilla.example.org.json
	diff --git a/test/fixtures/httpoison_mock/lain_squeet.me_webfinger.xml b/test/fixtures/tesla_mock/lain_squeet.me_webfinger.xml
	similarity index 100%
	rename from test/fixtures/httpoison_mock/lain_squeet.me_webfinger.xml
	rename to test/fixtures/tesla_mock/lain_squeet.me_webfinger.xml
	diff --git a/test/fixtures/httpoison_mock/lucifermysticus.json b/test/fixtures/tesla_mock/lucifermysticus.json
	similarity index 100%
	rename from test/fixtures/httpoison_mock/lucifermysticus.json
	rename to test/fixtures/tesla_mock/lucifermysticus.json
	diff --git a/test/fixtures/httpoison_mock/macgirvin.com_host_meta b/test/fixtures/tesla_mock/macgirvin.com_host_meta
	similarity index 100%
	rename from test/fixtures/httpoison_mock/macgirvin.com_host_meta
	rename to test/fixtures/tesla_mock/macgirvin.com_host_meta
	diff --git a/test/fixtures/httpoison_mock/mamot.fr_host_meta b/test/fixtures/tesla_mock/mamot.fr_host_meta
	similarity index 100%
	rename from test/fixtures/httpoison_mock/mamot.fr_host_meta
	rename to test/fixtures/tesla_mock/mamot.fr_host_meta
	diff --git a/test/fixtures/httpoison_mock/mastodon.social_host_meta b/test/fixtures/tesla_mock/mastodon.social_host_meta
	similarity index 100%
	rename from test/fixtures/httpoison_mock/mastodon.social_host_meta
	rename to test/fixtures/tesla_mock/mastodon.social_host_meta
	diff --git a/test/fixtures/httpoison_mock/mastodon.xyz_host_meta b/test/fixtures/tesla_mock/mastodon.xyz_host_meta
	similarity index 100%
	rename from test/fixtures/httpoison_mock/mastodon.xyz_host_meta
	rename to test/fixtures/tesla_mock/mastodon.xyz_host_meta
	diff --git a/test/fixtures/httpoison_mock/mayumayu.json b/test/fixtures/tesla_mock/mayumayu.json
	similarity index 100%
	rename from test/fixtures/httpoison_mock/mayumayu.json
	rename to test/fixtures/tesla_mock/mayumayu.json
	diff --git a/test/fixtures/httpoison_mock/mayumayupost.json b/test/fixtures/tesla_mock/mayumayupost.json
	similarity index 100%
	rename from test/fixtures/httpoison_mock/mayumayupost.json
	rename to test/fixtures/tesla_mock/mayumayupost.json
	diff --git a/test/fixtures/httpoison_mock/mike@osada.macgirvin.com.json b/test/fixtures/tesla_mock/mike@osada.macgirvin.com.json
	similarity index 100%
	rename from test/fixtures/httpoison_mock/mike@osada.macgirvin.com.json
	rename to test/fixtures/tesla_mock/mike@osada.macgirvin.com.json
	diff --git a/test/fixtures/httpoison_mock/nonexistant@social.heldscal.la.xml b/test/fixtures/tesla_mock/nonexistant@social.heldscal.la.xml
	similarity index 100%
	rename from test/fixtures/httpoison_mock/nonexistant@social.heldscal.la.xml
	rename to test/fixtures/tesla_mock/nonexistant@social.heldscal.la.xml
	diff --git a/test/fixtures/httpoison_mock/pawoo.net_host_meta b/test/fixtures/tesla_mock/pawoo.net_host_meta
	similarity index 100%
	rename from test/fixtures/httpoison_mock/pawoo.net_host_meta
	rename to test/fixtures/tesla_mock/pawoo.net_host_meta
	diff --git a/test/fixtures/httpoison_mock/peertube.moe-vid.json b/test/fixtures/tesla_mock/peertube.moe-vid.json
	similarity index 100%
	rename from test/fixtures/httpoison_mock/peertube.moe-vid.json
	rename to test/fixtures/tesla_mock/peertube.moe-vid.json
	diff --git a/test/fixtures/httpoison_mock/pleroma.soykaf.com_host_meta b/test/fixtures/tesla_mock/pleroma.soykaf.com_host_meta
	similarity index 100%
	rename from test/fixtures/httpoison_mock/pleroma.soykaf.com_host_meta
	rename to test/fixtures/tesla_mock/pleroma.soykaf.com_host_meta
	diff --git a/test/fixtures/httpoison_mock/puckipedia.com.json b/test/fixtures/tesla_mock/puckipedia.com.json
	similarity index 100%
	rename from test/fixtures/httpoison_mock/puckipedia.com.json
	rename to test/fixtures/tesla_mock/puckipedia.com.json
	diff --git a/test/fixtures/httpoison_mock/rinpatch.json b/test/fixtures/tesla_mock/rinpatch.json
	similarity index 100%
	rename from test/fixtures/httpoison_mock/rinpatch.json
	rename to test/fixtures/tesla_mock/rinpatch.json
	diff --git a/test/fixtures/httpoison_mock/rye.json b/test/fixtures/tesla_mock/rye.json
	similarity index 100%
	rename from test/fixtures/httpoison_mock/rye.json
	rename to test/fixtures/tesla_mock/rye.json
	diff --git a/test/fixtures/httpoison_mock/sakamoto.atom b/test/fixtures/tesla_mock/sakamoto.atom
	similarity index 100%
	rename from test/fixtures/httpoison_mock/sakamoto.atom
	rename to test/fixtures/tesla_mock/sakamoto.atom
	diff --git a/test/fixtures/httpoison_mock/sakamoto_eal_feed.atom b/test/fixtures/tesla_mock/sakamoto_eal_feed.atom
	similarity index 100%
	rename from test/fixtures/httpoison_mock/sakamoto_eal_feed.atom
	rename to test/fixtures/tesla_mock/sakamoto_eal_feed.atom
	diff --git a/test/fixtures/httpoison_mock/shitposter.club_host_meta b/test/fixtures/tesla_mock/shitposter.club_host_meta
	similarity index 100%
	rename from test/fixtures/httpoison_mock/shitposter.club_host_meta
	rename to test/fixtures/tesla_mock/shitposter.club_host_meta
	diff --git a/test/fixtures/httpoison_mock/shp@pleroma.soykaf.com.feed b/test/fixtures/tesla_mock/shp@pleroma.soykaf.com.feed
	similarity index 100%
	rename from test/fixtures/httpoison_mock/shp@pleroma.soykaf.com.feed
	rename to test/fixtures/tesla_mock/shp@pleroma.soykaf.com.feed
	diff --git a/test/fixtures/httpoison_mock/shp@pleroma.soykaf.com.webfigner b/test/fixtures/tesla_mock/shp@pleroma.soykaf.com.webfigner
	similarity index 100%
	rename from test/fixtures/httpoison_mock/shp@pleroma.soykaf.com.webfigner
	rename to test/fixtures/tesla_mock/shp@pleroma.soykaf.com.webfigner
	diff --git a/test/fixtures/httpoison_mock/shp@social.heldscal.la.xml b/test/fixtures/tesla_mock/shp@social.heldscal.la.xml
	similarity index 100%
	rename from test/fixtures/httpoison_mock/shp@social.heldscal.la.xml
	rename to test/fixtures/tesla_mock/shp@social.heldscal.la.xml
	diff --git a/test/fixtures/httpoison_mock/skruyb@mamot.fr.atom b/test/fixtures/tesla_mock/skruyb@mamot.fr.atom
	similarity index 100%
	rename from test/fixtures/httpoison_mock/skruyb@mamot.fr.atom
	rename to test/fixtures/tesla_mock/skruyb@mamot.fr.atom
	diff --git a/test/fixtures/httpoison_mock/social.heldscal.la_host_meta b/test/fixtures/tesla_mock/social.heldscal.la_host_meta
	similarity index 100%
	rename from test/fixtures/httpoison_mock/social.heldscal.la_host_meta
	rename to test/fixtures/tesla_mock/social.heldscal.la_host_meta
	diff --git a/test/fixtures/httpoison_mock/social.sakamoto.gq_host_meta b/test/fixtures/tesla_mock/social.sakamoto.gq_host_meta
	similarity index 100%
	rename from test/fixtures/httpoison_mock/social.sakamoto.gq_host_meta
	rename to test/fixtures/tesla_mock/social.sakamoto.gq_host_meta
	diff --git a/test/fixtures/httpoison_mock/social.stopwatchingus-heidelberg.de_host_meta b/test/fixtures/tesla_mock/social.stopwatchingus-heidelberg.de_host_meta
	similarity index 100%
	rename from test/fixtures/httpoison_mock/social.stopwatchingus-heidelberg.de_host_meta
	rename to test/fixtures/tesla_mock/social.stopwatchingus-heidelberg.de_host_meta
	diff --git a/test/fixtures/httpoison_mock/social.wxcafe.net_host_meta b/test/fixtures/tesla_mock/social.wxcafe.net_host_meta
	similarity index 100%
	rename from test/fixtures/httpoison_mock/social.wxcafe.net_host_meta
	rename to test/fixtures/tesla_mock/social.wxcafe.net_host_meta
	diff --git a/test/fixtures/httpoison_mock/spc_5381.atom b/test/fixtures/tesla_mock/spc_5381.atom
	similarity index 100%
	rename from test/fixtures/httpoison_mock/spc_5381.atom
	rename to test/fixtures/tesla_mock/spc_5381.atom
	diff --git a/test/fixtures/httpoison_mock/spc_5381_xrd.xml b/test/fixtures/tesla_mock/spc_5381_xrd.xml
	similarity index 100%
	rename from test/fixtures/httpoison_mock/spc_5381_xrd.xml
	rename to test/fixtures/tesla_mock/spc_5381_xrd.xml
	diff --git a/test/fixtures/httpoison_mock/squeet.me_host_meta b/test/fixtures/tesla_mock/squeet.me_host_meta
	similarity index 100%
	rename from test/fixtures/httpoison_mock/squeet.me_host_meta
	rename to test/fixtures/tesla_mock/squeet.me_host_meta
	diff --git a/test/fixtures/httpoison_mock/status.alpicola.com_host_meta b/test/fixtures/tesla_mock/status.alpicola.com_host_meta
	similarity index 100%
	rename from test/fixtures/httpoison_mock/status.alpicola.com_host_meta
	rename to test/fixtures/tesla_mock/status.alpicola.com_host_meta
	diff --git a/test/fixtures/httpoison_mock/status.emelie.json b/test/fixtures/tesla_mock/status.emelie.json
	similarity index 100%
	rename from test/fixtures/httpoison_mock/status.emelie.json
	rename to test/fixtures/tesla_mock/status.emelie.json
	diff --git a/test/fixtures/httpoison_mock/webfinger_emelie.json b/test/fixtures/tesla_mock/webfinger_emelie.json
	similarity index 100%
	rename from test/fixtures/httpoison_mock/webfinger_emelie.json
	rename to test/fixtures/tesla_mock/webfinger_emelie.json
	diff --git a/test/fixtures/httpoison_mock/winterdienst_webfinger.json b/test/fixtures/tesla_mock/winterdienst_webfinger.json
	similarity index 100%
	rename from test/fixtures/httpoison_mock/winterdienst_webfinger.json
	rename to test/fixtures/tesla_mock/winterdienst_webfinger.json
	diff --git a/test/http/request_builder_test.exs b/test/http/request_builder_test.exs
	new file mode 100644
	index 000000000..a368999ff
	--- /dev/null
	+++ b/test/http/request_builder_test.exs
	@@ -0,0 +1,91 @@
	+defmodule Pleroma.HTTP.RequestBuilderTest do
	+ use ExUnit.Case, async: true
	+ alias Pleroma.HTTP.RequestBuilder
	+
	+ describe "headers/2" do
	+ test "don't send pleroma user agent" do
	+ assert RequestBuilder.headers(%{}, []) == %{headers: []}
	+ end
	+
	+ test "send pleroma user agent" do
	+ send = Pleroma.Config.get([:http, :send_user_agent])
	+ Pleroma.Config.put([:http, :send_user_agent], true)
	+
	+ on_exit(fn ->
	+ Pleroma.Config.put([:http, :send_user_agent], send)
	+ end)
	+
	+ assert RequestBuilder.headers(%{}, []) == %{
	+ headers: [{"User-Agent", Pleroma.Application.user_agent()}]
	+ }
	+ end
	+ end
	+
	+ describe "add_optional_params/3" do
	+ test "don't add if keyword is empty" do
	+ assert RequestBuilder.add_optional_params(%{}, %{}, []) == %{}
	+ end
	+
	+ test "add query parameter" do
	+ assert RequestBuilder.add_optional_params(
	+ %{},
	+ %{query: :query, body: :body, another: :val},
	+ [
	+ {:query, "param1=val1&param2=val2"},
	+ {:body, "some body"}
	+ ]
	+ ) == %{query: "param1=val1&param2=val2", body: "some body"}
	+ end
	+ end
	+
	+ describe "add_param/4" do
	+ test "add file parameter" do
	+ %{
	+ body: %Tesla.Multipart{
	+ boundary: _,
	+ content_type_params: [],
	+ parts: [
	+ %Tesla.Multipart.Part{
	+ body: %File.Stream{
	+ line_or_bytes: 2048,
	+ modes: [:raw, :read_ahead, :read, :binary],
	+ path: "some-path/filename.png",
	+ raw: true
	+ },
	+ dispositions: [name: "filename.png", filename: "filename.png"],
	+ headers: []
	+ }
	+ ]
	+ }
	+ } = RequestBuilder.add_param(%{}, :file, "filename.png", "some-path/filename.png")
	+ end
	+
	+ test "add key to body" do
	+ %{
	+ body: %Tesla.Multipart{
	+ boundary: _,
	+ content_type_params: [],
	+ parts: [
	+ %Tesla.Multipart.Part{
	+ body: "\"someval\"",
	+ dispositions: [name: "somekey"],
	+ headers: ["Content-Type": "application/json"]
	+ }
	+ ]
	+ }
	+ } = RequestBuilder.add_param(%{}, :body, "somekey", "someval")
	+ end
	+
	+ test "add form parameter" do
	+ assert RequestBuilder.add_param(%{}, :form, "somename", "someval") == %{
	+ body: %{"somename" => "someval"}
	+ }
	+ end
	+
	+ test "add for location" do
	+ assert RequestBuilder.add_param(%{}, :some_location, "somekey", "someval") == %{
	+ some_location: [{"somekey", "someval"}]
	+ }
	+ end
	+ end
	+end
	diff --git a/test/integration/mastodon_websocket_test.exs b/test/integration/mastodon_websocket_test.exs
	index a604713d8..3975cdcd6 100644
	--- a/test/integration/mastodon_websocket_test.exs
	+++ b/test/integration/mastodon_websocket_test.exs
	@@ -1,111 +1,118 @@
	# Pleroma: A lightweight social networking server
	# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/>
	# SPDX-License-Identifier: AGPL-3.0-only

	defmodule Pleroma.Integration.MastodonWebsocketTest do
	use Pleroma.DataCase

	import Pleroma.Factory

	alias Pleroma.Integration.WebsocketClient
	alias Pleroma.Web.CommonAPI
	alias Pleroma.Web.OAuth
	alias Pleroma.Web.Streamer

	@path Pleroma.Web.Endpoint.url()
	\|> URI.parse()
	\|> Map.put(:scheme, "ws")
	\|> Map.put(:path, "/api/v1/streaming")
	\|> URI.to_string()

	setup do
	GenServer.start(Streamer, %{}, name: Streamer)

	on_exit(fn ->
	if pid = Process.whereis(Streamer) do
	Process.exit(pid, :kill)
	end
	end)
	end

	def start_socket(qs \\ nil, headers \\ []) do
	path =
	case qs do
	nil -> @path
	qs -> @path <> qs
	end

	WebsocketClient.start_link(self(), path, headers)
	end

	test "refuses invalid requests" do
	assert {:error, {400, _}} = start_socket()
	assert {:error, {404, _}} = start_socket("?stream=ncjdk")
	end

	test "requires authentication and a valid token for protected streams" do
	assert {:error, {403, _}} = start_socket("?stream=user&access_token=aaaaaaaaaaaa")
	assert {:error, {403, _}} = start_socket("?stream=user")
	end

	test "allows public streams without authentication" do
	assert {:ok, _} = start_socket("?stream=public")
	assert {:ok, _} = start_socket("?stream=public:local")
	assert {:ok, _} = start_socket("?stream=hashtag&tag=lain")
	end

	test "receives well formatted events" do
	user = insert(:user)
	{:ok, _} = start_socket("?stream=public")
	{:ok, activity} = CommonAPI.post(user, %{"status" => "nice echo chamber"})

	assert_receive {:text, raw_json}, 1_000
	assert {:ok, json} = Jason.decode(raw_json)

	assert "update" == json["event"]
	assert json["payload"]
	assert {:ok, json} = Jason.decode(json["payload"])

	view_json =
	Pleroma.Web.MastodonAPI.StatusView.render("status.json", activity: activity, for: nil)
	\|> Jason.encode!()
	\|> Jason.decode!()

	assert json == view_json
	end

	describe "with a valid user token" do
	setup do
	{:ok, app} =
	Pleroma.Repo.insert(
	OAuth.App.register_changeset(%OAuth.App{}, %{
	client_name: "client",
	scopes: ["scope"],
	redirect_uris: "url"
	})
	)

	user = insert(:user)

	{:ok, auth} = OAuth.Authorization.create_authorization(app, user)

	{:ok, token} = OAuth.Token.exchange_token(app, auth)

	%{user: user, token: token}
	end

	test "accepts valid tokens", state do
	assert {:ok, _} = start_socket("?stream=user&access_token=#{state.token.token}")
	end

	test "accepts the 'user' stream", %{token: token} = _state do
	assert {:ok, _} = start_socket("?stream=user&access_token=#{token.token}")
	assert {:error, {403, "Forbidden"}} = start_socket("?stream=user")
	end

	test "accepts the 'user:notification' stream", %{token: token} = _state do
	assert {:ok, _} = start_socket("?stream=user:notification&access_token=#{token.token}")
	assert {:error, {403, "Forbidden"}} = start_socket("?stream=user:notification")
	end
	+
	+ test "accepts valid token on Sec-WebSocket-Protocol header", %{token: token} do
	+ assert {:ok, _} = start_socket("?stream=user", [{"Sec-WebSocket-Protocol", token.token}])
	+
	+ assert {:error, {403, "Forbidden"}} =
	+ start_socket("?stream=user", [{"Sec-WebSocket-Protocol", "I am a friend"}])
	+ end
	end
	end
	diff --git a/test/reverse_proxy_test.exs b/test/reverse_proxy_test.exs
	new file mode 100644
	index 000000000..75a61445a
	--- /dev/null
	+++ b/test/reverse_proxy_test.exs
	@@ -0,0 +1,297 @@
	+defmodule Pleroma.ReverseProxyTest do
	+ use Pleroma.Web.ConnCase, async: true
	+ import ExUnit.CaptureLog
	+ import ExUnit.CaptureLog
	+ import Mox
	+ alias Pleroma.ReverseProxy
	+ alias Pleroma.ReverseProxy.ClientMock
	+
	+ setup_all do
	+ {:ok, _} = Registry.start_link(keys: :unique, name: Pleroma.ReverseProxy.ClientMock)
	+ :ok
	+ end
	+
	+ setup :verify_on_exit!
	+
	+ defp user_agent_mock(user_agent, invokes) do
	+ json = Jason.encode!(%{"user-agent": user_agent})
	+
	+ ClientMock
	+ \|> expect(:request, fn :get, url, _, _, _ ->
	+ Registry.register(Pleroma.ReverseProxy.ClientMock, url, 0)
	+
	+ {:ok, 200,
	+ [
	+ {"content-type", "application/json"},
	+ {"content-length", byte_size(json) \|> to_string()}
	+ ], %{url: url}}
	+ end)
	+ \|> expect(:stream_body, invokes, fn %{url: url} ->
	+ case Registry.lookup(Pleroma.ReverseProxy.ClientMock, url) do
	+ [{_, 0}] ->
	+ Registry.update_value(Pleroma.ReverseProxy.ClientMock, url, &(&1 + 1))
	+ {:ok, json}
	+
	+ [{_, 1}] ->
	+ Registry.unregister(Pleroma.ReverseProxy.ClientMock, url)
	+ :done
	+ end
	+ end)
	+ end
	+
	+ describe "user-agent" do
	+ test "don't keep", %{conn: conn} do
	+ user_agent_mock("hackney/1.15.1", 2)
	+ conn = ReverseProxy.call(conn, "/user-agent")
	+ assert json_response(conn, 200) == %{"user-agent" => "hackney/1.15.1"}
	+ end
	+
	+ test "keep", %{conn: conn} do
	+ user_agent_mock(Pleroma.Application.user_agent(), 2)
	+ conn = ReverseProxy.call(conn, "/user-agent-keep", keep_user_agent: true)
	+ assert json_response(conn, 200) == %{"user-agent" => Pleroma.Application.user_agent()}
	+ end
	+ end
	+
	+ test "closed connection", %{conn: conn} do
	+ ClientMock
	+ \|> expect(:request, fn :get, "/closed", _, _, _ -> {:ok, 200, [], %{}} end)
	+ \|> expect(:stream_body, fn _ -> {:error, :closed} end)
	+ \|> expect(:close, fn _ -> :ok end)
	+
	+ conn = ReverseProxy.call(conn, "/closed")
	+ assert conn.halted
	+ end
	+
	+ describe "max_body " do
	+ test "length returns error if content-length more than option", %{conn: conn} do
	+ user_agent_mock("hackney/1.15.1", 0)
	+
	+ assert capture_log(fn ->
	+ ReverseProxy.call(conn, "/user-agent", max_body_length: 4)
	+ end) =~
	+ "[error] Elixir.Pleroma.ReverseProxy: request to \"/user-agent\" failed: :body_too_large"
	+ end
	+
	+ defp stream_mock(invokes, with_close? \\ false) do
	+ ClientMock
	+ \|> expect(:request, fn :get, "/stream-bytes/" <> length, _, _, _ ->
	+ Registry.register(Pleroma.ReverseProxy.ClientMock, "/stream-bytes/" <> length, 0)
	+
	+ {:ok, 200, [{"content-type", "application/octet-stream"}],
	+ %{url: "/stream-bytes/" <> length}}
	+ end)
	+ \|> expect(:stream_body, invokes, fn %{url: "/stream-bytes/" <> length} ->
	+ max = String.to_integer(length)
	+
	+ case Registry.lookup(Pleroma.ReverseProxy.ClientMock, "/stream-bytes/" <> length) do
	+ [{_, current}] when current < max ->
	+ Registry.update_value(
	+ Pleroma.ReverseProxy.ClientMock,
	+ "/stream-bytes/" <> length,
	+ &(&1 + 10)
	+ )
	+
	+ {:ok, "0123456789"}
	+
	+ [{_, ^max}] ->
	+ Registry.unregister(Pleroma.ReverseProxy.ClientMock, "/stream-bytes/" <> length)
	+ :done
	+ end
	+ end)
	+
	+ if with_close? do
	+ expect(ClientMock, :close, fn _ -> :ok end)
	+ end
	+ end
	+
	+ test "max_body_size returns error if streaming body more than that option", %{conn: conn} do
	+ stream_mock(3, true)
	+
	+ assert capture_log(fn ->
	+ ReverseProxy.call(conn, "/stream-bytes/50", max_body_size: 30)
	+ end) =~
	+ "[warn] Elixir.Pleroma.ReverseProxy request to /stream-bytes/50 failed while reading/chunking: :body_too_large"
	+ end
	+ end
	+
	+ describe "HEAD requests" do
	+ test "common", %{conn: conn} do
	+ ClientMock
	+ \|> expect(:request, fn :head, "/head", _, _, _ ->
	+ {:ok, 200, [{"content-type", "text/html; charset=utf-8"}]}
	+ end)
	+
	+ conn = ReverseProxy.call(Map.put(conn, :method, "HEAD"), "/head")
	+ assert html_response(conn, 200) == ""
	+ end
	+ end
	+
	+ defp error_mock(status) when is_integer(status) do
	+ ClientMock
	+ \|> expect(:request, fn :get, "/status/" <> _, _, _, _ ->
	+ {:error, status}
	+ end)
	+ end
	+
	+ describe "returns error on" do
	+ test "500", %{conn: conn} do
	+ error_mock(500)
	+
	+ capture_log(fn -> ReverseProxy.call(conn, "/status/500") end) =~
	+ "[error] Elixir.Pleroma.ReverseProxy: request to /status/500 failed with HTTP status 500"
	+ end
	+
	+ test "400", %{conn: conn} do
	+ error_mock(400)
	+
	+ capture_log(fn -> ReverseProxy.call(conn, "/status/400") end) =~
	+ "[error] Elixir.Pleroma.ReverseProxy: request to /status/400 failed with HTTP status 400"
	+ end
	+
	+ test "204", %{conn: conn} do
	+ ClientMock
	+ \|> expect(:request, fn :get, "/status/204", _, _, _ -> {:ok, 204, [], %{}} end)
	+
	+ capture_log(fn ->
	+ conn = ReverseProxy.call(conn, "/status/204")
	+ assert conn.resp_body == "Request failed: No Content"
	+ assert conn.halted
	+ end) =~
	+ "[error] Elixir.Pleroma.ReverseProxy: request to \"/status/204\" failed with HTTP status 204"
	+ end
	+ end
	+
	+ test "streaming", %{conn: conn} do
	+ stream_mock(21)
	+ conn = ReverseProxy.call(conn, "/stream-bytes/200")
	+ assert conn.state == :chunked
	+ assert byte_size(conn.resp_body) == 200
	+ assert Plug.Conn.get_resp_header(conn, "content-type") == ["application/octet-stream"]
	+ end
	+
	+ defp headers_mock(_) do
	+ ClientMock
	+ \|> expect(:request, fn :get, "/headers", headers, _, _ ->
	+ Registry.register(Pleroma.ReverseProxy.ClientMock, "/headers", 0)
	+ {:ok, 200, [{"content-type", "application/json"}], %{url: "/headers", headers: headers}}
	+ end)
	+ \|> expect(:stream_body, 2, fn %{url: url, headers: headers} ->
	+ case Registry.lookup(Pleroma.ReverseProxy.ClientMock, url) do
	+ [{_, 0}] ->
	+ Registry.update_value(Pleroma.ReverseProxy.ClientMock, url, &(&1 + 1))
	+ headers = for {k, v} <- headers, into: %{}, do: {String.capitalize(k), v}
	+ {:ok, Jason.encode!(%{headers: headers})}
	+
	+ [{_, 1}] ->
	+ Registry.unregister(Pleroma.ReverseProxy.ClientMock, url)
	+ :done
	+ end
	+ end)
	+
	+ :ok
	+ end
	+
	+ describe "keep request headers" do
	+ setup [:headers_mock]
	+
	+ test "header passes", %{conn: conn} do
	+ conn =
	+ Plug.Conn.put_req_header(
	+ conn,
	+ "accept",
	+ "text/html"
	+ )
	+ \|> ReverseProxy.call("/headers")
	+
	+ %{"headers" => headers} = json_response(conn, 200)
	+ assert headers["Accept"] == "text/html"
	+ end
	+
	+ test "header is filtered", %{conn: conn} do
	+ conn =
	+ Plug.Conn.put_req_header(
	+ conn,
	+ "accept-language",
	+ "en-US"
	+ )
	+ \|> ReverseProxy.call("/headers")
	+
	+ %{"headers" => headers} = json_response(conn, 200)
	+ refute headers["Accept-Language"]
	+ end
	+ end
	+
	+ test "returns 400 on non GET, HEAD requests", %{conn: conn} do
	+ conn = ReverseProxy.call(Map.put(conn, :method, "POST"), "/ip")
	+ assert conn.status == 400
	+ end
	+
	+ describe "cache resp headers" do
	+ test "returns headers", %{conn: conn} do
	+ ClientMock
	+ \|> expect(:request, fn :get, "/cache/" <> ttl, _, _, _ ->
	+ {:ok, 200, [{"cache-control", "public, max-age=" <> ttl}], %{}}
	+ end)
	+ \|> expect(:stream_body, fn _ -> :done end)
	+
	+ conn = ReverseProxy.call(conn, "/cache/10")
	+ assert {"cache-control", "public, max-age=10"} in conn.resp_headers
	+ end
	+
	+ test "add cache-control", %{conn: conn} do
	+ ClientMock
	+ \|> expect(:request, fn :get, "/cache", _, _, _ ->
	+ {:ok, 200, [{"ETag", "some ETag"}], %{}}
	+ end)
	+ \|> expect(:stream_body, fn _ -> :done end)
	+
	+ conn = ReverseProxy.call(conn, "/cache")
	+ assert {"cache-control", "public"} in conn.resp_headers
	+ end
	+ end
	+
	+ defp disposition_headers_mock(headers) do
	+ ClientMock
	+ \|> expect(:request, fn :get, "/disposition", _, _, _ ->
	+ Registry.register(Pleroma.ReverseProxy.ClientMock, "/disposition", 0)
	+
	+ {:ok, 200, headers, %{url: "/disposition"}}
	+ end)
	+ \|> expect(:stream_body, 2, fn %{url: "/disposition"} ->
	+ case Registry.lookup(Pleroma.ReverseProxy.ClientMock, "/disposition") do
	+ [{_, 0}] ->
	+ Registry.update_value(Pleroma.ReverseProxy.ClientMock, "/disposition", &(&1 + 1))
	+ {:ok, ""}
	+
	+ [{_, 1}] ->
	+ Registry.unregister(Pleroma.ReverseProxy.ClientMock, "/disposition")
	+ :done
	+ end
	+ end)
	+ end
	+
	+ describe "response content disposition header" do
	+ test "not atachment", %{conn: conn} do
	+ disposition_headers_mock([
	+ {"content-type", "image/gif"},
	+ {"content-length", 0}
	+ ])
	+
	+ conn = ReverseProxy.call(conn, "/disposition")
	+
	+ assert {"content-type", "image/gif"} in conn.resp_headers
	+ end
	+
	+ test "with content-disposition header", %{conn: conn} do
	+ disposition_headers_mock([
	+ {"content-disposition", "attachment; filename=\"filename.jpg\""},
	+ {"content-length", 0}
	+ ])
	+
	+ conn = ReverseProxy.call(conn, "/disposition")
	+
	+ assert {"content-disposition", "attachment; filename=\"filename.jpg\""} in conn.resp_headers
	+ end
	+ end
	+end
	diff --git a/test/support/http_request_mock.ex b/test/support/http_request_mock.ex
	index 8e388e59e..c593a5e4a 100644
	--- a/test/support/http_request_mock.ex
	+++ b/test/support/http_request_mock.ex
	@@ -1,916 +1,910 @@
	# Pleroma: A lightweight social networking server
	# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/>
	# SPDX-License-Identifier: AGPL-3.0-only

	defmodule HttpRequestMock do
	require Logger

	def request(
	%Tesla.Env{
	url: url,
	method: method,
	headers: headers,
	query: query,
	body: body
	} = _env
	) do
	with {:ok, res} <- apply(__MODULE__, method, [url, query, body, headers]) do
	res
	else
	{_, _r} = error ->
	# Logger.warn(r)
	error
	end
	end

	# GET Requests
	#
	def get(url, query \\ [], body \\ [], headers \\ [])

	def get("https://osada.macgirvin.com/channel/mike", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	- body:
	- File.read!("test/fixtures/httpoison_mock/https___osada.macgirvin.com_channel_mike.json")
	+ body: File.read!("test/fixtures/tesla_mock/https___osada.macgirvin.com_channel_mike.json")
	}}
	end

	def get("https://mastodon.social/users/emelie/statuses/101849165031453009", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	- body: File.read!("test/fixtures/httpoison_mock/status.emelie.json")
	+ body: File.read!("test/fixtures/tesla_mock/status.emelie.json")
	}}
	end

	def get("https://mastodon.social/users/emelie", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	- body: File.read!("test/fixtures/httpoison_mock/emelie.json")
	+ body: File.read!("test/fixtures/tesla_mock/emelie.json")
	}}
	end

	def get("https://mastodon.sdf.org/users/rinpatch", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	- body: File.read!("test/fixtures/httpoison_mock/rinpatch.json")
	+ body: File.read!("test/fixtures/tesla_mock/rinpatch.json")
	}}
	end

	def get(
	"https://mastodon.social/.well-known/webfinger?resource=https://mastodon.social/users/emelie",
	_,
	_,
	_
	) do
	{:ok,
	%Tesla.Env{
	status: 200,
	- body: File.read!("test/fixtures/httpoison_mock/webfinger_emelie.json")
	+ body: File.read!("test/fixtures/tesla_mock/webfinger_emelie.json")
	}}
	end

	def get("https://mastodon.social/users/emelie.atom", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	- body: File.read!("test/fixtures/httpoison_mock/emelie.atom")
	+ body: File.read!("test/fixtures/tesla_mock/emelie.atom")
	}}
	end

	def get(
	"https://osada.macgirvin.com/.well-known/webfinger?resource=acct:mike@osada.macgirvin.com",
	_,
	_,
	Accept: "application/xrd+xml,application/jrd+json"
	) do
	{:ok,
	%Tesla.Env{
	status: 200,
	- body: File.read!("test/fixtures/httpoison_mock/mike@osada.macgirvin.com.json")
	+ body: File.read!("test/fixtures/tesla_mock/mike@osada.macgirvin.com.json")
	}}
	end

	def get(
	"https://social.heldscal.la/.well-known/webfinger?resource=https://social.heldscal.la/user/29191",
	_,
	_,
	Accept: "application/xrd+xml,application/jrd+json"
	) do
	{:ok,
	%Tesla.Env{
	status: 200,
	- body: File.read!("test/fixtures/httpoison_mock/https___social.heldscal.la_user_29191.xml")
	+ body: File.read!("test/fixtures/tesla_mock/https___social.heldscal.la_user_29191.xml")
	}}
	end

	def get("https://pawoo.net/users/pekorino.atom", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	- body: File.read!("test/fixtures/httpoison_mock/https___pawoo.net_users_pekorino.atom")
	+ body: File.read!("test/fixtures/tesla_mock/https___pawoo.net_users_pekorino.atom")
	}}
	end

	def get(
	"https://pawoo.net/.well-known/webfinger?resource=acct:https://pawoo.net/users/pekorino",
	_,
	_,
	Accept: "application/xrd+xml,application/jrd+json"
	) do
	{:ok,
	%Tesla.Env{
	status: 200,
	- body: File.read!("test/fixtures/httpoison_mock/https___pawoo.net_users_pekorino.xml")
	+ body: File.read!("test/fixtures/tesla_mock/https___pawoo.net_users_pekorino.xml")
	}}
	end

	def get(
	"https://social.stopwatchingus-heidelberg.de/api/statuses/user_timeline/18330.atom",
	_,
	_,
	_
	) do
	{:ok,
	%Tesla.Env{
	status: 200,
	- body: File.read!("test/fixtures/httpoison_mock/atarifrosch_feed.xml")
	+ body: File.read!("test/fixtures/tesla_mock/atarifrosch_feed.xml")
	}}
	end

	def get(
	"https://social.stopwatchingus-heidelberg.de/.well-known/webfinger?resource=acct:https://social.stopwatchingus-heidelberg.de/user/18330",
	_,
	_,
	Accept: "application/xrd+xml,application/jrd+json"
	) do
	{:ok,
	%Tesla.Env{
	status: 200,
	- body: File.read!("test/fixtures/httpoison_mock/atarifrosch_webfinger.xml")
	+ body: File.read!("test/fixtures/tesla_mock/atarifrosch_webfinger.xml")
	}}
	end

	def get("https://mamot.fr/users/Skruyb.atom", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	- body: File.read!("test/fixtures/httpoison_mock/https___mamot.fr_users_Skruyb.atom")
	+ body: File.read!("test/fixtures/tesla_mock/https___mamot.fr_users_Skruyb.atom")
	}}
	end

	def get(
	"https://mamot.fr/.well-known/webfinger?resource=acct:https://mamot.fr/users/Skruyb",
	_,
	_,
	Accept: "application/xrd+xml,application/jrd+json"
	) do
	{:ok,
	%Tesla.Env{
	status: 200,
	- body: File.read!("test/fixtures/httpoison_mock/skruyb@mamot.fr.atom")
	+ body: File.read!("test/fixtures/tesla_mock/skruyb@mamot.fr.atom")
	}}
	end

	def get(
	"https://social.heldscal.la/.well-known/webfinger?resource=nonexistant@social.heldscal.la",
	_,
	_,
	Accept: "application/xrd+xml,application/jrd+json"
	) do
	{:ok,
	%Tesla.Env{
	status: 200,
	- body: File.read!("test/fixtures/httpoison_mock/nonexistant@social.heldscal.la.xml")
	+ body: File.read!("test/fixtures/tesla_mock/nonexistant@social.heldscal.la.xml")
	}}
	end

	def get(
	"https://squeet.me/xrd/?uri=lain@squeet.me",
	_,
	_,
	Accept: "application/xrd+xml,application/jrd+json"
	) do
	{:ok,
	%Tesla.Env{
	status: 200,
	- body: File.read!("test/fixtures/httpoison_mock/lain_squeet.me_webfinger.xml")
	+ body: File.read!("test/fixtures/tesla_mock/lain_squeet.me_webfinger.xml")
	}}
	end

	def get(
	"https://mst3k.interlinked.me/users/luciferMysticus",
	_,
	_,
	Accept: "application/activity+json"
	) do
	{:ok,
	%Tesla.Env{
	status: 200,
	- body: File.read!("test/fixtures/httpoison_mock/lucifermysticus.json")
	+ body: File.read!("test/fixtures/tesla_mock/lucifermysticus.json")
	}}
	end

	def get("https://prismo.news/@mxb", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	- body: File.read!("test/fixtures/httpoison_mock/https___prismo.news__mxb.json")
	+ body: File.read!("test/fixtures/tesla_mock/https___prismo.news__mxb.json")
	}}
	end

	def get(
	"https://hubzilla.example.org/channel/kaniini",
	_,
	_,
	Accept: "application/activity+json"
	) do
	{:ok,
	%Tesla.Env{
	status: 200,
	- body: File.read!("test/fixtures/httpoison_mock/kaniini@hubzilla.example.org.json")
	+ body: File.read!("test/fixtures/tesla_mock/kaniini@hubzilla.example.org.json")
	}}
	end

	def get("https://niu.moe/users/rye", _, _, Accept: "application/activity+json") do
	{:ok,
	%Tesla.Env{
	status: 200,
	- body: File.read!("test/fixtures/httpoison_mock/rye.json")
	+ body: File.read!("test/fixtures/tesla_mock/rye.json")
	}}
	end

	def get("https://n1u.moe/users/rye", _, _, Accept: "application/activity+json") do
	{:ok,
	%Tesla.Env{
	status: 200,
	- body: File.read!("test/fixtures/httpoison_mock/rye.json")
	+ body: File.read!("test/fixtures/tesla_mock/rye.json")
	}}
	end

	def get("http://mastodon.example.org/users/admin/statuses/100787282858396771", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	body:
	File.read!(
	- "test/fixtures/httpoison_mock/http___mastodon.example.org_users_admin_status_1234.json"
	+ "test/fixtures/tesla_mock/http___mastodon.example.org_users_admin_status_1234.json"
	)
	}}
	end

	def get("https://puckipedia.com/", _, _, Accept: "application/activity+json") do
	{:ok,
	%Tesla.Env{
	status: 200,
	- body: File.read!("test/fixtures/httpoison_mock/puckipedia.com.json")
	+ body: File.read!("test/fixtures/tesla_mock/puckipedia.com.json")
	}}
	end

	def get("https://peertube.moe/accounts/7even", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	- body: File.read!("test/fixtures/httpoison_mock/7even.json")
	+ body: File.read!("test/fixtures/tesla_mock/7even.json")
	}}
	end

	def get("https://peertube.moe/videos/watch/df5f464b-be8d-46fb-ad81-2d4c2d1630e3", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	- body: File.read!("test/fixtures/httpoison_mock/peertube.moe-vid.json")
	+ body: File.read!("test/fixtures/tesla_mock/peertube.moe-vid.json")
	}}
	end

	def get("https://baptiste.gelez.xyz/@/BaptisteGelez", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	- body: File.read!("test/fixtures/httpoison_mock/baptiste.gelex.xyz-user.json")
	+ body: File.read!("test/fixtures/tesla_mock/baptiste.gelex.xyz-user.json")
	}}
	end

	def get("https://baptiste.gelez.xyz/~/PlumeDevelopment/this-month-in-plume-june-2018/", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	- body: File.read!("test/fixtures/httpoison_mock/baptiste.gelex.xyz-article.json")
	+ body: File.read!("test/fixtures/tesla_mock/baptiste.gelex.xyz-article.json")
	}}
	end

	def get("http://mastodon.example.org/users/admin", _, _, Accept: "application/activity+json") do
	{:ok,
	%Tesla.Env{
	status: 200,
	- body: File.read!("test/fixtures/httpoison_mock/admin@mastdon.example.org.json")
	+ body: File.read!("test/fixtures/tesla_mock/admin@mastdon.example.org.json")
	}}
	end

	def get("http://mastodon.example.org/users/gargron", _, _, Accept: "application/activity+json") do
	{:error, :nxdomain}
	end

	def get(
	"http://mastodon.example.org/@admin/99541947525187367",
	_,
	_,
	Accept: "application/activity+json"
	) do
	{:ok,
	%Tesla.Env{
	status: 200,
	body: File.read!("test/fixtures/mastodon-note-object.json")
	}}
	end

	def get("https://shitposter.club/notice/7369654", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	- body: File.read!("test/fixtures/httpoison_mock/7369654.html")
	+ body: File.read!("test/fixtures/tesla_mock/7369654.html")
	}}
	end

	def get("https://mstdn.io/users/mayuutann", _, _, Accept: "application/activity+json") do
	{:ok,
	%Tesla.Env{
	status: 200,
	- body: File.read!("test/fixtures/httpoison_mock/mayumayu.json")
	+ body: File.read!("test/fixtures/tesla_mock/mayumayu.json")
	}}
	end

	def get(
	"https://mstdn.io/users/mayuutann/statuses/99568293732299394",
	_,
	_,
	Accept: "application/activity+json"
	) do
	{:ok,
	%Tesla.Env{
	status: 200,
	- body: File.read!("test/fixtures/httpoison_mock/mayumayupost.json")
	+ body: File.read!("test/fixtures/tesla_mock/mayumayupost.json")
	}}
	end

	def get("https://pleroma.soykaf.com/users/lain/feed.atom", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	body:
	File.read!(
	- "test/fixtures/httpoison_mock/https___pleroma.soykaf.com_users_lain_feed.atom.xml"
	+ "test/fixtures/tesla_mock/https___pleroma.soykaf.com_users_lain_feed.atom.xml"
	)
	}}
	end

	def get(url, _, _, Accept: "application/xrd+xml,application/jrd+json")
	when url in [
	"https://pleroma.soykaf.com/.well-known/webfinger?resource=acct:https://pleroma.soykaf.com/users/lain",
	"https://pleroma.soykaf.com/.well-known/webfinger?resource=https://pleroma.soykaf.com/users/lain"
	] do
	{:ok,
	%Tesla.Env{
	status: 200,
	- body: File.read!("test/fixtures/httpoison_mock/https___pleroma.soykaf.com_users_lain.xml")
	+ body: File.read!("test/fixtures/tesla_mock/https___pleroma.soykaf.com_users_lain.xml")
	}}
	end

	def get("https://shitposter.club/api/statuses/user_timeline/1.atom", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	body:
	File.read!(
	- "test/fixtures/httpoison_mock/https___shitposter.club_api_statuses_user_timeline_1.atom.xml"
	+ "test/fixtures/tesla_mock/https___shitposter.club_api_statuses_user_timeline_1.atom.xml"
	)
	}}
	end

	def get(
	"https://shitposter.club/.well-known/webfinger?resource=https://shitposter.club/user/1",
	_,
	_,
	Accept: "application/xrd+xml,application/jrd+json"
	) do
	{:ok,
	%Tesla.Env{
	status: 200,
	- body: File.read!("test/fixtures/httpoison_mock/https___shitposter.club_user_1.xml")
	+ body: File.read!("test/fixtures/tesla_mock/https___shitposter.club_user_1.xml")
	}}
	end

	def get("https://shitposter.club/notice/2827873", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	- body:
	- File.read!("test/fixtures/httpoison_mock/https___shitposter.club_notice_2827873.html")
	+ body: File.read!("test/fixtures/tesla_mock/https___shitposter.club_notice_2827873.html")
	}}
	end

	def get("https://shitposter.club/api/statuses/show/2827873.atom", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	body:
	File.read!(
	- "test/fixtures/httpoison_mock/https___shitposter.club_api_statuses_show_2827873.atom.xml"
	+ "test/fixtures/tesla_mock/https___shitposter.club_api_statuses_show_2827873.atom.xml"
	)
	}}
	end

	def get("https://testing.pleroma.lol/objects/b319022a-4946-44c5-9de9-34801f95507b", _, _, _) do
	{:ok, %Tesla.Env{status: 200}}
	end

	def get("https://shitposter.club/api/statuses/user_timeline/5381.atom", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	- body: File.read!("test/fixtures/httpoison_mock/spc_5381.atom")
	+ body: File.read!("test/fixtures/tesla_mock/spc_5381.atom")
	}}
	end

	def get(
	"https://shitposter.club/.well-known/webfinger?resource=https://shitposter.club/user/5381",
	_,
	_,
	Accept: "application/xrd+xml,application/jrd+json"
	) do
	{:ok,
	%Tesla.Env{
	status: 200,
	- body: File.read!("test/fixtures/httpoison_mock/spc_5381_xrd.xml")
	+ body: File.read!("test/fixtures/tesla_mock/spc_5381_xrd.xml")
	}}
	end

	def get("http://shitposter.club/.well-known/host-meta", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	- body: File.read!("test/fixtures/httpoison_mock/shitposter.club_host_meta")
	+ body: File.read!("test/fixtures/tesla_mock/shitposter.club_host_meta")
	}}
	end

	def get("https://shitposter.club/api/statuses/show/7369654.atom", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	- body: File.read!("test/fixtures/httpoison_mock/7369654.atom")
	+ body: File.read!("test/fixtures/tesla_mock/7369654.atom")
	}}
	end

	def get("https://shitposter.club/notice/4027863", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	- body: File.read!("test/fixtures/httpoison_mock/7369654.html")
	+ body: File.read!("test/fixtures/tesla_mock/7369654.html")
	}}
	end

	def get("https://social.sakamoto.gq/users/eal/feed.atom", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	- body: File.read!("test/fixtures/httpoison_mock/sakamoto_eal_feed.atom")
	+ body: File.read!("test/fixtures/tesla_mock/sakamoto_eal_feed.atom")
	}}
	end

	def get("http://social.sakamoto.gq/.well-known/host-meta", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	- body: File.read!("test/fixtures/httpoison_mock/social.sakamoto.gq_host_meta")
	+ body: File.read!("test/fixtures/tesla_mock/social.sakamoto.gq_host_meta")
	}}
	end

	def get(
	"https://social.sakamoto.gq/.well-known/webfinger?resource=https://social.sakamoto.gq/users/eal",
	_,
	_,
	Accept: "application/xrd+xml,application/jrd+json"
	) do
	{:ok,
	%Tesla.Env{
	status: 200,
	- body: File.read!("test/fixtures/httpoison_mock/eal_sakamoto.xml")
	+ body: File.read!("test/fixtures/tesla_mock/eal_sakamoto.xml")
	}}
	end

	def get(
	"https://social.sakamoto.gq/objects/0ccc1a2c-66b0-4305-b23a-7f7f2b040056",
	_,
	_,
	Accept: "application/atom+xml"
	) do
	- {:ok, %Tesla.Env{status: 200, body: File.read!("test/fixtures/httpoison_mock/sakamoto.atom")}}
	+ {:ok, %Tesla.Env{status: 200, body: File.read!("test/fixtures/tesla_mock/sakamoto.atom")}}
	end

	def get("http://mastodon.social/.well-known/host-meta", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	- body: File.read!("test/fixtures/httpoison_mock/mastodon.social_host_meta")
	+ body: File.read!("test/fixtures/tesla_mock/mastodon.social_host_meta")
	}}
	end

	def get(
	"https://mastodon.social/.well-known/webfinger?resource=https://mastodon.social/users/lambadalambda",
	_,
	_,
	Accept: "application/xrd+xml,application/jrd+json"
	) do
	{:ok,
	%Tesla.Env{
	status: 200,
	body:
	- File.read!(
	- "test/fixtures/httpoison_mock/https___mastodon.social_users_lambadalambda.xml"
	- )
	+ File.read!("test/fixtures/tesla_mock/https___mastodon.social_users_lambadalambda.xml")
	}}
	end

	def get("http://gs.example.org/.well-known/host-meta", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	- body: File.read!("test/fixtures/httpoison_mock/gs.example.org_host_meta")
	+ body: File.read!("test/fixtures/tesla_mock/gs.example.org_host_meta")
	}}
	end

	def get(
	"http://gs.example.org/.well-known/webfinger?resource=http://gs.example.org:4040/index.php/user/1",
	_,
	_,
	Accept: "application/xrd+xml,application/jrd+json"
	) do
	{:ok,
	%Tesla.Env{
	status: 200,
	body:
	- File.read!(
	- "test/fixtures/httpoison_mock/http___gs.example.org_4040_index.php_user_1.xml"
	- )
	+ File.read!("test/fixtures/tesla_mock/http___gs.example.org_4040_index.php_user_1.xml")
	}}
	end

	def get(
	"http://gs.example.org:4040/index.php/user/1",
	_,
	_,
	Accept: "application/activity+json"
	) do
	{:ok, %Tesla.Env{status: 406, body: ""}}
	end

	def get("http://gs.example.org/index.php/api/statuses/user_timeline/1.atom", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	body:
	File.read!(
	- "test/fixtures/httpoison_mock/http__gs.example.org_index.php_api_statuses_user_timeline_1.atom.xml"
	+ "test/fixtures/tesla_mock/http__gs.example.org_index.php_api_statuses_user_timeline_1.atom.xml"
	)
	}}
	end

	def get("https://social.heldscal.la/api/statuses/user_timeline/29191.atom", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	body:
	File.read!(
	- "test/fixtures/httpoison_mock/https___social.heldscal.la_api_statuses_user_timeline_29191.atom.xml"
	+ "test/fixtures/tesla_mock/https___social.heldscal.la_api_statuses_user_timeline_29191.atom.xml"
	)
	}}
	end

	def get("http://squeet.me/.well-known/host-meta", _, _, _) do
	{:ok,
	- %Tesla.Env{status: 200, body: File.read!("test/fixtures/httpoison_mock/squeet.me_host_meta")}}
	+ %Tesla.Env{status: 200, body: File.read!("test/fixtures/tesla_mock/squeet.me_host_meta")}}
	end

	def get(
	"https://squeet.me/xrd?uri=lain@squeet.me",
	_,
	_,
	Accept: "application/xrd+xml,application/jrd+json"
	) do
	{:ok,
	%Tesla.Env{
	status: 200,
	- body: File.read!("test/fixtures/httpoison_mock/lain_squeet.me_webfinger.xml")
	+ body: File.read!("test/fixtures/tesla_mock/lain_squeet.me_webfinger.xml")
	}}
	end

	def get(
	"https://social.heldscal.la/.well-known/webfinger?resource=shp@social.heldscal.la",
	_,
	_,
	Accept: "application/xrd+xml,application/jrd+json"
	) do
	{:ok,
	%Tesla.Env{
	status: 200,
	- body: File.read!("test/fixtures/httpoison_mock/shp@social.heldscal.la.xml")
	+ body: File.read!("test/fixtures/tesla_mock/shp@social.heldscal.la.xml")
	}}
	end

	def get("http://framatube.org/.well-known/host-meta", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	- body: File.read!("test/fixtures/httpoison_mock/framatube.org_host_meta")
	+ body: File.read!("test/fixtures/tesla_mock/framatube.org_host_meta")
	}}
	end

	def get(
	"http://framatube.org/main/xrd?uri=framasoft@framatube.org",
	_,
	_,
	Accept: "application/xrd+xml,application/jrd+json"
	) do
	{:ok,
	%Tesla.Env{
	status: 200,
	headers: [{"content-type", "application/json"}],
	- body: File.read!("test/fixtures/httpoison_mock/framasoft@framatube.org.json")
	+ body: File.read!("test/fixtures/tesla_mock/framasoft@framatube.org.json")
	}}
	end

	def get("http://gnusocial.de/.well-known/host-meta", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	- body: File.read!("test/fixtures/httpoison_mock/gnusocial.de_host_meta")
	+ body: File.read!("test/fixtures/tesla_mock/gnusocial.de_host_meta")
	}}
	end

	def get(
	"http://gnusocial.de/main/xrd?uri=winterdienst@gnusocial.de",
	_,
	_,
	Accept: "application/xrd+xml,application/jrd+json"
	) do
	{:ok,
	%Tesla.Env{
	status: 200,
	- body: File.read!("test/fixtures/httpoison_mock/winterdienst_webfinger.json")
	+ body: File.read!("test/fixtures/tesla_mock/winterdienst_webfinger.json")
	}}
	end

	def get("http://status.alpicola.com/.well-known/host-meta", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	- body: File.read!("test/fixtures/httpoison_mock/status.alpicola.com_host_meta")
	+ body: File.read!("test/fixtures/tesla_mock/status.alpicola.com_host_meta")
	}}
	end

	def get("http://macgirvin.com/.well-known/host-meta", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	- body: File.read!("test/fixtures/httpoison_mock/macgirvin.com_host_meta")
	+ body: File.read!("test/fixtures/tesla_mock/macgirvin.com_host_meta")
	}}
	end

	def get("http://gerzilla.de/.well-known/host-meta", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	- body: File.read!("test/fixtures/httpoison_mock/gerzilla.de_host_meta")
	+ body: File.read!("test/fixtures/tesla_mock/gerzilla.de_host_meta")
	}}
	end

	def get(
	"https://gerzilla.de/xrd/?uri=kaniini@gerzilla.de",
	_,
	_,
	Accept: "application/xrd+xml,application/jrd+json"
	) do
	{:ok,
	%Tesla.Env{
	status: 200,
	headers: [{"content-type", "application/json"}],
	- body: File.read!("test/fixtures/httpoison_mock/kaniini@gerzilla.de.json")
	+ body: File.read!("test/fixtures/tesla_mock/kaniini@gerzilla.de.json")
	}}
	end

	def get("https://social.heldscal.la/api/statuses/user_timeline/23211.atom", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	body:
	File.read!(
	- "test/fixtures/httpoison_mock/https___social.heldscal.la_api_statuses_user_timeline_23211.atom.xml"
	+ "test/fixtures/tesla_mock/https___social.heldscal.la_api_statuses_user_timeline_23211.atom.xml"
	)
	}}
	end

	def get(
	"https://social.heldscal.la/.well-known/webfinger?resource=https://social.heldscal.la/user/23211",
	_,
	_,
	_
	) do
	{:ok,
	%Tesla.Env{
	status: 200,
	- body: File.read!("test/fixtures/httpoison_mock/https___social.heldscal.la_user_23211.xml")
	+ body: File.read!("test/fixtures/tesla_mock/https___social.heldscal.la_user_23211.xml")
	}}
	end

	def get("http://social.heldscal.la/.well-known/host-meta", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	- body: File.read!("test/fixtures/httpoison_mock/social.heldscal.la_host_meta")
	+ body: File.read!("test/fixtures/tesla_mock/social.heldscal.la_host_meta")
	}}
	end

	def get("https://social.heldscal.la/.well-known/host-meta", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	- body: File.read!("test/fixtures/httpoison_mock/social.heldscal.la_host_meta")
	+ body: File.read!("test/fixtures/tesla_mock/social.heldscal.la_host_meta")
	}}
	end

	def get("https://mastodon.social/users/lambadalambda.atom", _, _, _) do
	{:ok, %Tesla.Env{status: 200, body: File.read!("test/fixtures/lambadalambda.atom")}}
	end

	def get("https://mastodon.social/users/lambadalambda", _, _, _) do
	{:ok, %Tesla.Env{status: 200, body: File.read!("test/fixtures/lambadalambda.json")}}
	end

	def get("https://social.heldscal.la/user/23211", _, _, Accept: "application/activity+json") do
	{:ok, Tesla.Mock.json(%{"id" => "https://social.heldscal.la/user/23211"}, status: 200)}
	end

	def get("http://example.com/ogp", _, _, _) do
	{:ok, %Tesla.Env{status: 200, body: File.read!("test/fixtures/rich_media/ogp.html")}}
	end

	def get("https://example.com/ogp", _, _, _) do
	{:ok, %Tesla.Env{status: 200, body: File.read!("test/fixtures/rich_media/ogp.html")}}
	end

	def get("https://pleroma.local/notice/9kCP7V", _, _, _) do
	{:ok, %Tesla.Env{status: 200, body: File.read!("test/fixtures/rich_media/ogp.html")}}
	end

	def get("http://localhost:4001/users/masto_closed/followers", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	body: File.read!("test/fixtures/users_mock/masto_closed_followers.json")
	}}
	end

	def get("http://localhost:4001/users/masto_closed/following", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	body: File.read!("test/fixtures/users_mock/masto_closed_following.json")
	}}
	end

	def get("http://localhost:4001/users/fuser2/followers", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	body: File.read!("test/fixtures/users_mock/pleroma_followers.json")
	}}
	end

	def get("http://localhost:4001/users/fuser2/following", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	body: File.read!("test/fixtures/users_mock/pleroma_following.json")
	}}
	end

	def get("http://domain-with-errors:4001/users/fuser1/followers", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 504,
	body: ""
	}}
	end

	def get("http://domain-with-errors:4001/users/fuser1/following", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 504,
	body: ""
	}}
	end

	def get("http://example.com/ogp-missing-data", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	body: File.read!("test/fixtures/rich_media/ogp-missing-data.html")
	}}
	end

	def get("https://example.com/ogp-missing-data", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	body: File.read!("test/fixtures/rich_media/ogp-missing-data.html")
	}}
	end

	def get("http://example.com/malformed", _, _, _) do
	{:ok,
	%Tesla.Env{status: 200, body: File.read!("test/fixtures/rich_media/malformed-data.html")}}
	end

	def get("http://example.com/empty", _, _, _) do
	{:ok, %Tesla.Env{status: 200, body: "hello"}}
	end

	def get("http://404.site" <> _, _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 404,
	body: ""
	}}
	end

	def get(url, query, body, headers) do
	{:error,
	"Not implemented the mock response for get #{inspect(url)}, #{query}, #{inspect(body)}, #{
	inspect(headers)
	}"}
	end

	# POST Requests
	#

	def post(url, query \\ [], body \\ [], headers \\ [])

	def post("http://example.org/needs_refresh", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	body: ""
	}}
	end

	def post("http://mastodon.example.org/inbox", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	body: ""
	}}
	end

	def post("https://hubzilla.example.org/inbox", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	body: ""
	}}
	end

	def post("http://gs.example.org/index.php/main/salmon/user/1", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	body: ""
	}}
	end

	def post("http://200.site" <> _, _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	body: ""
	}}
	end

	def post("http://connrefused.site" <> _, _, _, _) do
	{:error, :connrefused}
	end

	def post("http://404.site" <> _, _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 404,
	body: ""
	}}
	end

	def post(url, _query, _body, _headers) do
	{:error, "Not implemented the mock response for post #{inspect(url)}"}
	end
	end
	diff --git a/test/tasks/ecto/ecto_test.exs b/test/tasks/ecto/ecto_test.exs
	new file mode 100644
	index 000000000..b48662c88
	--- /dev/null
	+++ b/test/tasks/ecto/ecto_test.exs
	@@ -0,0 +1,11 @@
	+defmodule Mix.Tasks.Pleroma.EctoTest do
	+ use ExUnit.Case, async: true
	+
	+ test "raise on bad path" do
	+ assert_raise RuntimeError, ~r/Could not find migrations directory/, fn ->
	+ Mix.Tasks.Pleroma.Ecto.ensure_migrations_path(Pleroma.Repo,
	+ migrations_path: "some-path"
	+ )
	+ end
	+ end
	+end
	diff --git a/test/tasks/pleroma_test.exs b/test/tasks/pleroma_test.exs
	new file mode 100644
	index 000000000..e236ccbbb
	--- /dev/null
	+++ b/test/tasks/pleroma_test.exs
	@@ -0,0 +1,46 @@
	+defmodule Mix.PleromaTest do
	+ use ExUnit.Case, async: true
	+ import Mix.Pleroma
	+
	+ setup_all do
	+ Mix.shell(Mix.Shell.Process)
	+
	+ on_exit(fn ->
	+ Mix.shell(Mix.Shell.IO)
	+ end)
	+
	+ :ok
	+ end
	+
	+ describe "shell_prompt/1" do
	+ test "input" do
	+ send(self(), {:mix_shell_input, :prompt, "Yes"})
	+
	+ answer = shell_prompt("Do you want this?")
	+ assert_received {:mix_shell, :prompt, [message]}
	+ assert message =~ "Do you want this?"
	+ assert answer == "Yes"
	+ end
	+
	+ test "with defval" do
	+ send(self(), {:mix_shell_input, :prompt, "\n"})
	+
	+ answer = shell_prompt("Do you want this?", "defval")
	+
	+ assert_received {:mix_shell, :prompt, [message]}
	+ assert message =~ "Do you want this? [defval]"
	+ assert answer == "defval"
	+ end
	+ end
	+
	+ describe "get_option/3" do
	+ test "get from options" do
	+ assert get_option([domain: "some-domain.com"], :domain, "Promt") == "some-domain.com"
	+ end
	+
	+ test "get from prompt" do
	+ send(self(), {:mix_shell_input, :prompt, "another-domain.com"})
	+ assert get_option([], :domain, "Prompt") == "another-domain.com"
	+ end
	+ end
	+end
	diff --git a/test/tasks/robots_txt_test.exs b/test/tasks/robots_txt_test.exs
	new file mode 100644
	index 000000000..539193f73
	--- /dev/null
	+++ b/test/tasks/robots_txt_test.exs
	@@ -0,0 +1,43 @@
	+defmodule Mix.Tasks.Pleroma.RobotsTxtTest do
	+ use ExUnit.Case, async: true
	+ alias Mix.Tasks.Pleroma.RobotsTxt
	+
	+ test "creates new dir" do
	+ path = "test/fixtures/new_dir/"
	+ file_path = path <> "robots.txt"
	+
	+ static_dir = Pleroma.Config.get([:instance, :static_dir])
	+ Pleroma.Config.put([:instance, :static_dir], path)
	+
	+ on_exit(fn ->
	+ Pleroma.Config.put([:instance, :static_dir], static_dir)
	+ {:ok, ["test/fixtures/new_dir/", "test/fixtures/new_dir/robots.txt"]} = File.rm_rf(path)
	+ end)
	+
	+ RobotsTxt.run(["disallow_all"])
	+
	+ assert File.exists?(file_path)
	+ {:ok, file} = File.read(file_path)
	+
	+ assert file == "User-Agent: *\nDisallow: /\n"
	+ end
	+
	+ test "to existance folder" do
	+ path = "test/fixtures/"
	+ file_path = path <> "robots.txt"
	+ static_dir = Pleroma.Config.get([:instance, :static_dir])
	+ Pleroma.Config.put([:instance, :static_dir], path)
	+
	+ on_exit(fn ->
	+ Pleroma.Config.put([:instance, :static_dir], static_dir)
	+ :ok = File.rm(file_path)
	+ end)
	+
	+ RobotsTxt.run(["disallow_all"])
	+
	+ assert File.exists?(file_path)
	+ {:ok, file} = File.read(file_path)
	+
	+ assert file == "User-Agent: *\nDisallow: /\n"
	+ end
	+end
	diff --git a/test/test_helper.exs b/test/test_helper.exs
	index f604ba63d..3e33f0335 100644
	--- a/test/test_helper.exs
	+++ b/test/test_helper.exs
	@@ -1,8 +1,8 @@
	# Pleroma: A lightweight social networking server
	# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/>
	# SPDX-License-Identifier: AGPL-3.0-only

	ExUnit.start()
	-
	Ecto.Adapters.SQL.Sandbox.mode(Pleroma.Repo, :manual)
	+Mox.defmock(Pleroma.ReverseProxy.ClientMock, for: Pleroma.ReverseProxy.Client)
	{:ok, _} = Application.ensure_all_started(:ex_machina)

File Metadata

Mime Type: text/x-diff
Expires: Sun, Oct 11, 7:41 AM (1 d, 12 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1785664
Default Alt Text: (140 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions