sup 0.20.0 → 1.0

data/devel/profile.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'ruby-prof'
 require "redwood"
 

data/ext/mkrf_conf_xapian.rb

@@ -16,7 +16,7 @@ begin
   if !RbConfig::CONFIG['arch'].include?('openbsd')
     # update version in Gemfile as well
     name    = "xapian-ruby"
-    version = "~> 1.2.15"
+    version = "~> 1.2"
 
     begin
       # try to load gem

data/lib/sup.rb

@@ -1,6 +1,5 @@
 # encoding: utf-8
 
-require 'rubygems'
 require 'yaml'
 require 'zlib'
 require 'thread'
@@ -105,7 +104,7 @@ module Redwood
       o
     end
 
-    mode = if File.exists? fn
+    mode = if File.exist? fn
       File.stat(fn).mode
     else
       0600
@@ -113,7 +112,7 @@ module Redwood
 
     if backup
       backup_fn = fn + '.bak'
-      if File.exists?(fn) && File.size(fn) > 0
+      if File.exist?(fn) && File.size(fn) > 0
         File.open(backup_fn, "w", mode) do |f|
           File.open(fn, "r") { |old_f| FileUtils.copy_stream old_f, f }
           f.fsync
@@ -139,7 +138,7 @@ module Redwood
   end
 
   def load_yaml_obj fn, compress=false
-    o = if File.exists? fn
+    o = if File.exist? fn
       if compress
         Zlib::GzipReader.open(fn) { |f| YAML::load f }
       else
@@ -180,7 +179,7 @@ module Redwood
     return if bypass_sync_check
 
     if $config[:sync_back_to_maildir]
-      if not File.exists? Redwood::SYNC_OK_FN
+      if not File.exist? Redwood::SYNC_OK_FN
         Redwood.warn_syncback <<EOS
 It appears that the "sync_back_to_maildir" option has been changed
 from false to true since the last execution of sup.
@@ -191,14 +190,14 @@ Should I complain about this again? (Y/n)
 EOS
         File.open(Redwood::SYNC_OK_FN, 'w') {|f| f.write(Redwood::MAILDIR_SYNC_CHECK_SKIPPED) } if STDIN.gets.chomp.downcase == 'n'
       end
-    elsif not $config[:sync_back_to_maildir] and File.exists? Redwood::SYNC_OK_FN
+    elsif not $config[:sync_back_to_maildir] and File.exist? Redwood::SYNC_OK_FN
       File.delete(Redwood::SYNC_OK_FN)
     end
   end
 
   def check_syncback_settings
     # don't check if syncback was never performed
-    return unless File.exists? Redwood::SYNC_OK_FN
+    return unless File.exist? Redwood::SYNC_OK_FN
     active_sync_sources = File.readlines(Redwood::SYNC_OK_FN).collect { |e| e.strip }.find_all { |e| not e.empty? }
     return if active_sync_sources.length == 1 and active_sync_sources[0] == Redwood::MAILDIR_SYNC_CHECK_SKIPPED
     sources = SourceManager.sources
@@ -332,13 +331,14 @@ EOM
       :poll_interval => 300,
       :wrap_width => 0,
       :slip_rows => 0,
+      :indent_spaces => 2,
       :col_jump => 2,
       :stem_language => "english",
       :sync_back_to_maildir => false,
       :continuous_scroll => false,
       :always_edit_async => false,
     }
-    if File.exists? filename
+    if File.exist? filename
       config = Redwood::load_yaml_obj filename
       abort "#{filename} is not a valid configuration file (it's a #{config.class}, not a hash)" unless config.is_a?(Hash)
       default_config.merge config

data/lib/sup/colormap.rb

@@ -17,6 +17,9 @@ module Ncurses
 
     ## xterm 24-shade grayscale
     24.times { |x| color! "g#{x}", (16+6*6*6) + x }
+  elsif Ncurses::NUM_COLORS == -1
+    ## Terminal emulator doesn't appear to support colors
+    fail "sup must be run in a terminal with color support, please check your TERM variable."
   end
 end
 
@@ -186,13 +189,13 @@ class Colormap
   ## Try to use the user defined colors, in case of an error fall back
   ## to the default ones.
   def populate_colormap
-    user_colors = if File.exists? Redwood::COLOR_FN
+    user_colors = if File.exist? Redwood::COLOR_FN
       debug "loading user colors from #{Redwood::COLOR_FN}"
       Redwood::load_yaml_obj Redwood::COLOR_FN
     end
 
     ## Set attachment sybmol to sane default for existing colorschemes
-    if user_colors and user_colors.has_key? :to_me 
+    if user_colors and user_colors.has_key? :to_me
       user_colors[:with_attachment] = user_colors[:to_me] unless user_colors.has_key? :with_attachment
     end
 

data/lib/sup/contact.rb

@@ -16,7 +16,7 @@ class ContactManager
     @a2p = {} # alias to person
     @e2p = {} # email to person
 
-    if File.exists? fn
+    if File.exist? fn
       IO.foreach(fn) do |l|
         l =~ /^([^:]*): (.*)$/ or raise "can't parse #{fn} line #{l.inspect}"
         aalias, addr = $1, $2
@@ -29,11 +29,13 @@ class ContactManager
   def contacts_with_aliases; @a2p.values.uniq end
 
   def update_alias person, aalias=nil
+    ## Deleting old data if it exists
     old_aalias = @p2a[person]
-    if(old_aalias != nil and old_aalias != "") # remove old alias
+    if old_aalias
       @a2p.delete old_aalias
       @e2p.delete person.email
     end
+    ## Update with new data
     @p2a[person] = aalias
     unless aalias.nil? || aalias.empty?
       @a2p[aalias] = person

data/lib/sup/crypto.rb

@@ -10,11 +10,14 @@ class CryptoManager
 
   class Error < StandardError; end
 
-  OUTGOING_MESSAGE_OPERATIONS = OrderedHash.new(
-    [:sign, "Sign"],
-    [:sign_and_encrypt, "Sign and encrypt"],
-    [:encrypt, "Encrypt only"]
-  )
+  OUTGOING_MESSAGE_OPERATIONS = {
+    sign: "Sign",
+    sign_and_encrypt: "Sign and encrypt",
+    encrypt: "Encrypt only"
+  }
+
+  KEY_PATTERN = /(-----BEGIN PGP PUBLIC KEY BLOCK.*-----END PGP PUBLIC KEY BLOCK)/m
+  KEYSERVER_URL = "http://pool.sks-keyservers.net:11371/pks/lookup"
 
   HookManager.register "gpg-options", <<EOS
 Runs before gpg is called, allowing you to modify the options (most
@@ -124,18 +127,27 @@ EOS
   def sign from, to, payload
     return unknown_status(@not_working_reason) unless @not_working_reason.nil?
 
+    # We grab this from the GPG::Ctx below after signing, so that we can set
+    # micalg in Content-Type to match the hash algorithm GPG decided to use.
+    hash_algo = nil
+
     gpg_opts = {:protocol => GPGME::PROTOCOL_OpenPGP, :armor => true, :textmode => true}
     gpg_opts.merge!(gen_sign_user_opts(from))
     gpg_opts = HookManager.run("gpg-options",
                                {:operation => "sign", :options => gpg_opts}) || gpg_opts
     begin
-      if GPGME.respond_to?('detach_sign')
-        sig = GPGME.detach_sign(format_payload(payload), gpg_opts)
-      else
-        crypto = GPGME::Crypto.new
-        gpg_opts[:mode] = GPGME::SIG_MODE_DETACH
-        sig = crypto.sign(format_payload(payload), gpg_opts).read
+      input = GPGME::Data.new(format_payload(payload))
+      output = GPGME::Data.new()
+      GPGME::Ctx.new(gpg_opts) do |ctx|
+        if gpg_opts[:signer]
+          signers = GPGME::Key.find(:secret, gpg_opts[:signer], :sign)
+          ctx.add_signer(*signers)
+        end
+        ctx.sign(input, output, GPGME::SIG_MODE_DETACH)
+        hash_algo = GPGME::hash_algo_name(ctx.sign_result.signatures[0].hash_algo)
       end
+      output.seek(0)
+      sig = output.read
     rescue GPGME::Error => exc
       raise Error, gpgme_exc_msg(exc.message)
     end
@@ -147,7 +159,7 @@ EOS
     end
 
     envelope = RMail::Message.new
-    envelope.header["Content-Type"] = 'multipart/signed; protocol=application/pgp-signature'
+    envelope.header["Content-Type"] = "multipart/signed; protocol=application/pgp-signature; micalg=pgp-#{hash_algo.downcase}"
 
     envelope.add_part payload
     signature = RMail::Message.make_attachment sig, "application/pgp-signature", nil, "signature.asc"
@@ -212,9 +224,10 @@ EOS
     unknown = false
     all_output_lines = []
     all_trusted = true
+    unknown_fingerprint = nil
 
     verify_result.signatures.each do |signature|
-      output_lines, trusted = sig_output_lines signature
+      output_lines, trusted, unknown_fingerprint = sig_output_lines signature
       all_output_lines << output_lines
       all_output_lines.flatten!
       all_trusted &&= trusted
@@ -229,7 +242,7 @@ EOS
     end
 
     if valid || !unknown
-      summary_line = simplify_sig_line(verify_result.signatures[0].to_s, all_trusted)
+      summary_line = simplify_sig_line(verify_result.signatures[0].to_s.dup, all_trusted)
     end
 
     if all_output_lines.length == 0
@@ -242,6 +255,8 @@ EOS
       end
     elsif !unknown
       Chunk::CryptoNotice.new(:invalid, summary_line, all_output_lines)
+    elsif unknown_fingerprint
+      Chunk::CryptoNotice.new(:unknown_key, "Unable to determine validity of cryptographic signature", all_output_lines, unknown_fingerprint)
     else
       unknown_status all_output_lines
     end
@@ -351,6 +366,31 @@ EOS
     [notice, sig, msg]
   end
 
+  def retrieve fingerprint
+    require 'net/http'
+    uri = URI($config[:keyserver_url] || KEYSERVER_URL)
+    unless uri.scheme == "http" and not uri.host.nil?
+      return "Invalid url: #{uri}"
+    end
+
+    fingerprint = "0x" + fingerprint unless fingerprint[0..1] == "0x"
+    params = {op: "get", search: fingerprint}
+    uri.query = URI.encode_www_form(params)
+
+    begin
+      res = Net::HTTP.get_response(uri)
+    rescue SocketError # Host doesn't exist or we couldn't connect
+    end
+    return "Couldn't get key from keyserver at this address: #{uri}" unless res.is_a?(Net::HTTPSuccess)
+
+    match = KEY_PATTERN.match(res.body)
+    return "No key found" unless match && match.length > 0
+
+    GPGME::Key.import(match[0])
+
+    return nil
+  end
+
 private
 
   def unknown_status lines=[]
@@ -394,6 +434,7 @@ private
     rescue EOFError
       from_key = nil
       first_sig = "No public key available for #{signature.fingerprint}"
+      unknown_fpr = signature.fingerprint
     end
 
     time_line = "Signature made " + signature.timestamp.strftime("%a %d %b %Y %H:%M:%S %Z") +
@@ -422,7 +463,7 @@ private
       output_lines << HookManager.run("sig-output",
                                {:signature => signature, :from_key => from_key})
     end
-    return output_lines, trusted
+    return output_lines, trusted, unknown_fpr
   end
 
   def key_type key, fpr
@@ -435,6 +476,7 @@ private
     when GPGME::PK_DSA then "DSA "
     when GPGME::PK_ELG then "ElGamel "
     when GPGME::PK_ELG_E then "ElGamel "
+    else "unknown key type (#{subkey.pubkey_algo}) "
     end
   end
 
@@ -443,7 +485,7 @@ private
   # elsif only one account,            then leave blank so gpg default will be user
   # else                                    set --local-user from_email_address
   # NOTE: multiple signers doesn't seem to work with gpgme (2.0.2, 1.0.8)
-  #       
+  #
   def gen_sign_user_opts from
     account = AccountManager.account_for from
     account ||= AccountManager.default_account

data/lib/sup/draft.rb

@@ -16,7 +16,7 @@ class DraftManager
   def write_draft
     offset = @source.gen_offset
     fn = @source.fn_for_offset offset
-    File.open(fn, "w") { |f| yield f }
+    File.open(fn, "w:UTF-8") { |f| yield f }
     PollManager.poll_from @source
   end
 
@@ -33,7 +33,7 @@ class DraftLoader < Source
   yaml_properties
 
   def initialize dir=Redwood::DRAFT_DIR
-    Dir.mkdir dir unless File.exists? dir
+    Dir.mkdir dir unless File.exist? dir
     super DraftManager.source_name, true, false
     @dir = dir
     @cur_offset = 0
@@ -61,8 +61,8 @@ class DraftLoader < Source
   end
 
   def gen_offset
-    i = 0
-    while File.exists? fn_for_offset(i)
+    i = @cur_offset
+    while File.exist? fn_for_offset(i)
       i += 1
     end
     i
@@ -75,7 +75,7 @@ class DraftLoader < Source
   end
 
   def load_message offset
-    raise SourceError, "Draft not found" unless File.exists? fn_for_offset(offset)
+    raise SourceError, "Draft not found" unless File.exist? fn_for_offset(offset)
     File.open fn_for_offset(offset) do |f|
       RMail::Mailbox::MBoxReader.new(f).each_message do |input|
         return RMail::Parser.read(input)
@@ -85,7 +85,7 @@ class DraftLoader < Source
 
   def raw_header offset
     ret = ""
-    File.open fn_for_offset(offset) do |f|
+    File.open(fn_for_offset(offset), "r:UTF-8") do |f|
       until f.eof? || (l = f.gets) =~ /^$/
         ret += l
       end
@@ -94,13 +94,13 @@ class DraftLoader < Source
   end
 
   def each_raw_message_line offset
-    File.open(fn_for_offset(offset)) do |f|
+    File.open(fn_for_offset(offset), "r:UTF-8") do |f|
       yield f.gets until f.eof?
     end
   end
 
   def raw_message offset
-    IO.read(fn_for_offset(offset))
+    IO.read(fn_for_offset(offset), :encoding => "UTF-8")
   end
 
   def start_offset; 0; end

data/lib/sup/hook.rb

@@ -83,7 +83,7 @@ class HookManager
     @contexts = {}
     @tags = {}
 
-    Dir.mkdir dir unless File.exists? dir
+    Dir.mkdir dir unless File.exist? dir
   end
 
   attr_reader :tags
@@ -109,20 +109,20 @@ class HookManager
     @descs[name] = desc
   end
 
-  def print_hooks f=$stdout
-puts <<EOS
-Have #{HookManager.descs.size} registered hooks:
-
-EOS
-
-    HookManager.descs.sort.each do |name, desc|
-      f.puts <<EOS
+  def print_hooks pattern="", f=$stdout
+    matching_hooks = HookManager.descs.sort.keep_if {|name, desc| pattern.empty? or name.match(pattern)}.map do |name, desc|
+      <<EOS
 #{name}
 #{"-" * name.length}
 File: #{fn_for name}
 #{desc}
 EOS
     end
+
+    showing_str = matching_hooks.size == HookManager.descs.size ? "" : " (showing #{matching_hooks.size})"
+    f.puts "Have #{HookManager.descs.size} registered hooks#{showing_str}:"
+    f.puts
+    matching_hooks.each { |text| f.puts text }
   end
 
   def enabled? name; !hook_for(name).nil? end

data/lib/sup/index.rb

@@ -105,7 +105,7 @@ EOS
 
   def save
     debug "saving index and sources..."
-    FileUtils.mkdir_p @dir unless File.exists? @dir
+    FileUtils.mkdir_p @dir unless File.exist? @dir
     SourceManager.save_sources
     save_index
   end
@@ -116,7 +116,7 @@ EOS
 
   def load_index failsafe=false
     path = File.join(@dir, 'xapian')
-    if File.exists? path
+    if File.exist? path
       @xapian = Xapian::WritableDatabase.new(path, Xapian::DB_OPEN)
       db_version = @xapian.get_metadata 'version'
       db_version = '0' if db_version.empty?
@@ -516,19 +516,32 @@ EOS
     qp.stemmer = Xapian::Stem.new($config[:stem_language])
     qp.stemming_strategy = Xapian::QueryParser::STEM_SOME
     qp.default_op = Xapian::Query::OP_AND
-    qp.add_valuerangeprocessor(Xapian::NumberValueRangeProcessor.new(DATE_VALUENO, 'date:', true))
-    NORMAL_PREFIX.each { |k,info| info[:prefix].each { |v| qp.add_prefix k, v } }
-    BOOLEAN_PREFIX.each { |k,info| info[:prefix].each { |v| qp.add_boolean_prefix k, v, info[:exclusive] } }
+    valuerangeprocessor = Xapian::NumberValueRangeProcessor.new(DATE_VALUENO,
+                                                                'date:', true)
+    qp.add_valuerangeprocessor(valuerangeprocessor)
+    NORMAL_PREFIX.each { |k,info| info[:prefix].each {
+      |v| qp.add_prefix k, v }
+    }
+    BOOLEAN_PREFIX.each { |k,info| info[:prefix].each {
+      |v| qp.add_boolean_prefix k, v, info[:exclusive] }
+    }
 
     begin
-      xapian_query = qp.parse_query(subs, Xapian::QueryParser::FLAG_PHRASE|Xapian::QueryParser::FLAG_BOOLEAN|Xapian::QueryParser::FLAG_LOVEHATE|Xapian::QueryParser::FLAG_WILDCARD)
+      xapian_query = qp.parse_query(subs, Xapian::QueryParser::FLAG_PHRASE   |
+                                          Xapian::QueryParser::FLAG_BOOLEAN  |
+                                          Xapian::QueryParser::FLAG_LOVEHATE |
+                                          Xapian::QueryParser::FLAG_WILDCARD)
     rescue RuntimeError => e
       raise ParseError, "xapian query parser error: #{e}"
     end
 
     debug "parsed xapian query: #{Util::Query.describe(xapian_query, subs)}"
 
-    raise ParseError if xapian_query.nil? or xapian_query.empty?
+    if xapian_query.nil? or xapian_query.empty?
+      raise ParseError, "couldn't parse \"#{s}\" as xapian query " \
+                        "(special characters aren't indexed)"
+    end
+
     query[:qobj] = xapian_query
     query[:text] = s
     query

data/lib/sup/label.rb

@@ -15,7 +15,7 @@ class LabelManager
   def initialize fn
     @fn = fn
     labels =
-      if File.exists? fn
+      if File.exist? fn
         IO.readlines(fn).map { |x| x.chomp.intern }
       else
         []