nuntius 1.3.20 → 1.3.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c35384ba46c7a00cccf82ae49b6ecf09e5e6c2439196ba5cd03d6d508a4ff1d
-  data.tar.gz: bf0e4bde69a856f82f37c205d15f3685d4da3eb612cd2eaf582642bdd388574a
+  metadata.gz: d75772fb2b03f8972790cc21ccc4bbffdc514e92e5020c2cfd3c1015a61550da
+  data.tar.gz: ee6a3397760d7f18ce525d40493894d0395b24861c3a6ca12f81f7c07cbb62ed
 SHA512:
-  metadata.gz: ddc8ce1306965ac2306ca8ab1d7e258478868d669b34b9eb997cb6dee6f747f0e06ac5149b51afb02dcdc3bb3f50eecefe0f3dfe035e771089ade69241537098
-  data.tar.gz: f64fc4ad0d78a90f8c1cac8fb99106322af707387d10d0b51af82d1879a0ef77a3fb4f7c46414c4a9551f77cb473e1cb3e04d8f8b3d26ecf1342b2ad019f0e70
+  metadata.gz: c17b0f252f59e5ed8da3d37db297b78f197b23cd5e349e168c2bab960b0e7bbc5563a9d2330e7802cba2945ce855e30f9cfead383f6c56541954f225b9ce7acb
+  data.tar.gz: 5335902adaf5342c364c2e1219877c8855bdf5c00ebc83eaf41a282dd7b884cb94736029af0022fb8888619d4fba683546c47e7e33b80a0cd69a86e0e7c6ecd0

data/app/messengers/nuntius/base_messenger.rb

@@ -9,14 +9,16 @@ module Nuntius
 
     define_callbacks :action, terminator: ->(_target, result_lambda) { result_lambda.call == false }
 
-    attr_reader :attachments, :event, :object, :params
-    attr_accessor :templates
+    attr_reader :attachments, :headers, :event, :object, :params
+    attr_accessor :templates, :smtp_envelope_from
 
     def initialize(object, event, params = {})
       @object = object
       @event = event
       @params = params
       @attachments = params.fetch(:attachments, [])
+      @headers = params.fetch(:headers, {})
+      @smtp_envelope_from = params[:smtp_envelope_from]
     end
 
     # Calls the event method on the messenger
@@ -35,6 +37,7 @@ module Nuntius
         @attachments.each do |attachment|
           msg.add_attachment(attachment)
         end
+        apply_mail_overrides(msg)
 
         transport = Nuntius::BaseTransport.class_from_name(template.transport).new
         transport.deliver(msg) if msg.to.present?
@@ -50,6 +53,12 @@ module Nuntius
       @attachments << attachment
     end
 
+    # Sets an extra header on the resulting message (currently applied by the
+    # mail transport). Useful for things like "Auto-Submitted" or "Precedence".
+    def header(key, value)
+      @headers[key.to_s] = value
+    end
+
     class << self
       #
       # Returns the variable name used in the liquid context
@@ -168,6 +177,19 @@ module Nuntius
 
     private
 
+    # Persists any messenger-provided mail overrides (extra headers and/or a
+    # custom SMTP envelope sender) onto the message so they survive the
+    # transport delivery job and can be applied by the provider.
+    def apply_mail_overrides(message)
+      return if @headers.blank? && @smtp_envelope_from.nil?
+
+      mail = {}
+      mail["headers"] = @headers if @headers.present?
+      mail["envelope_from"] = @smtp_envelope_from unless @smtp_envelope_from.nil?
+
+      message.metadata = (message.metadata || {}).merge("mail" => mail)
+    end
+
     # Returns the relevant templates for the object / event combination
     def select_templates
       return @templates if @templates
@@ -184,7 +206,7 @@ module Nuntius
 
     def liquid_context
       assigns = @params || {}
-      instance_variables.reject { |i| %w[@params @object @locale @templates @template_scope].include? i.to_s }.each do |i|
+      instance_variables.reject { |i| %w[@params @object @locale @templates @template_scope @headers @smtp_envelope_from].include? i.to_s }.each do |i|
         assigns[i.to_s[1..]] = instance_variable_get(i)
       end
 

