sisimai 4.19.0-java → 4.20.0-java

data/lib/sisimai/order/email.rb

@@ -0,0 +1,231 @@
+module Sisimai
+  # Sisimai::Order::Email makes optimized order list which include MTA, MSP and
+  # CED modules to be loaded on first from MTA, MSP or CED specific headers in
+  # the bounce mail headers such as X-Failed-Recipients.
+  # This module are called from only Sisimai::Message::Email.
+  module Order
+    module Email
+      # Imported from p5-Sisimail/lib/Sisimai/Order/Email.pm
+      class << self
+        require 'sisimai/mta'
+        require 'sisimai/msp'
+        require 'sisimai/ced'
+
+        EngineOrder1 = [
+          # These modules have many subject patterns or have MIME encoded subjects
+          # which is hard to code as regular expression
+          'Sisimai::MTA::Exim',
+          'Sisimai::MTA::Exchange2003',
+        ]
+        EngineOrder2 = [
+          # These modules have no MTA specific header and did not listed in the
+          # following subject header based regular expressions.
+          'Sisimai::MTA::Exchange2007',
+          'Sisimai::MSP::US::Facebook',
+          'Sisimai::MSP::JP::KDDI',
+        ]
+        EngineOrder3 = [
+          # These modules have no MTA specific header but listed in the following
+          # subject header based regular expressions.
+          'Sisimai::MTA::Qmail',
+          'Sisimai::MTA::Notes',
+          'Sisimai::MTA::MessagingServer',
+          'Sisimai::MTA::Domino',
+          'Sisimai::MSP::DE::EinsUndEins',
+          'Sisimai::MTA::OpenSMTPD',
+          'Sisimai::MTA::MXLogic',
+          'Sisimai::MTA::Postfix',
+          'Sisimai::MTA::Sendmail',
+          'Sisimai::MTA::Courier',
+          'Sisimai::MTA::IMailServer',
+          'Sisimai::MSP::US::SendGrid',
+          'Sisimai::MSP::US::Bigfoot',
+          'Sisimai::MTA::X4',
+        ]
+        EngineOrder4 = [
+          # These modules have no MTA specific headers and there are few samples or
+          # too old MTA
+          'Sisimai::MSP::US::Verizon',
+          'Sisimai::MTA::InterScanMSS',
+          'Sisimai::MTA::MailFoundry',
+          'Sisimai::MTA::ApacheJames',
+          'Sisimai::MSP::JP::Biglobe',
+          'Sisimai::MSP::JP::EZweb',
+          'Sisimai::MTA::X5',
+          'Sisimai::MTA::X3',
+          'Sisimai::MTA::X2',
+          'Sisimai::MTA::X1',
+          'Sisimai::MTA::V5sendmail',
+        ]
+        EngineOrder5 = [
+          # These modules have one or more MTA specific headers but other headers
+          # also required for detecting MTA name
+          'Sisimai::MSP::US::Google',
+          'Sisimai::MSP::US::Outlook',
+          'Sisimai::MSP::RU::MailRu',
+          'Sisimai::MSP::UK::MessageLabs',
+          'Sisimai::MTA::MailMarshalSMTP',
+          'Sisimai::MTA::MFILTER',
+        ]
+        EngineOrder9 = [
+          # These modules have one or more MTA specific headers
+          'Sisimai::MSP::US::Aol',
+          'Sisimai::MSP::US::Yahoo',
+          'Sisimai::MSP::US::AmazonSES',
+          'Sisimai::MSP::DE::GMX',
+          'Sisimai::MSP::RU::Yandex',
+          'Sisimai::MSP::US::ReceivingSES',
+          'Sisimai::MSP::US::Office365',
+          'Sisimai::MSP::US::AmazonWorkMail',
+          'Sisimai::MSP::US::Zoho',
+          'Sisimai::MTA::McAfee',
+          'Sisimai::CED::US::AmazonSES',
+          'Sisimai::MTA::Activehunter',
+          'Sisimai::MTA::SurfControl',
+        ]
+
+        # This variable don't hold MTA/MSP name which have one or more MTA specific
+        # header such as X-AWS-Outgoing, X-Yandex-Uniq.
+        PatternTable = {
+          'subject' => {
+            %r/delivery/i => [
+              'Sisimai::MTA::Exim',
+              'Sisimai::MTA::Courier',
+              'Sisimai::MSP::US::Google',
+              'Sisimai::MSP::US::Outlook',
+              'Sisimai::MTA::Domino',
+              'Sisimai::MTA::OpenSMTPD',
+              'Sisimai::MSP::DE::EinsUndEins',
+              'Sisimai::MTA::InterScanMSS',
+              'Sisimai::MTA::MailFoundry',
+              'Sisimai::MTA::X4',
+              'Sisimai::MTA::X3',
+              'Sisimai::MTA::X2',
+            ],
+            %r/noti(?:ce|fi)/i => [
+              'Sisimai::MTA::Qmail',
+              'Sisimai::MTA::Sendmail',
+              'Sisimai::MSP::US::Google',
+              'Sisimai::MSP::US::Outlook',
+              'Sisimai::MTA::Courier',
+              'Sisimai::MTA::MessagingServer',
+              'Sisimai::MTA::OpenSMTPD',
+              'Sisimai::CED::US::AmazonSES',
+              'Sisimai::MTA::X4',
+              'Sisimai::MTA::X3',
+              'Sisimai::MTA::MFILTER',
+            ],
+            %r/return/i => [
+              'Sisimai::MTA::Postfix',
+              'Sisimai::MTA::Sendmail',
+              'Sisimai::MSP::US::SendGrid',
+              'Sisimai::MSP::US::Bigfoot',
+              'Sisimai::MTA::X1',
+              'Sisimai::MSP::DE::EinsUndEins',
+              'Sisimai::MSP::JP::Biglobe',
+              'Sisimai::MTA::V5sendmail',
+            ],
+            %r/undeliver/i => [
+              'Sisimai::MTA::Postfix',
+              'Sisimai::MTA::Exchange2007',
+              'Sisimai::MTA::Exchange2003',
+              'Sisimai::MTA::Notes',
+              'Sisimai::MSP::US::Office365',
+              'Sisimai::MSP::US::Verizon',
+              'Sisimai::MSP::US::SendGrid',
+              'Sisimai::MTA::IMailServer',
+              'Sisimai::MTA::MailMarshalSMTP',
+            ],
+            %r/failure/i => [
+              'Sisimai::MTA::Qmail',
+              'Sisimai::MTA::Domino',
+              'Sisimai::MSP::US::Google',
+              'Sisimai::MSP::US::Outlook',
+              'Sisimai::MSP::RU::MailRu',
+              'Sisimai::MTA::X4',
+              'Sisimai::MTA::X2',
+              'Sisimai::MTA::MFILTER',
+            ],
+            %r/warning/i => [
+              'Sisimai::MTA::Postfix',
+              'Sisimai::MTA::Sendmail',
+              'Sisimai::MTA::Exim',
+            ],
+          },
+        }
+
+        make_default_order = lambda do
+          # Make default order of MTA/MSP and CED modules to be loaded
+          rv = []
+          begin
+            rv.concat(Sisimai::MTA.index.map { |e| 'Sisimai::MTA::' + e })
+            rv.concat(Sisimai::MSP.index.map { |e| 'Sisimai::MSP::' + e })
+            rv.concat(Sisimai::CED.index.map { |e| 'Sisimai::CED::' + e })
+          rescue
+            # Failed to load MTA/MSP or CED module
+            next
+          end
+          return rv
+        end
+        DefaultOrder = make_default_order.call
+
+        # Make default order of MTA/MSP modules to be loaded
+        # @return   [Array] Default order list of MTA/MSP modules
+        def default
+          return DefaultOrder
+        end
+
+        # Get regular expression patterns for specified field
+        # @param    [String] group  Group name for "ORDER BY"
+        # @return   [Hash]          Pattern table for the group
+        def by(group = '')
+          return {} unless group.size > 0
+          return PatternTable[group] if PatternTable.key?(group)
+          return {}
+        end
+
+        # Make MTA, MSP, and CED module list as a spare
+        # @return   [Array] Ordered module list
+        def another
+          rv = []
+          rv.concat(EngineOrder1)
+          rv.concat(EngineOrder2)
+          rv.concat(EngineOrder3)
+          rv.concat(EngineOrder4)
+          rv.concat(EngineOrder5)
+          rv.concat(EngineOrder9)
+          return rv
+        end
+
+        # Make email header list in each MTA, MSP, and CED module
+        # @return   [Hash] Header list to be parsed
+        def headers
+          order = self.default
+          table = {}
+          skips = { 'return-path' => 1, 'x-mailer' => 1 }
+
+          order.each do |e|
+            # Load email headers from each MTA,MSP module
+            begin
+              require e.gsub('::', '/').downcase
+            rescue LoadError
+              warn ' ***warning: Failed to load ' + e
+              next
+            end
+
+            Module.const_get(e).headerlist.each do |v|
+              # Get header name which required each MTA/MSP module
+              q = v.downcase
+              next if skips.key?(q)
+              table[q]  ||= {}
+              table[q][e] = 1
+            end
+          end
+          return table
+        end
+
+      end
+    end
+  end
+end
+

