deliverable 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6939d9e02d7269dc2704b727f9aaf27b2374e271d88c03e48c126bfe6695132a
-  data.tar.gz: e0eca76ecdfc1478bfe3c507555c4b59054ac898a658499a573b86478f87c684
+  metadata.gz: e68d3c1f29cb9fac64f7185d0b4026f6d8f9bcf5a6e55d9e7d89b3b3ab126ae4
+  data.tar.gz: e6ca8b392fef7e5289586a2c774684e31b4330b23b2c20dea30571ed256331b5
 SHA512:
-  metadata.gz: 101133007279b3c6610dcad60d8c9dcb0a86a8ff9d5f7aa215d29cbe3cba1d0daf53bcd75f32afdc07ac56e154f019fd537dc4b6b15a7f2670cacaa9ae474c58
-  data.tar.gz: d7af7df7bb8ac409e211103eca6851ab63142cc9dc38fece9ae7cd9e3b2d00fea250466c97e8ea69ebc9702712bece6f1e5f0b182b2e42e971bc6adc862c7aba
+  metadata.gz: 72cc381a74af672304ae18c4d5523dd85ed5174e33638a4958f709da2cbe9f5fd3dc34defa2ce02842a59c11e3c3862e8ddaeb15dba4f587d5bd0911a2337b3c
+  data.tar.gz: d710009b9129b3dfc8014bebc374edf586ea3c3ce0aa0ae1390fa14f8fb274022bbeac79f6e14cd4d660dd139649918ee1eab93c7749add82c204361182a1eab

data/CHANGELOG.md

@@ -1,5 +1,24 @@
 # Changelog
 
+## 0.2.1
+
+- Fix: the catch-all probe was overwriting `smtp_response` and
+  `retryable` on the Result. A verification that returned a clean 250
+  for the real address could surface a 550 from the fake address used
+  to detect accept-all servers, making it look like the verifier had
+  ignored a hard bounce. The catch-all probe now runs silently and
+  only the real address's SMTP response is reported.
+
+## 0.2.0
+
+- Add `smtp_response` to the result: the SMTP code and message returned by
+  the destination MX (e.g. `{ code: "421", message: "Greylisted, try again" }`).
+  `nil` when no SMTP probe was made or no response was received.
+- Add `retryable` boolean to the result. `true` when the verifier hit a
+  transient signal (4xx response, server-busy, timeout, connection refused, or
+  a transient DNS error) and the result is `risky`. Callers can use this to
+  decide whether to enqueue a follow-up verification.
+
 ## 0.1.0
 
 - Initial release.

data/lib/deliverable/result.rb

@@ -1,8 +1,8 @@
 module Deliverable
   class Result
-    attr_reader :email, :score, :score_details, :errors, :warnings, :checks
+    attr_reader :email, :score, :score_details, :errors, :warnings, :checks, :smtp_response
 
-    def initialize(email:, score:, score_details:, classification:, errors:, warnings:, checks:)
+    def initialize(email:, score:, score_details:, classification:, errors:, warnings:, checks:, smtp_response: nil, retryable: false)
       @email = email
       @score = score
       @score_details = score_details
@@ -10,6 +10,8 @@ module Deliverable
       @errors = errors
       @warnings = warnings
       @checks = checks
+      @smtp_response = smtp_response
+      @retryable = retryable
     end
 
     def valid?
@@ -20,6 +22,11 @@ module Deliverable
       @classification
     end
 
+    def retryable?
+      @retryable
+    end
+    alias_method :retryable, :retryable?
+
     def to_h
       {
         email: @email,
@@ -29,6 +36,8 @@ module Deliverable
         score_details: @score_details,
         errors: @errors,
         warnings: @warnings,
+        retryable: @retryable,
+        smtp_response: @smtp_response,
         checks: @checks
       }
     end

data/lib/deliverable/verifier.rb

@@ -44,18 +44,23 @@ module Deliverable
         accepts_any_email: false
       }
       @accepts_any_email = nil
+      @smtp_response = nil
+      @smtp_retryable = false
     end
 
     def call
       ok = run_checks
       score = calculate_score
+      cls = classification(ok)
       Result.new(
         email: @email,
         score: score,
         score_details: @details.dup,
-        classification: classification(ok),
+        classification: cls,
         errors: @errors,
         warnings: @warnings,
+        smtp_response: @smtp_response,
+        retryable: retryable?(cls),
         checks: {
           syntax: @details[:syntax_valid],
           mx_record: @details[:mx_verified],
@@ -217,7 +222,7 @@ module Deliverable
       problematic_server?(mail_server) ? :assumed : (last || :assumed)
     end
 
-    def attempt_rcpt(mail_server, port, recipient)
+    def attempt_rcpt(mail_server, port, recipient, record: true)
       Timeout.timeout(@timeout) do
         smtp = Net::SMTP.new(mail_server, port)
         smtp.enable_starttls_auto if port == 587 || port == 465
@@ -225,44 +230,80 @@ module Deliverable
         smtp.start(@sender_domain) do |conn|
           conn.mailfrom(@sender_email)
           begin
-            conn.rcptto(recipient)
+            response = conn.rcptto(recipient)
+            record_response(response.status, response.message) if record && response.respond_to?(:status)
             return :verified
           rescue Net::SMTPFatalError => e
-            classify_fatal(e.message)
-          rescue Net::SMTPServerBusy, Net::SMTPSyntaxError, Net::SMTPAuthenticationError
+            record_error(e) if record
+            classify_fatal(e.message, record: record)
+          rescue Net::SMTPServerBusy => e
+            record_error(e, retryable: true) if record
+            return :assumed
+          rescue Net::SMTPSyntaxError, Net::SMTPAuthenticationError => e
+            record_error(e) if record
             return :assumed
           end
         end
       end
-    rescue Timeout::Error, Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::ENETUNREACH
+    rescue Timeout::Error => e
+      record_transient(e.message) if record
+      :connection_failed
+    rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::ENETUNREACH => e
+      record_transient(e.message) if record
       :connection_failed
-    rescue Net::SMTPAuthenticationError, Net::SMTPServerBusy
+    rescue Net::SMTPAuthenticationError => e
+      record_error(e) if record
+      :assumed
+    rescue Net::SMTPServerBusy => e
+      record_error(e, retryable: true) if record
       :assumed
     rescue StandardError => e
       log "SMTP probe failed for #{recipient} on #{mail_server}:#{port}: #{e.message}"
       :connection_failed
     end
 
-    def classify_fatal(message)
-      msg = message.to_s.downcase
-      if msg.include?("550") || msg.include?("551") ||
-          msg.include?("user unknown") || msg.include?("recipient unknown") ||
-          msg.include?("mailbox unavailable")
+    def classify_fatal(message, record: true)
+      code = extract_code(message)
+      case code&.[](0)
+      when "5"
         :invalid
-      elsif msg.include?("421") || msg.include?("450") || msg.include?("451") || msg.include?("temporary")
+      when "4"
+        @smtp_retryable = true if record
         :assumed
       else
+        if record && message.to_s.downcase.include?("temporary")
+          @smtp_retryable = true
+        end
         :assumed
       end
     end
 
+    def record_response(code, message)
+      @smtp_response = { code: code.to_s, message: message.to_s.strip }
+    end
+
+    def record_error(err, retryable: false)
+      code = extract_code(err.message)
+      @smtp_response = { code: code, message: err.message.to_s.strip }
+      @smtp_retryable = true if retryable || code&.start_with?("4")
+    end
+
+    def record_transient(message)
+      @smtp_response = { code: nil, message: message.to_s.strip }
+      @smtp_retryable = true
+    end
+
+    def extract_code(message)
+      message.to_s[/\b([45]\d{2})\b/, 1]
+    end
+
     def check_catch_all(mail_server)
       domain = extract_domain
       return unless domain
 
       fake = "definitely-does-not-exist-#{rand(10**10)}@#{domain}"
       result = SMTP_PORTS.each do |port|
-        outcome = attempt_rcpt(mail_server, port, fake)
+        outcome = attempt_rcpt(mail_server, port, fake, record: false)
         break :accepted if outcome == :verified
         break :rejected if outcome == :invalid
       end
@@ -367,6 +408,11 @@ module Deliverable
       "valid"
     end
 
+    def retryable?(cls)
+      return false unless cls == "risky"
+      @smtp_retryable || @details[:dns_failed_assumption]
+    end
+
     def log(message)
       @logger&.warn(message)
     end

data/lib/deliverable/version.rb

@@ -1,3 +1,3 @@
 module Deliverable
-  VERSION = "0.1.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: deliverable
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Erik Strömberg
 bindir: exe
 cert_chain: []
-date: 1980-01-01 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: valid_email2