A platform for community discussion. Free, open, simple.
SECURITY: Prevent Sidekiq DoS via Graphviz rendering (#40743)
David Taylor7056a3a95f2c
diff --git a/plugins/discourse-graphviz/plugin.rb b/plugins/discourse-graphviz/plugin.rbindex 315669b200f..7e8fef4f3a8 100644--- a/plugins/discourse-graphviz/plugin.rb+++ b/plugins/discourse-graphviz/plugin.rb@@ -14,9 +14,13 @@ register_asset "stylesheets/common/graphviz.scss"module ::DiscourseGraphvizALLOWED_URL_SCHEMES = %w[http https].freeze+ ALLOWED_ENGINES = %w[dot neato circo fdp osage twopi].freeze+ DEFAULT_ENGINE = "dot"++ RENDER_TIMEOUT_MS = 5_000def self.context- context = MiniRacer::Context.new+ context = MiniRacer::Context.new(timeout: RENDER_TIMEOUT_MS)context.load("#{Rails.root.join("plugins/discourse-graphviz/public/javascripts/viz-3.0.1.js")}")contextend@@ -55,11 +59,15 @@ after_initialize dodoc.css("div.graphviz").each do |graph|- engine = graph.attribute("data-engine").value+ engine = graph.attribute("data-engine")&.value+ valid_engine = DiscourseGraphviz::ALLOWED_ENGINES.include?(engine)+ engine = DiscourseGraphviz::DEFAULT_ENGINE if !valid_enginesvg_graph =begin- DiscourseGraphviz.context.eval(- "vizRenderStringSync(#{graph.children[0].content.inspect}, {engine: '#{engine}'})",+ DiscourseGraphviz.context.call(+ "vizRenderStringSync",+ graph.children[0].content,+ { engine: engine },)rescue StandardErrornil