mail 2.2.14 → 2.2.15

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+== Wed 26 Jan 2011 02:23:09 UTC Mikel Lindsaar <mikel@rubyx.com>
+
+* Update addresses passed into sendmail to escape them (Andy Lindeman)
+* Version bump to 2.2.15 and gem release
+
 == Mon  3 Jan 2011 12:48:59 UTC Mikel Lindsaar <mikel@rubyx.com>
 
 * Update field_spec to handle encodings, closes issues 44 and 120 (Luis Lopez)

data/lib/VERSION

@@ -1,4 +1,4 @@
-patch:14
+patch:15
 major:2
 build:
 minor:2

data/lib/mail.rb

@@ -2,6 +2,7 @@
 module Mail # :doc:
 
   require 'date'
+  require 'shellwords'
 
   require 'active_support'
   require 'active_support/core_ext/class/attribute_accessors'
@@ -33,6 +34,7 @@ module Mail # :doc:
 
   require 'mail/core_extensions/nil'
   require 'mail/core_extensions/string'
+  require 'mail/core_extensions/shellwords' unless String.new.respond_to?(:shellescape)
   require 'mail/core_extensions/smtp' if RUBY_VERSION < '1.9.3'
 
   require 'mail/patterns'

data/lib/mail/core_extensions/shellwords.rb

@@ -0,0 +1,55 @@
+# The following is imported from ruby 1.9.2 shellwords.rb
+#
+module Shellwords
+  # Escapes a string so that it can be safely used in a Bourne shell
+  # command line.
+  #
+  # Note that a resulted string should be used unquoted and is not
+  # intended for use in double quotes nor in single quotes.
+  #
+  #   open("| grep #{Shellwords.escape(pattern)} file") { |pipe|
+  #     # ...
+  #   }
+  #
+  # +String#shellescape+ is a shorthand for this function.
+  #
+  #   open("| grep #{pattern.shellescape} file") { |pipe|
+  #     # ...
+  #   }
+  #
+  def shellescape(str)
+    # An empty argument will be skipped, so return empty quotes.
+    return "''" if str.empty?
+
+    str = str.dup
+
+    # Process as a single byte sequence because not all shell
+    # implementations are multibyte aware.
+    str.gsub!(/([^A-Za-z0-9_\-.,:\/@\n])/n, "\\\\\\1")
+
+    # A LF cannot be escaped with a backslash because a backslash + LF
+    # combo is regarded as line continuation and simply ignored.
+    str.gsub!(/\n/, "'\n'")
+
+    return str
+  end
+
+  module_function :shellescape
+
+  class << self
+    alias escape shellescape
+  end
+
+end
+
+class String
+  # call-seq:
+  #   str.shellescape => string
+  #
+  # Escapes +str+ so that it can be safely used in a Bourne shell
+  # command line.  See +Shellwords::shellescape+ for details.
+  #
+  def shellescape
+    Shellwords.escape(self)
+  end
+end

data/lib/mail/fields/content_type_field.rb

@@ -128,7 +128,7 @@ module Mail
     private
 
     def method_missing(name, *args, &block)
-      if name.to_s =~ /([\w_]+)=/
+      if name.to_s =~ /(\w+)=/
         self.parameters[$1] = args.first
         @value = "#{content_type}; #{stringify(parameters)}"
       else

data/lib/mail/mail.rb

@@ -10,11 +10,11 @@ module Mail
   # 
   # Creating via a string:
   # 
-  #  string = 'To: mikel@test.lindsaar.net\r\n'
-  #  string << 'From: bob@test.lindsaar.net\r\n\r\n'
-  #  string << 'Subject: This is an email\r\n'
-  #  string << '\r\n'
-  #  string << 'This is the body'
+  #  string = "To: mikel@test.lindsaar.net\r\n"
+  #  string << "From: bob@test.lindsaar.net\r\n"
+  #  string << "Subject: This is an email\r\n"
+  #  string << "\r\n"
+  #  string << "This is the body"
   #  Mail.new(string)
   # 
   # Or creating via a block:
