Switch to HTTP
This commit is contained in:
parent
984ac15084
commit
45f55083fc
9 changed files with 221 additions and 30 deletions
29
lib/birdy_chat/dispatcher.ex
Normal file
29
lib/birdy_chat/dispatcher.ex
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
defmodule BirdyChat.Dispatcher do
|
||||
def dispatch(%Ecto.Changeset{changes: changes} = changeset) do
|
||||
case changes do
|
||||
%{routing: :local} -> BirdyChat.MessageWriter.write(changeset.changes)
|
||||
%{routing: :remote} -> send_to_remote(changeset.changes)
|
||||
end
|
||||
end
|
||||
|
||||
def send_to_remote(%{server: server, to: to} = message) do
|
||||
{name, base_url} =
|
||||
BirdyChat.Identity.peers()
|
||||
|> Enum.find(fn {name, _url} -> name == server end)
|
||||
|
||||
api_url = base_url <> "/api/internal"
|
||||
token = Phoenix.Token.sign(BirdyChatWeb.Endpoint, "serverAuth", to)
|
||||
|
||||
result =
|
||||
Req.new(url: api_url, retry: false, method: :post)
|
||||
|> Req.merge(req_opts())
|
||||
|> Req.Request.put_new_header("authorization", token)
|
||||
|> Req.merge(json: message)
|
||||
|> Req.Request.run_request()
|
||||
end
|
||||
|
||||
def req_opts do
|
||||
Application.get_env(:birdy_chat, __MODULE__)
|
||||
|> Access.get(:req_opts, [])
|
||||
end
|
||||
end
|
||||
|
|
@ -5,6 +5,8 @@ defmodule BirdyChat.Message do
|
|||
field :from, :string
|
||||
field :to, :string
|
||||
field :message, :string
|
||||
field :routing, Ecto.Enum, values: [:remote, :local]
|
||||
field :server, :string
|
||||
end
|
||||
|
||||
def validate(params) do
|
||||
|
|
@ -12,6 +14,7 @@ defmodule BirdyChat.Message do
|
|||
%__MODULE__{}
|
||||
|> Ecto.Changeset.cast(params, [:from, :to, :message])
|
||||
|> Ecto.Changeset.validate_required([:from, :to, :message])
|
||||
|> put_routing()
|
||||
|
||||
if changeset.valid? do
|
||||
{:ok, changeset}
|
||||
|
|
@ -20,20 +23,32 @@ defmodule BirdyChat.Message do
|
|||
end
|
||||
end
|
||||
|
||||
def find_peer(%{to: to}) do
|
||||
defp put_routing(%Ecto.Changeset{changes: %{to: to}} = changeset) do
|
||||
identity = BirdyChat.Identity.identity()
|
||||
|
||||
if String.starts_with?(to, identity) do
|
||||
{:ok, :local}
|
||||
changeset
|
||||
|> Ecto.Changeset.put_change(:routing, :local)
|
||||
|> Ecto.Changeset.put_change(:server, identity)
|
||||
else
|
||||
result =
|
||||
server =
|
||||
BirdyChat.Identity.peers()
|
||||
|> Enum.find(fn {name, _url} -> String.starts_with?(to, name) end)
|
||||
|
||||
case result do
|
||||
{name, _url} -> {:ok, name}
|
||||
nil -> {:error, :not_found}
|
||||
case server do
|
||||
{name, _url} ->
|
||||
changeset
|
||||
|> Ecto.Changeset.put_change(:routing, :remote)
|
||||
|> Ecto.Changeset.put_change(:server, name)
|
||||
|
||||
nil ->
|
||||
changeset
|
||||
|> Ecto.Changeset.add_error(:server, "unknown 'to' server")
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
defp put_routing(%Ecto.Changeset{} = changeset) do
|
||||
changeset
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -4,27 +4,13 @@ defmodule BirdyChatWeb.Api.Messages.Controller do
|
|||
def create(conn, params) do
|
||||
case BirdyChat.Message.validate(params) do
|
||||
{:ok, changeset} ->
|
||||
case BirdyChat.Message.find_peer(changeset.changes) do
|
||||
{:ok, :local} ->
|
||||
case BirdyChat.MessageWriter.write(changeset.changes) do
|
||||
:ok ->
|
||||
conn
|
||||
|> put_status(:created)
|
||||
|> render(:create, message: changeset.changes)
|
||||
end
|
||||
|
||||
{:ok, peer_name} ->
|
||||
BirdyChatWeb.ServerChannel.broadcast!(peer_name, changeset.changes)
|
||||
|
||||
case BirdyChat.Dispatcher.dispatch(changeset) do
|
||||
:ok ->
|
||||
conn
|
||||
|> put_status(:created)
|
||||
|> render(:create, message: changeset.changes)
|
||||
|
||||
{:error, :not_found} ->
|
||||
changeset =
|
||||
changeset
|
||||
|> Ecto.Changeset.add_error(:to, "Unknown 'to' server")
|
||||
|
||||
:error ->
|
||||
conn
|
||||
|> put_status(:unprocessable_entity)
|
||||
|> render(:error, changeset: changeset)
|
||||
|
|
|
|||
34
lib/birdy_chat_web/api/server/internal/controller.ex
Normal file
34
lib/birdy_chat_web/api/server/internal/controller.ex
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
defmodule BirdyChatWeb.Api.Server.Internal.Controller do
|
||||
use BirdyChatWeb, :controller
|
||||
|
||||
def create(conn, params) do
|
||||
if authorised?(conn.req_headers, params) do
|
||||
case BirdyChat.Message.validate(params) do
|
||||
{:ok, changeset} ->
|
||||
case BirdyChat.MessageWriter.write(changeset.changes) do
|
||||
:ok ->
|
||||
conn
|
||||
|> put_status(:created)
|
||||
|> render(:create, message: changeset.changes)
|
||||
end
|
||||
end
|
||||
else
|
||||
conn
|
||||
|> put_status(:forbidden)
|
||||
|> render(:error, message: "Unauthorised")
|
||||
end
|
||||
end
|
||||
|
||||
defp authorised?(headers, %{"from" => from}) do
|
||||
case Enum.find(headers, fn {key, _value} -> key == "authorization" end) do
|
||||
nil ->
|
||||
false
|
||||
|
||||
{"authorization", token} ->
|
||||
case Phoenix.Token.verify(BirdyChatWeb.Endpoint, "serverAuth", token, max_age: 1200) do
|
||||
{:ok, id} -> id == from
|
||||
{:error, :invalid} -> false
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
18
lib/birdy_chat_web/api/server/internal/json.ex
Normal file
18
lib/birdy_chat_web/api/server/internal/json.ex
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
defmodule BirdyChatWeb.Api.Server.Internal.JSON do
|
||||
def render("create.json", %{message: message}) do
|
||||
message
|
||||
end
|
||||
|
||||
def render("error.json", %{message: message}) do
|
||||
%{errors: %{"general" => Gettext.dgettext(BirdyChatWeb.Gettext, "errors", message, [])}}
|
||||
end
|
||||
|
||||
def render("error.json", %{changeset: changeset}) do
|
||||
errors = Ecto.Changeset.traverse_errors(changeset, &get_error/1)
|
||||
%{errors: errors}
|
||||
end
|
||||
|
||||
def get_error({msg, opts}) do
|
||||
Gettext.dgettext(BirdyChatWeb.Gettext, "errors", msg, opts)
|
||||
end
|
||||
end
|
||||
|
|
@ -24,6 +24,7 @@ defmodule BirdyChatWeb.Router do
|
|||
pipe_through [:api]
|
||||
|
||||
post "/messages", Messages.Controller, :create
|
||||
post "/internal", Server.Internal.Controller, :create
|
||||
end
|
||||
|
||||
# Other scopes may use custom stacks.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue