patronus_fati 0.9.22 → 0.9.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ee0d88e2f295746a1cd8eb715171d51e8625ae9
-  data.tar.gz: 9a96cb7239ea1a5a8a510bd86195b923ad2b25fd
+  metadata.gz: 02b72bd8a2e65ca6d3dbc4ffee2c9382595ae59d
+  data.tar.gz: 936150671fe91d3921136531e0f2aa3761af2c56
 SHA512:
-  metadata.gz: 5a9530e7399aeafbadf00334e69c2a1fb0e188a625d973f186f720512c463ff5aa559478b318dfccd42d288cb6f998d3b19d0671287aa37fe32febecd27bdfd9
-  data.tar.gz: b4b17ac88a9295cc757c14242852899d23b58a90e9b9d6bbf12353239fd1498a6f81b07d4349586a29e2f928d2cf1ee0567614692e8ebf8d5d37387527dfd0f0
+  metadata.gz: 5ec75ed1c6efdb7d89c1c2f7426f9f8bf01a0037764db0489254dede3e90ee5553da96597c5970d42bd84abe4e755d0acf912c4a7733e24f0ce326147d8afc9a
+  data.tar.gz: 0fc6b36f15b8707e24a236aeeafc7e6607a7c1434f12d34153a57c00441a9de80492709bf993f5ec7c3d9d926c0e7e45aae273962f1be814757ace1f69fb3f2f

data/lib/patronus_fati.rb

@@ -45,6 +45,8 @@ require 'patronus_fati/data_observers/connection_observer'
 require 'patronus_fati/data_observers/ssid_observer'
 
 module PatronusFati
+  @@startup_time = Time.now.to_i
+
   def self.event_handler
     @event_handler ||= PatronusFati::EventHandler.new
   end
@@ -58,4 +60,8 @@ module PatronusFati
 
     PatronusFati::Connection.new(kismet_server, kismet_port)
   end
+
+  def self.startup_time
+    @@startup_time
+  end
 end

data/lib/patronus_fati/consts.rb

@@ -79,6 +79,11 @@ 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/data_models/common.rb

@@ -48,7 +48,7 @@ module PatronusFati
       end
 
       def seen!
-        update(last_seen_at: Time.now.to_i)
+        update!(last_seen_at: Time.now.to_i)
       end
 
       def uptime

data/lib/patronus_fati/message_parser.rb

@@ -15,6 +15,10 @@ module PatronusFati
 
       src_keys = cap.enabled_keys.empty? ? cap.attribute_keys : cap.enabled_keys
       cap.new(Hash[src_keys.zip(raw_data[1])])
+    rescue ParseError => e
+      # Detected corrupt messages from kismet in the wild, warn about them but
+      # don't fail the connection.
+      $stderr.puts("Warning: Unable to parse message from kismet: #{e.message}")
     end
 
     protected

data/lib/patronus_fati/message_processor/bssid.rb

@@ -2,8 +2,10 @@ module PatronusFati::MessageProcessor::Bssid
   include PatronusFati::MessageProcessor
 
   def self.process(obj)
-    # We don't care about objects that would have expired already...
-    return if obj[:lasttime] < (Time.now.to_i - PatronusFati::AP_EXPIRATION) || obj[:bssid].nil?
+    # 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?
 
     # 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,8 +2,10 @@ module PatronusFati::MessageProcessor::Client
   include PatronusFati::MessageProcessor
 
   def self.process(obj)
-    # We don't care about objects that would have expired already...
-    return if obj[:lasttime] < PatronusFati::DataModels::Client.current_expiration_threshold
+    # 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
 
     # 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,8 +2,10 @@ module PatronusFati::MessageProcessor::Ssid
   include PatronusFati::MessageProcessor
 
   def self.process(obj)
-    # We don't care about objects that would have expired already...
-    return if obj[:lasttime] < PatronusFati::DataModels::Ssid.current_expiration_threshold
+    # 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
 
     ssid_info = ssid_data(obj.attributes)
 

data/lib/patronus_fati/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: patronus_fati
 version: !ruby/object:Gem::Version
-  version: 0.9.22
+  version: 0.9.23
 platform: ruby
 authors:
 - Sam Stelfox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-10 00:00:00.000000000 Z
+date: 2016-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dm-constraints