sisimai 4.16.0-java → 4.17.0-java

data/lib/sisimai/reason/delivered.rb

@@ -0,0 +1,27 @@
+module Sisimai
+  module Reason
+    # Sisimai::Reason::Delivered checks the email you sent is delivered successfully
+    # or not by matching diagnostic messages with message patterns. Sisimai will
+    # set "delivered" to the value of "reason" when Status: field in the bounce
+    # message begins with "2" like following:
+    #
+    #  Final-Recipient: rfc822; kijitora@neko.nyaan.jp
+    #  Action: deliverable
+    #  Status: 2.1.5
+    #  Diagnostic-Code: SMTP; 250 2.1.5 OK
+    #
+    # This class is called only Sisimai.reason method. This is NOT AN ERROR reason.
+    module Delivered
+      # Imported from p5-Sisimail/lib/Sisimai/Reason/Delivered.pm
+      class << self
+        def text; return 'delivered'; end
+        def description
+          return 'Email delivered successfully'
+        end
+        def match;   return nil; end
+        def true(*); return nil; end
+      end
+    end
+  end
+end
+

data/lib/sisimai/reason/exceedlimit.rb

@@ -10,6 +10,9 @@ module Sisimai
       # Imported from p5-Sisimail/lib/Sisimai/Reason/ExceedLimit.pm
       class << self
         def text; return 'exceedlimit'; end
+        def description
+          return 'Email rejected due to an email exceeded the limit'
+        end
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions

data/lib/sisimai/reason/expired.rb

@@ -10,6 +10,9 @@ module Sisimai
       # Imported from p5-Sisimail/lib/Sisimai/Reason/Expired.pm
       class << self
         def text; return 'expired'; end
+        def description
+          return 'Delivery time has expired due to a connection failure'
+        end
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions

data/lib/sisimai/reason/feedback.rb

@@ -0,0 +1,18 @@
+module Sisimai
+  module Reason
+    # Sisimai::Reason::Feedback is for only returning text and description.
+    # This class is called only from Sisimai.reason method and Sisimai::ARF class.
+    module Feedback
+      # Imported from p5-Sisimail/lib/Sisimai/Reason/Feedback.pm
+      class << self
+        def text; return 'feedback'; end
+        def description
+          return 'Email forwarded to the sender as a complaint message from your mailbox provider'
+        end
+        def match;   return nil; end
+        def true(*); return nil; end
+      end
+    end
+  end
+end
+

data/lib/sisimai/reason/filtered.rb

@@ -13,6 +13,9 @@ module Sisimai
       # Imported from p5-Sisimail/lib/Sisimai/Reason/Filtered.pm
       class << self
         def text; return 'filtered'; end
+        def description
+          return 'Email rejected due to a header content after SMTP DATA command'
+        end
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions
@@ -28,6 +31,7 @@ module Sisimai
               being[ ]accepted[ ]for[ ]this[ ]mailbox
             |has[ ]restricted[ ]SMS[ ]e-mail    # AT&T
             |http://postmaster[.]facebook[.]com/.+refused[ ]due[ ]to[ ]recipient[ ]preferences # Facebook
+            |IS[ ]NOT[ ]ACCEPTING[ ]ANY[ ]MAIL
             |permanent[ ]failure[ ]for[ ]one[ ]or[ ]more[ ]recipients[ ][(].+:blocked[)]
             |RESOLVER[.]RST[.]NotAuthorized # Microsoft Exchange
             |This[ ]account[ ]is[ ]protected[ ]by

data/lib/sisimai/reason/hasmoved.rb

@@ -10,6 +10,9 @@ module Sisimai
       # Imported from p5-Sisimail/lib/Sisimai/Reason/HasMoved.pm
       class << self
         def text; return 'hasmoved'; end
+        def description
+          return "Email rejected due to user's mailbox has moved and is not forwarded automatically"
+        end
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions

data/lib/sisimai/reason/hostunknown.rb

@@ -9,6 +9,9 @@ module Sisimai
       # Imported from p5-Sisimail/lib/Sisimai/Reason/HostUnknown.pm
       class << self
         def text; return 'hostunknown'; end
+        def description
+          return "Delivery failed due to a domain part of a recipient's email address does not exist"
+        end
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions

data/lib/sisimai/reason/mailboxfull.rb

