sisimai 4.16.0-java → 4.17.0-java

data/lib/sisimai/mta/x4.rb

@@ -55,21 +55,21 @@ module Sisimai
         ReSMTP = {
           # Error text regular expressions which defined in qmail-remote.c
           # qmail-remote.c:225|  if (smtpcode() != 220) quit("ZConnected to "," but greeting failed");
-          'conn'  => %r/(?:Error:)?Connected[ ]to[ ].+[ ]but[ ]greeting[ ]failed[.]/x,
+          conn: %r/(?:Error:)?Connected[ ]to[ ].+[ ]but[ ]greeting[ ]failed[.]/x,
           # qmail-remote.c:231|  if (smtpcode() != 250) quit("ZConnected to "," but my name was rejected");
-          'ehlo'  => %r/(?:Error:)?Connected[ ]to[ ].+[ ]but[ ]my[ ]name[ ]was[ ]rejected[.]/x,
+          ehlo: %r/(?:Error:)?Connected[ ]to[ ].+[ ]but[ ]my[ ]name[ ]was[ ]rejected[.]/x,
           # qmail-remote.c:238|  if (code >= 500) quit("DConnected to "," but sender was rejected");
           # reason = rejected
-          'mail'  => %r/(?:Error:)?Connected[ ]to[ ].+[ ]but[ ]sender[ ]was[ ]rejected[.]/x,
+          mail: %r/(?:Error:)?Connected[ ]to[ ].+[ ]but[ ]sender[ ]was[ ]rejected[.]/x,
           # qmail-remote.c:249|  out("h"); outhost(); out(" does not like recipient.\n");
           # qmail-remote.c:253|  out("s"); outhost(); out(" does not like recipient.\n");
           # reason = userunknown
-          'rcpt'  => %r/(?:Error:)?.+[ ]does[ ]not[ ]like[ ]recipient[.]/x,
+          rcpt: %r/(?:Error:)?.+[ ]does[ ]not[ ]like[ ]recipient[.]/x,
           # qmail-remote.c:265|  if (code >= 500) quit("D"," failed on DATA command");
           # qmail-remote.c:266|  if (code >= 400) quit("Z"," failed on DATA command");
           # qmail-remote.c:271|  if (code >= 500) quit("D"," failed after I sent the message");
           # qmail-remote.c:272|  if (code >= 400) quit("Z"," failed after I sent the message");
-          'data'  => %r{(?:
+          data: %r{(?:
              (?:Error:)?.+[ ]failed[ ]on[ ]DATA[ ]command[.]
             |(?:Error:)?.+[ ]failed[ ]after[ ]I[ ]sent[ ]the[ ]message[.]
             )
@@ -84,10 +84,10 @@ module Sisimai
         }x
         # qmail-ldap-1.03-20040101.patch:19817 - 19866
         ReLDAP = {
-          'suspend'     => %r/Mailaddress is administrative?le?y disabled/,            # 5.2.1
-          'userunknown' => %r/[Ss]orry, no mailbox here by that name/,                 # 5.1.1
-          'exceedlimit' => %r/The message exeeded the maximum size the user accepts/,  # 5.2.3
-          'systemerror' => %r{(?>
+          suspend:     %r/Mailaddress is administrative?le?y disabled/,            # 5.2.1
+          userunknown: %r/[Ss]orry, no mailbox here by that name/,                 # 5.1.1
+          exceedlimit: %r/The message exeeded the maximum size the user accepts/,  # 5.2.3
+          systemerror: %r{(?>
              Automatic[ ]homedir[ ]creator[ ]crashed                    # 4.3.0
             |Illegal[ ]value[ ]in[ ]LDAP[ ]attribute                    # 5.3.5
             |LDAP[ ]attribute[ ]is[ ]not[ ]given[ ]but[ ]mandatory      # 5.3.5
@@ -115,40 +115,36 @@ module Sisimai
         ReFailure = {
           # qmail-local.c:589|  strerr_die1x(100,"Sorry, no mailbox here by that name. (#5.1.1)");
           # qmail-remote.c:253|  out("s"); outhost(); out(" does not like recipient.\n");
-          'userunknown' => %r{(?:
+          userunknown: %r{(?:
              no[ ]mailbox[ ]here[ ]by[ ]that[ ]name
             |[ ]does[ ]not[ ]like[ ]recipient[.]
             )
           }x,
           # error_str.c:192|  X(EDQUOT,"disk quota exceeded")
-          'mailboxfull' => %r/disk[ ]quota[ ]exceeded/x,
+          mailboxfull: %r/disk[ ]quota[ ]exceeded/x,
           # qmail-qmtpd.c:233| ... result = "Dsorry, that message size exceeds my databytes limit (#5.3.4)";
           # qmail-smtpd.c:391| ... out("552 sorry, that message size exceeds my databytes limit (#5.3.4)\r\n"); return;
-          'mesgtoobig'  => %r/Message[ ]size[ ]exceeds[ ]fixed[ ]maximum[ ]message[ ]size:/x,
+          mesgtoobig:  %r/Message[ ]size[ ]exceeds[ ]fixed[ ]maximum[ ]message[ ]size:/x,
           # qmail-remote.c:68|  Sorry, I couldn't find any host by that name. (#4.1.2)\n"); zerodie();
           # qmail-remote.c:78|  Sorry, I couldn't find any host named ");
-          'hostunknown' => %r/\ASorry[,][ ]I[ ]couldn[']t[ ]find[ ]any[ ]host[ ]/x,
-          'systemerror' => %r{(?>
+          hostunknown: %r/\ASorry[,][ ]I[ ]couldn[']t[ ]find[ ]any[ ]host[ ]/x,
+          systemerror: %r{(?>
              bad[ ]interpreter:[ ]No[ ]such[ ]file[ ]or[ ]directory
             |system[ ]error
             |Unable[ ]to\b
             )
           }x,
-          'networkerror' => %r{Sorry(?:
+          networkerror: %r{Sorry(?:
              [,][ ]I[ ]wasn[']t[ ]able[ ]to[ ]establish[ ]an[ ]SMTP[ ]connection
             |[,][ ]I[ ]couldn[']t[ ]find[ ]a[ ]mail[ ]exchanger[ ]or[ ]IP[ ]address
             |[.][ ]Although[ ]I[']m[ ]listed[ ]as[ ]a[ ]best[-]preference[ ]MX[ ]or[ ]A[ ]for[ ]that[ ]host
             )
           }x,
-          'systemfull' => %r/Requested action not taken: mailbox unavailable [(]not enough free space[)]/,
+          systemfull: %r/Requested action not taken: mailbox unavailable [(]not enough free space[)]/,
         }
-
         # qmail-send.c:922| ... (&dline[c],"I'm not going to try again; this message has been in the queue too long.\n")) nomem();
-        ReDelayed = %r/this[ ]message[ ]has[ ]been[ ]in[ ]the[ ]queue[ ]too[ ]long[.]\z/x
-
+        ReDelayed  = %r/this[ ]message[ ]has[ ]been[ ]in[ ]the[ ]queue[ ]too[ ]long[.]\z/x
         Indicators = Sisimai::MTA.INDICATORS
-        LongFields = Sisimai::RFC5322.LONGFIELDS
-        RFC822Head = Sisimai::RFC5322.HEADERFIELDS
 
         def description; return 'Unknown MTA #4'; end
         def smtpagent;   return 'X4'; end
@@ -179,11 +175,10 @@ module Sisimai
           match += 1 if mhead['received'].find { |a| a =~ Re0[:received] }
           return nil if match == 0
 
-          dscontents = []; dscontents << Sisimai::MTA.DELIVERYSTATUS
+          dscontents = [Sisimai::MTA.DELIVERYSTATUS]
           hasdivided = mbody.split("\n")
-          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
           v = nil
@@ -192,7 +187,7 @@ module Sisimai
             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
@@ -207,30 +202,16 @@ 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 unless e.empty?
-                rfc822next[previousfn] = true
+              if e.empty?
+                blanklines += 1
+                break if blanklines > 1
+                next
               end
+              rfc822list << e
 
             else
               # Before "message/rfc822"
-              next if readcursor & Indicators[:'deliverystatus'] == 0
+              next if readcursor & Indicators[:deliverystatus] == 0
               next if e.empty?
 
               # <kijitora@example.jp>:
@@ -266,23 +247,12 @@ module Sisimai
                 end
               end
             end
-
           end
-
           return nil if recipients == 0
           require 'sisimai/string'
-          require 'sisimai/smtp/status'
 
           dscontents.map do |e|
-            e['agent'] = Sisimai::MTA::X4.smtpagent
-
-            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['agent']     = Sisimai::MTA::X4.smtpagent
             e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
 
             unless e['command']
@@ -290,7 +260,7 @@ module Sisimai
               ReSMTP.each_key do |r|
                 # Verify each regular expression of SMTP commands
                 next unless e['diagnosis'] =~ ReSMTP[r]
-                e['command'] = r.upcase
+                e['command'] = r.to_s.upcase
                 break
               end
 
@@ -325,12 +295,12 @@ module Sisimai
                   if e['alterrors']
                     # Check the value of "alterrors"
                     next unless e['alterrors'] =~ ReFailure[r]
-                    e['reason'] = r
+                    e['reason'] = r.to_s
                   end
                   break if e['reason']
 
                   next unless e['diagnosis'] =~ ReFailure[r]
-                  e['reason'] = r
+                  e['reason'] = r.to_s
                   break
                 end
 
@@ -338,7 +308,7 @@ module Sisimai
                   ReLDAP.each_key do |r|
                     # Verify each regular expression of LDAP errors
                     next unless e['diagnosis'] =~ ReLDAP[r]
-                    e['reason'] = r
+                    e['reason'] = r.to_s
                     break
                   end
                 end
@@ -348,13 +318,10 @@ module Sisimai
                 end
               end
             end
-
-            e['status']    = Sisimai::SMTP::Status.find(e['diagnosis'])
-            e['spec']      = e['reason'] == 'mailererror' ? 'X-UNIX' : 'SMTP'
-            e['action']    = 'failed' if e['status'] =~ /\A[45]/
             e.each_key { |a| e[a] ||= '' }
           end
 
+          rfc822part = Sisimai::RFC5322.weedout(rfc822list)
           return { 'ds' => dscontents, 'rfc822' => rfc822part }
         end
 

data/lib/sisimai/mta/x5.rb

@@ -18,8 +18,6 @@ module Sisimai
           :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
         }
         Indicators = Sisimai::MTA.INDICATORS
-        LongFields = Sisimai::RFC5322.LONGFIELDS
-        RFC822Head = Sisimai::RFC5322.HEADERFIELDS
 
         def description; return 'Unknown MTA #5'; end
         def smtpagent;   return 'X5'; end
@@ -64,24 +62,24 @@ module Sisimai
           end
           return nil if match < 2
 
-          dscontents = []; dscontents << Sisimai::MTA.DELIVERYSTATUS
+          dscontents = [Sisimai::MTA.DELIVERYSTATUS]
           hasdivided = mbody.split("\n")
           havepassed = ['']
-          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
           v = nil
 
           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
@@ -110,7 +108,7 @@ module Sisimai
                 recipients += 1
 
               elsif cv = e.match(/\A[Xx]-[Aa]ctual-[Rr]ecipient:[ ]*(?:RFC|rfc)822;[ ]*([^ ]+)\z/) ||
-                    cv = e.match(/\A[Oo]riginal-[Rr]ecipient:[ ]*(?:RFC|rfc)822;[ ]*([^ ]+)\z/)
+                         e.match(/\A[Oo]riginal-[Rr]ecipient:[ ]*(?:RFC|rfc)822;[ ]*([^ ]+)\z/)
                 # X-Actual-Recipient: RFC822; kijitora@example.co.jp
                 # Original-Recipient: rfc822;kijitora@example.co.jp
                 v['alias'] = cv[1]
@@ -154,50 +152,25 @@ module Sisimai
               next if recipients == 0
               next if readcursor & Indicators['deliverystatus'] == 0
 
-              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 unless e.empty?
-                rfc822next[previousfn] = true
+              if e.empty?
+                blanklines += 1
+                break if blanklines > 1
+                next
               end
+              rfc822list << e
+
             end
           end
-
           return nil if recipients == 0
           require 'sisimai/string'
-          require 'sisimai/smtp/status'
 
           dscontents.map do |e|
-            e['agent'] = Sisimai::MTA::X5.smtpagent
-
-            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['agent']       = Sisimai::MTA::X5.smtpagent
             e['diagnosis'] ||= Sisimai::String.sweep(e['diagnosis'])
-            e['status']    ||= Sisimai::SMTP::Status.find(e['diagnosis'])
-            e['spec']      ||= e['reason'] == 'mailererror' ? 'X-UNIX' : 'SMTP'
-            e['action']    ||= 'failed' if e['status'] =~ /\A[45]/
             e.each_key { |a| e[a] ||= '' }
           end
 
+          rfc822part = Sisimai::RFC5322.weedout(rfc822list)
           return { 'ds' => dscontents, 'rfc822' => rfc822part }
         end
 

data/lib/sisimai/reason.rb

@@ -19,13 +19,13 @@ module Sisimai
           Blocked ContentError ExceedLimit Expired Filtered HasMoved HostUnknown
           MailboxFull MailerError MesgTooBig NetworkError NotAccept OnHold
           Rejected NoRelaying SpamDetected SecurityError Suspend SystemError
-          SystemFull TooManyConn UserUnknown
+          SystemFull TooManyConn UserUnknown SyntaxError
         ]
       end
 
       # Detect the bounce reason
       # @param    [Sisimai::Data] argvs   Parsed email object
-      # @return   [String, Undef]         Bounce reason or Undef if the argument
+      # @return   [String, Nil]           Bounce reason or Nil if the argument
       #                                   is missing or invalid object
       # @see anotherone
       def get(argvs)
@@ -68,22 +68,7 @@ module Sisimai
 
         if reasontext.empty? || reasontext == 'undefined'
           # Bounce reason is not detected yet.
-          loop do
-            p = 'Sisimai::Reason::OnHold' # Onhold ?
-            r = nil
-            begin
-              require p.downcase.gsub('::', '/')
-              r = Module.const_get(p)
-              reasontext = r.text if r.true(argvs)
-            rescue
-              warn ' ***warning: Failed to load ' + p
-            end
-            break if reasontext.size > 0
-
-            # Other reason ?
-            reasontext = self.anotherone(argvs)
-            break
-          end
+          reasontext = self.anotherone(argvs)
 
           if reasontext == 'undefined' || reasontext.empty?
             # Action: delayed => "expired"
@@ -154,6 +139,11 @@ module Sisimai
             elsif argvs.diagnostictype =~ /\AX-(?:UNIX|POSTFIX)\z/
               # Diagnostic-Code: X-UNIX; ...
               reasontext = 'mailererror'
+
+            else
+              # 50X Syntax Error?
+              require 'sisimai/reason/syntaxerror'
+              reasontext = 'syntaxerror' if Sisimai::Reason::SyntaxError.true(argvs)
             end
           end
 
@@ -175,59 +165,6 @@ module Sisimai
         return reasontext
       end
 
-      # Detect the bounce reason from given text
-      # @param    [String] argv1  Error message
-      # @return   [String]        Bounce reason
-      def match(argv1)
-        return nil unless argv1
-        require 'sisimai/smtp/status'
-
-        reasontext = ''
-        typestring = ''
-        classorder = %w|
-          MailboxFull MesgTooBig ExceedLimit Suspend UserUnknown Filtered Rejected
-          HostUnknown SpamDetected TooManyConn Blocked SpamDetected SecurityError
-          SystemError NetworkError Suspend Expired ContentError HasMoved SystemFull
-          NotAccept MailerError NoRelaying OnHold
-        |
-
-        statuscode = Sisimai::SMTP::Status.find(argv1)
-        if cv = argv1.match(/\A(SMTP|X-.+);/i)
-          typestring = cv[1].upcase
-        end
-
-        # Diagnostic-Code: SMTP; ... or empty value
-        classorder.each do |e|
-          # Check the value of Diagnostic-Code: and the value of Status:, it is a
-          # deliverystats, with true() method in each Sisimai::Reason::* class.
-          p = 'Sisimai::Reason::' + e
-          r = nil
-          begin
-            require p.downcase.gsub('::', '/')
-            r = Module.const_get(p)
-          rescue
-            warn ' ***warning: Failed to load ' + p
-            next
-          end
-
-          next unless r.match(argv1)
-          reasontext = r.text
-          break
-        end
-
-        if reasontext.empty?
-          # Check the value of $typestring
-          if typestring == 'X-UNIX'
-            # X-Unix; ...
-            reasontext = 'mailererror'
-          else
-            # Detect the bounce reason from "Status:" code
-            reasontext = Sisimai::SMTP::Status.name(statuscode) || 'undefined'
-          end
-        end
-        return reasontext
-      end
-
     end
   end
 end

data/lib/sisimai/reason/blocked.rb

@@ -10,6 +10,9 @@ module Sisimai
       # Imported from p5-Sisimail/lib/Sisimai/Reason/Blocked.pm
       class << self
         def text; return 'blocked'; end
+        def description
+          return 'Email rejected due to client IP address or a hostname'
+        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/contenterror.rb

@@ -11,6 +11,9 @@ module Sisimai
       # Imported from p5-Sisimail/lib/Sisimai/Reason/ContentError.pm
       class << self
         def text; return 'contenterror'; end
+        def description
+          return 'Email rejected due to a header format of the email'
+        end
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions