mirror of
https://github.com/discourse/discourse.git
synced 2024-11-23 01:16:38 -06:00
f58ab2283d
Same fix is applied to emails immediately after being parsed because long headers are sometimes in an invalid format.
29 lines
708 B
Ruby
29 lines
708 B
Ruby
# frozen_string_literal: true
|
|
|
|
module Email
|
|
class Validator
|
|
def self.ensure_valid!(mail)
|
|
Email::Validator.ensure_valid_address_lists!(mail)
|
|
Email::Validator.ensure_valid_date!(mail)
|
|
|
|
mail
|
|
end
|
|
|
|
def self.ensure_valid_address_lists!(mail)
|
|
[:to, :cc, :bcc].each do |field|
|
|
addresses = mail[field]
|
|
|
|
if addresses&.errors.present?
|
|
mail[field] = addresses.to_s.scan(/\b[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}\b/i)
|
|
end
|
|
end
|
|
end
|
|
|
|
def self.ensure_valid_date!(mail)
|
|
if mail.date.nil?
|
|
raise Email::Receiver::InvalidPost, I18n.t("system_messages.email_reject_invalid_post_specified.date_invalid")
|
|
end
|
|
end
|
|
end
|
|
end
|