@@ -10,6 +10,9 @@ module Sisimai
       # Imported from p5-Sisimail/lib/Sisimai/Reason/MailboxFull.pm
       class << self
         def text; return 'mailboxfull'; end
+        def description
+          return "Email rejected due to a recipient's mailbox is full"
+        end
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions

data/lib/sisimai/reason/mailererror.rb

@@ -12,6 +12,9 @@ module Sisimai
       # Imported from p5-Sisimail/lib/Sisimai/Reason/MailerError.pm
       class << self
         def text; return 'mailererror'; end
+        def description
+          return 'Email returned due to a mailer program has not exited successfully'
+        end
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions

data/lib/sisimai/reason/mesgtoobig.rb

@@ -9,6 +9,9 @@ module Sisimai
       # Imported from p5-Sisimail/lib/Sisimai/Reason/MesgTooBig.pm
       class << self
         def text; return 'mesgtoobig'; end
+        def description
+          return 'Email rejected due to a email size is too big for a destination mail server'
+        end
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions

data/lib/sisimai/reason/networkerror.rb

@@ -14,6 +14,9 @@ module Sisimai
       # Imported from p5-Sisimail/lib/Sisimai/Reason/NetworkError.pm
       class << self
         def text; return 'networkerror'; end
+        def description
+          return 'SMTP connection failed due to DNS look up failure or other network problems'
+        end
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions

data/lib/sisimai/reason/norelaying.rb

@@ -14,6 +14,9 @@ module Sisimai
       # Imported from p5-Sisimail/lib/Sisimai/Reason/NoRelaying.pm
       class << self
         def text; return 'norelaying'; end
+        def description
+          return 'Email rejected with error message "Relaying Denied"'
+        end
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions

data/lib/sisimai/reason/notaccept.rb

@@ -12,6 +12,9 @@ module Sisimai
       # Imported from p5-Sisimail/lib/Sisimai/Reason/NotAccept.pm
       class << self
         def text; return 'notaccept'; end
+        def description
+          return 'Delivery failed due to a destination mail server does not accept any email'
+        end
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions

data/lib/sisimai/reason/onhold.rb

@@ -9,6 +9,9 @@ module Sisimai
       # Imported from p5-Sisimail/lib/Sisimai/Reason/OnHold.pm
       class << self
         def text; return 'onhold'; end
+        def description
+          return 'Sisimai could not decided the reason due to there is no (or less) detailed information for judging the reason'
+        end
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions

data/lib/sisimai/reason/rejected.rb

@@ -16,6 +16,9 @@ module Sisimai
       # Imported from p5-Sisimail/lib/Sisimai/Reason/Rejected.pm
       class << self
         def text; return 'rejected'; end
+        def description
+          return "Email rejected due to a sender's email address (envelope from)"
+        end
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions

data/lib/sisimai/reason/securityerror.rb

@@ -16,6 +16,9 @@ module Sisimai
       # Imported from p5-Sisimail/lib/Sisimai/Reason/SecurityError.pm
       class << self
         def text; return 'securityerror'; end
+        def description
+          return 'Email rejected due to security violation was detected on a destination host'
+        end
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions

data/lib/sisimai/reason/spamdetected.rb

@@ -17,6 +17,9 @@ module Sisimai
       # Imported from p5-Sisimail/lib/Sisimai/Reason/SpamDetected.pm
       class << self
         def text; return 'spamdetected'; end
+        def description
+          return 'Email rejected by spam filter running on the remote host'
+        end
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions

data/lib/sisimai/reason/suspend.rb

@@ -9,6 +9,9 @@ module Sisimai
       # Imported from p5-Sisimail/lib/Sisimai/Reason/Suspend.pm
       class << self
         def text; return 'suspend'; end
+        def description
+          return 'Email rejected due to a recipient account is being suspended'
+        end
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions

data/lib/sisimai/reason/syntaxerror.rb

