aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshibayashi <shibayashi@cypherpunk.observer>2018-08-28 00:40:58 +0200
committershibayashi <shibayashi@cypherpunk.observer>2018-08-28 00:40:58 +0200
commitb9a642da1ec290386d04245eb17175866e40308c (patch)
treec9a6b0195563e30ce32c73ca591b4762337ecba6
parent5ffaa2bf69679f118af9736d62535cc4eb870709 (diff)
downloadpleroma-b9a642da1ec290386d04245eb17175866e40308c.tar.gz
Add Secure and SameSite cookie flags
-rw-r--r--config/config.exs3
-rw-r--r--lib/pleroma/web/endpoint.ex4
2 files changed, 5 insertions, 2 deletions
diff --git a/config/config.exs b/config/config.exs
index eaf20e8f9..d5e28f586 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -24,7 +24,8 @@ config :pleroma, Pleroma.Web.Endpoint,
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]
+ pubsub: [name: Pleroma.PubSub, adapter: Phoenix.PubSub.PG2],
+ secure_cookie_flag: true
# Configures Elixir's Logger
config :logger, :console,
diff --git a/lib/pleroma/web/endpoint.ex b/lib/pleroma/web/endpoint.ex
index cbedca004..e81bc75b6 100644
--- a/lib/pleroma/web/endpoint.ex
+++ b/lib/pleroma/web/endpoint.ex
@@ -49,7 +49,9 @@ defmodule Pleroma.Web.Endpoint do
Plug.Session,
store: :cookie,
key: "_pleroma_key",
- signing_salt: "CqaoopA2"
+ signing_salt: "CqaoopA2",
+ secure: Application.get_env(:pleroma, Pleroma.Web.Endpoint) |> Keyword.get(:secure_cookie_flag),
+ extra: "SameSite=Lax"
)
plug(Pleroma.Web.Router)