From be495c6a80fadd6c741b82c7e9d585f3f1ab349b Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Tue, 24 Jul 2018 12:58:31 -0700 Subject: Fix slow Markdown rendering The sanitize transformers were being duplicated each time the Markdown renderer was called, leading to expontential growth in rendering times. The problem was that although HTML::Pipeline::SanitizationFilter.WHITELIST is a frozen hash, the `:transformers` array can be modified. We need to do deep copy of this to avoid adding duplicates. Closes #49409 --- changelogs/unreleased/sh-revert-markdown-changes.yml | 5 +++++ lib/banzai/filter/sanitization_filter.rb | 2 +- spec/lib/banzai/filter/sanitization_filter_spec.rb | 12 ++++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 changelogs/unreleased/sh-revert-markdown-changes.yml diff --git a/changelogs/unreleased/sh-revert-markdown-changes.yml b/changelogs/unreleased/sh-revert-markdown-changes.yml new file mode 100644 index 00000000000..72540f710a1 --- /dev/null +++ b/changelogs/unreleased/sh-revert-markdown-changes.yml @@ -0,0 +1,5 @@ +--- +title: Fix slow Markdown rendering +merge_request: 20820 +author: +type: performance diff --git a/lib/banzai/filter/sanitization_filter.rb b/lib/banzai/filter/sanitization_filter.rb index 80b9d3d045f..8ba09290e6d 100644 --- a/lib/banzai/filter/sanitization_filter.rb +++ b/lib/banzai/filter/sanitization_filter.rb @@ -13,7 +13,7 @@ module Banzai def whitelist strong_memoize(:whitelist) do - customize_whitelist(super.dup) + customize_whitelist(super.deep_dup) end end diff --git a/spec/lib/banzai/filter/sanitization_filter_spec.rb b/spec/lib/banzai/filter/sanitization_filter_spec.rb index d930c608b18..0b3c2390304 100644 --- a/spec/lib/banzai/filter/sanitization_filter_spec.rb +++ b/spec/lib/banzai/filter/sanitization_filter_spec.rb @@ -54,6 +54,18 @@ describe Banzai::Filter::SanitizationFilter do expect(instance.whitelist[:transformers].size).to eq control_count end + it 'customizes the whitelist only once for different instances' do + instance1 = described_class.new('Foo1') + instance2 = described_class.new('Foo2') + control_count = instance1.whitelist[:transformers].size + + instance1.whitelist + instance2.whitelist + + expect(instance1.whitelist[:transformers].size).to eq control_count + expect(instance2.whitelist[:transformers].size).to eq control_count + end + it 'sanitizes `class` attribute from all elements' do act = %q{
<span class="k">def</span>
} exp = %q{
<span class="k">def</span>
} -- cgit v1.2.1