@@ -0,0 +1,41 @@
+module Sisimai
+  module Reason
+    # Sisimai::Reason::SyntaxError checks the bounce reason is "syntaxerror" or
+    # not. This class is called only Sisimai::Reason class.
+    #
+    # This is the error that a destination mail server could not recognize SMTP
+    # command which is sent from a sender's MTA. Sisimai will set "syntaxerror"
+    # to the reason if the value of "replycode" begins with "50" such as 502,
+    # or 503.
+    #   Action: failed
+    #   Status: 5.5.0
+    #   Diagnostic-Code: SMTP; 503 Improper sequence of commands
+    #
+    module SyntaxError
+      # Imported from p5-Sisimail/lib/Sisimai/Reason/SyntaxError.pm
+      class << self
+        def text; return 'syntaxerror'; end
+        def description
+          return 'Email rejected due to syntax error at sent commands in SMTP session'
+        end
+        def match(*); return nil; end
+
+        # Connection rejected due to syntax error or not
+        # @param    [Sisimai::Data] argvs   Object to be detected the reason
+        # @return   [True,False]            true: Connection rejected due to
+        #                                         syntax error
+        #                                   false: is not syntax error
+        # @see http://www.ietf.org/rfc/rfc2822.txt
+        def true(argvs)
+          return nil unless argvs
+          return nil unless argvs.is_a? Sisimai::Data
+          return true if argvs.reason == Sisimai::Reason::SyntaxError.text
+          return true if argvs.replycode =~ /\A[45]0[0-7]\z/
+          return false
+        end
+
+      end
+    end
+  end
+end
+

data/lib/sisimai/reason/systemerror.rb

@@ -13,6 +13,9 @@ module Sisimai
       # Imported from p5-Sisimail/lib/Sisimai/Reason/SystemError.pm
       class << self
         def text; return 'systemerror'; end
+        def description
+          return 'Email returned due to system error on the remote host'
+        end
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions

data/lib/sisimai/reason/systemfull.rb

@@ -10,6 +10,9 @@ module Sisimai
       # Imported from p5-Sisimail/lib/Sisimai/Reason/SystemFull.pm
       class << self
         def text; return 'systemfull'; end
+        def description
+          return "Email rejected due to a destination mail server's disk is full"
+        end
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions

data/lib/sisimai/reason/toomanyconn.rb

@@ -13,6 +13,9 @@ module Sisimai
       # Imported from p5-Sisimail/lib/Sisimai/Reason/TooManyConn.pm
       class << self
         def text; return 'toomanyconn'; end
+        def description
+          return 'SMTP connection rejected temporarily due to too many concurrency connections to the remote host'
+        end
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions

data/lib/sisimai/reason/undefined.rb

@@ -0,0 +1,18 @@
+module Sisimai
+  module Reason
+    # Sisimai::Reason::Undefined is for only returning text and description.
+    # This class is called only from Sisimai.reason method.
+    module Undefined
+      # Imported from p5-Sisimail/lib/Sisimai/Reason/Undefined.pm
+      class << self
+        def text; return 'undefined'; end
+        def description
+          return 'Sisimai could not detect an error reason'
+        end
+        def match;   return nil; end
+        def true(*); return nil; end
+      end
+    end
+  end
+end
+

data/lib/sisimai/reason/userunknown.rb

@@ -17,6 +17,9 @@ module Sisimai
       # Imported from p5-Sisimail/lib/Sisimai/Reason/UserUnknown.pm
       class << self
         def text; return 'userunknown'; end
+        def description
+          return "Email rejected due to a local part of a recipient's email address does not exist"
+        end
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions

data/lib/sisimai/reason/vacation.rb

@@ -0,0 +1,18 @@
+module Sisimai
+  module Reason
+    # Sisimai::Reason::Vacation is for only returning text and description.
+    # This class is called only from Sisimai.reason method.
+    module Vacation
+      # Imported from p5-Sisimail/lib/Sisimai/Reason/Vacation.pm
+      class << self
+        def text; return 'vacation'; end
+        def description
+          return 'Email replied automatically due to a recipient is out of office'
+        end
+        def match;   return nil; end
+        def true(*); return nil; end
+      end
+    end
+  end
+end
+

data/lib/sisimai/rfc3464.rb

@@ -42,10 +42,7 @@ module Sisimai
         :error   => %r/\A(?:[45]\d\d[ \t]+|[<][^@]+[@][^@]+[>]:?[ \t]+)/i,
         :command => %r/[ ](RCPT|MAIL|DATA)[ ]+command\b/,
       }
-
       Indicators = Sisimai::MTA.INDICATORS
-      LongFields = Sisimai::RFC5322.LONGFIELDS
-      RFC822Head = Sisimai::RFC5322.HEADERFIELDS
 
       def description; 'Fallback Module for MTAs'; end
       def smtpagent;   'RFC3464'; end
@@ -71,13 +68,12 @@ module Sisimai
         require 'sisimai/mda'
         require 'sisimai/address'
 
-        dscontents = []; dscontents << Sisimai::MTA.DELIVERYSTATUS
+        dscontents = [Sisimai::MTA.DELIVERYSTATUS]
         hasdivided = mbody.split("\n")
         havepassed = ['']
         scannedset = Sisimai::MDA.scan(mhead, mbody)
-        rfc822next = { 'from' => false, 'to' => false, 'subject' => false }
-        rfc822part = ''   # (String) message/rfc822-headers part
-        previousfn = ''   # (String) Previous field name
+        rfc822list = []   # (Array) Each line in message/rfc822 part string
+        blanklines = 0    # (Integer) The number of blank lines
         readcursor = 0    # (Integer) Points the current cursor position
         recipients = 0    # (Integer) The number of 'Final-Recipient' header
         connheader = {
@@ -89,12 +85,13 @@ module Sisimai
 
         hasdivided.each do |e|
           # Save the current line for the next loop
-          havepassed << e; p = havepassed[-2]
+          havepassed << e
+          p = havepassed[-2]
 
           if readcursor == 0
             # Beginning of the bounce message or delivery status part
             if e =~ Re1[:begin]
-              readcursor |= Indicators[:'deliverystatus']
+              readcursor |= Indicators[:deliverystatus]
               next
             end
           end
@@ -109,35 +106,21 @@ module Sisimai
 
           if readcursor & Indicators[:'message-rfc822'] > 0
             # After "message/rfc822"
-            if cv = e.match(/\A([-0-9A-Za-z]+?)[:][ ]*.+\z/)
-              # Get required headers only
-              lhs = cv[1].downcase
-              previousfn = ''
-              next unless RFC822Head.key?(lhs)
-
-              previousfn  = lhs
-              rfc822part += e + "\n"
-
-            elsif e =~ /\A[ \t]+/
-              # Continued line from the previous line
-              next if rfc822next[previousfn]
-              rfc822part += e + "\n" if LongFields.key?(previousfn)
-
-            else
-              # Check the end of headers in rfc822 part
-              next unless LongFields.key?(previousfn)
-              next if e.size > 0
-              rfc822next[previousfn] = true
+            if e.empty?
+              blanklines += 1
+              break if blanklines > 1
+              next
             end
+            rfc822list << e
 
           else
             # Before "message/rfc822"
-            next unless readcursor & Indicators[:'deliverystatus'] > 0
+            next unless readcursor & Indicators[:deliverystatus] > 0
             next unless e.size > 0
 
             v = dscontents[-1]
             if cv = e.match(/\A(?:[Ff]inal|[Oo]riginal)-[Rr]ecipient:[ ]*(?:RFC|rfc)822;[ ]*([^ ]+)\z/) ||
-               cv = e.match(/\A(?:[Ff]inal|[Oo]riginal)-[Rr]ecipient:[ ]*([^ ]+)\z/)
+                    e.match(/\A(?:[Ff]inal|[Oo]riginal)-[Rr]ecipient:[ ]*([^ ]+)\z/)
               # 2.3.2 Final-Recipient field
               #   The Final-Recipient field indicates the recipient for which this set
               #   of per-recipient fields applies.  This field MUST be present in each
@@ -476,19 +459,11 @@ module Sisimai
           if cv = e['diagnosis'].match(Re1[:command])
             e['command'] = cv[1]
           end
-
-          if mhead['received'].size > 0
-            # Get localhost and remote host name from Received header.
-            r0 = mhead['received']
-            %w|lhost rhost|.each { |a| e[a] ||= '' }
-            e['lhost'] = Sisimai::RFC5322.received(r0[0]).shift if e['lhost'].empty?
-            e['rhost'] = Sisimai::RFC5322.received(r0[-1]).pop  if e['rhost'].empty?
-          end
-
           e['date'] ||= mhead['date']
-          e['spec'] ||= 'SMTP'
           e.each_key { |a| e[a] ||= '' }
         end
+
+        rfc822part = Sisimai::RFC5322.weedout(rfc822list)
         return { 'ds' => dscontents, 'rfc822' => rfc822part }
       end