pleroma

commit: 52006f8f8a9e71f7444b6849ba01c4fef69745d7
parent: 5803672ae5c66f08ecec2d1e850cb4b4ccea3474
Author: rinpatch <rinpatch@sdf.org>
Date:   Mon, 21 Jan 2019 05:22:34 +0000

Merge branch 'bugfix/gen_signing_salt' into 'develop'

Mix.Tasks.Pleroma.Instance: Generate signing_salt

Closes #533

See merge request pleroma/pleroma!689
Diffstat:
M
lib/mix/tasks/pleroma/instance.ex
2
++
M
lib/mix/tasks/pleroma/sample_config.eex
3
++-

2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/lib/mix/tasks/pleroma/instance.ex b/lib/mix/tasks/pleroma/instance.ex
@@ -105,6 +105,7 @@ defmodule Mix.Tasks.Pleroma.Instance do
         )
 
       secret = :crypto.strong_rand_bytes(64) |> Base.encode64() |> binary_part(0, 64)
+      signing_salt = :crypto.strong_rand_bytes(8) |> Base.encode64() |> binary_part(0, 8)
       {web_push_public_key, web_push_private_key} = :crypto.generate_key(:ecdh, :prime256v1)
 
       result_config =
@@ -120,6 +121,7 @@ defmodule Mix.Tasks.Pleroma.Instance do
           dbpass: dbpass,
           version: Pleroma.Mixfile.project() |> Keyword.get(:version),
           secret: secret,
+          signing_salt: signing_salt,
           web_push_public_key: Base.url_encode64(web_push_public_key, padding: false),
           web_push_private_key: Base.url_encode64(web_push_private_key, padding: false)
         )
diff --git a/lib/mix/tasks/pleroma/sample_config.eex b/lib/mix/tasks/pleroma/sample_config.eex
@@ -7,7 +7,8 @@ use Mix.Config
 
 config :pleroma, Pleroma.Web.Endpoint,
    url: [host: "<%= domain %>", scheme: "https", port: <%= port %>],
-   secret_key_base: "<%= secret %>"
+   secret_key_base: "<%= secret %>",
+   signing_salt: "<%= signing_salt %>"
 
 config :pleroma, :instance,
   name: "<%= name %>",