diff --git a/app/controllers/billboards_controller.rb b/app/controllers/billboards_controller.rb index 8da7b6f5f..dd2d81bb3 100644 --- a/app/controllers/billboards_controller.rb +++ b/app/controllers/billboards_controller.rb @@ -1,7 +1,7 @@ class BillboardsController < ApplicationController before_action :set_cache_control_headers, only: %i[show], unless: -> { current_user } include BillboardHelper - CACHE_EXPIRY_FOR_BILLBOARDS = 15.minutes.to_i.freeze + CACHE_EXPIRY_FOR_BILLBOARDS = 3.minutes.to_i.freeze RANDOM_USER_TAG_RANGE_MIN = 5 RANDOM_USER_TAG_RANGE_MAX = 32 diff --git a/config/fastly/snippets/safe_params_list.vcl b/config/fastly/snippets/safe_params_list.vcl index 9f8cd3ded..3f5d334a0 100644 --- a/config/fastly/snippets/safe_params_list.vcl +++ b/config/fastly/snippets/safe_params_list.vcl @@ -2,6 +2,6 @@ import querystring; sub vcl_recv { # return this URL with only the parameters that match this regular expression if (req.url !~ "/admin/" && req.url !~ "/search/" && req.url !~ "/bulk_show") { - set req.url = querystring.regfilter_except(req.url, "^(a_id|args|article_id|article_ids|articles|asc|callback_url|category|client_id|code|collection_id|commentable_id|commentable_type|confirmation_token|created_at|end|email|filter|followable_id|followable_type|forem_owner_secret|fork_id|i|key|message_offset|name|oauth_token|oauth_verifier|offset|onboarding|org_id|organization_id|p|page|per_page|p_id|placement_area|prefill|preview|purchaser|q|reactable_ids|redirect_uri|reported_url|reporter_username|response_type|scope|search|signature|sort|source_id|source_type|start|state|status|tag|tag_list|top|type_of|url|username|invitation_token|reset_password_token|ut|verb|invitation_slug|period|comments_sort|billboard|controller_action|bb_test_placement_area|bb_test_id)$"); + set req.url = querystring.regfilter_except(req.url, "^(a_id|args|article_id|article_ids|articles|asc|callback_url|category|client_id|code|collection_id|commentable_id|commentable_type|confirmation_token|created_at|end|email|filter|followable_id|followable_type|forem_owner_secret|fork_id|i|key|message_offset|name|oauth_token|oauth_verifier|offset|onboarding|org_id|organization_id|p|page|per_page|p_id|placement_area|prefill|preview|purchaser|q|reactable_ids|redirect_uri|reported_url|reporter_username|response_type|scope|search|signature|sort|source_id|source_type|start|state|status|tag|tag_list|top|type_of|url|username|invitation_token|reset_password_token|ut|verb|invitation_slug|period|comments_sort|billboard|controller_action|bb_test_placement_area|cookies_allowed|bb_test_id)$"); } } diff --git a/spec/requests/billboards_spec.rb b/spec/requests/billboards_spec.rb index bc9899e49..9b2e63a95 100644 --- a/spec/requests/billboards_spec.rb +++ b/spec/requests/billboards_spec.rb @@ -4,7 +4,7 @@ RSpec.describe "Billboards" do let(:user) { create(:user) } let(:article) { create(:article, user: user) } - let(:max_age) { 15.minutes.to_i } + let(:max_age) { 3.minutes.to_i } let(:stale_if_error) { 26_400 } def create_billboard(**options)