A platform for community discussion. Free, open, simple.
SECURITY: Uncontrolled Resource Consumption in Number Poll Generation (#41141)
Sam5d21dae7d980
diff --git a/plugins/poll/assets/javascripts/lib/discourse-markdown/poll.js b/plugins/poll/assets/javascripts/lib/discourse-markdown/poll.jsindex 73ae0dfdaeb..64fa079e039 100644--- a/plugins/poll/assets/javascripts/lib/discourse-markdown/poll.js+++ b/plugins/poll/assets/javascripts/lib/discourse-markdown/poll.js@@ -3,6 +3,7 @@ import { i18n } from "discourse-i18n";const DATA_PREFIX = "data-poll-";const DEFAULT_POLL = { name: "poll", status: "open" };+const DEFAULT_MAXIMUM_OPTIONS = 20;const ALLOWED_ATTRIBUTES = ["chartType","close",@@ -19,10 +20,16 @@ const ALLOWED_ATTRIBUTES = ["dynamic",];-function addNumberListItems(state, pollTokens, min, max, step) {+function addNumberListItems(state, pollTokens, min, max, step, maximumOptions) {pollTokens.push(new state.Token("bullet_list_open", "ul", 1));- for (let i = min; i <= max; i += step) {+ const maximumGeneratedOptions = maximumOptions + 1;++ for (+ let i = min, count = 0;+ i <= max && count < maximumGeneratedOptions;+ i += step, count+++ ) {pollTokens.push(new state.Token("list_item_open", "li", 1));let token = new state.Token("text", "", 0);@@ -144,13 +151,21 @@ const rule = {let min = parseInt(attrs.min, 10);let max = parseInt(attrs.max, 10);let step = parseInt(attrs.step, 10);+ let maximumOptions = parseInt(+ state.md.options.discourse.pollMaximumOptions,+ 10+ );++ if (isNaN(maximumOptions) || maximumOptions < 1) {+ maximumOptions = DEFAULT_MAXIMUM_OPTIONS;+ }if (isNaN(min)) {min = 1;}if (isNaN(max)) {- max = state.md.options.discourse.pollMaximumOptions;+ max = maximumOptions;}if (isNaN(step) || step < 1) {@@ -161,7 +176,7 @@ const rule = {state.tokens.splice(openTokenIndex, 1);return;} else if (min <= max) {- addNumberListItems(state, pollTokens, min, max, step);+ addNumberListItems(state, pollTokens, min, max, step, maximumOptions);}}diff --git a/plugins/poll/spec/lib/poll_spec.rb b/plugins/poll/spec/lib/poll_spec.rbindex 6bd9151cf89..91a5e17007c 100644--- a/plugins/poll/spec/lib/poll_spec.rb+++ b/plugins/poll/spec/lib/poll_spec.rb@@ -338,6 +338,19 @@ RSpec.describe DiscoursePoll::Poll do)end+ it "limits generated number poll options to one more than the configured maximum" do+ SiteSetting.poll_maximum_options = 3++ raw = <<~RAW+ [poll type=number min=1 max=100 step=1]+ [/poll]+ RAW++ poll = DiscoursePoll::Poll.extract(raw, 2).first++ expect(poll["options"].map { |option| option["html"] }).to eq(%w[1 2 3 4])+ end+it "extracts poll when there are multiple quotes in the post" doraw = <<~RAW[quote="user1, post:1, topic:123"]diff --git a/plugins/poll/spec/lib/polls_validator_spec.rb b/plugins/poll/spec/lib/polls_validator_spec.rbindex 53f5d81ef0b..04d15c24e83 100644--- a/plugins/poll/spec/lib/polls_validator_spec.rb+++ b/plugins/poll/spec/lib/polls_validator_spec.rb@@ -217,6 +217,20 @@ RSpec.describe DiscoursePoll::PollsValidator do)end+ it "rejects number polls whose generated range exceeds poll_maximum_options" do+ SiteSetting.poll_maximum_options = 20++ post.raw = <<~RAW+ [poll type=number min=1 max=100 step=1]+ [/poll]+ RAW++ expect(post.valid?).to eq(false)+ expect(post.errors[:base]).to include(+ I18n.t("poll.default_poll_must_have_less_options", count: SiteSetting.poll_maximum_options),+ )+ end+describe "multiple type polls" doit "ensure that min < max" doraw = <<~RAW