## i would like, for example, to be able to add in a ruby-talk
## specific module that would detect and link to /ruby-talk:\d+/
## sequences in the text of an email. (how sweet would that be?)
+##
+## this class cathces all source exceptions. if the underlying source throws
+## an error, it is caught and handled.
+
class Message
SNIPPET_LEN = 80
RE_PATTERN = /^((re|re[\[\(]\d[\]\)]):\s*)+/i
attr_reader :id, :date, :from, :subj, :refs, :replytos, :to, :source,
:cc, :bcc, :labels, :list_address, :recipient_email, :replyto,
- :source_info, :chunks
+ :source_info, :chunks, :list_subscribe, :list_unsubscribe
- bool_reader :dirty, :source_marked_read
+ bool_reader :dirty, :source_marked_read, :snippet_contains_encrypted_content
## if you specify a :header, will use values from that. otherwise,
## will try and load the header from the source.
def initialize opts
@source = opts[:source] or raise ArgumentError, "source can't be nil"
@source_info = opts[:source_info] or raise ArgumentError, "source_info can't be nil"
- @snippet = opts[:snippet] || ""
- @have_snippet = !opts[:snippet].nil?
+ @snippet = opts[:snippet]
+ @snippet_contains_encrypted_content = false
+ @have_snippet = !(opts[:snippet].nil? || opts[:snippet].empty?)
@labels = [] + (opts[:labels] || [])
@dirty = false
+ @encrypted = false
@chunks = nil
parse_header(opts[:header] || @source.load_header(@source_info))
def parse_header header
header.each { |k, v| header[k.downcase] = v }
- @from = PersonManager.person_for header["from"]
-
@id =
if header["message-id"]
sanitize_message_id header["message-id"]
end
end
+ @from =
+ if header["from"]
+ PersonManager.person_for header["from"]
+ else
+ name = "Sup Auto-generated Fake Sender <sup@fake.sender.example.com>"
+ Redwood::log "faking from for message #@id: #{name}"
+ PersonManager.person_for name
+ end
+
date = header["date"]
@date =
case date
@recipient_email = header["envelope-to"] || header["x-original-to"] || header["delivered-to"]
@source_marked_read = header["status"] == "RO"
+ @list_subscribe = header["list-subscribe"]
+ @list_unsubscribe = header["list-unsubscribe"]
end
private :parse_header
- def snippet; @snippet || chunks && @snippet; end
+ def snippet; @snippet || (chunks && @snippet); end
def is_list_message?; !@list_address.nil?; end
def is_draft?; @source.is_a? DraftLoader; end
def draft_filename
Redwood::log "problem getting messages from #{@source}: #{e.message}"
## we need force_to_top here otherwise this window will cover
## up the error message one
+ @source.error ||= e
Redwood::report_broken_sources :force_to_top => true
[Chunk::Text.new(error_message(e.message))]
end
EOS
end
+ ## wrap any source methods that might throw sourceerrors
def with_source_errors_handled
begin
yield
rescue SourceError => e
Redwood::log "problem getting messages from #{@source}: #{e.message}"
+ @source.error ||= e
+ Redwood::report_broken_sources :force_to_top => true
error_message e.message
end
end
].flatten.compact.join " "
end
- def basic_body_lines
- chunks.find_all { |c| c.is_a?(Chunk::Text) || c.is_a?(Chunk::Quote) }.map { |c| c.lines }.flatten
+ def quotable_body_lines
+ chunks.find_all { |c| c.quotable? }.map { |c| c.lines }.flatten
end
- def basic_header_lines
+ def quotable_header_lines
["From: #{@from.full_address}"] +
(@to.empty? ? [] : ["To: " + @to.map { |p| p.full_address }.join(", ")]) +
(@cc.empty? ? [] : ["Cc: " + @cc.map { |p| p.full_address }.join(", ")]) +
## product.
def multipart_signed_to_chunks m
-# Redwood::log ">> multipart SIGNED: #{m.header['Content-Type']}: #{m.body.size}"
if m.body.size != 2
Redwood::log "warning: multipart/signed with #{m.body.size} parts (expecting 2)"
return
return
end
+ ## this probably will never happen
if payload.header.content_type == "application/pgp-signature"
Redwood::log "warning: multipart/signed with payload content type #{payload.header.content_type}"
return
end
if signature.header.content_type != "application/pgp-signature"
- Redwood::log "warning: multipart/signed with signature content type #{signature.header.content_type}"
+ ## unknown signature type; just ignore.
+ #Redwood::log "warning: multipart/signed with signature content type #{signature.header.content_type}"
return
end
end
def multipart_encrypted_to_chunks m
- Redwood::log ">> multipart ENCRYPTED: #{m.header['Content-Type']}: #{m.body.size}"
if m.body.size != 2
Redwood::log "warning: multipart/encrypted with #{m.body.size} parts (expecting 2)"
return
end
decryptedm, sig, notice = CryptoManager.decrypt payload
- children = message_to_chunks(decryptedm) if decryptedm
+ children = message_to_chunks(decryptedm, true) if decryptedm
[notice, sig, children].flatten.compact
end
- def message_to_chunks m, sibling_types=[]
+ def message_to_chunks m, encrypted=false, sibling_types=[]
if m.multipart?
chunks =
case m.header.content_type
unless chunks
sibling_types = m.body.map { |p| p.header.content_type }
- chunks = m.body.map { |p| message_to_chunks p, sibling_types }.flatten.compact
+ chunks = m.body.map { |p| message_to_chunks p, encrypted, sibling_types }.flatten.compact
end
chunks
else
filename =
## first, paw through the headers looking for a filename
- if m.header["Content-Disposition"] &&
- m.header["Content-Disposition"] =~ /filename="?(.*?[^\\])("|;|$)/
+ if m.header["Content-Disposition"] && m.header["Content-Disposition"] =~ /filename="?(.*?[^\\])("|;|$)/
$1
- elsif m.header["Content-Type"] &&
- m.header["Content-Type"] =~ /name=(.*?)(;|$)/
+ elsif m.header["Content-Type"] && m.header["Content-Type"] =~ /name="?(.*?[^\\])("|;|$)/
$1
## haven't found one, but it's a non-text message. fake
## it.
+ ##
+ ## TODO: make this less lame.
elsif m.header["Content-Type"] && m.header["Content-Type"] !~ /^text\/plain/
- "sup-attachment-#{Time.now.to_i}-#{rand 10000}"
+ extension =
+ case m.header["Content-Type"]
+ when /text\/html/: "html"
+ when /image\/(.*)/: $1
+ end
+
+ ["sup-attachment-#{Time.now.to_i}-#{rand 10000}", extension].join(".")
end
## if there's a filename, we'll treat it as an attachment.
## otherwise, it's body text
else
body = Message.convert_from m.decode, m.charset
- text_to_chunks body.normalize_whitespace.split("\n")
+ text_to_chunks (body || "").normalize_whitespace.split("\n"), encrypted
end
end
end
begin
raise MessageFormatError, "RubyMail decode returned a null body" unless body
return body unless charset
- Iconv.iconv($encoding, charset, body).join
+ Iconv.iconv($encoding + "//IGNORE", charset, body + " ").join[0 .. -2]
rescue Errno::EINVAL, Iconv::InvalidEncoding, Iconv::IllegalSequence, MessageFormatError => e
Redwood::log "warning: error (#{e.class.name}) decoding message body from #{charset}: #{e.message}"
File.open("sup-unable-to-decode.txt", "w") { |f| f.write body }
## parse the lines of text into chunk objects. the heuristics here
## need tweaking in some nice manner. TODO: move these heuristics
## into the classes themselves.
- def text_to_chunks lines
+ def text_to_chunks lines, encrypted
state = :text # one of :text, :quote, or :sig
chunks = []
chunk_lines = []
when :block_quote, :sig
chunk_lines << line
end
-
+
if !@have_snippet && state == :text && (@snippet.nil? || @snippet.length < SNIPPET_LEN) && line !~ /[=\*#_-]{3,}/ && line !~ /^\s*$/
+ @snippet ||= ""
@snippet += " " unless @snippet.empty?
@snippet += line.gsub(/^\s+/, "").gsub(/[\r\n]/, "").gsub(/\s+/, " ")
@snippet = @snippet[0 ... SNIPPET_LEN].chomp
+ @dirty = true unless encrypted && $config[:discard_snippets_from_encrypted_messages]
+ @snippet_contains_encrypted_content = true if encrypted
end
end
projects / sup / blobdiff