diff options
| author | Louise Crow <louise.crow@gmail.com> | 2015-05-22 15:29:34 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2015-05-26 16:17:20 +0100 |
| commit | c0a76dd0b1816f9a324e6187795c18abf36eeed5 (patch) | |
| tree | 3bc118b20a1d24385200b23e14cb736f2979cdb2 /app | |
| parent | 0c915e5e1a982513f9ded38b11f8b7b570c518e8 (diff) | |
Handle unparsed email contents as binary.
I think I was wrong in a83b379fd2d676172855825d0592937b234371e2 in
assuming that all email gets properly encoded for transfer. Looking
at the mail gem load method
https://github.com/mikel/mail/blob/b159e0a542962fdd5e292a48cfffa560d7cf412e/lib/mail/mail.rb#L175a,
it reads raw email content from a file in binary mode. So this commit
makes both reading and writing the raw_email a binary mode operation
and adds a data_as_text method for displaying the data in the admin
interface that coerces it to valid utf-8.
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/raw_email.rb | 19 | ||||
| -rw-r--r-- | app/views/admin_raw_email/show.html.erb | 5 |
2 files changed, 21 insertions, 3 deletions
diff --git a/app/models/raw_email.rb b/app/models/raw_email.rb index 3b466cb81..907d3c7a0 100644 --- a/app/models/raw_email.rb +++ b/app/models/raw_email.rb @@ -39,11 +39,26 @@ class RawEmail < ActiveRecord::Base def data=(d) FileUtils.mkdir_p(directory) unless File.exists?(directory) - File.atomic_write(filepath) { |file| file.write(d) } + File.atomic_write(filepath) do |file| + file.binmode + file.write(d) + end end def data - File.open(filepath, "r").read + File.open(filepath, "rb").read + end + + def data_as_text + text = data + if text.respond_to?(:encoding) + text = text.encode("UTF-8", :invalid => :replace, + :undef => :replace, + :replace => "") + else + text = Iconv.conv('UTF-8//IGNORE', 'UTF-8', text) + end + text end def destroy_file_representation! diff --git a/app/views/admin_raw_email/show.html.erb b/app/views/admin_raw_email/show.html.erb index f88b00ef0..1de719544 100644 --- a/app/views/admin_raw_email/show.html.erb +++ b/app/views/admin_raw_email/show.html.erb @@ -59,5 +59,8 @@ <p><%= link_to "Download", admin_raw_email_path(@raw_email, :format => 'txt') %></p> -<pre><%=h(@raw_email.data).gsub(/\n/, '<br>').html_safe %></pre> +<h2>Preview</h2> + +For an exact rendering of this email, use the "Download" link. +<pre><%=h(@raw_email.data_as_text).gsub(/\n/, '<br>').html_safe %></pre> |