treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Fix caching headers in ActivityPub endpoints (#11331) 

* Fix reverse-proxy caching in public fetch mode

* Fix caching in ActivityPub-specific controllers
lolsob-rspec
ThibG 2019-07-17 00:00:39 +02:00 committed by Eugen Rochko
parent ab6af77728
commit a4b1083795
5 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/controllers/activitypub/base_controller.rb Normal file
View File

@ -0,0 +1,9 @@
# frozen_string_literal: true
class ActivityPub::BaseController < Api::BaseController
private
def set_cache_headers
response.headers['Vary'] = 'Signature' if authorized_fetch_mode?
end
end

2
app/controllers/activitypub/collections_controller.rb
View File

@ -1,6 +1,6 @@
# frozen_string_literal: true # frozen_string_literal: true
class ActivityPub::CollectionsController < Api::BaseController class ActivityPub::CollectionsController < ActivityPub::BaseController
include SignatureVerification include SignatureVerification
include AccountOwnedConcern include AccountOwnedConcern

2
app/controllers/activitypub/outboxes_controller.rb
View File

@ -1,6 +1,6 @@
# frozen_string_literal: true # frozen_string_literal: true
class ActivityPub::OutboxesController < Api::BaseController class ActivityPub::OutboxesController < ActivityPub::BaseController
LIMIT = 20 LIMIT = 20
include SignatureVerification include SignatureVerification

2
app/controllers/activitypub/replies_controller.rb
View File

@ -1,6 +1,6 @@
# frozen_string_literal: true # frozen_string_literal: true
class ActivityPub::RepliesController < Api::BaseController class ActivityPub::RepliesController < ActivityPub::BaseController
include SignatureAuthentication include SignatureAuthentication
include Authorization include Authorization
include AccountOwnedConcern include AccountOwnedConcern

2
app/controllers/application_controller.rb
View File

@ -160,6 +160,6 @@ class ApplicationController < ActionController::Base
end end
def set_cache_headers def set_cache_headers
response.headers['Vary'] = 'Accept, Signature' response.headers['Vary'] = public_fetch_mode? ? 'Accept' : 'Accept, Signature'
end end
end end