Skip to content
Permalink
Browse files

Fix invalid votes from the API being accepted (#12601)

* Fix invalid votes from the API being accepted

Fixes #12556

- Ensure `choice` is an integer instead of silently converting to 0
- Ensure `choice` corresponds to an actual choice of the poll

* Please CodeClimate
  • Loading branch information
ThibG authored and Gargron committed Jan 12, 2020
1 parent 7da5400 commit d386d89179ccc2b86894a8639b658f4ede24c5f6
Showing with 10 additions and 1 deletion.
  1. +1 −1 app/services/vote_service.rb
  2. +8 −0 app/validators/vote_validator.rb
  3. +1 −0 config/locales/en.yml
@@ -20,7 +20,7 @@ def call(account, poll, choices)

ApplicationRecord.transaction do
@choices.each do |choice|
@votes << @poll.votes.create!(account: @account, choice: choice)
@votes << @poll.votes.create!(account: @account, choice: Integer(choice))
end
end
else
@@ -4,10 +4,18 @@ class VoteValidator < ActiveModel::Validator
def validate(vote)
vote.errors.add(:base, I18n.t('polls.errors.expired')) if vote.poll.expired?

vote.errors.add(:base, I18n.t('polls.errors.invalid_choice')) if invalid_choice?(vote)

if vote.poll.multiple? && vote.poll.votes.where(account: vote.account, choice: vote.choice).exists?
vote.errors.add(:base, I18n.t('polls.errors.already_voted'))
elsif !vote.poll.multiple? && vote.poll.votes.where(account: vote.account).exists?
vote.errors.add(:base, I18n.t('polls.errors.already_voted'))
end
end

private

def invalid_choice?(vote)
vote.choice.negative? || vote.choice >= vote.poll.options.size
end
end
@@ -922,6 +922,7 @@ en:
duration_too_long: is too far into the future
duration_too_short: is too soon
expired: The poll has already ended
invalid_choice: The chosen vote option does not exist
over_character_limit: cannot be longer than %{max} characters each
too_few_options: must have more than one item
too_many_options: can't contain more than %{max} items

0 comments on commit d386d89

Please sign in to comment.
You can’t perform that action at this time.