d9a4ca5975
The method Banzai::Renderer.pre_process would always be called, regardless of whether the Markdown to render was already cached or not. In cache the document _was_ cached the output of the pre-processing pipeline was ignored resulting in it doing nothing but wasting CPU cycles. This commit moves Banzai::Renderer.pre_process into Banzai::Renderer.render_result so that it's _only_ used when needed.
82 lines
2.6 KiB
Ruby
82 lines
2.6 KiB
Ruby
module Banzai
|
|
module Renderer
|
|
# Convert a Markdown String into an HTML-safe String of HTML
|
|
#
|
|
# Note that while the returned HTML will have been sanitized of dangerous
|
|
# HTML, it may post a risk of information leakage if it's not also passed
|
|
# through `post_process`.
|
|
#
|
|
# Also note that the returned String is always HTML, not XHTML. Views
|
|
# requiring XHTML, such as Atom feeds, need to call `post_process` on the
|
|
# result, providing the appropriate `pipeline` option.
|
|
#
|
|
# markdown - Markdown String
|
|
# context - Hash of context options passed to our HTML Pipeline
|
|
#
|
|
# Returns an HTML-safe String
|
|
def self.render(text, context = {})
|
|
cache_key = context.delete(:cache_key)
|
|
cache_key = full_cache_key(cache_key, context[:pipeline])
|
|
|
|
if cache_key
|
|
Gitlab::Metrics.measure(:banzai_cached_render) do
|
|
Rails.cache.fetch(cache_key) do
|
|
cacheless_render(text, context)
|
|
end
|
|
end
|
|
else
|
|
cacheless_render(text, context)
|
|
end
|
|
end
|
|
|
|
def self.render_result(text, context = {})
|
|
text = Pipeline[:pre_process].to_html(text, context) if text
|
|
|
|
Pipeline[context[:pipeline]].call(text, context)
|
|
end
|
|
|
|
# Perform post-processing on an HTML String
|
|
#
|
|
# This method is used to perform state-dependent changes to a String of
|
|
# HTML, such as removing references that the current user doesn't have
|
|
# permission to make (`RedactorFilter`).
|
|
#
|
|
# html - String to process
|
|
# context - Hash of options to customize output
|
|
# :pipeline - Symbol pipeline type
|
|
# :project - Project
|
|
# :user - User object
|
|
#
|
|
# Returns an HTML-safe String
|
|
def self.post_process(html, context)
|
|
context = Pipeline[context[:pipeline]].transform_context(context)
|
|
|
|
pipeline = Pipeline[:post_process]
|
|
if context[:xhtml]
|
|
pipeline.to_document(html, context).to_html(save_with: Nokogiri::XML::Node::SaveOptions::AS_XHTML)
|
|
else
|
|
pipeline.to_html(html, context)
|
|
end.html_safe
|
|
end
|
|
|
|
private
|
|
|
|
def self.cacheless_render(text, context = {})
|
|
Gitlab::Metrics.measure(:banzai_cacheless_render) do
|
|
result = render_result(text, context)
|
|
|
|
output = result[:output]
|
|
if output.respond_to?(:to_html)
|
|
output.to_html
|
|
else
|
|
output.to_s
|
|
end
|
|
end
|
|
end
|
|
|
|
def self.full_cache_key(cache_key, pipeline_name)
|
|
return unless cache_key
|
|
["banzai", *cache_key, pipeline_name || :full]
|
|
end
|
|
end
|
|
end
|