From 148110e70c0a408ea418a8e36a6a99305fdd9c99 Mon Sep 17 00:00:00 2001
From: George Claghorn <george@basecamp.com>
Date: Sun, 25 Nov 2018 14:30:05 -0500
Subject: Extract ActionMailbox::PostfixRelayer

---
 lib/tasks/ingress.rake | 37 ++++++++-----------------------------
 1 file changed, 8 insertions(+), 29 deletions(-)

(limited to 'lib/tasks')

diff --git a/lib/tasks/ingress.rake b/lib/tasks/ingress.rake
index 6620e1fe43..6d1c0797ff 100644
--- a/lib/tasks/ingress.rake
+++ b/lib/tasks/ingress.rake
@@ -2,45 +2,24 @@
 
 namespace :action_mailbox do
   namespace :ingress do
-    desc "Pipe an inbound email from STDIN to the Postfix ingress at the given URL"
+    desc "Pipe an inbound email from STDIN to the Postfix ingress (URL and INGRESS_PASSWORD required)"
     task :postfix do
       require "active_support"
       require "active_support/core_ext/object/blank"
-      require "http"
+      require "action_mailbox/ingresses/postfix/relayer"
 
-      url, password = ENV.values_at("URL", "INGRESS_PASSWORD")
+      url, password, user_agent = ENV.values_at("URL", "INGRESS_PASSWORD", "USER_AGENT")
 
       if url.blank? || password.blank?
-        puts "4.3.5 URL and INGRESS_PASSWORD are required"
+        echo "4.3.5 URL and INGRESS_PASSWORD are required"
         exit 1
       end
 
-      begin
-        response = HTTP.basic_auth(user: "actionmailbox", pass: password)
-          .timeout(connect: 1, write: 10, read: 10)
-          .post(url, body: STDIN.read,
-            headers: { "Content-Type" => "message/rfc822", "User-Agent" => ENV.fetch("USER_AGENT", "Postfix") })
-
-        case
-        when response.status.success?
-          puts "2.0.0 HTTP #{response.status}"
-        when response.status.unauthorized?
-          puts "4.7.0 HTTP #{response.status}"
-          exit 1
-        when response.status.unsupported_media_type?
-          puts "5.6.1 HTTP #{response.status}"
-          exit 1
-        else
-          puts "4.0.0 HTTP #{response.status}"
-          exit 1
+      ActionMailbox::PostfixRelayer.new(url: url, password: password, user_agent: user_agent)
+        .relay(STDIN.read).tap do |result|
+          echo result.output
+          exit result.success? ? 0 : 1
         end
-      rescue HTTP::ConnectionError => error
-        puts "4.4.2 Error connecting to the Postfix ingress: #{error.message}"
-        exit 1
-      rescue HTTP::TimeoutError
-        puts "4.4.7 Timed out piping to the Postfix ingress"
-        exit 1
-      end
     end
   end
 end
-- 
cgit v1.2.3