patronus_fati 0.9.11 → 0.9.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5af36651b4ac2ef9bb6f2ed152fd34062c7d5e54
-  data.tar.gz: 21d48319ada17b176a06044641f20f9c52c02ec1
+  metadata.gz: 9494304c05c4e1107313822eb7ca6671fe736a40
+  data.tar.gz: ed4c5b18d335e2d08611718d4d3957ebe9202a15
 SHA512:
-  metadata.gz: 0b2c4b99ec27244d00a1882680848c01bd53b9b4ad2db6cb6ab253bdeb7031c2a367addac2c5b9567af2a065ae7b4a053b7e919183e3061b7b2485fafb003ee9
-  data.tar.gz: c6d74a76140b8304237e36118637398048ae8fa9c9162f39970ff57172e38c882c9cfc5a93b96056488955744c65219f2b208b326c70a22a2c054ab83e888cfe
+  metadata.gz: 30cc6b08f1a9e44f54ed589ec15211e8debf8244f3e2969ef1384477dddd0c51b5d266cc5c46a98a4c79c9a272ce41a05ff0d2dd4a4512cd2f59584618342bdf
+  data.tar.gz: 30ee69e1c3d916d7e46068c2383f370dcee51d6362b331e5dbd3d8962b3fff92cb01584bb10761060e8e7db4ebeb6849909190e6a42d66496ebaaef67a012297

data/lib/patronus_fati/connection.rb

@@ -1,6 +1,4 @@
 module PatronusFati
-  DisconnectError = Class.new(StandardError)
-
   class Connection
     attr_reader :port, :read_queue, :server, :write_queue
 
@@ -14,17 +12,18 @@ module PatronusFati
 
     def connect
       establish_connection
+      return unless connected?
 
       start_read_thread
       start_write_thread
     end
 
     def connected?
-      !socket.nil?
+      !(socket.nil? || socket.closed?)
     end
 
     def disconnect
-      return unless connected?
+      return unless socket
 
       Thread.kill(read_thread)
       Thread.kill(write_thread)

data/lib/patronus_fati/data_models/access_point.rb

@@ -2,6 +2,7 @@ module PatronusFati::DataModels
   class AccessPoint
     include DataMapper::Resource
 
+    include PatronusFati::DataModels::AutoVendorLookup
     include PatronusFati::DataModels::ExpirationAttributes
     include PatronusFati::DataModels::ReportedAttributes
 
@@ -20,10 +21,7 @@ module PatronusFati::DataModels
                             :child_key  => :access_point_id
     has n, :ssids,          :constraint => :destroy
 
-    belongs_to :mac, :required => false
-    before :save do
-      self.mac = Mac.first_or_create(mac: bssid)
-    end
+    vendor_attribute :bssid
 
     def self.current_expiration_threshold
       Time.now.to_i - PatronusFati::AP_EXPIRATION
@@ -48,7 +46,7 @@ module PatronusFati::DataModels
         .merge(
           active: active?,
           connected_clients: connected_clients.map(&:bssid),
-          vendor: mac.vendor,
+          vendor: vendor,
           ssids: current_ssids.map(&:full_state)
         )
     end

data/lib/patronus_fati/data_models/client.rb

@@ -2,6 +2,7 @@ module PatronusFati::DataModels
   class Client
     include DataMapper::Resource
 
+    include PatronusFati::DataModels::AutoVendorLookup
     include PatronusFati::DataModels::ExpirationAttributes
     include PatronusFati::DataModels::ReportedAttributes
 
@@ -15,10 +16,7 @@ module PatronusFati::DataModels
 
     has n, :probes,             :constraint => :destroy
 
-    belongs_to :mac, :required => false
-    before :save do
-      self.mac = Mac.first_or_create(mac: bssid)
-    end
+    vendor_attribute :bssid
 
     def self.current_expiration_threshold
       Time.now.to_i - PatronusFati::CLIENT_EXPIRATION
@@ -39,7 +37,7 @@ module PatronusFati::DataModels
         active: active?,
         connected_access_points: connected_access_points.map(&:bssid),
         probes: probes.map(&:essid),
-        vendor: mac.vendor
+        vendor: vendor
       )
     end
   end

data/lib/patronus_fati/data_models/common.rb

@@ -17,6 +17,26 @@ module PatronusFati
       end
     end
 
+    module AutoVendorLookup
+      def self.included(klass)
+        klass.extend AVLClassMethods
+        klass.property :vendor, DataMapper::Property::String, :length => 255
+
+        klass.before(:save) do
+          next if self.vendor || self.class.vendor_attribute.nil?
+          result = Louis.lookup(attributes[self.class.vendor_attribute])
+          self.vendor = result['long_vendor'] || result['short_vendor']
+        end
+      end
+
+      module AVLClassMethods
+        def vendor_attribute(attr = nil)
+          @@vendor_attribute = attr if attr && properties[attr]
+          @@vendor_attribute
+        end
+      end
+    end
+
     module ExpirationAttributes
       def self.included(klass)
         klass.extend EAClassMethods

data/lib/patronus_fati/data_models/ssid.rb

@@ -3,7 +3,6 @@ module PatronusFati::DataModels
     include DataMapper::Resource
 
     include PatronusFati::DataModels::ExpirationAttributes
-    include PatronusFati::DataModels::ReportedAttributes
 
     property :id,           Serial
 

data/lib/patronus_fati/data_observers/access_point_observer.rb

@@ -37,12 +37,17 @@ module PatronusFati::DataObservers
     after :save do
       next unless @change_type
 
-      mac.update_cached_counts!
+      fs = self.full_state
+
+      # During the initial creation we haven't had the opportunity to see any
+      # broadcast SSIDs yet. If we sent up an empty one it would delete the
+      # existing SSIDs.
+      fs.delete(:ssids) if @change_type == :new
 
       PatronusFati.event_handler.event(
         :access_point,
         @change_type,
-        self.full_state,
+        fs,
         @change_list || {}
       )
 

data/lib/patronus_fati/data_observers/client_observer.rb

@@ -36,8 +36,6 @@ module PatronusFati::DataObservers
     after :save do
       next unless @change_type
 
-      mac.update_cached_counts!
-
       PatronusFati.event_handler.event(
         :client,
         @change_type,

data/lib/patronus_fati/data_observers/connection_observer.rb

@@ -33,9 +33,6 @@ module PatronusFati::DataObservers
     after :save do
       next unless @change_type
 
-      client.mac.update_cached_counts!
-      access_point.mac.update_cached_counts!
-
       if @change_type == :new
         if disconnected_at.nil?
           PatronusFati.event_handler.event(

data/lib/patronus_fati/data_observers/ssid_observer.rb

@@ -7,47 +7,29 @@ module PatronusFati::DataObservers
     before :save do
       next unless self.valid?
 
-      # We're about to report this, make sure the attribute gets saved
-      old_ro_val = reported_online
-      self.reported_online = true
-
-      @change_list = {
-        ssids: [
-          [],
-          [full_state]
-        ]
-      }
-
-      unless self.new?
-        dirty = self.dirty_attributes.map { |a| a.first.name }.map(&:to_s)
-        dirty.delete('last_seen_at')
-
-        # If there weren't any meaningful changes, don't print out anything
-        # after we save.
-        if dirty.empty?
-          @change_list = nil
-          self.reported_online = old_ro_val
-          next
-        end
-
-        tmp_obj = Hash[original_attributes.map { |k,v| [k.name, v] }]
-        @change_list[:ssids][0] = PatronusFati::DataModels::Ssid.new(tmp_obj).full_state
-      end
+      @old_ssids = self.access_point.ssids.active.map(&:full_state)
+        .sort_by { |s| s[:essid] }
     end
 
     after :save do
-      next unless @change_list
+      new_ssids = self.access_point.ssids.active.map(&:full_state)
+        .sort_by { |s| s[:essid] }
 
-      access_point.mac.update_cached_counts!
+      change_list = {
+        ssids: [
+          @old_ssids,
+          new_ssids
+        ]
+      }
 
       PatronusFati.event_handler.event(
         :access_point,
         :changed,
         self.access_point.full_state,
-        @change_list
+        change_list
       )
 
-      @change_list = nil
+      @old_ssids = nil
     end
   end
 end

data/lib/patronus_fati/message_processor/alert.rb

@@ -2,14 +2,19 @@ module PatronusFati::MessageProcessor::Alert
   include PatronusFati::MessageProcessor
 
   def self.process(obj)
-    src_mac = PatronusFati::DataModels::Mac.first_or_create(mac: obj[:source])
-    dst_mac = PatronusFati::DataModels::Mac.first_or_create(mac: obj[:dest])
-    other_mac = PatronusFati::DataModels::Mac.first_or_create(mac: obj[:other])
-
-    PatronusFati::DataModels::Alert.first_or_create({created_at: obj.sec, \
-      message: obj[:text]}, {created_at: obj.sec, message: obj[:text], \
-      src_mac: src_mac, dst_mac: dst_mac, other_mac: other_mac})
+    PatronusFati.event_handler.event(:alert, :new, process_obj(obj))
 
     nil
   end
+
+  def self.process_obj(obj)
+    {
+      created_at: obj[:sec],
+      message: obj[:text],
+
+      source: obj[:source],
+      destination: obj[:dest],
+      other: obj[:other]
+    }
+  end
 end

data/lib/patronus_fati/message_processor.rb

@@ -12,15 +12,18 @@ module PatronusFati
           ap.update(:reported_online => false)
           PatronusFati.event_handler.event(:access_point, :offline, {'bssid' => ap.bssid, 'uptime' => ap.uptime})
           ap.disconnect_clients!
+          ap.destroy
         end
 
         PatronusFati::DataModels::Client.inactive.reported_online.each do |cli|
           cli.update(:reported_online => false)
           PatronusFati.event_handler.event(:client, :offline, {'bssid' => cli.bssid, 'uptime' => cli.uptime})
           cli.disconnect!
+          cli.destroy
         end
 
         PatronusFati::DataModels::Connection.inactive.connected.map(&:disconnect!)
+        PatronusFati::DataModels::Ssid.inactive.destroy
       end
     end
 

data/lib/patronus_fati/version.rb

@@ -1,3 +1,3 @@
 module PatronusFati
-  VERSION = '0.9.11'
+  VERSION = '0.9.12'
 end

data/lib/patronus_fati.rb

@@ -34,15 +34,12 @@ require 'patronus_fati/message_processor'
 require 'patronus_fati/data_models/common'
 
 require 'patronus_fati/data_models/access_point'
-require 'patronus_fati/data_models/alert'
 require 'patronus_fati/data_models/client'
 require 'patronus_fati/data_models/connection'
-require 'patronus_fati/data_models/mac'
 require 'patronus_fati/data_models/probe'
 require 'patronus_fati/data_models/ssid'
 
 require 'patronus_fati/data_observers/access_point_observer'
-require 'patronus_fati/data_observers/alert_observer'
 require 'patronus_fati/data_observers/client_observer'
 require 'patronus_fati/data_observers/connection_observer'
 require 'patronus_fati/data_observers/ssid_observer'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: patronus_fati
 version: !ruby/object:Gem::Version
-  version: 0.9.11
+  version: 0.9.12
 platform: ruby
 authors:
 - Sam Stelfox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-18 00:00:00.000000000 Z
+date: 2016-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dm-constraints
@@ -287,15 +287,12 @@ files:
 - lib/patronus_fati/data_mapper/crypt_flags.rb
 - lib/patronus_fati/data_mapper/null_table_prefix.rb
 - lib/patronus_fati/data_models/access_point.rb
-- lib/patronus_fati/data_models/alert.rb
 - lib/patronus_fati/data_models/client.rb
 - lib/patronus_fati/data_models/common.rb
 - lib/patronus_fati/data_models/connection.rb
-- lib/patronus_fati/data_models/mac.rb
 - lib/patronus_fati/data_models/probe.rb
 - lib/patronus_fati/data_models/ssid.rb
 - lib/patronus_fati/data_observers/access_point_observer.rb
-- lib/patronus_fati/data_observers/alert_observer.rb
 - lib/patronus_fati/data_observers/client_observer.rb
 - lib/patronus_fati/data_observers/connection_observer.rb
 - lib/patronus_fati/data_observers/probe_observer.rb

data/lib/patronus_fati/data_models/alert.rb

@@ -1,24 +0,0 @@
-module PatronusFati::DataModels
-  class Alert
-    include DataMapper::Resource
-
-    property :id,         Serial
-    property :created_at, Integer,  :default => Proc.new { Time.now.to_i }
-    property :message,    String,   :length => 255
-
-    belongs_to :src_mac,   :model => 'Mac', :required => false
-    belongs_to :dst_mac,   :model => 'Mac', :required => false
-    belongs_to :other_mac, :model => 'Mac', :required => false
-
-    def full_state
-      {
-        created_at: created_at,
-        message: message,
-
-        source: src_mac.mac,
-        destination: dst_mac.mac,
-        other: other_mac.mac
-      }
-    end
-  end
-end

data/lib/patronus_fati/data_models/mac.rb

@@ -1,48 +0,0 @@
-module PatronusFati::DataModels
-  class Mac
-    include DataMapper::Resource
-
-    property :id,     Serial
-
-    property :mac,    String, :length => 17, :unique => true
-    property :vendor, String, :length => 255
-
-    property :alert_count,        Integer, :default => 0
-    property :clients_connected,  Integer, :default => 0
-    property :active_ssids,       Integer, :default => 0
-    property :is_client,          Boolean, :default => false
-    property :connections_to_ap,  Integer, :default => 0
-
-    has n, :access_points
-    has n, :clients
-
-    has n, :dst_alerts,   :model => 'Alert', :child_key => :dst_mac_id
-    has n, :other_alerts, :model => 'Alert', :child_key => :other_mac_id
-    has n, :src_alerts,   :model => 'Alert', :child_key => :src_mac_id
-
-    before :save do
-      next if self.vendor
-
-      result = Louis.lookup(mac)
-      self.vendor = result['long_vendor'] || result['short_vendor']
-    end
-
-    def is_ap?
-      access_points.active.any?
-    end
-
-    def is_client?
-      clients.active.any?
-    end
-
-    def update_cached_counts!
-      update(
-        alert_count:        (dst_alerts | other_alerts | src_alerts).count,
-        active_ssids:       access_points.ssids.active.count,
-        clients_connected:  access_points.connections.connected.count,
-        connections_to_ap:  clients.connections.connected.count,
-        is_client:          is_client?
-      )
-    end
-  end
-end

data/lib/patronus_fati/data_observers/alert_observer.rb

@@ -1,12 +0,0 @@
-module PatronusFati::DataObservers
-  class AlertObserver
-    include DataMapper::Observer
-
-    observe PatronusFati::DataModels::Alert
-
-    after :save do
-      [src_mac, dst_mac, other_mac].uniq.map(&:update_cached_counts!)
-      PatronusFati.event_handler.event(:alert, :new, self.full_state)
-    end
-  end
-end