osa 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 257c4fb16627c69c705da1ca2c95fe5b120f7706cbbacec3cb5b54cec8aa4e97
-  data.tar.gz: 003041712c82eeb6d9e686de02a36372517dfda89c5d1b4ca58920efc1a06cfd
+  metadata.gz: c0fbdd1dceb350e48a1d593ec7590e5c1caba49136ae6c6a1afb3a41a86683d8
+  data.tar.gz: 962578a1b23e0879a5175f21a6c617812cec82e3f6577b58f401dc0cd78becc8
 SHA512:
-  metadata.gz: 904c9b9e2db9f64c0bdab038a3fce8cb5f294ed7c38f1a25ad50f4df769456880ac7e3a17df7dcf6a101f332c836f821edf7e992a07a6ce1ec4b6c1604862407
-  data.tar.gz: 8ee576b4dcb8c7e78742328fbc3921ac7f17a7d56b85bf2474feb251cdcc8d6a5deda969d2219a40815d8f14075d4fdae5fcd9c400abbcc1b0974ee8ba7eb782
+  metadata.gz: aabca2784a303f54c43eda8ef7f1491438c65658184eebc6821574785057b2b3ced909787cd66dca29b8db38aa85fdf60959041884373eb84c6bbeb72204d99e
+  data.tar.gz: befb3a9c9ac8ca252c5e23c84bb7fdb709be6765e092d2315472baccfda59736949d4bfcb1fa6e78b3216e09d638798c344150b18af26147c7eddd2a2307dd73

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    osa (0.1.2)
+    osa (0.1.3)
       activerecord (~> 6.0)
       faraday (~> 1.1)
       public_suffix (~> 4.0)
@@ -11,23 +11,25 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.0.3.4)
-      activesupport (= 6.0.3.4)
-    activerecord (6.0.3.4)
-      activemodel (= 6.0.3.4)
-      activesupport (= 6.0.3.4)
-    activesupport (6.0.3.4)
+    activemodel (6.1.0)
+      activesupport (= 6.1.0)
+    activerecord (6.1.0)
+      activemodel (= 6.1.0)
+      activesupport (= 6.1.0)
+    activesupport (6.1.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     ast (2.4.1)
     concurrent-ruby (1.1.7)
-    faraday (1.1.0)
+    faraday (1.3.0)
+      faraday-net_http (~> 1.0)
       multipart-post (>= 1.2, < 3)
       ruby2_keywords
-    i18n (1.8.5)
+    faraday-net_http (1.0.0)
+    i18n (1.8.6)
       concurrent-ruby (~> 1.0)
     minitest (5.14.2)
     multipart-post (2.1.1)
@@ -57,22 +59,21 @@ GEM
     ruby-progressbar (1.10.1)
     ruby2_keywords (0.0.2)
     sqlite3 (1.4.2)
-    thread_safe (0.3.6)
     tty-color (0.6.0)
     tty-cursor (0.7.1)
-    tty-prompt (0.22.0)
+    tty-prompt (0.23.0)
       pastel (~> 0.8)
       tty-reader (~> 0.8)
-    tty-reader (0.8.0)
+    tty-reader (0.9.0)
       tty-cursor (~> 0.7)
       tty-screen (~> 0.8)
       wisper (~> 2.0)
     tty-screen (0.8.1)
-    tzinfo (1.2.8)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
     unicode-display_width (1.7.0)
     wisper (2.0.1)
-    zeitwerk (2.4.1)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby

data/lib/osa/clients/ms_graph_client.rb

@@ -48,6 +48,9 @@ module OSA
       raw_mail = self.raw_mail(mail_id)
       forward_message = create_forward_message(mail_id)
       update = {
+        body: {
+          content: ''
+        },
         toRecipients: [
           {
             emailAddress: {

data/lib/osa/scripts/scan_junk_folder.rb

@@ -3,6 +3,7 @@ require 'osa/util/constants'
 require 'public_suffix'
 require 'osa/util/db'
 require 'osa/util/context'
+require 'public_suffix'
 
 context = OSA::Context.new
 
@@ -37,6 +38,19 @@ while continue
       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'])
+
+      if flagged
+        domain = PublicSuffix.domain(email_address.split('@', 2)[1])
+
+        is_free_provider = OSA::EmailProvider.where(value: domain).exists?
+        if is_free_provider
+          puts "#{email_address} is using a free provider, blacklisting full address"
+          OSA::Blacklist.find_or_create_by(value: email_address).save!
+        else
+          puts "Adding #{domain} to blacklist"
+          OSA::Blacklist.find_or_create_by(value: domain).save!
+        end
+      end
     end
     mails = mails.next
   end

data/lib/osa/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: osa
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Moray Baruh
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-30 00:00:00.000000000 Z
+date: 2021-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord