Browse Source

Fix caching headers in ActivityPub endpoints (#11331)

* Fix reverse-proxy caching in public fetch mode

* Fix caching in ActivityPub-specific controllers
pull/4/head
ThibG 4 years ago
committed by Eugen Rochko
parent
commit
15ddabf95a
5 changed files with 13 additions and 4 deletions
  1. +9
    -0
      app/controllers/activitypub/base_controller.rb
  2. +1
    -1
      app/controllers/activitypub/collections_controller.rb
  3. +1
    -1
      app/controllers/activitypub/outboxes_controller.rb
  4. +1
    -1
      app/controllers/activitypub/replies_controller.rb
  5. +1
    -1
      app/controllers/application_controller.rb

+ 9
- 0
app/controllers/activitypub/base_controller.rb 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

+ 1
- 1
app/controllers/activitypub/collections_controller.rb View File

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

+ 1
- 1
app/controllers/activitypub/outboxes_controller.rb View File

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

+ 1
- 1
app/controllers/activitypub/replies_controller.rb View File

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

+ 1
- 1
app/controllers/application_controller.rb View File

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

Loading…
Cancel
Save