No OneTemporary
Actions

Authored By

Unknown

Size

46 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/config/config.exs b/config/config.exs
	index e6c695215..bd714a189 100644
	--- a/config/config.exs
	+++ b/config/config.exs
	@@ -1,65 +1,66 @@
	# 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"],
	"application/activity+json" => ["activity+json"]
	}

	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/user.ex b/lib/pleroma/user.ex
	index c3fce17de..a503a5b3f 100644
	--- a/lib/pleroma/user.ex
	+++ b/lib/pleroma/user.ex
	@@ -1,461 +1,461 @@
	defmodule Pleroma.User do
	use Ecto.Schema

	import Ecto.{Changeset, Query}
	alias Pleroma.{Repo, User, Object, Web, Activity, Notification}
	alias Comeonin.Pbkdf2
	alias Pleroma.Web.{OStatus, Websub}
	alias Pleroma.Web.ActivityPub.{Utils, ActivityPub}

	schema "users" do
	field :bio, :string
	field :email, :string
	field :name, :string
	field :nickname, :string
	field :password_hash, :string
	field :password, :string, virtual: true
	field :password_confirmation, :string, virtual: true
	field :following, {:array, :string}, default: []
	field :ap_id, :string
	field :avatar, :map
	field :local, :boolean, default: true
	field :info, :map, default: %{}
	field :follower_address, :string
	has_many :notifications, Notification

	timestamps()
	end

	def avatar_url(user) do
	case user.avatar do
	%{"url" => [%{"href" => href} \| _]} -> href
	_ -> "#{Web.base_url()}/images/avi.png"
	end
	end

	def banner_url(user) do
	case user.info["banner"] do
	%{"url" => [%{"href" => href} \| _]} -> href
	_ -> "#{Web.base_url()}/images/banner.png"
	end
	end

	def ap_id(%User{nickname: nickname}) do
	"#{Web.base_url}/users/#{nickname}"
	end

	def ap_followers(%User{} = user) do
	"#{ap_id(user)}/followers"
	end

	def follow_changeset(struct, params \\ %{}) do
	struct
	\|> cast(params, [:following])
	\|> validate_required([:following])
	end

	def info_changeset(struct, params \\ %{}) do
	struct
	\|> cast(params, [:info])
	\|> validate_required([:info])
	end

	def user_info(%User{} = user) do
	oneself = if user.local, do: 1, else: 0
	%{
	following_count: length(user.following) - oneself,
	note_count: user.info["note_count"] \|\| 0,
	follower_count: user.info["follower_count"] \|\| 0
	}
	end

	@email_regex ~r/^[a-zA-Z0-9.!#$%&'+\/=?^_`{\|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)$/
	def remote_user_creation(params) do
	changes = %User{}
	\|> cast(params, [:bio, :name, :ap_id, :nickname, :info, :avatar])
	\|> validate_required([:name, :ap_id, :nickname])
	\|> unique_constraint(:nickname)
	\|> validate_format(:nickname, @email_regex)
	\|> validate_length(:bio, max: 5000)
	\|> validate_length(:name, max: 100)
	\|> put_change(:local, false)
	if changes.valid? do
	case changes.changes[:info]["source_data"] do
	%{"followers" => followers} ->
	changes
	\|> put_change(:follower_address, followers)
	_ ->
	followers = User.ap_followers(%User{nickname: changes.changes[:nickname]})
	changes
	\|> put_change(:follower_address, followers)
	end
	else
	changes
	end
	end

	def update_changeset(struct, params \\ %{}) do
	struct
	\|> cast(params, [:bio, :name])
	\|> unique_constraint(:nickname)
	\|> validate_format(:nickname, ~r/^[a-zA-Z\d]+$/)
	- \|> validate_length(:bio, min: 1, max: 5000)
	+ \|> validate_length(:bio, max: 1000)
	\|> validate_length(:name, min: 1, max: 100)
	end

	def upgrade_changeset(struct, params \\ %{}) do
	struct
	\|> cast(params, [:bio, :name, :info, :follower_address, :avatar])
	\|> unique_constraint(:nickname)
	\|> validate_format(:nickname, ~r/^[a-zA-Z\d]+$/)
	\|> validate_length(:bio, max: 5000)
	\|> validate_length(:name, max: 100)
	end

	def password_update_changeset(struct, params) do
	changeset = struct
	\|> cast(params, [:password, :password_confirmation])
	\|> validate_required([:password, :password_confirmation])
	\|> validate_confirmation(:password)

	if changeset.valid? do
	hashed = Pbkdf2.hashpwsalt(changeset.changes[:password])
	changeset
	\|> put_change(:password_hash, hashed)
	else
	changeset
	end
	end

	def reset_password(user, data) do
	update_and_set_cache(password_update_changeset(user, data))
	end

	def register_changeset(struct, params \\ %{}) do
	changeset = struct
	\|> cast(params, [:bio, :email, :name, :nickname, :password, :password_confirmation])
	- \|> validate_required([:bio, :email, :name, :nickname, :password, :password_confirmation])
	+ \|> validate_required([:email, :name, :nickname, :password, :password_confirmation])
	\|> validate_confirmation(:password)
	\|> unique_constraint(:email)
	\|> unique_constraint(:nickname)
	\|> validate_format(:nickname, ~r/^[a-zA-Z\d]+$/)
	\|> validate_format(:email, @email_regex)
	- \|> validate_length(:bio, min: 1, max: 1000)
	+ \|> validate_length(:bio, max: 1000)
	\|> validate_length(:name, min: 1, max: 100)

	if changeset.valid? do
	hashed = Pbkdf2.hashpwsalt(changeset.changes[:password])
	ap_id = User.ap_id(%User{nickname: changeset.changes[:nickname]})
	followers = User.ap_followers(%User{nickname: changeset.changes[:nickname]})
	changeset
	\|> put_change(:password_hash, hashed)
	\|> put_change(:ap_id, ap_id)
	\|> put_change(:following, [followers])
	\|> put_change(:follower_address, followers)
	else
	changeset
	end
	end

	def follow(%User{} = follower, %User{info: info} = followed) do
	ap_followers = followed.follower_address

	if following?(follower, followed) or info["deactivated"] do
	{:error,
	"Could not follow user: #{followed.nickname} is already on your list."}
	else
	if !followed.local && follower.local && !ap_enabled?(followed) do
	Websub.subscribe(follower, followed)
	end

	following = [ap_followers \| follower.following]
	\|> Enum.uniq

	follower = follower
	\|> follow_changeset(%{following: following})
	\|> update_and_set_cache

	{:ok, _} = update_follower_count(followed)

	follower
	end
	end

	def unfollow(%User{} = follower, %User{} = followed) do
	ap_followers = followed.follower_address
	if following?(follower, followed) and follower.ap_id != followed.ap_id do
	following = follower.following
	\|> List.delete(ap_followers)

	{ :ok, follower } = follower
	\|> follow_changeset(%{following: following})
	\|> update_and_set_cache

	{:ok, followed} = update_follower_count(followed)

	{:ok, follower, Utils.fetch_latest_follow(follower, followed)}
	else
	{:error, "Not subscribed!"}
	end
	end

	def following?(%User{} = follower, %User{} = followed) do
	Enum.member?(follower.following, followed.follower_address)
	end

	def get_by_ap_id(ap_id) do
	Repo.get_by(User, ap_id: ap_id)
	end

	def update_and_set_cache(changeset) do
	with {:ok, user} <- Repo.update(changeset) do
	Cachex.set(:user_cache, "ap_id:#{user.ap_id}", user)
	Cachex.set(:user_cache, "nickname:#{user.nickname}", user)
	Cachex.set(:user_cache, "user_info:#{user.id}", user_info(user))
	{:ok, user}
	else
	e -> e
	end
	end

	def invalidate_cache(user) do
	Cachex.del(:user_cache, "ap_id:#{user.ap_id}")
	Cachex.del(:user_cache, "nickname:#{user.nickname}")
	end

	def get_cached_by_ap_id(ap_id) do
	key = "ap_id:#{ap_id}"
	Cachex.get!(:user_cache, key, fallback: fn(_) -> get_by_ap_id(ap_id) end)
	end

	def get_cached_by_nickname(nickname) do
	key = "nickname:#{nickname}"
	Cachex.get!(:user_cache, key, fallback: fn(_) -> get_or_fetch_by_nickname(nickname) end)
	end

	def get_by_nickname(nickname) do
	Repo.get_by(User, nickname: nickname)
	end

	def get_cached_user_info(user) do
	key = "user_info:#{user.id}"
	Cachex.get!(:user_cache, key, fallback: fn(_) -> user_info(user) end)
	end

	def fetch_by_nickname(nickname) do
	ap_try = ActivityPub.make_user_from_nickname(nickname)

	case ap_try do
	{:ok, user} -> {:ok, user}
	_ -> OStatus.make_user(nickname)
	end
	end

	def get_or_fetch_by_nickname(nickname) do
	with %User{} = user <- get_by_nickname(nickname) do
	user
	else _e ->
	with [_nick, _domain] <- String.split(nickname, "@"),
	{:ok, user} <- fetch_by_nickname(nickname) do
	user
	else _e -> nil
	end
	end
	end

	def get_followers(%User{id: id, follower_address: follower_address}) do
	q = from u in User,
	where: ^follower_address in u.following,
	where: u.id != ^id

	{:ok, Repo.all(q)}
	end

	def get_friends(%User{id: id, following: following}) do
	q = from u in User,
	where: u.follower_address in ^following,
	where: u.id != ^id

	{:ok, Repo.all(q)}
	end

	def increase_note_count(%User{} = user) do
	note_count = (user.info["note_count"] \|\| 0) + 1
	new_info = Map.put(user.info, "note_count", note_count)

	cs = info_changeset(user, %{info: new_info})

	update_and_set_cache(cs)
	end

	def update_note_count(%User{} = user) do
	note_count_query = from a in Object,
	where: fragment("?->>'actor' = ? and ?->>'type' = 'Note'", a.data, ^user.ap_id, a.data),
	select: count(a.id)

	note_count = Repo.one(note_count_query)

	new_info = Map.put(user.info, "note_count", note_count)

	cs = info_changeset(user, %{info: new_info})

	update_and_set_cache(cs)
	end

	def update_follower_count(%User{} = user) do
	follower_count_query = from u in User,
	where: ^user.follower_address in u.following,
	where: u.id != ^user.id,
	select: count(u.id)

	follower_count = Repo.one(follower_count_query)

	new_info = Map.put(user.info, "follower_count", follower_count)

	cs = info_changeset(user, %{info: new_info})

	update_and_set_cache(cs)
	end

	def get_notified_from_activity(%Activity{recipients: to}) do
	query = from u in User,
	where: u.ap_id in ^to,
	where: u.local == true

	Repo.all(query)
	end

	def get_recipients_from_activity(%Activity{recipients: to}) do
	query = from u in User,
	where: u.ap_id in ^to,
	or_where: fragment("? && ?", u.following, ^to)

	query = from u in query,
	where: u.local == true

	Repo.all(query)
	end

	def search(query, resolve) do
	if resolve do
	User.get_or_fetch_by_nickname(query)
	end
	q = from u in User,
	where: fragment("(to_tsvector('english', ?) \|\| to_tsvector('english', ?)) @@ plainto_tsquery('english', ?)", u.nickname, u.name, ^query),
	limit: 20
	Repo.all(q)
	end

	def block(user, %{ap_id: ap_id}) do
	blocks = user.info["blocks"] \|\| []
	new_blocks = Enum.uniq([ap_id \| blocks])
	new_info = Map.put(user.info, "blocks", new_blocks)

	cs = User.info_changeset(user, %{info: new_info})
	update_and_set_cache(cs)
	end

	def unblock(user, %{ap_id: ap_id}) do
	blocks = user.info["blocks"] \|\| []
	new_blocks = List.delete(blocks, ap_id)
	new_info = Map.put(user.info, "blocks", new_blocks)

	cs = User.info_changeset(user, %{info: new_info})
	update_and_set_cache(cs)
	end

	def blocks?(user, %{ap_id: ap_id}) do
	blocks = user.info["blocks"] \|\| []
	Enum.member?(blocks, ap_id)
	end

	def local_user_query() do
	from u in User,
	where: u.local == true
	end

	def deactivate (%User{} = user) do
	new_info = Map.put(user.info, "deactivated", true)
	cs = User.info_changeset(user, %{info: new_info})
	update_and_set_cache(cs)
	end

	def delete (%User{} = user) do
	{:ok, user} = User.deactivate(user)

	# Remove all relationships
	{:ok, followers } = User.get_followers(user)
	followers
	\|> Enum.each(fn (follower) -> User.unfollow(follower, user) end)

	{:ok, friends} = User.get_friends(user)
	friends
	\|> Enum.each(fn (followed) -> User.unfollow(user, followed) end)

	query = from a in Activity,
	where: a.actor == ^user.ap_id

	Repo.all(query)
	\|> Enum.each(fn (activity) ->
	case activity.data["type"] do
	"Create" -> ActivityPub.delete(Object.get_by_ap_id(activity.data["object"]["id"]))
	_ -> "Doing nothing" # TODO: Do something with likes, follows, repeats.
	end
	end)

	:ok
	end

	def get_or_fetch_by_ap_id(ap_id) do
	if user = get_by_ap_id(ap_id) do
	user
	else
	ap_try = ActivityPub.make_user_from_ap_id(ap_id)

	case ap_try do
	{:ok, user} -> user
	_ ->
	case OStatus.make_user(ap_id) do
	{:ok, user} -> user
	_ -> {:error, "Could not fetch by ap id"}
	end
	end
	end
	end

	# AP style
	def public_key_from_info(%{"source_data" => %{"publicKey" => %{"publicKeyPem" => public_key_pem}}}) do
	key = :public_key.pem_decode(public_key_pem)
	\|> hd()
	\|> :public_key.pem_entry_decode()

	{:ok, key}
	end

	# OStatus Magic Key
	def public_key_from_info(%{"magic_key" => magic_key}) do
	{:ok, Pleroma.Web.Salmon.decode_key(magic_key)}
	end

	def get_public_key_for_ap_id(ap_id) do
	with %User{} = user <- get_or_fetch_by_ap_id(ap_id),
	{:ok, public_key} <- public_key_from_info(user.info) do
	{:ok, public_key}
	else
	_ -> :error
	end
	end

	defp blank?(""), do: nil
	defp blank?(n), do: n

	def insert_or_update_user(data) do
	data = data
	\|> Map.put(:name, blank?(data[:name]) \|\| data[:nickname])
	cs = User.remote_user_creation(data)
	Repo.insert(cs, on_conflict: :replace_all, conflict_target: :nickname)
	end

	def ap_enabled?(%User{info: info}), do: info["ap_enabled"]
	def ap_enabled?(_), do: false
	end
	diff --git a/lib/pleroma/web/federator/federator.ex b/lib/pleroma/web/federator/federator.ex
	index 0b9808b8f..daf836a40 100644
	--- a/lib/pleroma/web/federator/federator.ex
	+++ b/lib/pleroma/web/federator/federator.ex
	@@ -1,174 +1,178 @@
	defmodule Pleroma.Web.Federator do
	use GenServer
	alias Pleroma.User
	alias Pleroma.Activity
	alias Pleroma.Web.{WebFinger, Websub}
	alias Pleroma.Web.ActivityPub.ActivityPub
	alias Pleroma.Web.ActivityPub.Transmogrifier
	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)
	if ActivityPub.is_public?(activity) do
	Logger.info(fn -> "Sending #{activity.data["id"]} out via websub" end)
	Websub.publish(Pleroma.Web.OStatus.feed_path(actor), actor, activity)

	Logger.info(fn -> "Sending #{activity.data["id"]} out via salmon" end)
	Pleroma.Web.Salmon.publish(actor, activity)
	end

	Logger.info(fn -> "Sending #{activity.data["id"]} out via AP" end)
	Pleroma.Web.ActivityPub.ActivityPub.publish(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.info("Got document, trying to parse")
	@ostatus.handle_incoming(doc)
	end

	def handle(:incoming_ap_doc, params) do
	Logger.info("Handling incoming ap activity")
	with {:ok, _user} <- ap_enabled_actor(params["actor"]),
	nil <- Activity.get_by_ap_id(params["id"]),
	{:ok, activity} <- Transmogrifier.handle_incoming(params) do
	else
	%Activity{} ->
	Logger.info("Already had #{params["id"]}")
	e ->
	# Just drop those for now
	Logger.info("Unhandled activity")
	Logger.info(Poison.encode!(params, [pretty: 2]))
	end
	end

	def handle(:publish_single_ap, params) do
	ActivityPub.publish_one(params)
	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, :incoming_ap_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

	def ap_enabled_actor(id) do
	user = User.get_by_ap_id(id)
	if User.ap_enabled?(user) do
	{:ok, user}
	else
	ActivityPub.make_user_from_ap_id(id)
	end
	end
	end
	diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
	index 8d93e1ea6..520ac4a8c 100644
	--- a/lib/pleroma/web/router.ex
	+++ b/lib/pleroma/web/router.ex
	@@ -1,289 +1,297 @@
	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", "activity+json"]
	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

	pipeline :activitypub do
	plug :accepts, ["activity+json"]
	plug Pleroma.Web.Plugs.HTTPSignaturePlug
	end

	- scope "/", Pleroma.Web.ActivityPub do
	- pipe_through :activitypub
	- post "/users/:nickname/inbox", ActivityPubController, :inbox
	- post "/inbox", ActivityPubController, :inbox
	- end
	+ if @federating do
	+ scope "/", Pleroma.Web.ActivityPub do
	+ pipe_through :activitypub
	+ post "/users/:nickname/inbox", ActivityPubController, :inbox
	+ post "/inbox", ActivityPubController, :inbox
	+ end

	- scope "/.well-known", Pleroma.Web do
	- pipe_through :well_known
	+ 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
	diff --git a/test/user_test.exs b/test/user_test.exs
	index 100b3d0a0..35de0a7ce 100644
	--- a/test/user_test.exs
	+++ b/test/user_test.exs
	@@ -1,385 +1,386 @@
	defmodule Pleroma.UserTest do
	alias Pleroma.Builders.UserBuilder
	alias Pleroma.{User, Repo, Activity}
	alias Pleroma.Web.OStatus
	alias Pleroma.Web.Websub.WebsubClientSubscription
	alias Pleroma.Web.CommonAPI
	use Pleroma.DataCase

	import Pleroma.Factory
	import Ecto.Query

	test "ap_id returns the activity pub id for the user" do
	user = UserBuilder.build

	expected_ap_id = "#{Pleroma.Web.base_url}/users/#{user.nickname}"

	assert expected_ap_id == User.ap_id(user)
	end

	test "ap_followers returns the followers collection for the user" do
	user = UserBuilder.build

	expected_followers_collection = "#{User.ap_id(user)}/followers"

	assert expected_followers_collection == User.ap_followers(user)
	end

	test "follow takes a user and another user" do
	user = insert(:user)
	followed = insert(:user)

	{:ok, user} = User.follow(user, followed)

	user = Repo.get(User, user.id)

	followed = User.get_by_ap_id(followed.ap_id)
	assert followed.info["follower_count"] == 1

	assert User.ap_followers(followed) in user.following
	end

	test "can't follow a deactivated users" do
	user = insert(:user)
	followed = insert(:user, info: %{"deactivated" => true})

	{:error, _} = User.follow(user, followed)
	end

	# This is a somewhat useless test.
	# test "following a remote user will ensure a websub subscription is present" do
	# user = insert(:user)
	# {:ok, followed} = OStatus.make_user("shp@social.heldscal.la")

	# assert followed.local == false

	# {:ok, user} = User.follow(user, followed)
	# assert User.ap_followers(followed) in user.following

	# query = from w in WebsubClientSubscription,
	# where: w.topic == ^followed.info["topic"]
	# websub = Repo.one(query)

	# assert websub
	# end

	test "unfollow takes a user and another user" do
	followed = insert(:user)
	user = insert(:user, %{following: [User.ap_followers(followed)]})

	{:ok, user, _activity } = User.unfollow(user, followed)

	user = Repo.get(User, user.id)

	assert user.following == []
	end

	test "unfollow doesn't unfollow yourself" do
	user = insert(:user)

	{:error, _} = User.unfollow(user, user)

	user = Repo.get(User, user.id)
	assert user.following == [user.ap_id]
	end


	test "test if a user is following another user" do
	followed = insert(:user)
	user = insert(:user, %{following: [User.ap_followers(followed)]})

	assert User.following?(user, followed)
	refute User.following?(followed, user)
	end

	describe "user registration" do
	@full_user_data %{
	bio: "A guy",
	name: "my name",
	nickname: "nick",
	password: "test",
	password_confirmation: "test",
	email: "email@example.com"
	}

	- test "it requires a bio, email, name, nickname and password" do
	+ test "it requires an email, name, nickname and password, bio is optional" do
	@full_user_data
	\|> Map.keys
	\|> Enum.each(fn (key) ->
	params = Map.delete(@full_user_data, key)
	changeset = User.register_changeset(%User{}, params)
	- assert changeset.valid? == false
	+
	+ assert (if key == :bio, do: changeset.valid?, else: not changeset.valid?)
	end)
	end

	test "it sets the password_hash, ap_id and following fields" do
	changeset = User.register_changeset(%User{}, @full_user_data)

	assert changeset.valid?

	assert is_binary(changeset.changes[:password_hash])
	assert changeset.changes[:ap_id] == User.ap_id(%User{nickname: @full_user_data.nickname})
	assert changeset.changes[:following] == [User.ap_followers(%User{nickname: @full_user_data.nickname})]
	assert changeset.changes.follower_address == "#{changeset.changes.ap_id}/followers"
	end
	end

	describe "fetching a user from nickname or trying to build one" do
	test "gets an existing user" do
	user = insert(:user)
	fetched_user = User.get_or_fetch_by_nickname(user.nickname)

	assert user == fetched_user
	end

	test "gets an existing user, case insensitive" do
	user = insert(:user, nickname: "nick")
	fetched_user = User.get_or_fetch_by_nickname("NICK")

	assert user == fetched_user
	end

	test "fetches an external user via ostatus if no user exists" do
	fetched_user = User.get_or_fetch_by_nickname("shp@social.heldscal.la")
	assert fetched_user.nickname == "shp@social.heldscal.la"
	end

	test "returns nil if no user could be fetched" do
	fetched_user = User.get_or_fetch_by_nickname("nonexistant@social.heldscal.la")
	assert fetched_user == nil
	end

	test "returns nil for nonexistant local user" do
	fetched_user = User.get_or_fetch_by_nickname("nonexistant")
	assert fetched_user == nil
	end
	end

	test "returns an ap_id for a user" do
	user = insert(:user)
	assert User.ap_id(user) == Pleroma.Web.Router.Helpers.o_status_url(Pleroma.Web.Endpoint, :feed_redirect, user.nickname)
	end

	test "returns an ap_followers link for a user" do
	user = insert(:user)
	assert User.ap_followers(user) == Pleroma.Web.Router.Helpers.o_status_url(Pleroma.Web.Endpoint, :feed_redirect, user.nickname) <> "/followers"
	end

	describe "remote user creation changeset" do
	@valid_remote %{
	bio: "hello",
	name: "Someone",
	nickname: "a@b.de",
	ap_id: "http...",
	info: %{some: "info"},
	avatar: %{some: "avatar"}
	}

	test "it confirms validity" do
	cs = User.remote_user_creation(@valid_remote)
	assert cs.valid?
	end

	test "it sets the follower_adress" do
	cs = User.remote_user_creation(@valid_remote)
	# remote users get a fake local follower address
	assert cs.changes.follower_address == User.ap_followers(%User{ nickname: @valid_remote[:nickname] })
	end

	test "it enforces the fqn format for nicknames" do
	cs = User.remote_user_creation(%{@valid_remote \| nickname: "bla"})
	assert cs.changes.local == false
	assert cs.changes.avatar
	refute cs.valid?
	end

	test "it has required fields" do
	[:name, :nickname, :ap_id]
	\|> Enum.each(fn (field) ->
	cs = User.remote_user_creation(Map.delete(@valid_remote, field))
	refute cs.valid?
	end)
	end

	test "it restricts some sizes" do
	[bio: 5000, name: 100]
	\|> Enum.each(fn ({field, size}) ->
	string = String.pad_leading(".", size)
	cs = User.remote_user_creation(Map.put(@valid_remote, field, string))
	assert cs.valid?

	string = String.pad_leading(".", size + 1)
	cs = User.remote_user_creation(Map.put(@valid_remote, field, string))
	refute cs.valid?
	end)
	end
	end

	describe "followers and friends" do
	test "gets all followers for a given user" do
	user = insert(:user)
	follower_one = insert(:user)
	follower_two = insert(:user)
	not_follower = insert(:user)

	{:ok, follower_one} = User.follow(follower_one, user)
	{:ok, follower_two} = User.follow(follower_two, user)

	{:ok, res} = User.get_followers(user)

	assert Enum.member?(res, follower_one)
	assert Enum.member?(res, follower_two)
	refute Enum.member?(res, not_follower)
	end

	test "gets all friends (followed users) for a given user" do
	user = insert(:user)
	followed_one = insert(:user)
	followed_two = insert(:user)
	not_followed = insert(:user)

	{:ok, user} = User.follow(user, followed_one)
	{:ok, user} = User.follow(user, followed_two)

	{:ok, res} = User.get_friends(user)

	followed_one = User.get_by_ap_id(followed_one.ap_id)
	followed_two = User.get_by_ap_id(followed_two.ap_id)
	assert Enum.member?(res, followed_one)
	assert Enum.member?(res, followed_two)
	refute Enum.member?(res, not_followed)
	end
	end

	describe "updating note and follower count" do
	test "it sets the info->note_count property" do
	note = insert(:note)

	user = User.get_by_ap_id(note.data["actor"])

	assert user.info["note_count"] == nil

	{:ok, user} = User.update_note_count(user)

	assert user.info["note_count"] == 1
	end

	test "it increases the info->note_count property" do
	note = insert(:note)
	user = User.get_by_ap_id(note.data["actor"])

	assert user.info["note_count"] == nil

	{:ok, user} = User.increase_note_count(user)

	assert user.info["note_count"] == 1

	{:ok, user} = User.increase_note_count(user)

	assert user.info["note_count"] == 2
	end

	test "it sets the info->follower_count property" do
	user = insert(:user)
	follower = insert(:user)

	User.follow(follower, user)

	assert user.info["follower_count"] == nil

	{:ok, user} = User.update_follower_count(user)

	assert user.info["follower_count"] == 1
	end
	end

	describe "blocks" do
	test "it blocks people" do
	user = insert(:user)
	blocked_user = insert(:user)

	refute User.blocks?(user, blocked_user)

	{:ok, user} = User.block(user, blocked_user)

	assert User.blocks?(user, blocked_user)
	end

	test "it unblocks users" do
	user = insert(:user)
	blocked_user = insert(:user)

	{:ok, user} = User.block(user, blocked_user)
	{:ok, user} = User.unblock(user, blocked_user)

	refute User.blocks?(user, blocked_user)
	end
	end

	test "get recipients from activity" do
	actor = insert(:user)
	user = insert(:user, local: true)
	user_two = insert(:user, local: false)
	addressed = insert(:user, local: true)
	addressed_remote = insert(:user, local: false)
	{:ok, activity} = CommonAPI.post(actor, %{"status" => "hey @#{addressed.nickname} @#{addressed_remote.nickname}"})

	assert [addressed] == User.get_recipients_from_activity(activity)

	{:ok, user} = User.follow(user, actor)
	{:ok, _user_two} = User.follow(user_two, actor)
	recipients = User.get_recipients_from_activity(activity)
	assert length(recipients) == 2
	assert user in recipients
	assert addressed in recipients
	end

	test ".deactivate deactivates a user" do
	user = insert(:user)
	assert false == !!user.info["deactivated"]
	{:ok, user} = User.deactivate(user)
	assert true == user.info["deactivated"]
	end

	test ".delete deactivates a user, all follow relationships and all create activities" do
	user = insert(:user)
	followed = insert(:user)
	follower = insert(:user)

	{:ok, user} = User.follow(user, followed)
	{:ok, follower} = User.follow(follower, user)

	{:ok, activity} = CommonAPI.post(user, %{"status" => "2hu"})
	{:ok, activity_two} = CommonAPI.post(follower, %{"status" => "3hu"})

	{:ok, _, _} = CommonAPI.favorite(activity_two.id, user)
	{:ok, _, _} = CommonAPI.favorite(activity.id, follower)
	{:ok, _, _} = CommonAPI.repeat(activity.id, follower)

	:ok = User.delete(user)

	followed = Repo.get(User, followed.id)
	follower = Repo.get(User, follower.id)
	user = Repo.get(User, user.id)

	assert user.info["deactivated"]

	refute User.following?(user, followed)
	refute User.following?(followed, follower)

	# TODO: Remove favorites, repeats, delete activities.

	refute Repo.get(Activity, activity.id)
	end

	test "get_public_key_for_ap_id fetches a user that's not in the db" do
	assert {:ok, _key} = User.get_public_key_for_ap_id("http://mastodon.example.org/users/admin")
	end

	test "insert or update a user from given data" do
	user = insert(:user, %{nickname: "nick@name.de"})
	data = %{ ap_id: user.ap_id <> "xxx", name: user.name, nickname: user.nickname }

	assert {:ok, %User{}} = User.insert_or_update_user(data)
	end
	end

File Metadata

Mime Type: text/x-diff
Expires: Thu, Oct 29, 9:28 PM (1 d, 18 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1798681
Default Alt Text: (46 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions