ses-proxy 0.2.1 → 0.3.0

data/lib/ses_proxy/smtp_server.rb

@@ -2,6 +2,19 @@ require 'eventmachine'
 require 'mail'
 require 'aws-sdk'
 
+if SesProxy::Conf.get[:aws][:ses] and SesProxy::Conf.get[:aws][:ses][:username] and SesProxy::Conf.get[:aws][:ses][:password]
+  Mail.defaults do
+    delivery_method :smtp, {
+      :address => 'email-smtp.us-east-1.amazonaws.com',
+      :port => '587',
+      :user_name => SesProxy::Conf.get[:aws][:ses][:username],
+      :password => SesProxy::Conf.get[:aws][:ses][:password],
+      :authentication => :plain,
+      :enable_starttls_auto => true
+    }
+  end
+end
+
 module SesProxy
   class SmtpServer < EM::P::SmtpServer
 
@@ -64,12 +77,31 @@ module SesProxy
     def receive_message
       return false unless verified
       mail = Mail.read_from_string(message)
-      bounced = Bounce.where({:email=>{"$in"=>recipients|mail.cc_addrs|mail.bcc_addrs}}).map(&:email)
+      bounced = Bounce.where({:email=>{"$in"=>recipients}}).map(&:email)
       #TODO: Define policy for retry when bounce is not permanent
-      actual_recipients = recipients - bounced
+
+      #Remove bounced addresses
+      actual_recipients = mail.to_addrs - bounced
       actual_cc_addrs = mail.cc_addrs - bounced
-      actual_bcc_addrs = mail.bcc_addrs - bounced
-      original_number = recipients.size+mail.cc_addrs.size+mail.bcc_addrs.size
+      actual_bcc_addrs = recipients - (mail.to_addrs + mail.cc_addrs) - bounced
+
+      #Remove blacklisted domains
+      if SesProxy::Conf.get[:blacklisted_domains] and SesProxy::Conf.get[:blacklisted_domains].any?
+        bld = SesProxy::Conf.get[:blacklisted_domains]
+        actual_recipients.collect!{|address| address unless bld.include?(address.split('@').last)}.compact!
+        actual_cc_addrs.collect!{|address| address unless bld.include?(address.split('@').last)}.compact!
+        actual_bcc_addrs.collect!{|address| address unless bld.include?(address.split('@').last)}.compact!
+      end
+
+      #Remove blacklisted regexp
+      if SesProxy::Conf.get[:blacklisted_regexp] and SesProxy::Conf.get[:blacklisted_regexp].any?
+        blr = SesProxy::Conf.get[:blacklisted_regexp]
+        actual_recipients.collect!{|address| address unless blr.map{|regexp| Regexp.new(regexp).match(address)}.compact.any? }.compact!
+        actual_cc_addrs.collect!{|address| address unless blr.map{|regexp| Regexp.new(regexp).match(address)}.compact.any? }.compact!
+        actual_bcc_addrs.collect!{|address| address unless blr.map{|regexp| Regexp.new(regexp).match(address)}.compact.any? }.compact!
+      end
+
+      original_number = recipients.size
       filtered_number = actual_recipients.size+actual_cc_addrs.size+actual_bcc_addrs.size
       record = RecipientsNumber.new({
         :original=>original_number,
@@ -82,40 +114,48 @@ module SesProxy
         mail.to = actual_recipients.uniq.join(",")
         mail.cc = actual_cc_addrs.uniq.join(",")
         mail.bcc = actual_bcc_addrs.uniq.join(",")
-        record = Email.new({
-          :sender => sender,
-          :recipients => actual_recipients.uniq.join(","),
-          :subject => mail.subject,
-          :body => mail.body.decoded,
-          :system => mail['X-Sender-System']||"Unknown",
-          :created_at => Time.now,
-          :updated_at => Time.now
-        })
-        record.save!
+        unless SesProxy::Conf.get[:collect_sent_mails].eql? false
+          record = Email.new({
+            :sender => sender,
+            :recipients => actual_recipients.uniq.join(","),
+            :subject => mail.subject,
+            :body => mail.body.decoded,
+            :system => mail['X-Sender-System']||"Unknown",
+            :created_at => Time.now,
+            :updated_at => Time.now
+          })
+          record.save!
+        end
         begin
-          ses.send_raw_email(mail.to_s)
+          if SesProxy::Conf.get[:aws][:ses] and SesProxy::Conf.get[:aws][:ses][:username] and SesProxy::Conf.get[:aws][:ses][:password]
+            mail.deliver!
+          else
+            ses.send_raw_email(mail.to_s)
+          end
         rescue Exception => e
           print "Error! "
           puts e.message
           return false
         end
       else
-        puts "No valid recipients!"
+        puts "No valid recipients! #{mail.to_addrs}"
       end
       if not original_number.eql? filtered_number
-        mail.to = (recipients&bounced).uniq.join(",")
-        mail.cc = (mail.cc_addrs&bounced).uniq.join(",")
-        mail.bcc = (mail.bcc_addrs&bounced).uniq.join(",")
-        record = BouncedEmail.new({
-          :sender => sender,
-          :recipients => (recipients&bounced).uniq.join(","),
-          :subject => mail.subject,
-          :body => mail.body.decoded,
-          :system => mail['X-Sender-System']||"Unknown",
-          :created_at => Time.now,
-          :updated_at => Time.now
-        })
-        record.save!
+        unless SesProxy::Conf.get[:collect_bounced_mails].eql? false
+          mail.to = (recipients&bounced).uniq.join(",")
+          mail.cc = (mail.cc_addrs&bounced).uniq.join(",")
+          mail.bcc = (mail.bcc_addrs&bounced).uniq.join(",")
+          record = BouncedEmail.new({
+            :sender => sender,
+            :recipients => (recipients&bounced).uniq.join(","),
+            :subject => mail.subject,
+            :body => mail.body.decoded,
+            :system => mail['X-Sender-System']||"Unknown",
+            :created_at => Time.now,
+            :updated_at => Time.now
+          })
+          record.save!
+        end
       end
     end
 
@@ -141,4 +181,4 @@ module SesProxy
       !!@server
     end
   end
-end
+end

data/template/ses-proxy.yml

@@ -1,8 +1,19 @@
+:collect_sent_mails: true
+:collect_bounced_mails: true
+:blacklisted_domains:
+  - domain1.ltd
+  - domain2.ltd
+:blacklisted_regexp:
+  - regexp1_pattern_without_delimiters
+  - regexp2_pattern_without_delimiters
 :aws:
   :access_key_id: your_access_key_id
   :secret_access_key: your_secret_access_key
   :account_id: 000000000000
   :allowed_topic_arns: ["arn:aws:sns:us-east-1:123456789012:MyTopic"]
+  :ses:
+    :username: your_ses_smtp_username
+    :password: your_ses_smtp_password
 :smtp_auth:
   :user: smtp_user
   :password: smtp_pass

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ses-proxy
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -289,8 +289,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: SMTP Proxy for Amazon Simple Email Service with bounce and complaints support
 test_files: []
+has_rdoc: false