data/lib/sisimai/order/json.rb

@@ -0,0 +1,56 @@
+module Sisimai
+  # Sisimai::Order::JSON - Make optimized order list for calling CED modules
+  module Order
+    module JSON
+      # Imported from p5-Sisimail/lib/Sisimai/Order/JSON.pm
+      class << self
+        require 'sisimai/ced'
+
+        PatternTable = {
+          'keyname' => {
+            'notificationType' => [
+              'Sisimai::CED::US::AmazonSES',
+            ],
+          },
+        }
+
+        make_default_order = lambda do
+          # Make default order of CED modules to be loaded
+          rv = []
+          begin
+            rv.concat(Sisimai::CED.index.map { |e| 'Sisimai::CED::' + e })
+          rescue
+            # Failed to load CED module
+            next
+          end
+          return rv
+        end
+        DefaultOrder = make_default_order.call
+
+        # Make default order of CED modules to be loaded
+        # @return   [Array] Default order list of CED modules
+        def default; return DefaultOrder; end
+
+        # Make CED module list as a spare
+        # @return   [Array] Ordered module list
+        def another; return []; end
+
+        # Make email header list in each CED module
+        # @return   [Hash] Header list to be parsed
+        def headers; return {}; end
+
+        # Get regular expression patterns for specified key name
+        # @param    [String] group  Group name for "ORDER BY"
+        # @return   [Hash]          Pattern table for the group
+        def by(group = '')
+          return {} unless group.size > 0
+          return PatternTable[group] if PatternTable.key?(group)
+          return {}
+        end
+
+      end
+    end
+  end
+end
+
+

data/lib/sisimai/reason/hostunknown.rb

@@ -30,6 +30,7 @@ module Sisimai
               |unknown
               |unreachable
               )
+            |Mail[ ]domain[ ]mentioned[ ]in[ ]email[ ]address[ ]is[ ]unknown
             |name[ ]or[ ]service[ ]not[ ]known
             |no[ ]such[ ]domain
             |recipient[ ](?:

data/lib/sisimai/reason/norelaying.rb

@@ -64,6 +64,8 @@ module Sisimai
             # Check the value of Diagnosic-Code: header with patterns
             return true if Sisimai::Reason::NoRelaying.match(argvs.diagnosticcode)
           end
+
+          return false
         end
 
       end

data/lib/sisimai/reason/notaccept.rb

@@ -24,7 +24,11 @@ module Sisimai
           return nil unless argv1
 
           # Destination mail server does not accept any message
-          regex = %r/smtp[ ]protocol[ ]returned[ ]a[ ]permanent[ ]error/xi
+          regex = %r{(?:
+               Name[ ]server:[ ][.]:[ ]host[ ]not[ ]found # Sendmail
+              |55[46][ ]smtp[ ]protocol[ ]returned[ ]a[ ]permanent[ ]error
+            )
+          }ix
 
           return true if argv1 =~ regex
           return false

data/lib/sisimai/rfc3464.rb

@@ -385,7 +385,7 @@ module Sisimai
             |You[ ]sent[ ]mail[ ]to[ ]
             |Your[ ]message[ ]to[ ]
             )
-            ['"]?[<]?([^\s\n\r@=]+[@][-.0-9A-Za-z]+[.][0-9A-Za-z]+)[>]?['"]?
+            ['"]?[<]?([^\s\n\r@=<>]+[@][-.0-9A-Za-z]+[.][0-9A-Za-z]+)[>]?['"]?
           }xi
 
           b = dscontents[-1]

data/lib/sisimai/skeleton.rb

@@ -0,0 +1,43 @@
+module Sisimai
+  # Sisimai::Skeleton - Class for basic data structure of Sisimai
+  module Skeleton
+    class << self
+      # Imported from p5-Sisimail/lib/Sisimai/Skeleton.pm
+
+      # Flags for position variable for
+      # @return   [Hash] Position flag data
+      # @private
+      def INDICATORS
+        return {
+          :'deliverystatus' => (1 << 1),
+          :'message-rfc822' => (1 << 2),
+        }
+      end
+
+      # Data structure for parsed bounce messages
+      # @return [Hash] Data structure for delivery status
+      # @private
+      def DELIVERYSTATUS
+        return {
+          'spec'         => nil,  # Protocl specification
+          'date'         => nil,  # The value of Last-Attempt-Date header
+          'rhost'        => nil,  # The value of Remote-MTA header
+          'lhost'        => nil,  # The value of Received-From-MTA header
+          'alias'        => nil,  # The value of alias entry(RHS)
+          'agent'        => nil,  # MTA name
+          'action'       => nil,  # The value of Action header
+          'status'       => nil,  # The value of Status header
+          'reason'       => nil,  # Temporary reason of bounce
+          'command'      => nil,  # SMTP command in the message body
+          'replycode'    => nil,  # SMTP Reply code
+          'diagnosis'    => nil,  # The value of Diagnostic-Code header
+          'recipient'    => nil,  # The value of Final-Recipient header
+          'softbounce'   => nil,  # Soft bounce or not
+          'feedbacktype' => nil,  # Feedback Type
+        }
+      end
+
+    end
+  end
+end
+

data/lib/sisimai/smtp.rb

@@ -4,55 +4,18 @@ module Sisimai
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/SMTP.pm
 
-      # Check softbounce or not
-      # @param    [String] argv1    String including SMTP Status code
-      # @return   [True,False,Nil]  true:  Soft bounce
-      #                             false: Hard bounce
-      #                             nil: May not be bounce ?
-      def is_softbounce(argv1 = '')
-        warn sprintf(" ***warning: Obsoleted method, use Sisimai::SMTP::Error.soft_or_hard() instead.");
-        return nil unless argv1
-        return nil unless argv1.size > 0
-
-        mesgstring = argv1.to_s
-        classvalue = nil
-        softbounce = -1
-
-        if cv = mesgstring.match(/\b([245])\d\d\b/)
-          # Valid SMTP reply code such as 550, 421
-          classvalue = cv[1].to_i
-
-        elsif cv = mesgstring.match(/\b([245])[.][0-9][.]\d+\b/)
-          # DSN value such as 5.1.1, 4.4.7
-          classvalue = cv[1].to_i
-        end
-
-        if classvalue == 4
-          # Soft bounce, Persistent transient error
-          softbounce = true
-
-        elsif classvalue == 5
-          # Hard bounce, Permanent error
-          softbounce = false
-        else
-          # Check with regular expression
-          if mesgstring =~ /(?:temporar|persistent)/i
-            # Temporary failure
-            softbounce = true
-
-          elsif mesgstring =~ /permanent/i
-            # Permanently failure
-            softbounce = false
-
-          else
-            # did not find information to decide that it is a soft bounce
-            # or a hard bounce.
-            softbounce = nil
-          end
-        end
-
-        return softbounce
+      # Detector for SMTP commands in a bounce mail message
+      # @private
+      # @return   [Hash] SMTP command regular expressions
+      def command
+        return {
+            :helo => %r/\b(?:HELO|EHLO)\b/,
+            :mail => %r/\bMAIL F(?:ROM|rom)\b/,
+            :rcpt => %r/\bRCPT T[Oo]\b/,
+            :data => %r/\bDATA\b/,
+        }
       end
+
     end
   end
 end

data/lib/sisimai/smtp/error.rb

@@ -100,12 +100,13 @@ module Sisimai
               # The value is 0 or 1
               softorhard = getchecked == 1 ? 'hard' : 'soft'
             end
+
           elsif argv1 == 'notaccept'
             # NotAccept: 5xx => hard bounce, 4xx => soft bounce
             if argv2.size > 0
               # Get D.S.N. or SMTP reply code from The 2nd argument string
               statuscode = Sisimai::SMTP::Status.find(argv2)
-              statuscode = Sisimai::SMTP::Reply.find(argv1) if statuscode.empty?
+              statuscode = Sisimai::SMTP::Reply.find(argv2) if statuscode.empty?
               classvalue = statuscode[0, 1].to_i
 
               if classvalue == 4
@@ -119,6 +120,7 @@ module Sisimai
               # "notaccept" is a hard bounce
               softorhard = 'hard'
             end
+
           else
             # Check all the reasons defined at the above
             catch :SOFT_OR_HARD do