@@ -30,8 +30,8 @@ module Mail
   # 
   #  message = Mail.new({:to => 'mikel@test.lindsaar.net',
   #                      'from' => 'bob@test.lindsaar.net',
-  #                       :subject 'This is an email',
-  #                       :body 'This is the body' })
+  #                      :subject => 'This is an email',
+  #                      :body => 'This is the body' })
   # 
   # Note, the hash keys can be strings or symbols, the passed in object
   # does not need to be a hash, it just needs to respond to :each_pair

data/lib/mail/network/delivery_methods/sendmail.rb

@@ -1,57 +1,57 @@
 module Mail
   # A delivery method implementation which sends via sendmail.
-  # 
+  #
   # To use this, first find out where the sendmail binary is on your computer,
   # if you are on a mac or unix box, it is usually in /usr/sbin/sendmail, this will
   # be your sendmail location.
-  # 
+  #
   #   Mail.defaults do
   #     delivery_method :sendmail
   #   end
-  # 
+  #
   # Or if your sendmail binary is not at '/usr/sbin/sendmail'
-  # 
+  #
   #   Mail.defaults do
   #     delivery_method :sendmail, :location => '/absolute/path/to/your/sendmail'
   #   end
-  # 
+  #
   # Then just deliver the email as normal:
-  # 
+  #
   #   Mail.deliver do
   #     to 'mikel@test.lindsaar.net'
   #     from 'ada@test.lindsaar.net'
   #     subject 'testing sendmail'
   #     body 'testing sendmail'
   #   end
-  # 
+  #
   # Or by calling deliver on a Mail message
-  # 
+  #
   #   mail = Mail.new do
   #     to 'mikel@test.lindsaar.net'
   #     from 'ada@test.lindsaar.net'
   #     subject 'testing sendmail'
   #     body 'testing sendmail'
   #   end
-  # 
+  #
   #   mail.deliver!
   class Sendmail
-    
+
     def initialize(values)
       self.settings = { :location       => '/usr/sbin/sendmail',
                         :arguments      => '-i -t' }.merge(values)
     end
-    
+
     attr_accessor :settings
 
     def deliver!(mail)
       envelope_from = mail.return_path || mail.sender || mail.from_addrs.first
-      return_path = "-f \"#{envelope_from}\"" if envelope_from
+      return_path = "-f \"#{envelope_from.to_s.shellescape}\"" if envelope_from
 
       arguments = [settings[:arguments], return_path].compact.join(" ")
-      
-      Sendmail.call(settings[:location], arguments, mail.destinations.join(" "), mail)
+
+      Sendmail.call(settings[:location], arguments, mail.destinations.collect(&:shellescape).join(" "), mail)
     end
-    
+
     def Sendmail.call(path, arguments, destinations, mail)
       IO.popen("#{path} #{arguments} #{destinations}", "w+") do |io|
         io.puts mail.encoded.to_lf

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 2
-  - 14
-  version: 2.2.14
+  - 15
+  version: 2.2.15
 platform: ruby
 authors: 
 - Mikel Lindsaar
@@ -14,13 +14,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-05 00:00:00 +11:00
+date: 2011-01-26 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -35,6 +36,7 @@ dependencies:
   name: mime-types
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -48,6 +50,7 @@ dependencies:
   name: treetop
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -62,6 +65,7 @@ dependencies:
   name: i18n
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -90,6 +94,7 @@ files:
 - lib/mail/body.rb
 - lib/mail/configuration.rb
 - lib/mail/core_extensions/nil.rb
+- lib/mail/core_extensions/shellwords.rb
 - lib/mail/core_extensions/smtp.rb
 - lib/mail/core_extensions/string.rb
 - lib/mail/elements/address.rb
@@ -216,6 +221,7 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -223,6 +229,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -232,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Mail provides a nice Ruby DSL for making, sending and reading emails.