Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: check we used the right encoding when parsing incoming emails

This commit is contained in:
Régis Hanol 2016-03-30 19:54:38 +02:00
parent 2ac38e9d05
commit 79329c8e85
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/email/receiver.rb
View File

@ -162,12 +162,13 @@ module Email
return fixed if fixed.present? return fixed if fixed.present?
end end
# 2) default to UTF-8 # 2) try most used encodings
try_to_encode(string, "UTF-8") try_to_encode(string, "UTF-8") || try_to_encode(string, "ISO-8859-1")
end end
def try_to_encode(string, encoding) def try_to_encode(string, encoding)
string.encode("UTF-8", encoding) encoded = string.encode("UTF-8", encoding)
encoded.present? && encoded.valid_encoding? ? encoded : nil
rescue Encoding::InvalidByteSequenceError, rescue Encoding::InvalidByteSequenceError,
Encoding::UndefinedConversionError, Encoding::UndefinedConversionError,
Encoding::ConverterNotFoundError Encoding::ConverterNotFoundError