mail_dude 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1bf22950ae8ba64ae0dc2176e5a5256fba2b7b1e0387ff24b421c3fa656fa205
-  data.tar.gz: 4f518d5ed49a686666e7af69d0b480fac69767af2c685626b0771fa93e2aebcb
+  metadata.gz: 38404e9ab732d38243310741c269a4ec27e02a3076c479c891fe7bd532474d97
+  data.tar.gz: c66340b339905d47989e60b49d86073aab27785eae7a9da526fd910914db81ff
 SHA512:
-  metadata.gz: 2ed12acd960afb2984cae6b80a707bd7d58a8d2e67f3bade8a238cee89df99ee9f1f989f2a1d67edf3e72d69a18c62380cb7e0abd6e73900ae7317a729225757
-  data.tar.gz: d8ded531449368b283d0341751331c13cdd1f74ce14207f697f8a971a5b60d02075c1fafde5e8886eff21171abffbebf8934a8540834d2e41b9bd4e5c2bc53dd
+  metadata.gz: 3d28003d59309eccded62419a0d28573facd4a027045c9df28eefa7491206f5815bc9906f60cb2631a8ada54921bbf59c9b3c418fa28a89462eca055946ee2ef
+  data.tar.gz: 7d8011434a33827a7f795f3bf865b7995dfec41d999aab8ef9cfd8d99e2f8b9d3ecf725c75f74deddbb4702fb9f8353666e66565254ca4e23c21f8e1a89b9be2

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.1.3
+
+- Fix CID image rendering for Content-ID attachments without inline disposition.
+- Strip attachment payloads from stored raw source when attachment capture is disabled.
+
 ## 0.1.2
 
 - Add official Ruby 3.1 support.

data/lib/mail_dude/attachment_locator.rb

@@ -2,6 +2,26 @@
 
 module MailDude
   class AttachmentLocator
+    class << self
+      def attachment_part?(part)
+        !part.multipart? && (part.attachment? || part.filename.present? || inline_renderable_part?(part))
+      end
+
+      def content_disposition(part)
+        part.content_disposition.to_s.split(';').first.to_s.downcase
+      end
+
+      def inline_renderable_part?(part)
+        inline_part?(part) || part.content_id.present?
+      end
+
+      private
+
+      def inline_part?(part)
+        content_disposition(part) == 'inline' && part.content_id.present?
+      end
+    end
+
     Attachment = Struct.new(:id, :part, :metadata, keyword_init: true) do
       def content_type
         metadata['content_type']
@@ -35,6 +55,14 @@ module MailDude
       end
     end
 
+    def attachments_count
+      attachment_parts.length
+    end
+
+    def attachments_present?
+      attachments_count.positive?
+    end
+
     def find(attachment_id)
       raise AttachmentNotFoundError, 'Attachment not found' unless attachment_id.to_s.match?(/\Aa\d+\z/)
 
@@ -44,6 +72,8 @@ module MailDude
 
     def find_inline_by_cid(content_id)
       normalized = normalize_content_id(content_id)
+      return nil if normalized.blank?
+
       attachments.find { |attachment| attachment.metadata['content_id'] == normalized }
     end
 
@@ -64,19 +94,7 @@ module MailDude
     def attachment_parts
       return [] unless mail
 
-      mail.all_parts.select { |part| attachment_part?(part) }
-    end
-
-    def attachment_part?(part)
-      !part.multipart? && (part.attachment? || part.filename.present? || inline_part?(part))
-    end
-
-    def content_disposition(part)
-      part.content_disposition.to_s.split(';').first.to_s.downcase
-    end
-
-    def inline_part?(part)
-      content_disposition(part) == 'inline' && part.content_id.present?
+      mail.all_parts.select { |part| self.class.attachment_part?(part) }
     end
 
     def mail
@@ -96,8 +114,8 @@ module MailDude
         'filename' => sanitize_filename(part.filename, fallback: "attachment-#{id}"),
         'content_type' => part.mime_type.presence || 'application/octet-stream',
         'content_id' => normalize_content_id(part.content_id),
-        'disposition' => content_disposition(part).presence || 'attachment',
-        'inline' => content_disposition(part) == 'inline',
+        'disposition' => self.class.content_disposition(part).presence || 'attachment',
+        'inline' => self.class.inline_renderable_part?(part),
         'size_bytes' => decoded_size(part)
       }
     end

data/lib/mail_dude/attachment_scrubber.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module MailDude
+  class AttachmentScrubber
+    RAW_SOURCE_OMITTED = "MailDude omitted raw message source because attachment capture is disabled.\n"
+
+    def initialize(mail)
+      @mail = mail
+    end
+
+    def raw_source
+      source = mail&.to_s
+      return RAW_SOURCE_OMITTED if source.blank?
+
+      sanitized = Mail.read_from_string(source)
+      remove_attachments!(sanitized)
+      sanitized.to_s
+    rescue StandardError
+      RAW_SOURCE_OMITTED
+    end
+
+    private
+
+    attr_reader :mail
+
+    def remove_attachments!(message)
+      return remove_single_part_attachment!(message) unless message.multipart?
+
+      message.parts.recursive_delete_if { |part| AttachmentLocator.attachment_part?(part) }
+    end
+
+    def remove_single_part_attachment!(message)
+      message.body = '' if AttachmentLocator.attachment_part?(message)
+    end
+  end
+end

data/lib/mail_dude/message_broadcast.rb

@@ -41,7 +41,7 @@ module MailDude
         sender: presenter.sender_summary,
         recipients: presenter.recipient_summary,
         captured_at: presenter.captured_at_label,
-        attachments_count: presenter.attachments.length,
+        attachments_count: presenter.attachment_count,
         attachment_count_label: presenter.attachment_count_label,
         mailer_label: presenter.mailer_label
       }

data/lib/mail_dude/message_presenter.rb

@@ -80,12 +80,12 @@ module MailDude
       raw_source.split(/\r?\n\r?\n/, 2).first.to_s
     end
 
-    def has_attachments?
-      attachments.any?
-    end
+    def has_attachments? = metadata_value('has_attachments') == true || attachments.any?
+
+    def attachment_count = metadata_value('attachments_count').presence&.to_i || attachments.length
 
     def attachment_count_label
-      count = attachments.length
+      count = attachment_count
       "#{count} #{'attachment'.pluralize(count)}"
     end
 

data/lib/mail_dude/message_serializer.rb

@@ -35,8 +35,8 @@ module MailDude
         'mailer_action' => internal_header(INTERNAL_ACTION_HEADER),
         'has_html' => part_present?('text/html'),
         'has_text' => part_present?('text/plain'),
-        'has_attachments' => attachments.any?,
-        'attachments_count' => attachments.length,
+        'has_attachments' => attachment_locator.attachments_present?,
+        'attachments_count' => attachment_locator.attachments_count,
         'attachments' => attachments,
         'size_bytes' => raw_source.bytesize
       }
@@ -55,7 +55,11 @@ module MailDude
     end
 
     def attachments
-      @attachments ||= AttachmentLocator.new(mail).attachments.map(&:metadata)
+      @attachments ||= attachment_locator.attachments.map(&:metadata)
+    end
+
+    def attachment_locator
+      @attachment_locator ||= AttachmentLocator.new(mail)
     end
 
     def content_type

data/lib/mail_dude/stores/base.rb

@@ -35,11 +35,17 @@ module MailDude
       private
 
       def build_record(mail, id: generate_id, captured_at: Time.now.utc)
-        raw_source = mail.to_s
+        raw_source = raw_source_for(mail)
         metadata = MessageSerializer.new(mail, id: id, captured_at: captured_at, raw_source: raw_source).metadata
         MessageRecord.new(id: id, metadata: metadata, raw_source: raw_source)
       end
 
+      def raw_source_for(mail)
+        return mail.to_s if MailDude.configuration.capture_attachments
+
+        AttachmentScrubber.new(mail).raw_source
+      end
+
       def generate_id
         time = Time.now.utc
         "#{time.strftime('%Y%m%dT%H%M%S')}#{format('%06d', time.usec)}Z-#{SecureRandom.hex(8)}"

data/lib/mail_dude/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MailDude
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/lib/mail_dude.rb

@@ -17,6 +17,7 @@ require_relative 'mail_dude/pagination'
 require_relative 'mail_dude/message_serializer'
 require_relative 'mail_dude/message_presenter'
 require_relative 'mail_dude/attachment_locator'
+require_relative 'mail_dude/attachment_scrubber'
 require_relative 'mail_dude/html_body_renderer'
 require_relative 'mail_dude/message_broadcast'
 require_relative 'mail_dude/stores/base'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mail_dude
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - MailDude contributors
@@ -184,6 +184,7 @@ files:
 - lib/generators/mail_dude/templates/initializer.tt
 - lib/mail_dude.rb
 - lib/mail_dude/attachment_locator.rb
+- lib/mail_dude/attachment_scrubber.rb
 - lib/mail_dude/configuration.rb
 - lib/mail_dude/dashboard.rb
 - lib/mail_dude/delivery_method.rb