aboutsummaryrefslogtreecommitdiffstats
path: root/guides/source/configuring.md
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2017-05-28 17:02:14 +0200
committerGitHub <noreply@github.com>2017-05-28 17:02:14 +0200
commitb88200f10376a3d73c34a7db0347acc7b06bad39 (patch)
tree4cca6ebc0d4f010a025b954ef75ac5733222dcff /guides/source/configuring.md
parent919bc57747924d77700db656ab7be34f4ff3a61f (diff)
parent5a3ba63d9abad86b7f6dd36a92cfaf722e52760b (diff)
downloadrails-b88200f10376a3d73c34a7db0347acc7b06bad39.tar.gz
rails-b88200f10376a3d73c34a7db0347acc7b06bad39.tar.bz2
rails-b88200f10376a3d73c34a7db0347acc7b06bad39.zip
Merge pull request #28132 from mikeycgto/aead-encrypted-cookies
AEAD encrypted cookies and sessions
Diffstat (limited to 'guides/source/configuring.md')
-rw-r--r--guides/source/configuring.md8
1 files changed, 6 insertions, 2 deletions
diff --git a/guides/source/configuring.md b/guides/source/configuring.md
index bf9456a482..6a7eaf00e1 100644
--- a/guides/source/configuring.md
+++ b/guides/source/configuring.md
@@ -456,10 +456,14 @@ to `'http authentication'`.
Defaults to `'signed cookie'`.
* `config.action_dispatch.encrypted_cookie_salt` sets the encrypted cookies salt
-value. Defaults to `'encrypted cookie'`.
+ value. Defaults to `'encrypted cookie'`.
* `config.action_dispatch.encrypted_signed_cookie_salt` sets the signed
-encrypted cookies salt value. Defaults to `'signed encrypted cookie'`.
+ encrypted cookies salt value. Defaults to `'signed encrypted cookie'`.
+
+* `config.action_dispatch.authenticated_encrypted_cookie_salt` sets the
+ authenticated encrypted cookie salt. Defaults to `'authenticated encrypted
+ cookie'`.
* `config.action_dispatch.perform_deep_munge` configures whether `deep_munge`
method should be performed on the parameters. See [Security Guide](security.html#unsafe-query-generation)