simple_mailing_list 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17c2c77915c5e0a76917d09694ae169b748a8452
-  data.tar.gz: 23f0b3d46cf1177824ba537adfab98d0b5adac95
+  metadata.gz: 4d8f533e87e480112035f53b5d344db916d0321a
+  data.tar.gz: 97dbe991ad2ce2ec4658d17f648b9784857d1554
 SHA512:
-  metadata.gz: 2c5662a1f771e384b6aafa869866c8b87b31c0ec08a5eabc7ec17bd72c5eabd1b3588a14f9823b6df1d5575693d6513ea1ed43b2929507a51ee8588c4227e68d
-  data.tar.gz: 68f7d6c4dfd8e750f1d68224a30821ad40060ef118c8339c7fe7fc55b67b1a916deb9b778f35b95f25301e8e95eba3ba414ded584f84fd4a492ccf95203c1593
+  metadata.gz: 89dc8c260cceee29e6b83f697e8c7f9b2b1ba392ba3a0570c9795442a99cb25b0092b2462294d02f69dedde9d6f4e6e000a7cfe979293b31070c5e4e4dbdf3a2
+  data.tar.gz: 1bfed8edcbaea036b2ce9dfe438738d9c90d95af95d6b67957d397ec397abc946ed0193329b6390ed715c05e0595d383c137c76f3c40d5a840d8d104e82c2a3f

data/example/config_example.ja.yaml

@@ -125,3 +125,22 @@ forward:
 # forward@mail.example.com に送ると登録者全員に、
 # forward(数値)@mail.example.com に送ると
 # 該当学年の登録者のみにメールを転送する。
+
+# メール転送に失敗／成功した際に送る報告メール。
+# 省略した場合は、報告メールを送らない。
+forward_fail_subject: メール配信の認証に失敗しました
+forward_fail_body: |
+  「{{subject}}」
+  のメール配信認証に失敗しました。
+  次のような原因が考えられます：
+  ・配信が許可されていないメールアドレスから配信しようとした。
+  ・認証コードが必要な設定にもかかわらず認証コードが入力されていない。
+  ・危険性のあるファイルを添付している。
+forward_success_subject: メール配信が完了しました
+forward_success_body: |
+  「{{subject}}」
+  のメール配信が終了しました。
+  全部で{{count}}通のメールが配信されました。
+
+# 転送メールの「reply_to」欄に設定するメールアドレス。
+reply_to_address: noreply_smltest@mail.nodai-2-h.ed.jp

data/example/config_example.yaml

@@ -87,3 +87,15 @@ forward:
     options: { grade: 2 }
   - address: forward3@mail.example.com
     options: { grade: 3 }
+
+forward_fail_subject: "Mail forwarding Error!"
+forward_fail_body: |
+  failed forwarding mail
+  "{{subject}}"
+forward_success_subject: "Mail forwarding successed."
+forward_success_body: |
+  successed forwarding mail
+  "{{subject}}"
+  {{count}} mails have been sent.
+
+reply_to_address: noreply_smltest@mail.nodai-2-h.ed.jp

data/lib/simple_mailing_list/configfile.rb

@@ -56,6 +56,10 @@ module SimpleMailingList
       @delete_success_body      = config["delete_success_body"] || ""
 
       @forward                  = config["forward"] || []
+      @forward_fail_subject     = config["forward_fail_subject"]
+      @forward_fail_body        = config["forward_fail_body"]
+      @forward_success_subject  = config["forward_success_subject"]
+      @forward_success_body     = config["forward_success_body"]
       @reply_to_address         = config["reply_to_address"]
 
       # database

data/lib/simple_mailing_list/main.rb

@@ -62,7 +62,7 @@ module SimpleMailingList
         mode:         "register",
         options:      JSON.generate(regisiter_options)
       ).save!
-
+      
       mail = create_mail(
         to:      address,
         subject: @register_confirm_subject,
@@ -90,7 +90,7 @@ module SimpleMailingList
         mode:         "delete",
         options:      "{}"
       ).save!
-
+      
       mail = create_mail(
         to:      address,
         subject: @delete_confirm_subject,
@@ -110,11 +110,11 @@ module SimpleMailingList
       subject = mail.subject.to_s
       body = mail.body ? mail.body.decoded : ""
       body += mail.text_part.decoded.to_s if mail.text_part
-
+      
       Confirmation.where(mail_address: address).each do |confirmation|
         check_code = confirmation.check_code
         next unless subject.index(check_code) || body.index(check_code)
-
+        
         confirm_options = {}
         subject_text, body_text = case confirmation.mode
         when "register"
@@ -129,7 +129,7 @@ module SimpleMailingList
         else
           next
         end
-
+        
         create_mail(
           to:       address,
           subject:  subject_text,
@@ -143,7 +143,7 @@ module SimpleMailingList
         confirmation.destroy
         return true
       end
-
+      
       return false
     end
 
@@ -178,12 +178,14 @@ module SimpleMailingList
       if @permitted_users
         permitted_user = @permitted_users.find do |user|
           (!user["address"]    || user["address"] == address) &&
-          (!user["check_code"] || subject.index(["check_code"]))
+          (!user["check_code"] || subject.encode("utf-8").index(user["check_code"]))
+        end
+        return forward_mail_failed(mail, filename) unless permitted_user
+        if permitted_user["check_code"]
+          subject = subject.encode("utf-8").sub(permitted_user["check_code"], "")
         end
-        return true unless permitted_user
-        subject.sub!(permitted_user["check_code"], "") if permitted_user["check_code"]
       elsif @registered_user_only
-        return true unless User.find_by(mail_address: address)
+        return forward_mail_failed(mail, filename) unless User.find_by(mail_address: address)
       end
       danger_ext = /\.(exe|com|bat|cmd|vbs|vbe|js|jse|wsf|wsh|msc|jar|hta|scr|cpl|lnk)$/i
       if mail.has_attachments?
@@ -192,20 +194,21 @@ module SimpleMailingList
         end
         if attachment
           @log.warn("Contains danger attachment![#{attachment}@#{File.basename(filename)}]")
-          return true
+          return forward_mail_failed(mail, filename)
         end
       end
-
+      
       sendmail = create_forward_mail(mail, subject)
-
+      
       users = User.where(enabled: 1).to_a.select do |user|
         user_options = JSON.parse(user.options)
         !forward_options.keys.any?{ |key| forward_options[key] != user_options[key] }
       end
       users.map! { |user| user.mail_address }
+      users.unshift(address)
       users.uniq!
-      users.delete(address)
-
+      
+      @log.info "Sending start."
       domains = { "???" => [] }
       users.each do |user|
         domain = user.match(/@([^@]+)$/) ? $1 : "???"
@@ -213,8 +216,7 @@ module SimpleMailingList
         domains[domain].push(user)
       end
       max = domains.values.map(&:size).max
-      domains["???"][max] = address
-      0.upto(max) do |i|
+      max.times do |i|
         time = Time.now
         domains.each_value do |address_array|
           mail_address = address_array[i]
@@ -237,7 +239,36 @@ module SimpleMailingList
         next if Time.now - time > @sleep_time2 || i+1 == max
         sleep time - Time.now + @sleep_time2
       end
-      @log.info "Forward mails to #{users.size + 1} user#{users.size > 0 ? 's' : ''}."
+      
+      @log.info "Forward mails to #{users.size} user#{users.size > 0 ? 's' : ''}."
+      if @forward_success_subject && @forward_success_body
+        options = {
+          "subject" => subject.encode("utf-8"),
+          "count"   => users.size
+        }
+        reportmail = create_mail(
+          to:      address,
+          subject: @forward_success_subject,
+          body:    @forward_success_body,
+          options: options
+        ).deliver
+      end
+      move_mail_file(filename, "forward")
+      return true
+    end
+
+    def forward_mail_failed(mail, filename)
+      return true unless @forward_fail_subject && @forward_fail_body
+      
+      options = {
+        "subject" => mail.subject.to_s.encode("utf-8")
+      }
+      sendmail = create_mail(
+        to:      Array(mail.from).first.to_s,
+        subject: @forward_fail_subject,
+        body:    @forward_fail_body,
+        options: options
+      ).deliver
       move_mail_file(filename, "forward")
       return true
     end

data/lib/simple_mailing_list/version.rb

@@ -1,3 +1,3 @@
 module SimpleMailingList
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_mailing_list
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - nodai2hITC
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-06 00:00:00.000000000 Z
+date: 2018-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler