IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Strip null bytes in mail subjects.

Browse Source
This commit is contained in:
Guo Xiang Tan
2018-10-11 09:46:32 +08:00
parent ffc241eb25
commit 5039a6c3f1
3 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/email/receiver.rb
View File

@@ -52,10 +52,12 @@ module Email
raise EmptyEmailError if mail_string.blank?
@staged_users = []
@raw_email = mail_string
COMMON_ENCODINGS.each do |encoding|
fixed = try_to_encode(mail_string, encoding)
break @raw_email = fixed if fixed.present?
end
@mail = Mail.new(@raw_email)
@message_id = @mail.message_id.presence || Digest::MD5.hexdigest(mail_string)
@opts = opts
@@ -482,7 +484,10 @@ module Email
end
def subject
@suject ||= @mail.subject.presence || I18n.t("emails.incoming.default_subject", email: @from_email)
@subject ||= begin
mail_subject = @mail.subject.delete("\u0000")
mail_subject.presence || I18n.t("emails.incoming.default_subject", email: @from_email)
end
end
def find_user(email)