codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-27 17:46:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
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?
end
# 2) default to UTF-8
try_to_encode(string, "UTF-8")
# 2) try most used encodings
try_to_encode(string, "UTF-8") || try_to_encode(string, "ISO-8859-1")
end
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,
Encoding::UndefinedConversionError,
Encoding::ConverterNotFoundError