actionmailbox 6.1.3.2 → 7.0.0.alpha2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d45ce812169c5e8553cc54252c95def9d218f237143b1824a5134a0f9ca33629
-  data.tar.gz: b74e2cf8ea5b0bd60ea0fe1a95eb074f866a1da6c09266167000b5bfd19ab687
+  metadata.gz: c0acaf02f90380aaa29444def7a09da2ab9e63181125a69ed9e7e281b0ee2368
+  data.tar.gz: 062c2471d985a887b524b7f71bc9e3f2f3d10c58611aa9935ee541a060955999
 SHA512:
-  metadata.gz: 6b3109e7409112a6df0223977124d5a8e0c43fe3e5d7886a63e3116bfad11779c898010472ce3f4d387fa3331b9f4abe0dea499401e9ddf425d4ea0bc9aca41b
-  data.tar.gz: 1fa108292e1f16ef20956588c546589de7d1252f23a3339e64426125aa1c131a9b61cad9ad9f643d43d58b99bf957f9d9d70aaeeb10bccb262805135397c571f
+  metadata.gz: 4d4a9176cb83742a11e7fd8fb7210a32471befbc1dc0032414120a587a13243d0d50d153735b411225856f8eba61de1f0e766b70ed80da8d5ddd3ec4109185ad
+  data.tar.gz: 764d5378d093c640f3de234165f381aaddf67f7ece1def993571761b0fd2f04693def88915ce45a2be07d552df3c5ae6107edcb8d33e052985f0e27705b3d188

data/CHANGELOG.md

@@ -1,71 +1,45 @@
-## Rails 6.1.3.2 (May 05, 2021) ##
+## Rails 7.0.0.alpha2 (September 15, 2021) ##
 
 *   No changes.
 
 
-## Rails 6.1.3.1 (March 26, 2021) ##
+## Rails 7.0.0.alpha1 (September 15, 2021) ##
 
-*   No changes.
-
-
-## Rails 6.1.3 (February 17, 2021) ##
-
-*   No changes.
-
-
-## Rails 6.1.2.1 (February 10, 2021) ##
-
-*   No changes.
-
-
-## Rails 6.1.2 (February 09, 2021) ##
-
-*   No changes.
-
-
-## Rails 6.1.1 (January 07, 2021) ##
-
-*   No changes.
-
-
-## Rails 6.1.0 (December 09, 2020) ##
-
-*   Change default queue name of the incineration (`:action_mailbox_incineration`) and
-    routing (`:action_mailbox_routing`) jobs to be the job adapter's default (`:default`).
-
-    *Rafael Mendonça França*
-
-*   Sendgrid ingress now passes through the envelope recipient as `X-Original-To`.
-
-    *Mark Haussmann*
-
-*   Update Mandrill inbound email route to respond appropriately to HEAD requests for URL health checks from Mandrill.
-
-    *Bill Cromie*
-
-*   Add way to deliver emails via source instead of filling out a form through the conductor interface.
+*   Add `attachments` to the list of permitted parameters for inbound emails conductor.
 
-    *DHH*
+    When using the conductor to test inbound emails with attachments, this prevents an
+    unpermitted parameter warning in default configurations, and prevents errors for
+    applications that set:
 
-*   Mailgun ingress now passes through the envelope recipient as `X-Original-To`.
+    ```ruby
+    config.action_controller.action_on_unpermitted_parameters = :raise
+    ```
 
-    *Rikki Pitt*
+    *David Jones*, *Dana Henke*
 
-*   Deprecate `Rails.application.credentials.action_mailbox.api_key` and `MAILGUN_INGRESS_API_KEY` in favor of `Rails.application.credentials.action_mailbox.signing_key` and `MAILGUN_INGRESS_SIGNING_KEY`.
+*   Add ability to configure ActiveStorage service
+    for storing email raw source.
 
-    *Matthijs Vos*
+    ```yml
+    # config/storage.yml
+    incoming_emails:
+      service: Disk
+      root: /secure/dir/for/emails/only
+    ```
 
-*   Allow easier creation of multi-part emails from the `create_inbound_email_from_mail` and `receive_inbound_email_from_mail` test helpers.
+    ```ruby
+    config.action_mailbox.storage_service = :incoming_emails
+    ```
 
-    *Michael Herold*
+    *Yurii Rashkovskii*
 
-*   Fix Bcc header not being included with emails from `create_inbound_email_from` test helpers.
+*   Add ability to incinerate an inbound message through the conductor interface.
 
-    *jduff*
+    *Santiago Bartesaghi*
 
-*   Add `ApplicationMailbox.mailbox_for` to expose mailbox routing.
+*   OpenSSL constants are now used for Digest computations.
 
