osa 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3bc9c2b204260bd0cecd1650fdbfca0676c53e6e44c59aef8926caf9a5f0246
-  data.tar.gz: f32d6566bc6195847fc12fe680f8c22e6cbfe91f587bc7a35937efb1582eaccc
+  metadata.gz: aa725966ad372fd1be8d324225544fe3d41075433fc2c6f5832f915600774b0d
+  data.tar.gz: 1ecdbe1fc443c62db5d611cbcceacb5c88e9c0777df2e0ae17a1b720f07bce18
 SHA512:
-  metadata.gz: 76462c72b811ecb6b2224725ec954aa3ff3c6d2fc99a4cc91ae66698d72de709c740683ce6c4690095853199c7ef67c836ddc0bf6c0d3c4eb33751ee0fec3058
-  data.tar.gz: f4e79f61caa68f2c1ecd646ffa3d127070addf334f827bb33066bfdefc1e44f8b2986b6983c120c94867fa907e65184fd679ef73ad0eaa6b1b34f49956d5393d
+  metadata.gz: 38eef44a8c56008bc86611994979f717b6dd029f03df021f9720ae6769a3d8be48bd6f2330d1f273867c8c295aa30fcd534949f1f0424a09082ec662ea942ebf
+  data.tar.gz: 0ea2067bb74bdea9220adc2fe8c0e7c53399b2e3340a5342b7ee463a6a3eaabb4c5f87a5397ca4da95182c47fa76e5bd450ea613a688321d64f0b3f5cb784009

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    osa (0.2.2)
+    osa (0.2.3)
       activerecord (~> 6.0)
       faraday (~> 1.1)
       mail (~> 2.7.1)

data/lib/osa/scripts/dashboard_server.rb

@@ -45,7 +45,8 @@ class DashboardServer < Sinatra::Base
     week_reported = reports.where('reported_at > ?', week).count
     month = DateTime.now - 30.days
     month_reported = reports.where('reported_at > ?', month).count
-    domains = reports.select(:sender).distinct.map { |e| e.sender.split('@', 2)[1] }.uniq
+    domains = reports.select(:sender).distinct.map { |e| e.sender.split('@', 2)[1] }
+    domains.uniq!
 
     json total_reported: total_reported,
          today_reported: today_reported,

data/lib/osa/scripts/scan_junk_folder.rb

@@ -25,7 +25,7 @@ def extract_email_address(mail)
   email_address = mail['sender']['emailAddress']['address']
   return email_address unless email_address.nil?
 
-  # Sometimes the SMTP From header is misformatted and the email address is
+  # The SMTP From header might be misformatted and the email address is
   # parsed as part of the name by Outlook. Try to extract the email address
   # from the name.
   sender_name = mail['sender']['emailAddress']['name']
@@ -34,6 +34,13 @@ def extract_email_address(mail)
   sender_name.scan(/<(.+@.+)>/).first&.first
 end
 
+def report(mail, context, email_address)
+  puts "forwarding spam from #{email_address}"
+  context.graph_client.forward_mail_as_attachment(mail['id'], context.config.spamcop_report_email)
+  puts "deleting spam from #{email_address}"
+  context.graph_client.delete_mail(mail['id'])
+end
+
 while continue
   mails = context.graph_client.mails(context.config.junk_folder_id)
   continue = false
@@ -41,10 +48,21 @@ while continue
     break if mails.nil?
     mails['value'].each do |mail|
       email_address = extract_email_address(mail)
+      flagged = mail['flag']['flagStatus'] == 'flagged'
+
+      # Emails without a proper email address are not properly
+      # handled down below. Just report the mail and skip other
+      # procedures.
+      if flagged && email_address.nil?
+        report(mail, context, email_address)
+        continue = true
+        next
+      end
+
       next if email_address.nil?
+
       domain = PublicSuffix.domain(email_address.split('@', 2)[1])
 
-      flagged = mail['flag']['flagStatus'] == 'flagged'
       blacklist = (resolve_blacklist(mail['id'], email_address, domain, context, dns_blacklists) unless flagged)
 
       if flagged
@@ -56,13 +74,9 @@ while continue
         next
       end
 
+      report(mail, context, email_address)
       continue = true
 
-      puts "forwarding spam from #{email_address}"
-      context.graph_client.forward_mail_as_attachment(mail['id'], context.config.spamcop_report_email)
-      puts "deleting spam from #{email_address}"
-      context.graph_client.delete_mail(mail['id'])
-
       OSA::Report.create!(sender: email_address,
                           sender_domain: domain,
                           subject: mail['subject'],
@@ -71,7 +85,7 @@ while continue
                           received_at: Time.iso8601(mail['receivedDateTime']),
                           reported_at: Time.now)
 
-      # Do not add to the blacklist if the it's blacklisted by the db (it's already present)
+      # Do not add to the blacklist if it's blacklisted by the db (it's already present)
       # or blacklisted by DNSBLs (these blacklists are only supposed to be temporary).
       if flagged
         is_free_provider = OSA::EmailProvider.where(value: domain).exists?

data/lib/osa/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module OSA
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: osa
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Moray Baruh
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-22 00:00:00.000000000 Z
+date: 2022-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord