cybrespace
/
mastodon
4
3
Fork 3
Code Issues 7 Pull Requests Releases Activity

Fix ActivityPub and REST API queries setting cookies and preventing caching (#11539) 

Regression from #8657
This commit is contained in:
ThibG 2019-08-11 22:59:40 +02:00 committed by Eugen Rochko
parent aebefc7ce9
commit 646f96d448
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/accounts_controller.rb
View File

@ -9,6 +9,8 @@ class AccountsController < ApplicationController
before_action :set_cache_headers before_action :set_cache_headers
before_action :set_body_classes before_action :set_body_classes
skip_around_action :set_locale, if: -> { request.format == :json }
def show def show
respond_to do |format| respond_to do |format|
format.html do format.html do

2
app/controllers/api/base_controller.rb
View File

@ -14,6 +14,8 @@ class Api::BaseController < ApplicationController
protect_from_forgery with: :null_session protect_from_forgery with: :null_session
skip_around_action :set_locale
rescue_from ActiveRecord::RecordInvalid, Mastodon::ValidationError do |e| rescue_from ActiveRecord::RecordInvalid, Mastodon::ValidationError do |e|
render json: { error: e.to_s }, status: 422 render json: { error: e.to_s }, status: 422
end end

2
app/controllers/statuses_controller.rb
View File

@ -18,6 +18,8 @@ class StatusesController < ApplicationController
before_action :set_body_classes before_action :set_body_classes
before_action :set_autoplay, only: :embed before_action :set_autoplay, only: :embed
skip_around_action :set_locale, if: -> { request.format == :json }
content_security_policy only: :embed do |p| content_security_policy only: :embed do |p|
p.frame_ancestors(false) p.frame_ancestors(false)
end end