osa 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1008becc098b639309f218c9f763e57d4d01f201b28fd105c478cd46534de913
-  data.tar.gz: 2c285065f454aeaa7fcc1f9dd6f72e92d3423dbe292d06ef36afba6a8db6f9eb
+  metadata.gz: b3bc9c2b204260bd0cecd1650fdbfca0676c53e6e44c59aef8926caf9a5f0246
+  data.tar.gz: f32d6566bc6195847fc12fe680f8c22e6cbfe91f587bc7a35937efb1582eaccc
 SHA512:
-  metadata.gz: 4b53ba423fc0b0da3bc8f49188d34370cf49d12e968a13a436ffaa6c849dceddedcf10c7e2b833d7316dbc0045fe487c44891b6eb50b98fb63477f63b8542a0e
-  data.tar.gz: ba063539fe384116422310df5a0d3a14c324a0560674932dd39998951d433236fb929a86aae981895adff04a29d71d0780c8fc4a2a9d11fa817359ad56c10ff0
+  metadata.gz: 76462c72b811ecb6b2224725ec954aa3ff3c6d2fc99a4cc91ae66698d72de709c740683ce6c4690095853199c7ef67c836ddc0bf6c0d3c4eb33751ee0fec3058
+  data.tar.gz: f4e79f61caa68f2c1ecd646ffa3d127070addf334f827bb33066bfdefc1e44f8b2986b6983c120c94867fa907e65184fd679ef73ad0eaa6b1b34f49956d5393d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    osa (0.2.1)
+    osa (0.2.2)
       activerecord (~> 6.0)
       faraday (~> 1.1)
       mail (~> 2.7.1)
@@ -37,7 +37,7 @@ GEM
     mail (2.7.1)
       mini_mime (>= 0.1.1)
     mini_mime (1.0.2)
-    minitest (5.14.3)
+    minitest (5.14.4)
     multi_json (1.15.0)
     multipart-post (2.1.1)
     mustermann (1.1.1)

data/lib/osa/scripts/dashboard_server.rb

@@ -6,6 +6,7 @@ require 'osa/util/db'
 class DashboardServer < Sinatra::Base
   set :views, File.absolute_path(File.dirname(__FILE__) + '/../views')
   set :port, ENV['SERVER_PORT'] || 8080
+  after { ActiveRecord::Base.connection.close }
 
   get '/' do
     erb :index
@@ -54,7 +55,11 @@ class DashboardServer < Sinatra::Base
   end
 
   get '/api/stats/spammers' do
-    spammers = OSA::Report.select('sender_domain as domain', 'COUNT(*) as count').limit(50).order(count: :desc).group(:sender_domain)
+    spammers = OSA::Report.select('sender_domain as domain', 'COUNT(*) as count')
+    unless params[:interval].blank?
+      spammers = spammers.where('received_at > ?', Time.now - params[:interval].to_i.days)
+    end
+    spammers = spammers.limit(50).order(count: :desc).group(:sender_domain)
     json spammers
   end
 
@@ -63,6 +68,9 @@ class DashboardServer < Sinatra::Base
     unless params[:spammer].blank?
       historical_data = historical_data.where(sender: params[:spammer]).or(OSA::Report.where(sender_domain: params[:spammer]))
     end
+    unless params[:interval].blank?
+      historical_data = historical_data.where('received_at > ?', Time.now - params[:interval].to_i.days)
+    end
     json historical_data.group(:date)
   end
 end

data/lib/osa/scripts/scan_junk_folder.rb

@@ -21,13 +21,26 @@ def resolve_blacklist(mail_id, email_address, domain, context, dns_blacklists)
   dns_blacklists.find { |bl| bl.blacklisted?(ip) }&.server
 end
 
+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
+  # parsed as part of the name by Outlook. Try to extract the email address
+  # from the name.
+  sender_name = mail['sender']['emailAddress']['name']
+  return nil if sender_name.nil?
+
+  sender_name.scan(/<(.+@.+)>/).first&.first
+end
+
 while continue
   mails = context.graph_client.mails(context.config.junk_folder_id)
   continue = false
   loop do
     break if mails.nil?
     mails['value'].each do |mail|
-      email_address = mail['sender']['emailAddress']['address']
+      email_address = extract_email_address(mail)
       next if email_address.nil?
       domain = PublicSuffix.domain(email_address.split('@', 2)[1])
 

data/lib/osa/util/db.rb

@@ -25,7 +25,7 @@ module OSA
 
   class DnsBlacklist < ActiveRecord::Base
     def blacklisted?(ip)
-      ::Resolv.getaddress("#{ip}.#{server}") != "0.0.0.0"
+      ::Resolv.getaddress("#{ip}.#{server}") != '0.0.0.0'
     rescue ::Resolv::ResolvError
       return false
     end

data/lib/osa/version.rb

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

data/lib/osa/views/index.erb

@@ -77,6 +77,15 @@
         <!-- ./col -->
       </div>
 
+      <div class="row">
+        <div id="interval-btn-group"  class="btn-group">
+          <button onclick="updateInterval(this, '')" type="button" class="btn btn-info active">All time</button>
+          <button onclick="updateInterval(this, '1')" type="button" class="btn btn-info">1 day</button>
+          <button onclick="updateInterval(this, '7')" type="button" class="btn btn-info">7 days</button>
+          <button onclick="updateInterval(this, '30')" type="button" class="btn btn-info">30 days</button>
+        </div>
+      </div>
+
       <div class="row">
         <div class="card">
           <div class="card-header">
@@ -136,6 +145,21 @@
 
 <script>
     let totalReportCount = 0;
+    let interval = "";
+
+    function updateInterval(element, newInterval) {
+        interval = newInterval;
+        let children = Array.from(document.getElementById("interval-btn-group").children);
+        console.log(children);
+        children.forEach((child) => {
+            if (child === element) {
+                child.classList.add("active");
+            } else {
+                child.classList.remove("active");
+            }
+        });
+        update();
+    }
 
     function sec2time(timeInSeconds) {
         const time = parseFloat(timeInSeconds).toFixed(3);
@@ -179,7 +203,7 @@
     }
 
     async function updateSpammers() {
-        const response = await fetch('/api/stats/spammers');
+        const response = await fetch(`/api/stats/spammers?interval=${interval}`);
         if (response.ok) {
             const body = await response.json();
 
@@ -270,7 +294,7 @@
     const historicalChart = createHistoricalChart();
 
     async function updateHistoricalChart() {
-        const response = await fetch("/api/stats/reports/historical");
+        const response = await fetch(`/api/stats/reports/historical?interval=${interval}`);
         if (response.ok) {
             const body = await response.json();
 
@@ -285,11 +309,11 @@
 
     function update() {
         updateStats()
-            .then(updateSpammers)
-            .then(updateHistoricalChart)
-            .then(() => {
-                setTimeout(update, 10 * 60 * 1000);
-            })
+          .then(updateSpammers)
+          .then(updateHistoricalChart)
+          .then(() => {
+              setTimeout(update, 10 * 60 * 1000);
+          })
     }
 
     update();

metadata

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