-    *James Dabbs*
+    *Dirkjan Bussink*
 
 
-Please check [6-0-stable](https://github.com/rails/rails/blob/6-0-stable/actionmailbox/CHANGELOG.md) for previous changes.
+Please check [6-1-stable](https://github.com/rails/rails/blob/6-1-stable/actionmailbox/CHANGELOG.md) for previous changes.

data/MIT-LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018-2020 Basecamp, LLC
+Copyright (c) 2018-2021 Basecamp, LLC
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/app/controllers/action_mailbox/ingresses/mailgun/inbound_emails_controller.rb

@@ -79,13 +79,13 @@ module ActionMailbox
       def key
         if Rails.application.credentials.dig(:action_mailbox, :mailgun_api_key)
           ActiveSupport::Deprecation.warn(<<-MSG.squish)
-            Rails.application.credentials.action_mailbox.api_key is deprecated and will be ignored in Rails 6.2.
+            Rails.application.credentials.action_mailbox.api_key is deprecated and will be ignored in Rails 7.0.
             Use Rails.application.credentials.action_mailbox.signing_key instead.
           MSG
           Rails.application.credentials.dig(:action_mailbox, :mailgun_api_key)
         elsif ENV["MAILGUN_INGRESS_API_KEY"]
           ActiveSupport::Deprecation.warn(<<-MSG.squish)
-            The MAILGUN_INGRESS_API_KEY environment variable is deprecated and will be ignored in Rails 6.2.
+            The MAILGUN_INGRESS_API_KEY environment variable is deprecated and will be ignored in Rails 7.0.
             Use MAILGUN_INGRESS_SIGNING_KEY instead.
           MSG
           ENV["MAILGUN_INGRESS_API_KEY"]

data/app/controllers/action_mailbox/ingresses/relay/inbound_emails_controller.rb

@@ -57,7 +57,7 @@ module ActionMailbox
 
     private
       def require_valid_rfc822_message
-        unless request.content_type == "message/rfc822"
+        unless request.media_type == "message/rfc822"
           head :unsupported_media_type
         end
       end

data/app/controllers/rails/conductor/action_mailbox/inbound_emails_controller.rb

@@ -20,14 +20,18 @@ module Rails
 
     private
       def new_mail
-        Mail.new(params.require(:mail).permit(:from, :to, :cc, :bcc, :x_original_to, :in_reply_to, :subject, :body).to_h).tap do |mail|
+        Mail.new(mail_params.except(:attachments).to_h).tap do |mail|
           mail[:bcc]&.include_in_headers = true
-          params[:mail][:attachments].to_a.each do |attachment|
+          mail_params[:attachments].to_a.each do |attachment|
             mail.add_file(filename: attachment.original_filename, content: attachment.read)
           end
         end
       end
 
+      def mail_params
+        params.require(:mail).permit(:from, :to, :cc, :bcc, :x_original_to, :in_reply_to, :subject, :body, attachments: [])
+      end
+
       def create_inbound_email(mail)
         ActionMailbox::InboundEmail.create_and_extract_message_id!(mail.to_s)
       end

data/app/controllers/rails/conductor/action_mailbox/incinerates_controller.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Rails
+  # Incinerating will destroy an email that is due and has already been processed.
+  class Conductor::ActionMailbox::IncineratesController < Rails::Conductor::BaseController
+    def create
+      ActionMailbox::InboundEmail.find(params[:inbound_email_id]).incinerate
+
+      redirect_to main_app.rails_conductor_inbound_emails_url
+    end
+  end
+end

data/app/models/action_mailbox/inbound_email/message_id.rb

@@ -14,12 +14,11 @@ module ActionMailbox::InboundEmail::MessageId
     # attachment called +raw_email+. Before the upload, extract the Message-ID from the +source+ and set
     # it as an attribute on the new +InboundEmail+.
     def create_and_extract_message_id!(source, **options)
-      message_checksum = Digest::SHA1.hexdigest(source)
+      message_checksum = OpenSSL::Digest::SHA1.hexdigest(source)
       message_id = extract_message_id(source) || generate_missing_message_id(message_checksum)
 
-      create! options.merge(message_id: message_id, message_checksum: message_checksum) do |inbound_email|
-        inbound_email.raw_email.attach io: StringIO.new(source), filename: "message.eml", content_type: "message/rfc822"
-      end
+      create! raw_email: create_and_upload_raw_email!(source),
+        message_id: message_id, message_checksum: message_checksum, **options
     rescue ActiveRecord::RecordNotUnique
       nil
     end
@@ -34,5 +33,10 @@ module ActionMailbox::InboundEmail::MessageId
           logger.warn "Message-ID couldn't be parsed or is missing. Generated a new Message-ID: #{message_id}"
         end
       end
+
+      def create_and_upload_raw_email!(source)
+        ActiveStorage::Blob.create_and_upload! io: StringIO.new(source), filename: "message.eml", content_type: "message/rfc822",
+                                               service_name: ActionMailbox.storage_service
+      end
   end
 end

data/app/models/action_mailbox/inbound_email.rb

@@ -29,7 +29,7 @@ module ActionMailbox
 
     include Incineratable, MessageId, Routable
 
-    has_one_attached :raw_email
+    has_one_attached :raw_email, service: ActionMailbox.storage_service
     enum status: %i[ pending processing delivered failed bounced ]
 
     def mail

data/app/models/action_mailbox/record.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module ActionMailbox
-  class Record < ActiveRecord::Base #:nodoc:
+  class Record < ActiveRecord::Base # :nodoc:
     self.abstract_class = true
   end
 end

data/app/views/rails/conductor/action_mailbox/inbound_emails/show.html.erb

@@ -4,7 +4,7 @@
 
 <ul>
   <li><%= button_to "Route again", main_app.rails_conductor_inbound_email_reroute_path(@inbound_email), method: :post %></li>
-  <li>Incinerate</li>
+  <li><%= button_to "Incinerate", main_app.rails_conductor_inbound_email_incinerate_path(@inbound_email), method: :post %></li>
 </ul>
 
 <details>

data/config/routes.rb

@@ -21,5 +21,6 @@ Rails.application.routes.draw do
     post "inbound_emails/sources", to: "inbound_emails/sources#create", as: :rails_conductor_inbound_email_sources
 
     post ":inbound_email_id/reroute" => "reroutes#create", as: :rails_conductor_inbound_email_reroute
+    post ":inbound_email_id/incinerate" => "incinerates#create", as: :rails_conductor_inbound_email_incinerate
   end
 end

data/lib/action_mailbox/base.rb

@@ -77,7 +77,7 @@ module ActionMailbox
       @inbound_email = inbound_email
     end
 
-    def perform_processing #:nodoc:
+    def perform_processing # :nodoc:
       track_status_of_inbound_email do
         run_callbacks :process do
           process
@@ -92,7 +92,7 @@ module ActionMailbox
       # Overwrite in subclasses
     end
 
-    def finished_processing? #:nodoc:
+    def finished_processing? # :nodoc:
       inbound_email.delivered? || inbound_email.bounced?
     end
 

data/lib/action_mailbox/engine.rb

@@ -20,6 +20,8 @@ module ActionMailbox
     config.action_mailbox.queues = ActiveSupport::InheritableOptions.new \
       incineration: :action_mailbox_incineration, routing: :action_mailbox_routing
 
+    config.action_mailbox.storage_service = nil
+
     initializer "action_mailbox.config" do
       config.after_initialize do |app|
         ActionMailbox.logger = app.config.action_mailbox.logger || Rails.logger
@@ -27,6 +29,7 @@ module ActionMailbox
         ActionMailbox.incinerate_after = app.config.action_mailbox.incinerate_after || 30.days
         ActionMailbox.queues = app.config.action_mailbox.queues || {}
         ActionMailbox.ingress = app.config.action_mailbox.ingress
+        ActionMailbox.storage_service = app.config.action_mailbox.storage_service
       end
     end
   end

data/lib/action_mailbox/gem_version.rb

@@ -7,10 +7,10 @@ module ActionMailbox
   end
 
   module VERSION
-    MAJOR = 6
-    MINOR = 1
-    TINY  = 3
-    PRE   = "2"
+    MAJOR = 7
+    MINOR = 0
+    TINY  = 0
+    PRE   = "alpha2"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/action_mailbox.rb

@@ -14,4 +14,5 @@ module ActionMailbox
   mattr_accessor :incinerate, default: true
   mattr_accessor :incinerate_after, default: 30.days
   mattr_accessor :queues, default: {}
+  mattr_accessor :storage_service
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: actionmailbox
 version: !ruby/object:Gem::Version
-  version: 6.1.3.2
+  version: 7.0.0.alpha2
 platform: ruby
 authors:
 - David Heinemeier Hansson
 - George Claghorn
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-05 00:00:00.000000000 Z
+date: 2021-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -17,70 +17,70 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.3.2
+        version: 7.0.0.alpha2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.3.2
+        version: 7.0.0.alpha2
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.3.2
+        version: 7.0.0.alpha2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.3.2
+        version: 7.0.0.alpha2
 - !ruby/object:Gem::Dependency
   name: activestorage
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.3.2
+        version: 7.0.0.alpha2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.3.2
+        version: 7.0.0.alpha2
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.3.2
+        version: 7.0.0.alpha2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.3.2
+        version: 7.0.0.alpha2
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.3.2
+        version: 7.0.0.alpha2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.3.2
+        version: 7.0.0.alpha2
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
@@ -114,6 +114,7 @@ files:
 - app/controllers/action_mailbox/ingresses/sendgrid/inbound_emails_controller.rb
 - app/controllers/rails/conductor/action_mailbox/inbound_emails/sources_controller.rb
 - app/controllers/rails/conductor/action_mailbox/inbound_emails_controller.rb
+- app/controllers/rails/conductor/action_mailbox/incinerates_controller.rb
 - app/controllers/rails/conductor/action_mailbox/reroutes_controller.rb
 - app/controllers/rails/conductor/base_controller.rb
 - app/jobs/action_mailbox/incineration_job.rb
@@ -163,11 +164,11 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v6.1.3.2/actionmailbox/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v6.1.3.2/
+  changelog_uri: https://github.com/rails/rails/blob/v7.0.0.alpha2/actionmailbox/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v7.0.0.alpha2/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v6.1.3.2/actionmailbox
-post_install_message:
+  source_code_uri: https://github.com/rails/rails/tree/v7.0.0.alpha2/actionmailbox
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -175,15 +176,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Inbound email handling framework.
 test_files: []