No OneTemporary
Actions

Authored By

Unknown

Size

18 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/config/config.exs b/config/config.exs
	index 01109b30f..703c10c48 100644
	--- a/config/config.exs
	+++ b/config/config.exs
	@@ -1,64 +1,65 @@
	# This file is responsible for configuring your application
	# and its dependencies with the aid of the Mix.Config module.
	#
	# This configuration file is loaded before any dependency and
	# is restricted to this project.
	use Mix.Config

	# General application configuration
	config :pleroma,
	ecto_repos: [Pleroma.Repo]

	config :pleroma, Pleroma.Upload,
	uploads: "uploads"

	# Configures the endpoint
	config :pleroma, Pleroma.Web.Endpoint,
	url: [host: "localhost"],
	protocol: "https",
	secret_key_base: "aK4Abxf29xU9TTDKre9coZPUgevcVCFQJe/5xP/7Lt4BEif6idBIbjupVbOrbKxl",
	render_errors: [view: Pleroma.Web.ErrorView, accepts: ~w(json)],
	pubsub: [name: Pleroma.PubSub,
	adapter: Phoenix.PubSub.PG2]

	# Configures Elixir's Logger
	config :logger, :console,
	format: "$time $metadata[$level] $message\n",
	metadata: [:request_id]

	config :mime, :types, %{
	"application/xrd+xml" => ["xrd+xml"]
	}

	config :pleroma, :websub, Pleroma.Web.Websub
	config :pleroma, :ostatus, Pleroma.Web.OStatus
	config :pleroma, :httpoison, Pleroma.HTTP

	version = with {version, 0} <- System.cmd("git", ["rev-parse", "HEAD"]) do
	"Pleroma #{String.trim(version)}"
	else
	_ -> "Pleroma dev"
	end

	# Configures http settings, upstream proxy etc.
	config :pleroma, :http,
	proxy_url: nil

	config :pleroma, :instance,
	version: version,
	name: "Pleroma",
	email: "example@example.com",
	limit: 5000,
	- registrations_open: true
	+ registrations_open: true,
	+ federating: true

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

	config :pleroma, :chat,
	enabled: true

	# Import environment specific config. This must remain at the bottom
	# of this file so it overrides the configuration defined above.
	import_config "#{Mix.env}.exs"
	diff --git a/lib/pleroma/web/federator/federator.ex b/lib/pleroma/web/federator/federator.ex
	index c9f9dc7a1..8e28976a6 100644
	--- a/lib/pleroma/web/federator/federator.ex
	+++ b/lib/pleroma/web/federator/federator.ex
	@@ -1,138 +1,142 @@
	defmodule Pleroma.Web.Federator do
	use GenServer
	alias Pleroma.User
	alias Pleroma.Web.{WebFinger, Websub}
	require Logger

	@websub Application.get_env(:pleroma, :websub)
	@ostatus Application.get_env(:pleroma, :ostatus)
	@httpoison Application.get_env(:pleroma, :httpoison)
	+ @instance Application.get_env(:pleroma, :instance)
	+ @federating Keyword.get(@instance, :federating)
	@max_jobs 10

	def start_link do
	spawn(fn ->
	Process.sleep(1000 * 60 * 1) # 1 minute
	enqueue(:refresh_subscriptions, nil)
	end)
	GenServer.start_link(__MODULE__, %{
	in: {:sets.new(), []},
	out: {:sets.new(), []}
	}, name: __MODULE__)
	end

	def handle(:refresh_subscriptions, _) do
	Logger.debug("Federator running refresh subscriptions")
	Websub.refresh_subscriptions()
	spawn(fn ->
	Process.sleep(1000 * 60 * 60 * 6) # 6 hours
	enqueue(:refresh_subscriptions, nil)
	end)
	end

	def handle(:request_subscription, websub) do
	Logger.debug("Refreshing #{websub.topic}")
	with {:ok, websub } <- Websub.request_subscription(websub) do
	Logger.debug("Successfully refreshed #{websub.topic}")
	else
	_e -> Logger.debug("Couldn't refresh #{websub.topic}")
	end
	end

	def handle(:publish, activity) do
	Logger.debug(fn -> "Running publish for #{activity.data["id"]}" end)
	with actor when not is_nil(actor) <- User.get_cached_by_ap_id(activity.data["actor"]) do
	{:ok, actor} = WebFinger.ensure_keys_present(actor)
	Logger.debug(fn -> "Sending #{activity.data["id"]} out via salmon" end)
	Pleroma.Web.Salmon.publish(actor, activity)

	Logger.debug(fn -> "Sending #{activity.data["id"]} out via websub" end)
	Websub.publish(Pleroma.Web.OStatus.feed_path(actor), actor, activity)
	end
	end

	def handle(:verify_websub, websub) do
	Logger.debug(fn -> "Running websub verification for #{websub.id} (#{websub.topic}, #{websub.callback})" end)
	@websub.verify(websub)
	end

	def handle(:incoming_doc, doc) do
	Logger.debug("Got document, trying to parse")
	@ostatus.handle_incoming(doc)
	end

	def handle(:publish_single_websub, %{xml: xml, topic: topic, callback: callback, secret: secret}) do
	signature = @websub.sign(secret \|\| "", xml)
	Logger.debug(fn -> "Pushing #{topic} to #{callback}" end)

	with {:ok, %{status_code: code}} <- @httpoison.post(callback, xml, [
	{"Content-Type", "application/atom+xml"},
	{"X-Hub-Signature", "sha1=#{signature}"}
	], timeout: 10000, recv_timeout: 20000) do
	Logger.debug(fn -> "Pushed to #{callback}, code #{code}" end)
	else e ->
	Logger.debug(fn -> "Couldn't push to #{callback}, #{inspect(e)}" end)
	end
	end

	def handle(type, _) do
	Logger.debug(fn -> "Unknown task: #{type}" end)
	{:error, "Don't know what do do with this"}
	end

	def enqueue(type, payload, priority \\ 1) do
	- if Mix.env == :test do
	- handle(type, payload)
	- else
	- GenServer.cast(__MODULE__, {:enqueue, type, payload, priority})
	+ if @federating do
	+ if Mix.env == :test do
	+ handle(type, payload)
	+ else
	+ GenServer.cast(__MODULE__, {:enqueue, type, payload, priority})
	+ end
	end
	end

	def maybe_start_job(running_jobs, queue) do
	if (:sets.size(running_jobs) < @max_jobs) && queue != [] do
	{{type, payload}, queue} = queue_pop(queue)
	{:ok, pid} = Task.start(fn -> handle(type, payload) end)
	mref = Process.monitor(pid)
	{:sets.add_element(mref, running_jobs), queue}
	else
	{running_jobs, queue}
	end
	end

	def handle_cast({:enqueue, type, payload, priority}, state) when type in [:incoming_doc] do
	%{in: {i_running_jobs, i_queue}, out: {o_running_jobs, o_queue}} = state
	i_queue = enqueue_sorted(i_queue, {type, payload}, 1)
	{i_running_jobs, i_queue} = maybe_start_job(i_running_jobs, i_queue)
	{:noreply, %{in: {i_running_jobs, i_queue}, out: {o_running_jobs, o_queue}}}
	end

	def handle_cast({:enqueue, type, payload, priority}, state) do
	%{in: {i_running_jobs, i_queue}, out: {o_running_jobs, o_queue}} = state
	o_queue = enqueue_sorted(o_queue, {type, payload}, 1)
	{o_running_jobs, o_queue} = maybe_start_job(o_running_jobs, o_queue)
	{:noreply, %{in: {i_running_jobs, i_queue}, out: {o_running_jobs, o_queue}}}
	end

	def handle_cast(m, state) do
	IO.inspect("Unknown: #{inspect(m)}, #{inspect(state)}")
	{:noreply, state}
	end

	def handle_info({:DOWN, ref, :process, _pid, _reason}, state) do
	%{in: {i_running_jobs, i_queue}, out: {o_running_jobs, o_queue}} = state
	i_running_jobs = :sets.del_element(ref, i_running_jobs)
	o_running_jobs = :sets.del_element(ref, o_running_jobs)
	{i_running_jobs, i_queue} = maybe_start_job(i_running_jobs, i_queue)
	{o_running_jobs, o_queue} = maybe_start_job(o_running_jobs, o_queue)

	{:noreply, %{in: {i_running_jobs, i_queue}, out: {o_running_jobs, o_queue}}}
	end

	def enqueue_sorted(queue, element, priority) do
	[%{item: element, priority: priority} \| queue]
	\|> Enum.sort_by(fn (%{priority: priority}) -> priority end)
	end

	def queue_pop([%{item: element} \| queue]) do
	{element, queue}
	end
	end
	diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
	index 6e9f40955..59fb5cd6b 100644
	--- a/lib/pleroma/web/router.ex
	+++ b/lib/pleroma/web/router.ex
	@@ -1,278 +1,286 @@
	defmodule Pleroma.Web.Router do
	use Pleroma.Web, :router

	alias Pleroma.{Repo, User, Web.Router}

	+ @instance Application.get_env(:pleroma, :instance)
	+ @federating Keyword.get(@instance, :federating)
	+
	def user_fetcher(username) do
	{:ok, Repo.get_by(User, %{nickname: username})}
	end

	pipeline :api do
	plug :accepts, ["json"]
	plug :fetch_session
	plug Pleroma.Plugs.OAuthPlug
	plug Pleroma.Plugs.AuthenticationPlug, %{fetcher: &Router.user_fetcher/1, optional: true}
	end

	pipeline :authenticated_api do
	plug :accepts, ["json"]
	plug :fetch_session
	plug Pleroma.Plugs.OAuthPlug
	plug Pleroma.Plugs.AuthenticationPlug, %{fetcher: &Router.user_fetcher/1}
	end

	pipeline :mastodon_html do
	plug :accepts, ["html"]
	plug :fetch_session
	plug Pleroma.Plugs.OAuthPlug
	plug Pleroma.Plugs.AuthenticationPlug, %{fetcher: &Router.user_fetcher/1, optional: true}
	end

	pipeline :pleroma_html do
	plug :accepts, ["html"]
	plug :fetch_session
	plug Pleroma.Plugs.OAuthPlug
	plug Pleroma.Plugs.AuthenticationPlug, %{fetcher: &Router.user_fetcher/1, optional: true}
	end

	pipeline :well_known do
	plug :accepts, ["xml", "xrd+xml"]
	end

	pipeline :config do
	plug :accepts, ["json", "xml"]
	end

	pipeline :oauth do
	plug :accepts, ["html", "json"]
	end

	pipeline :pleroma_api do
	plug :accepts, ["html", "json"]
	end

	scope "/api/pleroma", Pleroma.Web.TwitterAPI do
	pipe_through :pleroma_api
	get "/password_reset/:token", UtilController, :show_password_reset
	post "/password_reset", UtilController, :password_reset
	get "/emoji", UtilController, :emoji
	end

	scope "/", Pleroma.Web.TwitterAPI do
	pipe_through :pleroma_html
	get "/ostatus_subscribe", UtilController, :remote_follow
	post "/ostatus_subscribe", UtilController, :do_remote_follow
	post "/main/ostatus", UtilController, :remote_subscribe
	end

	scope "/api/pleroma", Pleroma.Web.TwitterAPI do
	pipe_through :authenticated_api
	post "/follow_import", UtilController, :follow_import
	end

	scope "/oauth", Pleroma.Web.OAuth do
	get "/authorize", OAuthController, :authorize
	post "/authorize", OAuthController, :create_authorization
	post "/token", OAuthController, :token_exchange
	end

	scope "/api/v1", Pleroma.Web.MastodonAPI do
	pipe_through :authenticated_api

	patch "/accounts/update_credentials", MastodonAPIController, :update_credentials
	get "/accounts/verify_credentials", MastodonAPIController, :verify_credentials
	get "/accounts/relationships", MastodonAPIController, :relationships
	get "/accounts/search", MastodonAPIController, :account_search
	post "/accounts/:id/follow", MastodonAPIController, :follow
	post "/accounts/:id/unfollow", MastodonAPIController, :unfollow
	post "/accounts/:id/block", MastodonAPIController, :block
	post "/accounts/:id/unblock", MastodonAPIController, :unblock
	post "/accounts/:id/mute", MastodonAPIController, :relationship_noop
	post "/accounts/:id/unmute", MastodonAPIController, :relationship_noop

	post "/follows", MastodonAPIController, :follow

	get "/blocks", MastodonAPIController, :blocks

	get "/domain_blocks", MastodonAPIController, :empty_array
	get "/follow_requests", MastodonAPIController, :empty_array
	get "/mutes", MastodonAPIController, :empty_array

	get "/timelines/home", MastodonAPIController, :home_timeline

	get "/favourites", MastodonAPIController, :favourites

	post "/statuses", MastodonAPIController, :post_status
	delete "/statuses/:id", MastodonAPIController, :delete_status

	post "/statuses/:id/reblog", MastodonAPIController, :reblog_status
	post "/statuses/:id/favourite", MastodonAPIController, :fav_status
	post "/statuses/:id/unfavourite", MastodonAPIController, :unfav_status

	post "/notifications/clear", MastodonAPIController, :clear_notifications
	post "/notifications/dismiss", MastodonAPIController, :dismiss_notification
	get "/notifications", MastodonAPIController, :notifications
	get "/notifications/:id", MastodonAPIController, :get_notification

	post "/media", MastodonAPIController, :upload
	end

	scope "/api/v1", Pleroma.Web.MastodonAPI do
	pipe_through :api
	get "/instance", MastodonAPIController, :masto_instance
	get "/instance/peers", MastodonAPIController, :peers
	post "/apps", MastodonAPIController, :create_app
	get "/custom_emojis", MastodonAPIController, :custom_emojis

	get "/timelines/public", MastodonAPIController, :public_timeline
	get "/timelines/tag/:tag", MastodonAPIController, :hashtag_timeline

	get "/statuses/:id", MastodonAPIController, :get_status
	get "/statuses/:id/context", MastodonAPIController, :get_context
	get "/statuses/:id/favourited_by", MastodonAPIController, :favourited_by
	get "/statuses/:id/reblogged_by", MastodonAPIController, :reblogged_by

	get "/accounts/:id/statuses", MastodonAPIController, :user_statuses
	get "/accounts/:id/followers", MastodonAPIController, :followers
	get "/accounts/:id/following", MastodonAPIController, :following
	get "/accounts/:id", MastodonAPIController, :user

	get "/search", MastodonAPIController, :search
	end

	scope "/api", Pleroma.Web do
	pipe_through :config

	get "/help/test", TwitterAPI.UtilController, :help_test
	post "/help/test", TwitterAPI.UtilController, :help_test
	get "/statusnet/config", TwitterAPI.UtilController, :config
	get "/statusnet/version", TwitterAPI.UtilController, :version
	end

	@instance Application.get_env(:pleroma, :instance)
	@registrations_open Keyword.get(@instance, :registrations_open)

	scope "/api", Pleroma.Web do
	pipe_through :api

	get "/statuses/public_timeline", TwitterAPI.Controller, :public_timeline
	get "/statuses/public_and_external_timeline", TwitterAPI.Controller, :public_and_external_timeline
	get "/statuses/networkpublic_timeline", TwitterAPI.Controller, :public_and_external_timeline
	get "/statuses/user_timeline", TwitterAPI.Controller, :user_timeline
	get "/qvitter/statuses/user_timeline", TwitterAPI.Controller, :user_timeline
	get "/users/show", TwitterAPI.Controller, :show_user

	get "/statuses/followers", TwitterAPI.Controller, :followers
	get "/statuses/friends", TwitterAPI.Controller, :friends
	get "/statuses/show/:id", TwitterAPI.Controller, :fetch_status
	get "/statusnet/conversation/:id", TwitterAPI.Controller, :fetch_conversation

	if @registrations_open do
	post "/account/register", TwitterAPI.Controller, :register
	end

	get "/search", TwitterAPI.Controller, :search
	get "/statusnet/tags/timeline/:tag", TwitterAPI.Controller, :public_and_external_timeline
	end

	scope "/api", Pleroma.Web do
	pipe_through :authenticated_api

	get "/account/verify_credentials", TwitterAPI.Controller, :verify_credentials
	post "/account/verify_credentials", TwitterAPI.Controller, :verify_credentials

	post "/account/update_profile", TwitterAPI.Controller, :update_profile
	post "/account/update_profile_banner", TwitterAPI.Controller, :update_banner
	post "/qvitter/update_background_image", TwitterAPI.Controller, :update_background

	post "/account/most_recent_notification", TwitterAPI.Controller, :update_most_recent_notification

	get "/statuses/home_timeline", TwitterAPI.Controller, :friends_timeline
	get "/statuses/friends_timeline", TwitterAPI.Controller, :friends_timeline
	get "/statuses/mentions", TwitterAPI.Controller, :mentions_timeline
	get "/statuses/mentions_timeline", TwitterAPI.Controller, :mentions_timeline

	post "/statuses/update", TwitterAPI.Controller, :status_update
	post "/statuses/retweet/:id", TwitterAPI.Controller, :retweet
	post "/statuses/destroy/:id", TwitterAPI.Controller, :delete_post

	post "/friendships/create", TwitterAPI.Controller, :follow
	post "/friendships/destroy", TwitterAPI.Controller, :unfollow
	post "/blocks/create", TwitterAPI.Controller, :block
	post "/blocks/destroy", TwitterAPI.Controller, :unblock

	post "/statusnet/media/upload", TwitterAPI.Controller, :upload
	post "/media/upload", TwitterAPI.Controller, :upload_json

	post "/favorites/create/:id", TwitterAPI.Controller, :favorite
	post "/favorites/create", TwitterAPI.Controller, :favorite
	post "/favorites/destroy/:id", TwitterAPI.Controller, :unfavorite

	post "/qvitter/update_avatar", TwitterAPI.Controller, :update_avatar

	get "/friends/ids", TwitterAPI.Controller, :friends_ids
	get "/friendships/no_retweets/ids", TwitterAPI.Controller, :empty_array

	get "/mutes/users/ids", TwitterAPI.Controller, :empty_array

	get "/externalprofile/show", TwitterAPI.Controller, :external_profile
	end

	pipeline :ostatus do
	plug :accepts, ["xml", "atom", "html"]
	end

	scope "/", Pleroma.Web do
	pipe_through :ostatus

	get "/objects/:uuid", OStatus.OStatusController, :object
	get "/activities/:uuid", OStatus.OStatusController, :activity
	get "/notice/:id", OStatus.OStatusController, :notice
	-
	get "/users/:nickname/feed", OStatus.OStatusController, :feed
	get "/users/:nickname", OStatus.OStatusController, :feed_redirect
	- post "/users/:nickname/salmon", OStatus.OStatusController, :salmon_incoming
	- post "/push/hub/:nickname", Websub.WebsubController, :websub_subscription_request
	- get "/push/subscriptions/:id", Websub.WebsubController, :websub_subscription_confirmation
	- post "/push/subscriptions/:id", Websub.WebsubController, :websub_incoming
	+
	+ if @federating do
	+ post "/users/:nickname/salmon", OStatus.OStatusController, :salmon_incoming
	+ post "/push/hub/:nickname", Websub.WebsubController, :websub_subscription_request
	+ get "/push/subscriptions/:id", Websub.WebsubController, :websub_subscription_confirmation
	+ post "/push/subscriptions/:id", Websub.WebsubController, :websub_incoming
	+ end
	+
	end

	- scope "/.well-known", Pleroma.Web do
	- pipe_through :well_known
	+ if @federating do
	+ scope "/.well-known", Pleroma.Web do
	+ pipe_through :well_known

	- get "/host-meta", WebFinger.WebFingerController, :host_meta
	- get "/webfinger", WebFinger.WebFingerController, :webfinger
	+ get "/host-meta", WebFinger.WebFingerController, :host_meta
	+ get "/webfinger", WebFinger.WebFingerController, :webfinger
	+ end
	end

	scope "/", Pleroma.Web.MastodonAPI do
	pipe_through :mastodon_html

	get "/web/login", MastodonAPIController, :login
	post "/web/login", MastodonAPIController, :login_post
	get "/web/*path", MastodonAPIController, :index
	delete "/auth/sign_out", MastodonAPIController, :logout
	end

	pipeline :remote_media do
	plug :accepts, ["html"]
	end
	scope "/proxy/", Pleroma.Web.MediaProxy do
	pipe_through :remote_media
	get "/:sig/:url", MediaProxyController, :remote
	end

	scope "/", Fallback do
	get "/*path", RedirectController, :redirector
	end
	end

	defmodule Fallback.RedirectController do
	use Pleroma.Web, :controller
	def redirector(conn, _params) do
	if Mix.env != :test do
	conn
	\|> put_resp_content_type("text/html")
	\|> send_file(200, "priv/static/index.html")
	end
	end
	end

File Metadata

Mime Type: text/x-diff
Expires: Sun, Nov 1, 6:38 AM (13 h, 33 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1802689
Default Alt Text: (18 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions