[whimsy] branch mod-gui updated: Fixes from master branch

[se...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch mod-gui
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/mod-gui by this push:
     new 78986cc  Fixes from master branch
78986cc is described below

commit 78986ccc7b74e3316229c294d84cba113eca87e3
Author: Sebb <se...@apache.org>
AuthorDate: Tue Feb 12 10:01:36 2019 +0000

    Fixes from master branch
---
 www/moderation/desk/models/message.rb | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/www/moderation/desk/models/message.rb b/www/moderation/desk/models/message.rb
index da562c7..cb73e18 100644
--- a/www/moderation/desk/models/message.rb
+++ b/www/moderation/desk/models/message.rb
@@ -16,11 +16,11 @@ class Message
   #
   # create a new message
   #
-  def initialize(mailbox, hash, headers, email)
+  def initialize(mailbox, hash, headers, raw)
     @hash = hash
     @mailbox = mailbox
     @headers = headers
-    @email = email
+    @raw = raw
     @mailbox = nil # lazily created
   end
 
@@ -51,11 +51,11 @@ class Message
   #
 
   def mail
-    @mail ||= Mail.new(@email)
+    @mail ||= Mail.new(@raw.gsub(LF_ONLY, CRLF))
   end
 
   def raw
-    @email
+    @raw
   end
 
   def id
@@ -162,7 +162,7 @@ class Message
   # write email to disk
   #
   def write_email
-    @mailbox.write_email(@hash, @email)
+    @mailbox.write_email(@hash, @raw)
   end
 
   #
@@ -310,11 +310,15 @@ class Message
   end
 
   # get the message ID
-  def self.getmid(hdrs)
+  def self.getmid(message)
+    # only search headers for MID
+    hdrs = message[/\A(.*?)\r?\n\r?\n/m, 1] || ''
     mid = hdrs[/^Message-ID:.*/i]
     if mid =~ /^Message-ID:\s*$/i # no mid on the first line
       # capture the next line and join them together
-      mid = hdrs[/^Message-ID:.*\r?\n .*/i].sub(/\r?\n/,'')
+      # line may also start with tab; we don't use \s as this also matches EOL
+      # Rescue is in case we don't match properly - we want to return nil in that case
+      mid = hdrs[/^Message-ID:.*\r?\n[ \t].*/i].sub(/\r?\n/,'') rescue nil
     end
     mid
   end
@@ -326,11 +330,15 @@ class Message
     Digest::SHA1.hexdigest(getmid(message) || message)[0..9]
   end
 
+  # Matches LF, but not CRLF
+  LF_ONLY = Regexp.new("(?<!\r)\n")
+  CRLF = "\r\n"
+
   #
   # parse a message, returning headers
   #
   def self.parse(message)
-    mail = Mail.read_from_string(message)
+    mail = Mail.read_from_string(message.gsub(LF_ONLY, CRLF))
 
     headers = Mailbox.headers(mail)