49219508bc
* Fix anonymous access to outbox not being cached by the reverse proxy Up until now, anonymous access to outbox was marked as public, but with a 0 duration for caching, which means remote proxies would only serve from cache when the server was completely overwhelmed. Changed that cache duration to one minute, so that repeated anonymous access to one account's outbox can be appropriately cached. Also added `Signature` to the `Vary` header in case a page is requested, so that authenticated fetches are never served from cache (which only contains public toots). * Remove Vary: Accept header from webfinger controller Indeed, we have stopped returning xrd, and only ever return jrd, so the Accept request header does not matter anymore. * Cache negative webfinger hits for 3 minutes
88 lines
2.2 KiB
Ruby
88 lines
2.2 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
class ActivityPub::OutboxesController < ActivityPub::BaseController
|
|
LIMIT = 20
|
|
|
|
include SignatureVerification
|
|
include AccountOwnedConcern
|
|
|
|
before_action :require_signature!, if: :authorized_fetch_mode?
|
|
before_action :set_statuses
|
|
before_action :set_cache_headers
|
|
|
|
def show
|
|
if page_requested?
|
|
expires_in(1.minute, public: public_fetch_mode? && signed_request_account.nil?)
|
|
else
|
|
expires_in(3.minutes, public: public_fetch_mode?)
|
|
end
|
|
render json: outbox_presenter, serializer: ActivityPub::OutboxSerializer, adapter: ActivityPub::Adapter, content_type: 'application/activity+json'
|
|
end
|
|
|
|
private
|
|
|
|
def outbox_presenter
|
|
if page_requested?
|
|
ActivityPub::CollectionPresenter.new(
|
|
id: outbox_url(**page_params),
|
|
type: :ordered,
|
|
part_of: outbox_url,
|
|
prev: prev_page,
|
|
next: next_page,
|
|
items: @statuses
|
|
)
|
|
else
|
|
ActivityPub::CollectionPresenter.new(
|
|
id: outbox_url,
|
|
type: :ordered,
|
|
size: @account.statuses_count,
|
|
first: outbox_url(page: true),
|
|
last: outbox_url(page: true, min_id: 0)
|
|
)
|
|
end
|
|
end
|
|
|
|
def outbox_url(**kwargs)
|
|
if params[:account_username].present?
|
|
account_outbox_url(@account, **kwargs)
|
|
else
|
|
instance_actor_outbox_url(**kwargs)
|
|
end
|
|
end
|
|
|
|
def next_page
|
|
outbox_url(page: true, max_id: @statuses.last.id) if @statuses.size == LIMIT
|
|
end
|
|
|
|
def prev_page
|
|
outbox_url(page: true, min_id: @statuses.first.id) unless @statuses.empty?
|
|
end
|
|
|
|
def set_statuses
|
|
return unless page_requested?
|
|
|
|
@statuses = cache_collection_paginated_by_id(
|
|
@account.statuses.permitted_for(@account, signed_request_account),
|
|
Status,
|
|
LIMIT,
|
|
params_slice(:max_id, :min_id, :since_id)
|
|
)
|
|
end
|
|
|
|
def page_requested?
|
|
truthy_param?(:page)
|
|
end
|
|
|
|
def page_params
|
|
{ page: true, max_id: params[:max_id], min_id: params[:min_id] }.compact
|
|
end
|
|
|
|
def set_account
|
|
@account = params[:account_username].present? ? Account.find_local!(username_param) : Account.representative
|
|
end
|
|
|
|
def set_cache_headers
|
|
response.headers['Vary'] = 'Signature' if authorized_fetch_mode? || page_requested?
|
|
end
|
|
end
|