sisimai 4.25.3-java → 4.25.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 566f76a60184562c81236ca1ed69414c6ff8f2a5
-  data.tar.gz: c41f35e8fe6cef2e270ffda60e9a0be0b8815ec2
+SHA256:
+  metadata.gz: 0447e075261174ff041771d1f5ad336285e307bb5d2c987a15f6118781910b8b
+  data.tar.gz: 6a01a9e3c78c2ef292595552416685bdd08d8cbccfbaf9ba7e5c5ff36b0da487
 SHA512:
-  metadata.gz: ef471a4b893dbb3b2123f6792f79c8c6748e63f6efce62149e82a662599de213220b0fc63c0addb5467cb7d5522bcf49b63efaa0b84377f59e29ec34f3334160
-  data.tar.gz: f052990f00ada0e7880de7f4c1a3830b3440c6ca2f903a04f402dd4a68809620f06837a70afa4edfa41c1f31a7a4f7b87b36c266b04a658b2c9130d73cff4a18
+  metadata.gz: 3535a69520e958950a1f450a6e2d1b04131012c8976ac3ae37efda0066edbd6e1943d6687f83be786787bafcd19b5eeab9cc46e4900b4fb3a93489dfe9d0cacb
+  data.tar.gz: a324969a25521aca7b227fc0c4846d9b7a9c2246aabf9f562c9871e6cdd2b63ef98c1374f0e2bdc77bcf967c542ad0bea0254daf4ed5e470b5d29f1224448d44

data/.gitignore

@@ -8,5 +8,6 @@
 /sbin
 /spec/reports/
 /set-of-emails/private/
+/set-of-emails/obsoleted/
 /tmp/
 .rubocop_todo.yml

data/.travis.yml

@@ -1,5 +1,6 @@
 language: ruby
 rvm:
+  # See http://rubies.travis-ci.org for Precompiled Ruby Versions
   - 2.1.1
   - 2.2.4
   - 2.3.0

data/ANALYTICAL-PRECISION

@@ -52,11 +52,9 @@ Email::Yandex ...........    4/0007  0.5714  Yandex.Mail: http://www.yandex.ru
 Email::Zoho .............    0/0011  0.0000  Zoho Mail: https://www.zoho.com
 Email::mFILTER ..........    0/0012  0.0000  Digital Arts m-FILTER
 Email::qmail ............   58/0087  0.6667  qmail
-JSON::AmazonSES .........   40/0049  0.8163  Amazon SES(JSON): http://aws.amazon.com/ses/
-JSON::SendGrid ..........    7/0012  0.5833  SendGrid(JSON): http://sendgrid.com/
 ARF .....................    8/0038  0.2105  Abuse Feedback Reporting Format
 RFC3464 .................  151/0322  0.4689  Fallback Module for MTAs
 RFC3834 .................    0/0014  0.0000  Detector for auto replied message
 --------------------------------------------------------------------------------
- bounceHammer 2.7.13p3    1570/2630  0.5970
- Sisimai 4.25.3           2630/2630  1.0000
+ bounceHammer 2.7.13p3    1523/2569  0.5928
+ Sisimai 4.25.3p2         2569/2569  1.0000

data/CONTRIBUTING

@@ -0,0 +1,4 @@
+CONTRIBUTING
+===============================================================================
+
+

data/ChangeLog.md

@@ -3,6 +3,45 @@ RELEASE NOTES for Ruby version of Sisimai
 - releases: "https://github.com/sisimai/rb-Sisimai/releases"
 - download: "https://rubygems.org/gems/sisimai"
 
+v4.25.4
+--------------------------------------------------------------------------------
+- release: "Tue,  3 Dec 2019 12:34:45 +0900 (JST)"
+- version: "4.25.4"
+- changes:
+  - #152 **THE ABILITY TO READ JSON STRING AS AN INPUT SOURCE AND TO PARSE JSON
+    FORMATTED BOUNCE MESSAGE WILL NOT BE SUPPORTED AT Sisimai 4.25.5**
+  - **The following modules for reading json string as an input source, and for
+    parsing json formatted bounce message will be removed at Sisimai 4.25.5**
+    - `Sisimai::Message::JSON`
+    - `Sisimai::Bite::JSON`
+    - `Sisimai::Bite::JSON::AmazonSES`
+    - `Sisimai::Bite::JSON::SendGrid`
+    - `Sisimai::Order::JSON`
+  - Implement a new MTA module class `Sisimai::Lhost`, it is a parent class of
+    all the MTA modules for a bounce mail returned as an email message via SMTP
+    and **THE FOLLOWING NAME SPACES WERE MARKED AS OBSOLETED OR REMOVED** #153
+    - `Sisimai::Bite`: Use `Sisimai::Lhost` instead
+    - `Sisimai::Bite::Email`: Merged into `Sisimai::Lhost`
+    - `Sisimai::Bite::Email::*`: Moved under `Sisimai::Lhost` as the same named
+      MTA module
+  - The following modules were marked as obsoleted, will be removed and merged
+    into each parent class
+    - `Sisimai::Message::Email`
+    - `Sisimai::Order::Email`
+  - USAGE AND PARAMETERS FOR THE FOLLOWING METHODS HAVE NOT BEEN CHANGED AT ALL
+    AND WILL NOT BE CHANGED AFTER Sisimai 4.25.5
+    - `Sisimai.make`
+    - `Sisimai.dump`
+    - `Sisimai::Message.new`
+  - Implement `Sisimai::Rhost::IUA` for SMTP error codes at https://www.i.ua/.
+  - Update error message pattern for ClamSMTP at "virusdetected" reason.
+  - Fix an indicator string for detecting the beginning of the original message
+    part at `Sisimai::Bite::Email::MFILTER`
+  - Multibyte characters in the original subject header will not be removed and
+    replaced with "MULTIBYTE CHARACTERS HAS BEEN REMOVED"
+  - Error message `... had no relevant answers.` from GSuite is classified into
+    "networkerror" reason.
+
 v4.25.3
 --------------------------------------------------------------------------------
 - release: ""Sat,  7 Sep 2019 15:00:22 +0900 (JST)

data/Developers.mk

@@ -15,27 +15,17 @@ LS    := ls -1
 CP    := cp
 RM    := rm -f
 
-THELASTBHVER := 2.7.13p3
-BOUNCEHAMMER := /usr/local/bouncehammer
-MBOXPARSERV0 := $(BOUNCEHAMMER)/bin/mailboxparser -T
 PERL5SISIMAI := p5-Sisimai
 PRECISIONTAB := ANALYTICAL-PRECISION
 PARSERLOGDIR := tmp/parser-logs
-MAILCLASSDIR := lib/$(NAME)/Bite/Email
-JSONCLASSDIR := lib/$(NAME)/Bite/JSON
+MAILCLASSDIR := lib/$(NAME)/Lhost
 MTARELATIVES := ARF rfc3464 rfc3834
-
 BENCHMARKDIR := tmp/benchmark
-PRECISIONDIR := tmp/emails-for-precision
-COMPARINGDIR := tmp/emails-for-comparing
-
 PARSERSCRIPT := $(RUBY) sbin/emparser --delivered
 RELEASEVERMP := $(RUBY) -rsisimai
 DEVELOPVERMP := $(RUBY) -I./lib -rsisimai
 HOWMANYMAILS := $(DEVELOPVERMP) -e 'print Sisimai.make($$*.shift, delivered: true).size' $(COMPARINGDIR)
-
 BENCHMARKEMP := sbin/mp
-
 SET_OF_EMAIL := set-of-emails
 PRIVATEMAILS := $(SET_OF_EMAIL)/private
 PUBLICEMAILS := $(SET_OF_EMAIL)/maildir/bsd
@@ -55,11 +45,6 @@ private-sample:
 	$(RM) -r ./$(PRIVATEMAILS)
 	$(CP) -vRp ../$(PERL5SISIMAI)/$(PRIVATEMAILS) $(SET_OF_EMAIL)
 
-precision-table:
-	cat ../$(PERL5SISIMAI)/$(PRECISIONTAB) | sed \
-		-e 's/Email::qmail/Email::Qmail/g' \
-		-e 's/Email::mFILTER/Email::MFILTER/g' > $(PRECISIONTAB)
-
 update-other-format-emails:
 	for v in `find $(PUBLICEMAILS) -name '*-01.eml' -type f`; do \
 		f="`basename $$v`" ;\
@@ -67,62 +52,6 @@ update-other-format-emails:
 		nkf -Lm $$v > $(MACFORMATSET)/$$f ;\
 	done
 
-emails-for-precision:
-	@ for v in `$(LS) ./$(MAILCLASSDIR)/*.rb | grep -v userdefined`; do \
-		MTA=`echo $$v | cut -d/ -f6 | tr '[A-Z]' '[a-z]' | sed 's/.rb//g'` ;\
-		$(MKDIR) $(PRECISIONDIR)/email-$$MTA ;\
-		$(CP) $(PUBLICEMAILS)/email-$$MTA-*.eml $(PRECISIONDIR)/email-$$MTA/ ;\
-		$(CP) $(PRIVATEMAILS)/email-$$MTA/* $(PRECISIONDIR)/email-$$MTA/ ;\
-	done
-	@ for v in arf rfc3464 rfc3834; do \
-		$(MKDIR) $(PRECISIONDIR)/$$v ;\
-		$(CP) $(PUBLICEMAILS)/$$v*.eml $(PRECISIONDIR)/$$v/ ;\
-		$(CP) $(PRIVATEMAILS)/$$v/* $(PRECISIONDIR)/$$v/ ;\
-	done
-
-emails-for-comparing:
-	@ rm -fr ./$(COMPARINGDIR)
-	@ $(MKDIR) $(COMPARINGDIR)
-	@ for v in $(BH_CAN_PARSE); do \
-		$(CP) $(PUBLICEMAILS)/email-`echo $$v | tr '[A-Z]' '[a-z]'`-*.eml $(COMPARINGDIR)/; \
-		test -d $(PRIVATEEMAILS) && $(CP) $(PRIVATEMAILS)/email-`echo $$v | tr '[A-Z]' '[a-z]'`/*.eml $(COMPARINGDIR)/; \
-	done
-
-comparison: emails-for-comparing
-	@ echo -------------------------------------------------------------------
-	@ echo `$(HOWMANYMAILS)` emails in $(COMPARINGDIR)
-	@ echo -n 'Calculating the velocity of parsing 1000 mails: multiply by '
-	@ echo "scale=6; 1000 / `$(HOWMANYMAILS)`" | bc
-	@ echo -------------------------------------------------------------------
-	@ uptime
-	@ echo -------------------------------------------------------------------
-	@ if [ -x "$(BOUNCEHAMMER)/bin/mailboxparser" ]; then \
-		echo bounceHammer $(THELASTBHVER); \
-		n=1; while [ $$n -le 5 ]; do \
-			/usr/bin/time $(MBOXPARSERV0) -Fjson $(COMPARINGDIR) > /dev/null ;\
-			sleep 1; \
-			n=`expr $$n + 1`; \
-		done; \
-		echo -------------------------------------------------------------------; \
-	fi
-	@ echo 'Sisimai' `$(RELEASEVERMP) -e 'puts Sisimai.version'` $(RELEASEVERMP)
-	@ n=1; while [ $$n -le 5 ]; do \
-		/usr/bin/time $(RELEASEVERMP) -e 'Sisimai.make($$*.shift, deliverd: true)' $(COMPARINGDIR) > /dev/null ;\
-		sleep 1; \
-		n=`expr $$n + 1`; \
-	done
-	@ echo -------------------------------------------------------------------
-	@ echo 'Sisimai' `$(DEVELOPVERMP) -e 'puts Sisimai.version'` $(DEVELOPVERMP)
-	@ n=1; while [ $$n -le 5 ]; do \
-		/usr/bin/time $(DEVELOPVERMP) -e 'Sisimai.make($$*.shift, deliverd: true)' $(COMPARINGDIR) > /dev/null ;\
-		sleep 1; \
-		n=`expr $$n + 1`; \
-	done
-	@ echo -------------------------------------------------------------------
-
 clean:
-	$(RM) -r ./$(PRECISIONDIR)
 	$(RM) -r ./$(BENCHMARKDIR)
-	$(RM) -f tmp/subject-list tmp/senders-list
-
 

data/Makefile

@@ -59,6 +59,10 @@ release:
 
 test: cruby-test
 
+check:
+	find lib -type f -exec grep --color -E ' $$' {} /dev/null \;
+	find lib -type f -exec grep --color -E '[;][ ]*$$' {} /dev/null \;
+
 cruby-test:
 	$(RAKE) spec
 

data/README-JA.md

@@ -57,6 +57,7 @@ Key features
   * 29種類のMTAに対応
   * 22種類の著名なMSPに対応
   * 2種類の著名なメール配信クラウドに対応(JSON)
+    * **Sisimai 4.25.5で削除予定**
   * Feedback Loopにも対応
   * 29種類のエラー理由を検出
 
@@ -160,6 +161,8 @@ puts Sisimai.dump('/path/to/mbox', delivered: true)
 
 Read bounce object
 -------------------------------------------------------------------------------
+**この機能はSisimai 4.25.5で削除されます**
+
 メール配信クラウドからAPIで取得したバウンスオブジェクト(JSON)を読んで解析する
 場合は、次のようなコードを書いてください。この機能はSisimai v4.20.0で実装され
 ました。

data/README.md

@@ -56,6 +56,7 @@ Key Features
   * Support 24 known MTAs and 5 unknown MTAs
   * Support 22 major MSPs(Mail Service Providers)
   * Support 2 major Cloud Email Delivery Services(JSON format)
+    * **WILL BE REMOVED AT Sisimai 4.25.5**
   * Support Feedback Loop Message(ARF)
   * Can detect 29 error reasons
 
@@ -165,9 +166,11 @@ puts Sisimai.dump('/path/to/mbox', delivered: true)
 
 Read bounce object
 -------------------------------------------------------------------------------
+**THIS FEATURE WILL BE REMOVED AT SISIMAI 4.25.5**
+
 The way to read a bounce object retrived from Cloud Email Services as JSON using
-their API is the following code. This feature is available at Sisimai 4.20.0 or
-later.
+their API is the following code. This feature is available at between v4.20.0
+and **v4.25.5**.
 
 ```ruby
 #! /usr/bin/env ruby

data/lib/sisimai.rb

@@ -66,6 +66,7 @@ module Sisimai
 
       elsif input == 'json'
         # Decoded JSON object: 'input' => 'json'
+        warn ' ***warning: input: "json" is marked as obsoleted'
         type = argv0.class.to_s
         list = []
 
@@ -125,12 +126,12 @@ module Sisimai
     def engine
       table = {}
 
-      %w[Bite::Email Bite::JSON ARF RFC3464 RFC3834].each do |e|
+      %w[Lhost ARF RFC3464 RFC3834].each do |e|
         r = 'Sisimai::' << e
         require r.gsub('::', '/').downcase
 
-        if e.start_with?('Bite::Email', 'Bite::JSON')
-          # Sisimai::Bite::Email or Sisimai::Bite::JSON
+        if e == 'Lhost'
+          # Sisimai::Lhost::*
           Module.const_get(r).send(:index).each do |ee|
             # Load and get the value of "description" from each module
             rr = 'Sisimai::' << e + '::' << ee

data/lib/sisimai/arf.rb

@@ -3,7 +3,7 @@ module Sisimai
   module ARF
     # Imported from p5-Sisimail/lib/Sisimai/ARF.pm
     class << self
-      require 'sisimai/bite/email'
+      require 'sisimai/lhost'
       require 'sisimai/rfc5322'
 
       # http://tools.ietf.org/html/rfc5965
@@ -13,7 +13,7 @@ module Sisimai
       # Netease DMARC uses:    This is a spf/dkim authentication-failure report for an email message received from IP
       # OpenDMARC 1.3.0 uses:  This is an authentication failure report for an email message received from IP
       # Abusix ARF uses        this is an autogenerated email abuse complaint regarding your network.
-      Indicators = Sisimai::Bite::Email.INDICATORS
+      Indicators = Sisimai::Lhost.INDICATORS
       StartingOf = { rfc822: ['Content-Type: message/rfc822', 'Content-Type: text/rfc822-headers'] }.freeze
       MarkingsOf = {
         message: %r{\A(?>
@@ -76,10 +76,10 @@ module Sisimai
       # @return        [Hash, Nil]        Bounce data list and message/rfc822 part
       #                                   or nil if it failed to parse or the
       #                                   arguments are missing
-      def scan(mhead, mbody)
+      def make(mhead, mbody)
         return nil unless self.is_arf(mhead)
 
-        dscontents = [Sisimai::Bite.DELIVERYSTATUS]
+        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
         hasdivided = mbody.split("\n")
         rfc822part = ''   # (String) message/rfc822-headers part
         previousfn = ''   # (String) Previous field name
@@ -195,7 +195,7 @@ module Sisimai
               # Redacted-Address: localpart@
               if v['recipient']
                 # There are multiple recipient addresses in the message body.
-                dscontents << Sisimai::Bite.DELIVERYSTATUS
+                dscontents << Sisimai::Lhost.DELIVERYSTATUS
                 v = dscontents[-1]
               end
               v['recipient'] = Sisimai::Address.s3s4(cv[1])
@@ -278,7 +278,7 @@ module Sisimai
         if cv = mhead['subject'].match(/complaint about message from (\d{1,3}[.]\d{1,3}[.]\d{1,3}[.]\d{1,3})/)
           # Microsoft ARF: remote host address.
           arfheaders['rhost'] = cv[1]
-          commondata['diagnosis'] = 
+          commondata['diagnosis'] =
             'This is a Microsoft email abuse report for an email message received from IP' << arfheaders['rhost'] + ' on ' << mhead['date']
         end
 

data/lib/sisimai/bite.rb

@@ -3,12 +3,13 @@ module Sisimai
   module Bite
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/Bite.pm
-      require 'sisimai/rfc5322'
+      require 'sisimai/lhost'
 
       # Data structure for parsed bounce messages
       # @return [Hash] Data structure for delivery status
       # @private
       def DELIVERYSTATUS
+        Sisimai::Lhost.warn
         return {
           'spec'         => nil,  # Protocl specification
           'date'         => nil,  # The value of Last-Attempt-Date header
@@ -28,8 +29,12 @@ module Sisimai
         }
       end
 
-      def smtpagent(v = ''); return v.to_s.sub(/\ASisimai::Bite::/, ''); end
-      def description; return ''; end
+      def smtpagent(v = '')
+        Sisimai::Lhost.warn(self.name)
+        return v.to_s.sub(/\ASisimai::Bite::/, '')
+      end
+
+      def description; Sisimai::Lhost.warn; return ''; end
     end
   end
 end

data/lib/sisimai/bite/email.rb

@@ -1,59 +1,16 @@
-  module Sisimai
+module Sisimai
   module Bite
     # Sisimai::Bite::Email- Base class for Sisimai::Bite::Email::*
     module Email
       class << self
         # Imported from p5-Sisimail/lib/Sisimai/Bite/Email.pm
-        require 'sisimai/bite'
-
-        # @abstract Flags for position variable
-        # @return   [Hash] Position flag data
-        # @private
-        def INDICATORS
-          return {
-            :'deliverystatus' => (1 << 1),
-            :'message-rfc822' => (1 << 2),
-          }
-        end
-        def headerlist; return []; end
-
-        # @abstract MTA list
-        # @return   [Array] MTA list with order
-        def index
-          return %w[
-            Sendmail Postfix Qmail Exim Courier OpenSMTPD Office365 Outlook
-            Exchange2007 Exchange2003 Yahoo GSuite Aol SendGrid AmazonSES MailRu
-            Yandex MessagingServer Domino Notes ReceivingSES AmazonWorkMail Verizon
-            GMX Bigfoot Facebook Zoho EinsUndEins MessageLabs EZweb KDDI Biglobe
-            Amavis ApacheJames McAfee MXLogic MailFoundry IMailServer
-            MFILTER Activehunter InterScanMSS SurfControl MailMarshalSMTP
-            X1 X2 X3 X4 X5 V5sendmail FML Google]
-        end
-
-        # @abstract MTA list which have one or more extra headers
-        # @return   [Array] MTA list (have extra headers)
-        def heads
-          return %w[
-            Exim Office365 Outlook Exchange2007 Exchange2003 GSuite SendGrid
-            AmazonSES ReceivingSES AmazonWorkMail Aol GMX MailRu MessageLabs Yahoo
-            Yandex Zoho EinsUndEins MXLogic McAfee MFILTER EZweb Activehunter IMailServer
-            SurfControl FML Google
-          ]
-        end
-
-        # @abstract Parse bounce messages
-        # @param         [Hash] mhead       Message header of a bounce email
-        # @options mhead [String] from      From header
-        # @options mhead [String] date      Date header
-        # @options mhead [String] subject   Subject header
-        # @options mhead [Array]  received  Received headers
-        # @options mhead [String] others    Other required headers
-        # @param         [String] mbody     Message body of a bounce email
-        # @return        [Hash, Nil]        Bounce data list and message/rfc822
-        #                                   part or nil if it failed to parse or
-        #                                   the arguments are missing
-        def scan; return nil; end
+        require 'sisimai/lhost'
 
+        def INDICATORS; Sisimai::Lhost.warn; return Sisimai::Lhost.INDICATORS; end
+        def headerlist; Sisimai::Lhost.warn; return Sisimai::Lhost.headerlist; end
+        def index;      Sisimai::Lhost.warn; return Sisimai::Lhost.index; end
+        def heads;      Sisimai::Lhost.warn; return Sisimai::Lhost.heads; end
+        def scan;       Sisimai::Lhost.warn('make'); return Sisimai::Lhost.make; end
       end
     end
   end

data/lib/sisimai/bite/json.rb

@@ -4,31 +4,11 @@ module Sisimai
     module JSON
       class << self
         # Imported from p5-Sisimail/lib/Sisimai/Bite/JSON.pm
-        require 'sisimai/bite'
-
-        def headerlist; return []; end
-
-        # MTA list
-        # @return   [Array] MTA list with order
-        def index
-          return %w[SendGrid AmazonSES]
-        end
-
-        # Convert from JSON object to Sisimai::Message
-        # @param         [Hash] mhead   Message header of a bounce email
-        # @param         [String] mbody Message body of a bounce email(JSON)
-        # @return        [Hash, Nil]    Bounce data list and message/rfc822 part
-        #                               or nil if it failed to parse or the
-        #                               arguments are missing
-        def scan; return nil; end
-
-        # @abstract      Adapt bounce object for Sisimai::Message format
-        # @param         [Hash] argvs   bounce object returned from each email cloud
-        # @return        [Hash, Nil]    Bounce data list and message/rfc822 part
-        #                               or nil if it failed to parse or the
-        #                               arguments are missing
-        def adapt; return nil; end
-
+        require 'sisimai/lhost'
+        def INDICATORS; Sisimai::Lhost.warn('gone'); return Sisimai::Lhost.INDICATORS; end
+        def index;      Sisimai::Lhost.warn('gone'); return Sisimai::Lhost.index; end
+        def scan;       Sisimai::Lhost.warn('gone'); return Sisimai::Lhost.make; end
+        def adapt;      Sisimai::Lhost.warn('gone'); return nil; end
       end
     end
   end