data/app/providers/nuntius/null_sender_smtp.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require "mail"
+
+module Nuntius
+  # A Mail::SMTP delivery method that sends with a null reverse-path
+  # (+MAIL FROM:<>+).
+  #
+  # The stock Mail::SmtpEnvelope refuses to emit an empty reverse-path
+  # (it raises on a blank From), and Net::SMTP wraps the address in angle
+  # brackets, so setting +smtp_envelope_from+ to +"<>"+ would produce the
+  # invalid +MAIL FROM:<<>>+. This delivery method bypasses Mail::SmtpEnvelope
+  # and hands an empty reverse-path straight to Net::SMTP, yielding the
+  # RFC 5321 null sender used by auto-generated/bounce notifications.
+  class NullSenderSmtp < ::Mail::SMTP
+    def deliver!(mail)
+      response = start_smtp_session do |smtp|
+        smtp.sendmail(mail.encoded, "", mail.smtp_envelope_to)
+      end
+
+      settings[:return_response] ? response : self
+    end
+  end
+end

data/app/providers/nuntius/smtp_mail_provider.rb

@@ -6,6 +6,9 @@ module Nuntius
   class SmtpMailProvider < BaseProvider
     transport :mail
 
+    # RFC 5321 null reverse-path, used for auto-generated/bounce notifications.
+    NULL_REVERSE_PATH = "<>"
+
     setting_reader :from_header, required: true, description: "From header (example: Nuntius Messenger <nuntius@entdec.com>)"
     setting_reader :host, required: true, description: "Host (example: smtp.soverin.net)"
     setting_reader :port, required: true, description: "Port (example: 578)"
@@ -24,16 +27,14 @@ module Nuntius
         Mail.new(from: from_header)
       end
 
+      null_sender = apply_mail_overrides(mail)
+
       if Rails.env.test?
         mail.delivery_method :test
+      elsif null_sender
+        mail.delivery_method Nuntius::NullSenderSmtp, smtp_settings
       else
-        mail.delivery_method :smtp,
-          address: host,
-          port: port,
-          user_name: username,
-          password: password,
-          return_response: true,
-          ssl: ssl
+        mail.delivery_method :smtp, smtp_settings
       end
 
       mail.to = message.to
@@ -83,6 +84,45 @@ module Nuntius
 
     private
 
+    def smtp_settings
+      {
+        address: host,
+        port: port,
+        user_name: username,
+        password: password,
+        return_response: true,
+        ssl: ssl
+      }
+    end
+
+    # Applies any messenger-provided overrides stored on the message: extra
+    # headers and/or a custom SMTP envelope sender. Returns true when a null
+    # reverse-path (+MAIL FROM:<>+) was requested, so the caller can pick the
+    # delivery method that can actually emit it.
+    def apply_mail_overrides(mail)
+      overrides = message.metadata&.dig("mail")
+      return false if overrides.blank?
+
+      (overrides["headers"] || {}).each do |key, value|
+        mail.header[key] = value
+      end
+
+      return false unless overrides.key?("envelope_from")
+
+      envelope_from = overrides["envelope_from"]
+      if null_reverse_path?(envelope_from)
+        mail.smtp_envelope_from = NULL_REVERSE_PATH
+        true
+      else
+        mail.smtp_envelope_from = envelope_from
+        false
+      end
+    end
+
+    def null_reverse_path?(value)
+      value.blank? || value == NULL_REVERSE_PATH
+    end
+
     def message_url(message)
       Nuntius::Engine.routes.url_helpers.message_url(message.id, host: Nuntius.config.host(message))
     end

data/lib/nuntius/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Nuntius
-  VERSION = "1.3.20"
+  VERSION = "1.3.21"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nuntius
 version: !ruby/object:Gem::Version
-  version: 1.3.20
+  version: 1.3.21
 platform: ruby
 authors:
 - Tom de Grunt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-28 00:00:00.000000000 Z
+date: 2026-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apnotic
@@ -497,6 +497,7 @@ files:
 - app/providers/nuntius/firebase_push_provider.rb
 - app/providers/nuntius/houston_push_provider.rb
 - app/providers/nuntius/message_bird_sms_provider.rb
+- app/providers/nuntius/null_sender_smtp.rb
 - app/providers/nuntius/slack_slack_provider.rb
 - app/providers/nuntius/smstools_sms_provider.rb
 - app/providers/nuntius/smtp_mail_provider.rb