sup 1.0 → 1.2

data/lib/sup/message.rb

@@ -1,6 +1,7 @@
 # encoding: UTF-8
 
 require 'time'
+require 'string-scrub' if /^2\.0\./ =~ RUBY_VERSION
 
 module Redwood
 
@@ -71,9 +72,9 @@ class Message
     return unless v
     return v unless v.is_a? String
     return unless v.size < MAX_HEADER_VALUE_SIZE # avoid regex blowup on spam
-    d = v.dup
-    d = d.transcode($encoding, 'ASCII')
-    Rfc2047.decode_to $encoding, d
+    ## Header values should be either 7-bit with RFC2047-encoded words
+    ## or UTF-8 as per RFC6532. Replace any invalid high bytes with U+FFFD.
+    Rfc2047.decode_to $encoding, v.dup.force_encoding(Encoding::UTF_8).scrub
   end
 
   def parse_header encoded_header
@@ -104,7 +105,7 @@ class Message
     when String
       begin
         Time.parse date
-      rescue ArgumentError => e
+      rescue ArgumentError
         #debug "faking mangled date header for #{@id} (orig #{header['date'].inspect} gave error: #{e.message})"
         Time.now
       end
@@ -270,7 +271,7 @@ class Message
         message_to_chunks rmsg
       rescue SourceError, SocketError, RMail::EncodingUnsupportedError => e
         warn_with_location "problem reading message #{id}"
-        debug "could not load message: #{location.inspect}, exception: #{e.inspect}"
+        debug "could not load message, exception: #{e.inspect}"
 
         [Chunk::Text.new(error_message.split("\n"))]
 
@@ -309,7 +310,7 @@ EOS
   end
 
   def each_raw_message_line &b
-    location.each_raw_message_line &b
+    location.each_raw_message_line(&b)
   end
 
   def sync_back
@@ -759,7 +760,7 @@ private
 
   def warn_with_location msg
     warn msg
-    warn "Message is in #{location.source.uri} at #{location.info}"
+    warn "Message is in #{@locations}"
   end
 end
 

data/lib/sup/message_chunks.rb

@@ -128,7 +128,16 @@ EOS
 
       text = case @content_type
       when /^text\/plain\b/
-        @raw_content.force_encoding(encoded_content.charset || 'US-ASCII')
+        if /^UTF-7$/i =~ encoded_content.charset
+          @raw_content.decode_utf7
+        else
+          begin
+            charset = Encoding.find(encoded_content.charset || 'US-ASCII')
+          rescue ArgumentError
+            charset = 'US-ASCII'
+          end
+          @raw_content.force_encoding(charset)
+        end
       else
         HookManager.run "mime-decode", :content_type => @content_type,
                         :filename => lambda { write_to_disk },
@@ -274,24 +283,19 @@ EOS
   class EnclosedMessage
     attr_reader :lines
     def initialize from, to, cc, date, subj
-      @from = from ? "unknown sender" : from.full_address
-      @to = to ? "" : to.map { |p| p.full_address }.join(", ")
-      @cc = cc ? "" : cc.map { |p| p.full_address }.join(", ")
-      if date
-        @date = date.rfc822
-      else
-        @date = ""
-      end
-
+      @from = !from ? "unknown sender" : from.full_address
+      @to = !to ? "" : to.map { |p| p.full_address }.join(", ")
+      @cc = !cc ? "" : cc.map { |p| p.full_address }.join(", ")
+      @date = !date ? "" : date.rfc822
       @subj = subj
-
-      @lines = "\nFrom: #{from}\n"
-      @lines += "To: #{to}\n"
-      if !cc.empty?
-        @lines += "Cc: #{cc}\n"
-      end
-      @lines += "Date: #{date}\n"
-      @lines += "Subject: #{subj}\n\n"
+      @lines = [
+        "From: #{@from}",
+        "To: #{@to}",
+        "Cc: #{@cc}",
+        "Date: #{@date}",
+        "Subject: #{@subj}"
+      ]
+      @lines.delete_if{ |line| line == 'Cc: ' }
     end
 
     def inlineable?; false end
@@ -302,7 +306,11 @@ EOS
     def viewable?; false end
 
     def patina_color; :generic_notice_patina_color end
-    def patina_text; "Begin enclosed message sent on #{@date}" end
+    def patina_text
+      "Begin enclosed message" + (
+        @date == "" ? "" : " sent on #{@date}"
+      )
+    end
 
     def color; :quote_color end
   end

data/lib/sup/modes/completion_mode.rb

@@ -26,7 +26,6 @@ class CompletionMode < ScrollMode
 private
 
   def update_lines
-    width = buffer.content_width
     max_length = @list.max_of { |s| s.length }
     num_per = [1, buffer.content_width / (max_length + INTERSTITIAL.length)].max
     @lines = [@header].compact

data/lib/sup/modes/console_mode.rb

@@ -11,7 +11,7 @@ class Console
   end
 
   def query(query)
-    Enumerator.new(Index.instance, :each_message, Index.parse_query(query))
+    Index.instance.enum_for :each_message, Index.parse_query(query)
   end
 
   def add_labels(query, *labels)

data/lib/sup/modes/file_browser_mode.rb

@@ -43,7 +43,7 @@ protected
   end
 
   def view
-     name, f = @files[curpos - RESERVED_ROWS]
+    _name, f = @files[curpos - RESERVED_ROWS]
     return unless f && f.file?
 
     begin
@@ -54,7 +54,7 @@ protected
   end
 
   def select_file_or_follow_directory
-    name, f = @files[curpos - RESERVED_ROWS]
+    _name, f = @files[curpos - RESERVED_ROWS]
     return unless f
 
     if f.directory? && f.to_s != "."

data/lib/sup/modes/label_list_mode.rb

@@ -129,7 +129,7 @@ protected
   end
 
   def select_label
-    label, num_unread = @labels[curpos]
+    label, _num_unread = @labels[curpos]
     return unless label
     LabelSearchResultsMode.spawn_nicely label
   end

data/lib/sup/modes/search_list_mode.rb

@@ -131,13 +131,13 @@ protected
   end
 
   def select_search
-    name, num_unread = @searches[curpos]
+    name, _num_unread = @searches[curpos]
     return unless name
     SearchResultsMode.spawn_from_query SearchManager.search_string_for(name)
   end
 
   def delete_selected_search
-    name, num_unread = @searches[curpos]
+    name, _num_unread = @searches[curpos]
     return unless name
     reload if SearchManager.delete name
   end

data/lib/sup/modes/thread_view_mode.rb

@@ -241,7 +241,7 @@ EOS
 
       begin
         u = URI.parse($1)
-      rescue URI::InvalidURIError => e
+      rescue URI::InvalidURIError
         BufferManager.flash("Invalid unsubscribe link")
         return
       end
@@ -868,7 +868,6 @@ private
       (0 ... text.length).each do |i|
         @chunk_lines[@text.length + i] = m
         @message_lines[@text.length + i] = m
-        lw = text[i].flatten.select { |x| x.is_a? String }.map { |x| x.display_length }.sum
       end
 
       @text += text

data/lib/sup/rfc2047.rb

@@ -17,7 +17,7 @@
 # This file is distributed under the same terms as Ruby.
 
 module Rfc2047
-  WORD = %r{=\?([!\#$%&'*+-/0-9A-Z\\^\`a-z{|}~]+)\?([BbQq])\?([!->@-~]+)\?=} # :nodoc: 'stupid ruby-mode
+  WORD = %r{=\?([!\#$%&'*+-/0-9A-Z\\^\`a-z{|}~]+)\?([BbQq])\?([!->@-~ ]+)\?=} # :nodoc: 'stupid ruby-mode
   WORDSEQ = %r{(#{WORD.source})\s+(?=#{WORD.source})}
 
   def Rfc2047.is_encoded? s; s =~ WORD end
@@ -28,16 +28,17 @@ module Rfc2047
   # converted to the target encoding, it is left in its encoded form.
   def Rfc2047.decode_to(target, from)
     from = from.gsub(WORDSEQ, '\1')
-    out = from.gsub(WORD) do
+    from.gsub(WORD) do
       |word|
       charset, encoding, text = $1, $2, $3
 
       # B64 or QP decode, as necessary:
       case encoding
         when 'b', 'B'
-          #puts text
-          text = text.unpack('m*')[0]
-          #puts text.dump
+          ## Padding is optional in RFC 2047 words. Add some extra padding
+          ## before decoding the base64, otherwise on Ruby 2.0 the final byte
+          ## might be discarded.
+          text = (text + '===').unpack('m*')[0]
 
         when 'q', 'Q'
           # RFC 2047 has a variant of quoted printable where a ' ' character
@@ -50,7 +51,21 @@ module Rfc2047
         # WORD.
       end
 
-      text.transcode(target, charset)
+      # Handle UTF-7 specially because Ruby doesn't actually support it as
+      # a normal character encoding.
+      if charset == 'UTF-7'
+        begin
+          next text.decode_utf7.encode(target)
+        rescue ArgumentError, EncodingError
+          next word
+        end
+      end
+
+      begin
+        text.force_encoding(charset).encode(target)
+      rescue ArgumentError, EncodingError
+        word
+      end
     end
   end
 end

data/lib/sup/source.rb

@@ -102,7 +102,7 @@ class Source
   end
 
   def synchronize &block
-    @poll_lock.synchronize &block
+    @poll_lock.synchronize(&block)
   end
 
   def try_lock
@@ -153,7 +153,7 @@ class Source
       next unless Rfc2047.is_encoded? v
       header[k] = begin
         Rfc2047.decode_to $encoding, v
-      rescue Errno::EINVAL, Iconv::InvalidEncoding, Iconv::IllegalSequence => e
+      rescue Errno::EINVAL, Iconv::InvalidEncoding, Iconv::IllegalSequence
         #debug "warning: error decoding RFC 2047 header (#{e.class.name}): #{e.message}"
         v
       end
@@ -169,6 +169,12 @@ protected
   def Source.expand_filesystem_uri uri
     uri.gsub "~", File.expand_path("~")
   end
+
+  def Source.encode_path_for_uri path
+    path.gsub(Regexp.new("[#{Regexp.quote(URI_ENCODE_CHARS)}]")) { |c|
+      c.each_byte.map { |x| sprintf("%%%02X", x) }.join
+    }
+  end
 end
 
 ## if you have a @labels instance variable, include this

data/lib/sup/textfield.rb

@@ -119,7 +119,6 @@ class TextField
         Ncurses::Form::REQ_END_FIELD
       when Ncurses::KEY_UP, Ncurses::KEY_DOWN
         unless !@i || @history.empty?
-          value = get_cursed_value
           #debug "history before #{@history.inspect}"
           @i = @i + (c.is_keycode?(Ncurses::KEY_UP) ? -1 : 1)
           @i = 0 if @i < 0

data/lib/sup/thread.rb

@@ -86,22 +86,22 @@ class Thread
     end
   end
 
-  def first; each { |m, *o| return m if m }; nil; end
-  def has_message?; any? { |m, *o| m.is_a? Message }; end
-  def dirty?; any? { |m, *o| m && m.dirty? }; end
-  def date; map { |m, *o| m.date if m }.compact.max; end
+  def first; each { |m, *| return m if m }; nil; end
+  def has_message?; any? { |m, *| m.is_a? Message }; end
+  def dirty?; any? { |m, *| m && m.dirty? }; end
+  def date; map { |m, *| m.date if m }.compact.max; end
   def snippet
-    with_snippets = select { |m, *o| m && m.snippet && !m.snippet.empty? }
-    first_unread, * = with_snippets.select { |m, *o| m.has_label?(:unread) }.sort_by { |m, *o| m.date }.first
+    with_snippets = select { |m, *| m && m.snippet && !m.snippet.empty? }
+    first_unread, * = with_snippets.select { |m, *| m.has_label?(:unread) }.sort_by { |m, *| m.date }.first
     return first_unread.snippet if first_unread
-    last_read, * = with_snippets.sort_by { |m, *o| m.date }.last
+    last_read, * = with_snippets.sort_by { |m, *| m.date }.last
     return last_read.snippet if last_read
     ""
   end
-  def authors; map { |m, *o| m.from if m }.compact.uniq; end
+  def authors; map { |m, *| m.from if m }.compact.uniq; end
 
-  def apply_label t; each { |m, *o| m && m.add_label(t) }; end
-  def remove_label t; each { |m, *o| m && m.remove_label(t) }; end
+  def apply_label t; each { |m, *| m && m.add_label(t) }; end
+  def remove_label t; each { |m, *| m && m.remove_label(t) }; end
 
   def toggle_label label
     if has_label? label
@@ -113,24 +113,24 @@ class Thread
     end
   end
 
-  def set_labels l; each { |m, *o| m && m.labels = l }; end
-  def has_label? t; any? { |m, *o| m && m.has_label?(t) }; end
-  def each_dirty_message; each { |m, *o| m && m.dirty? && yield(m) }; end
+  def set_labels l; each { |m, *| m && m.labels = l }; end
+  def has_label? t; any? { |m, *| m && m.has_label?(t) }; end
+  def each_dirty_message; each { |m, *| m && m.dirty? && yield(m) }; end
 
   def direct_participants
-    map { |m, *o| [m.from] + m.to if m }.flatten.compact.uniq
+    map { |m, *| [m.from] + m.to if m }.flatten.compact.uniq
   end
 
   def participants
-    map { |m, *o| [m.from] + m.to + m.cc + m.bcc if m }.flatten.compact.uniq
+    map { |m, *| [m.from] + m.to + m.cc + m.bcc if m }.flatten.compact.uniq
   end
 
-  def size; map { |m, *o| m ? 1 : 0 }.sum; end
-  def subj; argfind { |m, *o| m && m.subj }; end
-  def labels; inject(Set.new) { |s, (m, *o)| m ? s | m.labels : s } end
+  def size; map { |m, *| m ? 1 : 0 }.sum; end
+  def subj; argfind { |m, *| m && m.subj }; end
+  def labels; inject(Set.new) { |s, (m, *)| m ? s | m.labels : s } end
   def labels= l
     raise ArgumentError, "not a set" unless l.is_a?(Set)
-    each { |m, *o| m && m.labels = l.dup }
+    each { |m, *| m && m.labels = l.dup }
   end
 
   def latest_message
@@ -360,7 +360,7 @@ class ThreadSet
   ## merges in a pre-loaded thread
   def add_thread t
     raise "duplicate" if @threads.values.member? t
-    t.each { |m, *o| add_message m }
+    t.each { |m, *| add_message m }
   end
 
   ## merges two threads together. both must be members of this threadset.
@@ -407,7 +407,6 @@ class ThreadSet
     #puts "adding: #{message.id}, refs #{message.refs.inspect}"
 
     el.message = message
-    oldroot = el.root
 
     ## link via references:
     (message.refs + [el.id]).inject(nil) do |prev, ref_id|

data/lib/sup/util.rb

@@ -4,14 +4,16 @@ require 'thread'
 require 'lockfile'
 require 'mime/types'
 require 'pathname'
+require 'rmail'
 require 'set'
 require 'enumerator'
 require 'benchmark'
 require 'unicode'
 require 'unicode/display_width'
 require 'fileutils'
+require 'string-scrub' if /^2\.0\./ =~ RUBY_VERSION
 
-class Lockfile
+module ExtendedLockfile
   def gen_lock_id
     Hash[
          'host' => "#{ Socket.gethostname }",
@@ -37,6 +39,7 @@ class Lockfile
 
   def touch_yourself; touch path end
 end
+Lockfile.send :prepend, ExtendedLockfile
 
 class File
   # platform safe file.link which attempts a copy if hard-linking fails
@@ -106,7 +109,7 @@ module RMail
     end
   end
 
-  class Serialize
+  module CustomizedSerialize
     ## Don't add MIME-Version headers on serialization. Sup sometimes want's to serialize
     ## message parts where these headers are not needed and messing with the message on
     ## serialization breaks gpg signatures. The commented section shows the original RMail
@@ -118,48 +121,7 @@ module RMail
       # end
     end
   end
-
-  class Header
-
-    # Convert to ASCII before trying to match with regexp
-    class Field
-
-      class << self
-        def parse(field)
-          field = field.dup.to_s
-          field = field.fix_encoding!.ascii
-          if field =~ EXTRACT_FIELD_NAME_RE
-            [ $1, $'.chomp ]
-          else
-            [ "", Field.value_strip(field) ]
-          end
-        end
-      end
-    end
-
-    ## Be more cautious about invalid content-type headers
-    ## the original RMail code calls
-    ## value.strip.split(/\s*;\s*/)[0].downcase
-    ## without checking if split returned an element
-
-    # This returns the full content type of this message converted to
-    # lower case.
-    #
-    # If there is no content type header, returns the passed block is
-    # executed and its return value is returned.  If no block is passed,
-    # the value of the +default+ argument is returned.
-    def content_type(default = nil)
-      if value = self['content-type'] and ct = value.strip.split(/\s*;\s*/)[0]
-        return ct.downcase
-      else
-        if block_given?
-          yield
-        else
-          default
-        end
-      end
-    end
-  end
+  Serialize.send :prepend, CustomizedSerialize
 end
 
 class Module
@@ -354,11 +316,8 @@ class String
     # first try to encode to utf-8 from whatever current encoding
     encode!('UTF-8', :invalid => :replace, :undef => :replace)
 
-    # do this anyway in case string is set to be UTF-8, encoding to
-    # something else (UTF-16 which can fully represent UTF-8) and back
-    # ensures invalid chars are replaced.
-    encode!('UTF-16', 'UTF-8', :invalid => :replace, :undef => :replace)
-    encode!('UTF-8', 'UTF-16', :invalid => :replace, :undef => :replace)
+    # ensure invalid chars are replaced
+    scrub!
 
     fail "Could not create valid UTF-8 string out of: '#{self.to_s}'." unless valid_encoding?
 
@@ -392,8 +351,23 @@ class String
     self
   end
 
+  ## Decodes UTF-7 and returns the resulting decoded string as UTF-8.
+  ##
+  ## Ruby doesn't supply a UTF-7 encoding natively. There is
+  ## Net::IMAP::decode_utf7 which only handles the IMAP "modified UTF-7"
+  ## encoding. This implementation is inspired by that one but handles
+  ## standard UTF-7 shift characters and not the IMAP-specific variation.
+  def decode_utf7
+    gsub(/\+([^-]+)?-/) {
+      if $1
+        ($1 + "===").unpack("m")[0].encode(Encoding::UTF_8, Encoding::UTF_16BE)
+      else
+        "+"
+      end
+    }
+  end
+
   def normalize_whitespace
-    fix_encoding!
     gsub(/\t/, "    ").gsub(/\r/, "")
   end
 
@@ -405,7 +379,7 @@ class String
 
   unless method_defined? :each
     def each &b
-      each_line &b
+      each_line(&b)
     end
   end
 
@@ -507,7 +481,9 @@ module Enumerable
     ret
   end
 
-  def sum; inject(0) { |x, y| x + y }; end
+  if not method_defined? :sum
+    def sum; inject(0) { |x, y| x + y }; end
+  end
 
   def map_to_hash
     ret = {}
@@ -563,7 +539,9 @@ class Array
     inject([]) { |a, e| a + e }
   end
 
-  def to_h; Hash[*flatten]; end
+  if not method_defined? :to_h
+    def to_h; Hash[*flatten_one_level]; end
+  end
   def rest; self[1..-1]; end
 
   def to_boolean_h; Hash[*map { |x| [x, true] }.flatten]; end

data/lib/sup/version.rb

@@ -8,5 +8,5 @@ def git_suffix
 end
 
 module Redwood
-  VERSION = "1.0"
+  VERSION = "1.2"
 end

data/lib/sup.rb

@@ -26,7 +26,7 @@ class Module
     props = props.map { |p| p.to_s }
 
     path = name.gsub(/::/, "/")
-    yaml_tag "!#{Redwood::YAML_DOMAIN},#{Redwood::YAML_DATE}/#{path}"
+    yaml_tag "tag:#{Redwood::YAML_DOMAIN},#{Redwood::YAML_DATE}/#{path}"
 
     define_method :init_with do |coder|
       initialize(*coder.map.values_at(*props))
@@ -38,9 +38,6 @@ class Module
         hash
       end
     end
-
-    # Legacy
-    Psych.load_tags["!#{Redwood::LEGACY_YAML_DOMAIN},#{Redwood::YAML_DATE}/#{path}"] = self
   end
 end
 
@@ -139,10 +136,17 @@ module Redwood
 
   def load_yaml_obj fn, compress=false
     o = if File.exist? fn
-      if compress
-        Zlib::GzipReader.open(fn) { |f| YAML::load f }
+      raw_contents = if compress
+        Zlib::GzipReader.open(fn) { |f| f.read }
+      else
+        File::open(fn) { |f| f.read }
+      end
+      ## fix up malformed tag URIs created by earlier versions of sup
+      raw_contents.gsub!(/!supmua.org,2006-10-01\/(\S*)$/) { |m| "!<tag:supmua.org,2006-10-01/#{$1}>" }
+      if YAML.respond_to?(:unsafe_load)  # Ruby 3.1+
+        YAML::unsafe_load raw_contents
       else
-        YAML::load_file fn
+        YAML::load raw_contents
       end
     end
     if o.is_a?(Array)
@@ -349,7 +353,7 @@ EOM
       name ||= ENV["USER"]
       email = ENV["USER"] + "@" +
         begin
-          Socket.gethostbyname(Socket.gethostname).first
+          Addrinfo.getaddrinfo(Socket.gethostname, 'smtp').first.getnameinfo.first
         rescue SocketError
           Socket.gethostname
         end