patronus_fati 0.9.23 → 0.9.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02b72bd8a2e65ca6d3dbc4ffee2c9382595ae59d
-  data.tar.gz: 936150671fe91d3921136531e0f2aa3761af2c56
+  metadata.gz: 16a317acf1d621054cb167f661a59626b6abd5f9
+  data.tar.gz: f6a7904b7301861e0866cb87b0ea78f090acc514
 SHA512:
-  metadata.gz: 5ec75ed1c6efdb7d89c1c2f7426f9f8bf01a0037764db0489254dede3e90ee5553da96597c5970d42bd84abe4e755d0acf912c4a7733e24f0ce326147d8afc9a
-  data.tar.gz: 0fc6b36f15b8707e24a236aeeafc7e6607a7c1434f12d34153a57c00441a9de80492709bf993f5ec7c3d9d926c0e7e45aae273962f1be814757ace1f69fb3f2f
+  metadata.gz: bbe5e2c8f3c1fad88e4f1c406b5a572b546d9940e6cf947fcd3e998da7e3ceb4751c26a9db7df9235288e6b5b72dce5f97a98d5154c1d8dd3fb54a4c9febf446
+  data.tar.gz: 093f50a97c650e4bf05ac1998b10c6eb87513501a96bd49e7d48180b053fb846623f8d4ce8bd320f2d17484252622bb996b7a71883f653e17ef8a132748733e5

data/lib/patronus_fati/consts.rb

@@ -79,11 +79,6 @@ module PatronusFati
   # consider no longer actively connected.
   CONNECTION_EXPIRATION = 1800
 
-  # This is how long after startup we trust kismet's timestamps. It apparently
-  # does not reliably update it's timestamps so after the initial flood we
-  # start ignoring it.
-  STARTUP_TRUST_WINDOW = 300
-
   # Number of seconds before we consider an access point no longer advertising
   # an SSID. It is safe for this to be longer than the AP expiration; If we
   # think the AP has gone offline we will automatically mark all SSIDs as

data/lib/patronus_fati/message_processor/alert.rb

@@ -2,6 +2,9 @@ module PatronusFati::MessageProcessor::Alert
   include PatronusFati::MessageProcessor
 
   def self.process(obj)
+    # Ignore the initial flood of cached data
+    return unless PatronusFati.past_initial_flood?
+
     PatronusFati.event_handler.event(:alert, :new, process_obj(obj))
 
     nil

data/lib/patronus_fati/message_processor/bssid.rb

@@ -2,10 +2,10 @@ module PatronusFati::MessageProcessor::Bssid
   include PatronusFati::MessageProcessor
 
   def self.process(obj)
-    # We don't care about objects that would have expired already but only at
-    # the beginning because kismet can't be trusted.
-    return if (PatronusFati.startup_time + PatronusFati::STARTUP_TRUST_WINDOW) < Time.now.to_i &&
-      obj[:lasttime] < (Time.now.to_i - PatronusFati::AP_EXPIRATION) || obj[:bssid].nil?
+    # Ignore the initial flood of cached data and any objects that would have
+    # already expired
+    return unless PatronusFati.past_initial_flood? &&
+      obj[:lasttime] >= PatronusFati::DataModels::Ssid.current_expiration_threshold
 
     # Some messages from kismet come in corrupted with partial MACs. We care
     # not for them, just drop the bad data.

data/lib/patronus_fati/message_processor/client.rb

@@ -2,10 +2,10 @@ module PatronusFati::MessageProcessor::Client
   include PatronusFati::MessageProcessor
 
   def self.process(obj)
-    # We don't care about objects that would have expired already but only at
-    # the beginning because kismet can't be trusted.
-    return if (PatronusFati.startup_time + PatronusFati::STARTUP_TRUST_WINDOW) < Time.now.to_i &&
-      obj[:lasttime] < PatronusFati::DataModels::Client.current_expiration_threshold
+    # Ignore the initial flood of cached data and any objects that would have
+    # already expired
+    return unless PatronusFati.past_initial_flood? &&
+      obj[:lasttime] >= PatronusFati::DataModels::Ssid.current_expiration_threshold
 
     # obj[:mac] is the client's MAC address
     # obj[:bssid] is the AP's MAC address

data/lib/patronus_fati/message_processor/ssid.rb

@@ -2,10 +2,10 @@ module PatronusFati::MessageProcessor::Ssid
   include PatronusFati::MessageProcessor
 
   def self.process(obj)
-    # We don't care about objects that would have expired already but only at
-    # the beginning because kismet can't be trusted.
-    return if (PatronusFati.startup_time + PatronusFati::STARTUP_TRUST_WINDOW) < Time.now.to_i &&
-      obj[:lasttime] < PatronusFati::DataModels::Ssid.current_expiration_threshold
+    # Ignore the initial flood of cached data and any objects that would have
+    # already expired
+    return unless PatronusFati.past_initial_flood? &&
+      obj[:lasttime] >= PatronusFati::DataModels::Ssid.current_expiration_threshold
 
     ssid_info = ssid_data(obj.attributes)
 

data/lib/patronus_fati/message_processor.rb

@@ -73,6 +73,11 @@ module PatronusFati
     end
 
     def self.handle(message_obj)
+      if !PatronusFati.past_initial_flood? && @last_msg_received && (Time.now.to_f - @last_msg_received) >= 0.8
+        PatronusFati.past_initial_flood!
+      end
+      @last_msg_received = Time.now.to_f
+
       periodic_flush
       report_recently_seen
       result = factory(class_to_name(message_obj), message_obj)

data/lib/patronus_fati/version.rb

@@ -1,3 +1,3 @@
 module PatronusFati
-  VERSION = '0.9.23'
+  VERSION = '0.9.24'
 end

data/lib/patronus_fati.rb

@@ -64,4 +64,12 @@ module PatronusFati
   def self.startup_time
     @@startup_time
   end
+
+  def self.past_initial_flood?
+    @@flood_status ||= false
+  end
+
+  def self.past_initial_flood!
+    @@flood_status = true
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: patronus_fati
 version: !ruby/object:Gem::Version
-  version: 0.9.23
+  version: 0.9.24
 platform: ruby
 authors:
 - Sam Stelfox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-08 00:00:00.000000000 Z
+date: 2017-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dm-constraints
@@ -371,7 +371,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: A ruby implementation of the Kismet client protocol.