From 3bee0996c509f4b416096094061edbc9c10f5632 Mon Sep 17 00:00:00 2001
From: ThibG <thib@sitedethib.com>
Date: Thu, 4 Jan 2018 14:39:38 +0100
Subject: [PATCH] Make sure private toots remain private and do not end up in
HTTP caches (#6175)
---
app/controllers/application_controller.rb | 3 ++-
app/controllers/statuses_controller.rb | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index e17d1f26e3..f59f2725b6 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -124,6 +124,7 @@ class ApplicationController < ActionController::Base
def render_cached_json(cache_key, **options)
options[:expires_in] ||= 3.minutes
+ options[:public] ||= true
cache_key = cache_key.join(':') if cache_key.is_a?(Enumerable)
content_type = options.delete(:content_type) || 'application/json'
@@ -131,7 +132,7 @@ class ApplicationController < ActionController::Base
yield.to_json
end
- expires_in options[:expires_in], public: true
+ expires_in options[:expires_in], public: options[:public]
render json: data, content_type: content_type
end
diff --git a/app/controllers/statuses_controller.rb b/app/controllers/statuses_controller.rb
index 1a440fd599..367ea34e78 100644
--- a/app/controllers/statuses_controller.rb
+++ b/app/controllers/statuses_controller.rb
@@ -24,7 +24,7 @@ class StatusesController < ApplicationController
format.json do
skip_session! unless @stream_entry.hidden?
- render_cached_json(['activitypub', 'note', @status.cache_key], content_type: 'application/activity+json') do
+ render_cached_json(['activitypub', 'note', @status.cache_key], content_type: 'application/activity+json', public: !@stream_entry.hidden?) do
ActiveModelSerializers::SerializableResource.new(@status, serializer: ActivityPub::NoteSerializer, adapter: ActivityPub::Adapter)
end
end
@@ -34,7 +34,7 @@ class StatusesController < ApplicationController
def activity
skip_session!
- render_cached_json(['activitypub', 'activity', @status.cache_key], content_type: 'application/activity+json') do
+ render_cached_json(['activitypub', 'activity', @status.cache_key], content_type: 'application/activity+json', public: !@stream_entry.hidden?) do
ActiveModelSerializers::SerializableResource.new(@status, serializer: ActivityPub::ActivitySerializer, adapter: ActivityPub::Adapter)
end
end