sisimai 4.25.16-java → 5.0.2-java

data/Repository.mk

@@ -5,7 +5,7 @@
 # |  _ <  __/ |_) | (_) \__ \ | || (_) | |  | |_| |_| | | | | |   < 
 # |_| \_\___| .__/ \___/|___/_|\__\___/|_|   \__, (_)_| |_| |_|_|\_\
 #           |_|                              |___/                  
-# -----------------------------------------------------------------------------
+# -------------------------------------------------------------------------------------------------
 SHELL := /bin/sh
 GIT   ?= git
 CP    := cp
@@ -16,8 +16,7 @@ EMAILS = set-of-emails
 
 
 .DEFAULT_GOAL = git-status
-
-# -----------------------------------------------------------------------------
+# -------------------------------------------------------------------------------------------------
 .PHONY: clean
 
 git-status:

data/lib/sisimai/address.rb

@@ -1,9 +1,34 @@
 module Sisimai
   # Sisimai::Address provide methods for dealing email address.
   class Address
-    # Imported from p5-Sisimail/lib/Sisimai/Address.pm
-    require 'sisimai/rfc5322'
-    Indicators = {
+    build_regular_expressions = lambda do
+      # See http://www.ietf.org/rfc/rfc5322.txt
+      #  or http://www.ex-parrot.com/pdw/Mail-RFC822-Address.html ...
+      #   addr-spec       = local-part "@" domain
+      #   local-part      = dot-atom / quoted-string / obs-local-part
+      #   domain          = dot-atom / domain-literal / obs-domain
+      #   domain-literal  = [CFWS] "[" *([FWS] dcontent) [FWS] "]" [CFWS]
+      #   dcontent        = dtext / quoted-pair
+      #   dtext           = NO-WS-CTL /     ; Non white space controls
+      #                     %d33-90 /       ; The rest of the US-ASCII
+      #                     %d94-126        ;  characters not including "[", "]", or "\"
+      re             = { rfc5322: nil, ignored: nil, domain: nil }
+      atom           = %r([a-zA-Z0-9_!#\$\%&'*+/=?\^`{}~|\-]+)o
+      quoted_string  = %r/"(?:\\[^\r\n]|[^\\"])*"/o
+      domain_literal = %r/\[(?:\\[\x01-\x09\x0B-\x0c\x0e-\x7f]|[\x21-\x5a\x5e-\x7e])*\]/o
+      dot_atom       = %r/#{atom}(?:[.]#{atom})*/o
+      local_part     = %r/(?:#{dot_atom}|#{quoted_string})/o
+      domain         = %r/(?:#{dot_atom}|#{domain_literal})/o
+
+      re[:rfc5322]   = %r/\A#{local_part}[@]#{domain}\z/o
+      re[:ignored]   = %r/\A#{local_part}[.]*[@]#{domain}\z/o
+      re[:domain]    = %r/\A#{domain}\z/o
+
+      return re
+    end
+
+    Re          = build_regular_expressions.call
+    Indicators  = {
       :'email-address' => (1 << 0),    # <neko@example.org>
       :'quoted-string' => (1 << 1),    # "Neko, Nyaan"
       :'comment-block' => (1 << 2),    # (neko)
@@ -11,36 +36,44 @@ module Sisimai
     Delimiters  = { '<' => 1, '>' => 1, '(' => 1, ')' => 1, '"' => 1, ',' => 1 }.freeze
 
     # Return pseudo recipient or sender address
-    # @param    [Symbol] argv1  Address type: :r or :s
-    # @return   [String, Nil]   Pseudo recipient address or sender address or
-    #                           nil when the argv1 is neither :r nor :s
-    def self.undisclosed(argv1)
-      return nil unless argv1
-      return nil unless %w[r s].index(argv1)
-
-      local = argv1 == 'r' ? 'recipient' : 'sender'
-      return sprintf('undisclosed-%s-in-headers@libsisimai.org.invalid', local)
+    # @param    [Symbol] argv0  Address type: true = recipient, false = sender
+    # @return   [String, nil]   Pseudo recipient address or sender address or nil when the argv1 is
+    #                           neither :r nor :s
+    def self.undisclosed(argv0 = false)
+      return sprintf('undisclosed-%s-in-headers@libsisimai.org.invalid', argv0 ? 'recipient' : 'sender')
     end
 
-    # New constructor of Sisimai::Address
-    # @param    [Hash] argvs        Email address, name, and other elements
-    # @return   [Sisimai::Address]  Object or nil when the email address was
-    #                               not valid.
-    # @example  make({address: 'neko@example.org', name: 'Neko', comment: '(nyaan)')}
-    #           # => Sisimai::Address object
-    def self.make(argvs)
-      return nil unless argvs.is_a? Hash
-      return nil unless argvs[:address]
-      return nil if argvs[:address].empty?
-
-      thing = Sisimai::Address.new(argvs[:address])
-      return nil unless thing
-      return nil if thing.void
-
-      thing.name    = argvs[:name]    || ''
-      thing.comment = argvs[:comment] || ''
+    # Check that the argument is an email address or not
+    # @param    [String] email  Email address string
+    # @return   [True,False]    true: is an email address
+    #                           false: is not an email address
+    def self.is_emailaddress(email)
+      return false unless email.is_a?(::String)
+      return false if email =~ %r/(?:[\x00-\x1f]|\x1f)/
+      return false if email.size > 254
+      return true  if email =~ Re[:ignored]
+      return false
+    end
 
-      return thing
+    # Check that the argument is mailer-daemon or not
+    # @param    [String] argv0  Email address
+    # @return   [True,False]    true: mailer-daemon
+    #                           false: Not mailer-daemon
+    def self.is_mailerdaemon(argv0 = nil)
+      return false unless argv0
+      return false unless argv0.size > 0
+      return false unless argv0.is_a?(::String)
+
+      email = argv0.downcase
+      postmaster = [
+        'mailer-daemon@', '<mailer-daemon>', '(mailer-daemon)', ' mailer-daemon ',
+        'postmaster@', '<postmaster>', '(postmaster)'
+      ].freeze
+
+      return true if postmaster.any? { |a| email.include?(a) }
+      return true if email == 'mailer-daemon'
+      return true if email == 'postmaster'
+      return false
     end
 
     def self.find(argv1 = nil, addrs = false)
@@ -48,8 +81,7 @@ module Sisimai
       # @param    [String] argv1  String including email address
       # @param    [Boolean] addrs true:  Returns list including all the elements
       #                           false: Returns list including email addresses only
-      # @return   [Array, Nil]    Email address list or nil when there is no
-      #                           email address in the argument
+      # @return   [Array, Nil]    Email address list or nil when there is no email address in the argument
       # @example  Parse email address
       #   find('Neko <neko(nyaan)@example.org>')
       #   #=> [{ address: 'neko@example.org', name: 'Neko', comment: '(nyaan)'}]
@@ -98,7 +130,7 @@ module Sisimai
           if e == '<'
             # <: The beginning of an email address or not
             if v[:address].size > 0
-              p.empty?  ? (v[:name] << e) : (v[p] << e)
+              p.empty? ? (v[:name] << e) : (v[p] << e)
             else
               # <neko@nyaan.example.org>
               readcursor |= Indicators[:'email-address']
@@ -213,18 +245,19 @@ module Sisimai
           # String like an email address will be set to the value of "address"
           v[:address] = cv[1] + '@' + cv[2]
 
-        elsif Sisimai::RFC5322.is_mailerdaemon(v[:name])
+        elsif Sisimai::Address.is_mailerdaemon(v[:name])
           # Allow if the argument is MAILER-DAEMON
           v[:address] = v[:name]
         end
 
         unless v[:address].empty?
           # Remove the comment from the address
-          if cv = v[:address].match(/(.*)([(].+[)])(.*)/)
-            # (nyaan)nekochan@example.org, nekochan(nyaan)cat@example.org or
-            # nekochan(nyaan)@example.org
-            v[:address] = cv[1] << cv[3]
-            v[:comment] = cv[2]
+          if Sisimai::String.aligned(v[:address], ['(', ')'])
+            # (nyaan)nekochan@example.org, nekochan(nyaan)cat@example.org or nekochan(nyaan)@example.org
+            p1 = v[:address].index('(')
+            p2 = v[:address].index(')')
+            v[:address] = v[:address][0, p1] + v[:address][p2 + 1, v[:address].size]
+            v[:comment] = v[:address][p1, p2 - p1 - 1]
           end
           readbuffer << v
         end
@@ -233,15 +266,15 @@ module Sisimai
       while e = readbuffer.shift do
         # The element must not include any character except from 0x20 to 0x7e.
         next if e[:address] =~ /[^\x20-\x7e]/
-        unless e[:address]  =~ /\A.+[@].+\z/
+        if e[:address].include?('@') == false
           # Allow if the argument is MAILER-DAEMON
-          next unless Sisimai::RFC5322.is_mailerdaemon(e[:address])
+          next unless Sisimai::Address.is_mailerdaemon(e[:address])
         end
 
-        # Remove angle brackets, other brackets, and quotations: []<>{}'`
-        # except a domain part is an IP address like neko@[192.0.2.222]
-        e[:address] = e[:address].sub(/\A[\[<{('`]/, '').sub(/[.'`>});]\z/, '')
-        e[:address].chomp!(']') unless e[:address] =~ /[@]\[[0-9A-Za-z:\.]+\]\z/
+        # Remove angle brackets, other brackets, and quotations: []<>{}'` except a domain part is
+        # an IP address like neko@[192.0.2.222]
+        e[:address] = e[:address].gsub(/\A[\[<{('`]/, '').gsub(/[.,'`>});]\z/, '')
+        e[:address] = e[:address].gsub(/[^A-Za-z]\z/, '') unless e[:address].include?('@[')
         e[:address] = e[:address].sub(/\A["]/, '').chomp('"') unless e[:address] =~ /\A["].+["][@]/
 
         if addrs
@@ -271,7 +304,7 @@ module Sisimai
       return nil unless input
       return input unless input.is_a? Object::String
 
-      addrs = Sisimai::Address.find(input, 1) || []
+      addrs = Sisimai::Address.find(input, true) || []
       return input if addrs.empty?
       return addrs[0][:address]
     end
@@ -285,7 +318,7 @@ module Sisimai
       return nil unless email.is_a? Object::String
       return nil unless cv = email.split('@', 2).first.match(/\A[-\w]+?[+](\w[-.\w]+\w)[=](\w[-.\w]+\w)\z/)
       verp0 = cv[1] + '@' + cv[2]
-      return verp0 if Sisimai::RFC5322.is_emailaddress(verp0)
+      return verp0 if Sisimai::Address.is_emailaddress(verp0)
     end
 
     # Expand alias: remove from '+' to '@'
@@ -294,7 +327,7 @@ module Sisimai
     # @example  Expand alias
     #   expand_alias('neko+straycat@example.org') #=> 'neko@example.org'
     def self.expand_alias(email)
-      return nil unless Sisimai::RFC5322.is_emailaddress(email)
+      return nil unless Sisimai::Address.is_emailaddress(email)
 
       local = email.split('@')
       return nil unless cv = local[0].match(/\A([-\w]+?)[+].+\z/)
@@ -312,62 +345,72 @@ module Sisimai
     attr_accessor :name, :comment
 
     # Constructor of Sisimai::Address
-    # @param <str>  [String] argv1          Email address
-    # @return       [Sisimai::Address, Nil] Object or nil when the email
-    #                                       address was not valid
-    def initialize(argv1)
-      return nil unless argv1
-
-      addrs = Sisimai::Address.find(argv1)
-      return nil unless addrs
-      return nil if addrs.empty?
+    # @param    [Hash] argvs        Email address, name, and other elements
+    # @return   [Sisimai::Address]  Object or nil when the email address was not valid.
+    # @example  new({address: 'neko@example.org', name: 'Neko', comment: '(nyaan)')} # => Sisimai::Address object
+    def initialize(argvs)
+      return nil unless argvs.is_a? Hash
+      return nil unless argvs[:address]
+      return nil if argvs[:address].empty?
 
-      thing = addrs.shift
       heads = ['<']
       tails = ['>', ',', '.', ';']
-
-      if cv = thing[:address].match(/\A([^\s]+)[@]([^@]+)\z/) ||
-              thing[:address].match(/\A(["].+?["])[@]([^@]+)\z/)
+      point = argvs[:address].rindex('@')
+      if cv = argvs[:address].match(/\A([^\s]+)[@]([^@]+)\z/) ||
+              argvs[:address].match(/\A(["].+?["])[@]([^@]+)\z/)
         # Get the local part and the domain part from the email address
-        lpart = cv[1]; heads.each { |e| lpart.gsub!(/\A#{e}/, '') if lpart.start_with?(e) }
-        dpart = cv[2]; tails.each { |e| dpart.gsub!(/#{e}\z/, '') if dpart.end_with?(e)   }        
-        email = Sisimai::Address.expand_verp(thing[:address])
+        lpart = argvs[:address][0, point]
+        dpart = argvs[:address][point + 1,  argvs[:address].size]
+        email = Sisimai::Address.expand_verp(argvs[:address])
         aname = nil
 
         unless email
           # Is not VERP address, try to expand the address as an alias
-          email = Sisimai::Address.expand_alias(thing[:address]) || ''
+          email = Sisimai::Address.expand_alias(argvs[:address]) || ''
           aname = true unless email.empty?
         end
 
-        if email =~ /\A.+[@].+?\z/
+        if email.include?('@')
           # The address is a VERP or an alias
           if aname
             # The address is an alias: neko+nyaan@example.jp
-            @alias = thing[:address]
+            @alias = argvs[:address]
           else
             # The address is a VERP: b+neko=example.jp@example.org
-            @verp  = thing[:address]
+            @verp  = argvs[:address]
+          end
+        end
+
+        heads.each do |e|
+          while lpart[0, 1] == e
+            lpart[0, 1] = ''
           end
         end
+
+        tails.each do |e|
+          while dpart[-1, 1] == e
+            dpart[-1, 1] = ''
+          end
+        end
+
         @user    = lpart
         @host    = dpart
         @address = lpart + '@' + dpart
       else
         # The argument does not include "@"
-        return nil unless Sisimai::RFC5322.is_mailerdaemon(thing[:address])
-        return nil if thing[:address].include?(' ')
+        return nil unless Sisimai::Address.is_mailerdaemon(argvs[:address])
+        return nil if argvs[:address].include?(' ')
 
         # The argument does not include " "
-        @user    = thing[:address]
+        @user    = argvs[:address]
         @host  ||= ''
-        @address = thing[:address]
+        @address = argvs[:address]
       end
 
       @alias ||= ''
       @verp  ||= ''
-      @name    = thing[:name]    || ''
-      @comment = thing[:comment] || ''
+      @name    = argvs[:name]    || ''
+      @comment = argvs[:comment] || ''
     end
 
     # Check whether the object has valid content or not
@@ -391,3 +434,4 @@ module Sisimai
 
   end
 end
+

data/lib/sisimai/arf.rb

@@ -1,7 +1,6 @@
 module Sisimai
   # Sisimai::ARF is a parser for email returned as a FeedBack Loop report message.
   module ARF
-    # Imported from p5-Sisimail/lib/Sisimai/ARF.pm
     class << self
       require 'sisimai/lhost'
       require 'sisimai/rfc5322'
@@ -15,23 +14,18 @@ module Sisimai
       # Abusix ARF uses        this is an autogenerated email abuse complaint regarding your network.
       Indicators = Sisimai::Lhost.INDICATORS
       StartingOf = {
-        rfc822: ['Content-Type: message/rfc822', 'Content-Type: text/rfc822-headers'],
-        report: ['Content-Type: message/feedback-report'],
+        rfc822:  ['Content-Type: message/rfc822', 'Content-Type: text/rfc822-headers'],
+        report:  ['Content-Type: message/feedback-report'],
+        message: [
+          ['this is a', 'abuse report'],
+          ['this is a', 'authentication', 'failure report'],
+          ['this is a', ' report for'],
+          ['this is an authentication', 'failure report'],
+          ['this is an autogenerated email abuse complaint'],
+          ['this is an email abuse report'],
+        ],
       }.freeze
-      MarkingsOf = {
-        message: %r{\A(?>
-          [Tt]his[ ]is[ ]a[ ][^ ]+[ ](?:email[ ])?[Aa]buse[ ][Rr]eport
-         |[Tt]his[ ]is[ ]an[ ]email[ ]abuse[ ]report
-         |[Tt]his[ ]is[ ](?:
-            a[ ][^ ]+[ ]authentication[ -]failure[ ]report
-           |an[ ]authentication[ -]failure[ ]report
-           |an[ ]autogenerated[ ]email[ ]abuse[ ]complaint
-           |an?[ ][^ ]+[ ]report[ ]for
-           )
-          )
-        }x,
-      }.freeze
-      ReportFrom = /(?:staff[@]hotmail[.]com|complaints[@]email-abuse[.]amazonses[.]com)\z/.freeze
+      ReportFrom = ['staff@hotmail.com', 'complaints@email-abuse.amazonses.com'];
       LongFields = Sisimai::RFC5322.LONGFIELDS
       RFC822Head = Sisimai::RFC5322.HEADERFIELDS
 
@@ -45,19 +39,19 @@ module Sisimai
         return false unless heads
         match = false
 
-        if heads['content-type'] =~ /report-type=["]?feedback-report["]?/
+        if Sisimai::String.aligned(heads['content-type'], ['report-type=', 'feedback-report'])
           # Content-Type: multipart/report; report-type=feedback-report; ...
           match = true
 
-        elsif heads['content-type'].start_with?('multipart/mixed')
+        elsif heads['content-type'].include?('multipart/mixed')
           # Microsoft (Hotmail, MSN, Live, Outlook) uses its own report format.
           # Amazon SES Complaints bounces
-          p = Sisimai::Address.s3s4(heads['from'])
-          if p =~ ReportFrom && heads['subject'].include?('complaint about message from ')
+          cv = Sisimai::Address.s3s4(heads['from'])
+          if heads['subject'].include?('complaint about message from ')
             # From: staff@hotmail.com
             # From: complaints@email-abuse.amazonses.com
             # Subject: complaint about message from 192.0.2.1
-            match = true
+            match = true if ReportFrom.any? { |a| cv.include?(a) }
           end
         end
         return match
@@ -68,7 +62,7 @@ module Sisimai
       # @param  [String] mbody  Message body of a bounce email
       # @return [Hash]          Bounce data list and message/rfc822 part
       # @return [Nil]           it failed to parse or the arguments are missing
-      def make(mhead, mbody)
+      def inquire(mhead, mbody)
         return nil unless self.is_arf(mhead)
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
@@ -117,8 +111,9 @@ module Sisimai
           #   message-id of 0000-000000000000000000000000000000000@mx
           #   received from IP address 192.0.2.1 on
           #   Thu, 29 Apr 2010 00:00:00 +0900 (JST)
-          if e =~ MarkingsOf[:message]
-            commondata['diagnosis'] = e if commondata['diagnosis'].empty?
+          p = e.downcase
+          if commondata['diagnosis'].empty?
+            commondata['diagnosis'] = e if StartingOf[:message].any? { |a| Sisimai::String.aligned(p, a) }
           end
 
           if readcursor == 0
@@ -136,23 +131,22 @@ module Sisimai
 
           if readcursor & Indicators[:'message-rfc822'] > 0
             # message/rfc822 OR text/rfc822-headers part
-            if cv = e.match(/X-HmXmrOriginalRecipient:[ ]*(.+)\z/)
+            if e.start_with?('X-HmXmrOriginalRecipient:')
               # Microsoft ARF: original recipient.
-              dscontents[-1]['recipient'] = Sisimai::Address.s3s4(cv[1])
+              dscontents[-1]['recipient'] = Sisimai::Address.s3s4(e[e.index(':') + 1, e.size])
               recipients += 1
 
-              # The "X-HmXmrOriginalRecipient" header appears only once so
-              # we take this opportunity to hard-code ARF headers missing in
-              # Microsoft's implementation.
+              # The "X-HmXmrOriginalRecipient" header appears only once so we take this opportunity
+              # to hard-code ARF headers missing in Microsoft's implementation.
               arfheaders['feedbacktype'] = 'abuse'
               arfheaders['agent'] = 'Microsoft Junk Mail Reporting Program'
 
-            elsif cv = e.match(/\AFrom:[ ]*(.+)\z/)
+            elsif e.start_with?('From: ')
               # Microsoft ARF: original sender.
-              commondata['from'] = Sisimai::Address.s3s4(cv[1]) if commondata['from'].empty?
+              commondata['from'] = Sisimai::Address.s3s4(e[6, e.size]) if commondata['from'].empty?
               previousfn = 'from'
 
-            elsif e.start_with?(' ', "\t")
+            elsif e.start_with?(' ')
               # Continued line from the previous line
               if previousfn == 'from'
                 # Multiple lines at "From:" field
@@ -166,7 +160,7 @@ module Sisimai
 
             else
               # Get required headers only
-              (lhs, rhs) = e.split(/:[ ]*/, 2)
+              (lhs, rhs) = e.split(/:[ ]/, 2)
               next unless lhs
               lhs.downcase!
 
@@ -191,10 +185,8 @@ module Sisimai
             # Source-IP: 192.0.2.1
             v = dscontents[-1]
 
-            if cv = e.match(/\AOriginal-Rcpt-To:[ ]+[<]?(.+)[>]?\z/) ||
-                    e.match(/\ARedacted-Address:[ ]([^ ].+[@])\z/)
-              # Original-Rcpt-To header field is optional and may appear any
-              # number of times as appropriate:
+            if e.start_with?('Original-Rcpt-To: ', 'Redacted-Address: ')
+              # Original-Rcpt-To header field is optional and may appear any number of times as appropriate:
               # Original-Rcpt-To: <user@example.com>
               # Redacted-Address: localpart@
               if v['recipient']
@@ -202,48 +194,45 @@ module Sisimai
                 dscontents << Sisimai::Lhost.DELIVERYSTATUS
                 v = dscontents[-1]
               end
-              v['recipient'] = Sisimai::Address.s3s4(cv[1])
+              v['recipient'] = Sisimai::Address.s3s4(e[e.index(' ') + 1, e.size])
               recipients += 1
 
-            elsif cv = e.match(/\AFeedback-Type:[ ]*([^ ]+)\z/)
+            elsif e.start_with?('Feedback-Type: ')
               # The header field MUST appear exactly once.
               # Feedback-Type: abuse
-              arfheaders['feedbacktype'] = cv[1]
+              arfheaders['feedbacktype'] = e[e.index(' ') + 1, e.size]
 
-            elsif cv = e.match(/\AAuthentication-Results:[ ]*(.+)\z/)
-              # "Authentication-Results" indicates the result of one or more
-              # authentication checks run by the report generator.
-              #
-              # Authentication-Results: mail.example.com;
-              #   spf=fail smtp.mail=somespammer@example.com
-              arfheaders['authres'] = cv[1]
+            elsif e.start_with?('Authentication-Results: ')
+              # "Authentication-Results" indicates the result of one or more authentication checks
+              # run by the report generator.
+              #   Authentication-Results: mail.example.jp; spf=fail smtp.mail=spammer@example.com
+              arfheaders['authres'] = e[e.index(' ') + 1, e.size]
 
-            elsif cv = e.match(/\AUser-Agent:[ ]*(.+)\z/)
+            elsif e.start_with?('User-Agent: ')
               # The header field MUST appear exactly once.
               # User-Agent: SomeGenerator/1.0
-              arfheaders['agent'] = cv[1]
+              arfheaders['agent'] = e[e.index(' ') + 1, e.size]
 
-            elsif cv = e.match(/\A(?:Received|Arrival)-Date:[ ]*(.+)\z/)
-              # Arrival-Date header is optional and MUST NOT appear more than
-              # once.
+            elsif e.start_with?('Received-Date: ', 'Arrival-Date: ')
+              # Arrival-Date header is optional and MUST NOT appear more than once.
               # Received-Date: Thu, 29 Apr 2010 00:00:00 JST
               # Arrival-Date: Thu, 29 Apr 2010 00:00:00 +0000
-              arfheaders['date'] = cv[1]
+              arfheaders['date'] = e[e.index(' ') + 1, e.size]
 
-            elsif cv = e.match(/\AReporting-MTA:[ ]*dns;[ ]*(.+)\z/)
+            elsif e.start_with?('Reporting-MTA: dns; ')
               # The header is optional and MUST NOT appear more than once.
               # Reporting-MTA: dns; mx.example.jp
-              commondata['rhost'] = cv[1]
+              commondata['rhost'] = e[e.index(';') + 2, e.size]
 
-            elsif cv = e.match(/\ASource-I[Pp]:[ ]*(.+)\z/)
+            elsif e.start_with?('Source-IP: ')
               # The header is optional and MUST NOT appear more than once.
               # Source-IP: 192.0.2.45
-              arfheaders['rhost'] = cv[1]
+              arfheaders['rhost'] = e[e.index(' ') + 1, e.size]
 
-            elsif cv = e.match(/\AOriginal-Mail-From:[ ]*(.+)\z/)
+            elsif e.start_with?('Original-Mail-From: ')
               # the header is optional and MUST NOT appear more than once.
               # Original-Mail-From: <somespammer@example.net>
-              commondata['from'] = Sisimai::Address.s3s4(cv[1]) if commondata['from'].empty?
+              commondata['from'] = Sisimai::Address.s3s4(e[e.index(' ') + 1, e.size]) if commondata['from'].empty?
 
             end
           end
@@ -254,41 +243,51 @@ module Sisimai
           commondata['diagnosis'] << ' ' << arfheaders['authres']
         end
 
-        unless recipients > 0
+        if recipients == 0
           # The original recipient address was not found
-          if cv = rfc822part.match(/^To: (.+[@].+)$/)
+          if Sisimai::String.aligned(rfc822part, ["\nTo: ", '@'])
             # pick the address from To: header in message/rfc822 part.
-            dscontents[-1]['recipient'] = Sisimai::Address.s3s4(cv[1])
-          else
-            # Insert pseudo recipient address when there is no valid recipient
-            # address in the message.
-            dscontents[-1]['recipient'] = Sisimai::Address.undisclosed('r')
+            p1 = rfc822part.index("\nTo: ") + 5
+            p2 = rfc822part.index("\n", p1 + 1)
+            cm = p2 > 0 ? p2 - p1 : 255
+            dscontents[-1]['recipient'] = Sisimai::Address.s3s4(rfc822part[p1, cm])
+            recipients = 1
+          end
+
+          while true
+            # Insert pseudo recipient address when there is no valid recipient address in the message
+            # for example,
+            #   Date: Thu, 29 Apr 2015 23:34:45 +0000
+            #   To: "undisclosed"
+            #   Subject: Nyaan
+            #   Message-ID: <ffffffffffffffffffffffff00000000@example.net>
+            dscontents[-1]['recipient'] ||= ''
+            break if dscontents[-1]['recipient'].include?('@')
+            dscontents[-1]['recipient'] = Sisimai::Address.undisclosed(true)
+            recipients = 1
+            break
           end
-          recipients = 1
         end
 
-        unless rfc822part =~ /\bFrom: [^ ]+[@][^ ]+\b/
-          # There is no "From:" header in the original message
-          # Append the value of "Original-Mail-From" value as a sender address.
+        unless Sisimai::String.aligned(rfc822part, ['From: ', '@'])
+          # There is no "From:" header in the original message. Append the value of "Original-Mail-From"
+          # value as a sender address.
           rfc822part << 'From: ' << commondata['from'] + "\n" unless commondata['from'].empty?
         end
 
-        if cv = mhead['subject'].match(/complaint about message from (\d{1,3}[.]\d{1,3}[.]\d{1,3}[.]\d{1,3})/)
+        if mhead['subject'].include?('complaint about message from ')
           # Microsoft ARF: remote host address.
-          arfheaders['rhost'] = cv[1]
+          arfheaders['rhost'] = mhead['subject'][mhead['subject'].rindex(' ') + 1, mhead['subject'].size]
           commondata['diagnosis'] =
             'This is a Microsoft email abuse report for an email message received from IP' << arfheaders['rhost'] + ' on ' << mhead['date']
         end
 
         dscontents.each do |e|
-          if e['recipient'] =~ /\A[^ ]+[@]\z/
-            # AOL = http://forums.cpanel.net/f43/aol-brutal-work-71473.html
-            e['recipient'] = Sisimai::Address.s3s4(rcptintext)
-          end
+          # AOL = http://forums.cpanel.net/f43/aol-brutal-work-71473.html
+          e['recipient'] = Sisimai::Address.s3s4(rcptintext) if e['recipient'][-1, 1] == '@'
           arfheaders.each_key { |a| e[a] ||= arfheaders[a] || '' }
           e.delete('authres')
 
-          e['softbounce'] = -1
           e['diagnosis']  = commondata['diagnosis'] unless e['diagnosis']
           e['diagnosis']  = Sisimai::String.sweep(e['diagnosis'])
           e['date']       = mhead['date'] if e['date'].empty?
@@ -302,10 +301,12 @@ module Sisimai
             # The value of "Reporting-MTA" header
             e['rhost'] = commondata['rhost']
 
-          elsif cv = e['diagnosis'].match(/\breceived from IP address ([^ ]+)/)
-            # This is an email abuse report for an email message received
-            # from IP address 24.64.1.1 on Thu, 29 Apr 2010 00:00:00 +0000
-            e['rhost'] = cv[1]
+          else
+            # Try to get an IP address from the error message
+            # This is an email abuse report for an email message received from IP address 24.64.1.1
+            # on Thu, 29 Apr 2010 00:00:00 +0000
+            ip = Sisimai::String.ipv4(e['diagnosis']) || []
+            e['rhost'] = ip[0] if ip.size > 0
           end
         end
         return { 'ds' => dscontents, 'rfc822' => rfc822part }
@@ -313,3 +314,4 @@ module Sisimai
     end
   end
 end
+