diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-04-08 19:53:32 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-04-08 19:53:32 +0200 |
| commit | ff73d43b3596d50d071fd3e6ab6f49608b62c9d1 (patch) | |
| tree | bf8dca3a3864b013b0e55476a21fb1ad0d97c41f /lib/action_dispatch/cookie_jar_extensions.rb | |
| parent | e0c39f9fad837b77373220515f078f2443ddf553 (diff) | |
| parent | 68273a7c6d6c630b6c88764579580682e12eebce (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `Gemfile.lock`: Not a real conflict, just an upstream dependency udpated textually too close to a glitch-soc-only dependency. Updated dependencies like upstream. - `app/controllers/settings/preferences_controller.rb`: Upstream added settings where we had extra glitch-soc-specific settings. Added upstream's new settings. - `app/models/user.rb`: Upstream added settings where we had extra glitch-soc-specific settings. Added upstream's new settings. - `config/i18n-tasks.yml`: Not a real conflict, just a new upstream line too textually close to a glitch-soc-only line. Ported upstream's change.
Diffstat (limited to 'lib/action_dispatch/cookie_jar_extensions.rb')
| -rw-r--r-- | lib/action_dispatch/cookie_jar_extensions.rb | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/lib/action_dispatch/cookie_jar_extensions.rb b/lib/action_dispatch/cookie_jar_extensions.rb deleted file mode 100644 index 1be9053ba..000000000 --- a/lib/action_dispatch/cookie_jar_extensions.rb +++ /dev/null @@ -1,25 +0,0 @@ -# frozen_string_literal: true - -module ActionDispatch - module CookieJarExtensions - private - - # Monkey-patch ActionDispatch to serve secure cookies to Tor Hidden Service - # users. Otherwise, ActionDispatch would drop the cookie over HTTP. - def write_cookie?(*) - request.host.end_with?('.onion') || super - end - end -end - -ActionDispatch::Cookies::CookieJar.prepend(ActionDispatch::CookieJarExtensions) - -module Rack - module SessionPersistedExtensions - def security_matches?(request, options) - request.host.end_with?('.onion') || super - end - end -end - -Rack::Session::Abstract::Persisted.prepend(Rack::SessionPersistedExtensions) |