projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'captcha' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
endpoint.ex
diff --git
a/lib/pleroma/web/endpoint.ex
b/lib/pleroma/web/endpoint.ex
index 2469d7283af7ba55b37019b10ca96be933bb2665..e52667c72691245aabb10e1b06ae9788526478dc 100644
(file)
--- a/
lib/pleroma/web/endpoint.ex
+++ b/
lib/pleroma/web/endpoint.ex
@@
-1,17
+1,16
@@
defmodule Pleroma.Web.Endpoint do
use Phoenix.Endpoint, otp_app: :pleroma
defmodule Pleroma.Web.Endpoint do
use Phoenix.Endpoint, otp_app: :pleroma
- if Application.get_env(:pleroma, :chat) |> Keyword.get(:enabled) do
- socket("/socket", Pleroma.Web.UserSocket)
- end
-
- socket("/api/v1", Pleroma.Web.MastodonAPI.MastodonSocket)
+ socket("/socket", Pleroma.Web.UserSocket)
# Serve at "/" the static files from "priv/static" directory.
#
# You should set gzip to true if you are running phoenix.digest
# when deploying your static files in production.
# Serve at "/" the static files from "priv/static" directory.
#
# You should set gzip to true if you are running phoenix.digest
# when deploying your static files in production.
- plug(Plug.Static, at: "/media", from: Pleroma.Uploaders.Local.upload_path(), gzip: false)
+ plug(CORSPlug)
+ plug(Pleroma.Plugs.HTTPSecurityPlug)
+
+ plug(Pleroma.Plugs.UploadedMedia)
plug(
Plug.Static,
plug(
Plug.Static,
@@
-43,21
+42,25
@@
defmodule Pleroma.Web.Endpoint do
plug(Plug.MethodOverride)
plug(Plug.Head)
plug(Plug.MethodOverride)
plug(Plug.Head)
+ cookie_name =
+ if Application.get_env(:pleroma, Pleroma.Web.Endpoint) |> Keyword.get(:secure_cookie_flag),
+ do: "__Host-pleroma_key",
+ else: "pleroma_key"
+
# The session will be stored in the cookie and signed,
# this means its contents can be read but not tampered with.
# Set :encryption_salt if you would also like to encrypt it.
plug(
Plug.Session,
store: :cookie,
# The session will be stored in the cookie and signed,
# this means its contents can be read but not tampered with.
# Set :encryption_salt if you would also like to encrypt it.
plug(
Plug.Session,
store: :cookie,
- key:
"_pleroma_key"
,
- signing_salt:
"CqaoopA2"
,
+ key:
cookie_name
,
+ signing_salt:
{Pleroma.Config, :get, [[__MODULE__, :signing_salt], "CqaoopA2"]}
,
http_only: true,
secure:
Application.get_env(:pleroma, Pleroma.Web.Endpoint) |> Keyword.get(:secure_cookie_flag),
extra: "SameSite=Strict"
)
http_only: true,
secure:
Application.get_env(:pleroma, Pleroma.Web.Endpoint) |> Keyword.get(:secure_cookie_flag),
extra: "SameSite=Strict"
)
- plug(CORSPlug)
plug(Pleroma.Web.Router)
@doc """
plug(Pleroma.Web.Router)
@doc """