patronus_fati 1.3.5 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f79f91a49135b01c1f848b0883de89f9bd3c2dc6
-  data.tar.gz: 86929ed03d0bd55c48df02d70772b8308c901ae5
+  metadata.gz: 61ba287f4168013f92fa49e04138633d212d535a
+  data.tar.gz: d566e6a16567e1d3cd5d30cf82c7125b6c01549c
 SHA512:
-  metadata.gz: 3cc136a90de07282ade2b6e050bd09799ea64978cda5d6f77cb20ffe16617c8f2271479f366782bd7c7b37f780f2b9b95eb9a2373e20f1ea92bcbd16bcd45a98
-  data.tar.gz: 3c1aca19035a8a86d434d6a579967bc9275c42e367d30933e2d1a41e4d5375e304b2487822584afae0307887df346dc999ba3d7f071102bba24a6139436b3687
+  metadata.gz: a129ae80a6cf7ef9e645bf0eac7f319cae3de7bf120794c64188a91c7c8166c505969ae279c537052449ce76b1fd7bb059e5cfeadbbf58c57118cec3b94a4694
+  data.tar.gz: b65d3ef79d1ccebeed87355537cb57aad5a45497d0385dddff529662a69b6f6bf729c88464409a56be223cfd5a3e57c8fca179820ed0c77c79c54eed453dec51

data/DATA_CLEANUP_TASKS.md

@@ -0,0 +1,4 @@
+* Multiple cloaked access points result in flapping of settings (we assume a max of 1)
+* Adjust channel tracking to include breakdown of time APs spend on channels
+* Adjust encryption tracking to hold down flapping changes to the largest inclusive set
+* Investigate duplicate BSSIDs on multiple bands

data/bin/patronus_fati

@@ -40,7 +40,7 @@ exception_logger('process') do
   connection.connect
 
   PatronusFati.event_handler.on(:any) do |asset_type, event_type, msg, diagnostics|
-    PatronusFati.logger.info(JSON.generate(
+    STDERR.puts(JSON.generate(
       {
         asset_type: asset_type,
         event_type: event_type,

data/lib/patronus_fati/data_models/access_point.rb

@@ -29,7 +29,7 @@ module PatronusFati
       end
 
       def announce_changes
-        return unless dirty? && valid?
+        return unless dirty? && valid? && worth_syncing?
 
         if active?
           status = new? ? :new : :changed
@@ -126,9 +126,14 @@ module PatronusFati
 
       def track_ssid(ssid_data)
         self.ssids ||= {}
-        ssids[ssid_data[:essid]] ||= DataModels::Ssid.new(ssid_data[:essid])
 
-        ssid = ssids[ssid_data[:essid]]
+        ssid_key = ssid_data[:cloaked] ?
+          Digest::SHA256.hexdigest(ssid_data[:crypt_set].join) :
+          ssid_data[:essid]
+
+        ssids[ssid_key] ||= DataModels::Ssid.new(ssid_data[:essid])
+
+        ssid = ssids[ssid_key]
         ssid.presence.mark_visible
         ssid.update(ssid_data)
 
@@ -138,7 +143,7 @@ module PatronusFati
       def update(attrs)
         attrs.each do |k, v|
           next unless LOCAL_ATTRIBUTE_KEYS.include?(k)
-          next if local_attributes[k] == v
+          next if v.nil? || local_attributes[k] == v
 
           set_sync_flag(:dirtyAttributes)
           local_attributes[k] = v
@@ -155,6 +160,14 @@ module PatronusFati
         result = Louis.lookup(local_attributes[:bssid])
         result['long_vendor'] || result['short_vendor']
       end
+
+      # This is a safety mechanism to check whether or not an access point is
+      # actually 'present'. This is intended to assist in cutting out the
+      # access points that are just on the edge of being visible to our sensors.
+      def worth_syncing?
+        client_macs.any? || sync_flag?(:syncedOnline) ||
+          (presence && presence.visible_time && presence.visible_time > INTERVAL_DURATION)
+      end
     end
   end
 end

data/lib/patronus_fati/data_models/client.rb

@@ -90,7 +90,7 @@ module PatronusFati
       def update(attrs)
         attrs.each do |k, v|
           next unless LOCAL_ATTRIBUTE_KEYS.include?(k)
-          next if local_attributes[k] == v
+          next if v.nil? || local_attributes[k] == v
 
           set_sync_flag(:dirtyAttributes)
           local_attributes[k] = v

data/lib/patronus_fati/data_models/ssid.rb

@@ -28,7 +28,7 @@ module PatronusFati
       def update(attrs)
         attrs.each do |k, v|
           next unless LOCAL_ATTRIBUTE_KEYS.include?(k)
-          next if local_attributes[k] == v
+          next if v.nil? || local_attributes[k] == v
 
           set_sync_flag(:dirtyAttributes)
           local_attributes[k] = v

data/lib/patronus_fati/message_models/bssid.rb

@@ -22,9 +22,10 @@ module PatronusFati
                           :minnoise_rssi, :maxsignal_rssi, :maxnoise_rssi,
                           :bestlat, :bestlon, :bestalt, :agglat, :agglon,
                           :aggalt, :aggpoints, :datasize, :turbocellnid,
-                          :turbocellmode, :turbocellsat, :carrierset, :channel,
+                          :turbocellmode, :turbocellsat, :carrierset,
                           :maxseenrate, :encodingset, :decrypted, :dupeivpackets,
                           :bsstimestamp, :fragments, :retries, :newpackets) { |val| val.to_i }
+    Bssid.set_data_filter(:channel) { |val| val.to_i == 0 ? nil : val.to_i }
 
     # Attempt to map the returned BSSID type to one we know about it and
     # convert it to a string. In the event we don't know it will leave this as

data/lib/patronus_fati/message_processor/client.rb

@@ -50,8 +50,8 @@ module PatronusFati::MessageProcessor::Client
     client.announce_changes
 
     # Don't deal in associations that are outside of our connection expiration
-    # time... or if we don't have an access point
-    return if access_point.nil? ||
+    # time... or if we don't have a valid access point
+    return if access_point.nil? || !access_point.valid? ||
       obj[:lasttime] < PatronusFati::DataModels::Connection.current_expiration_threshold
 
     connection_key = "#{obj[:bssid]}^#{obj[:mac]}"

data/lib/patronus_fati/message_processor.rb

@@ -41,32 +41,6 @@ module PatronusFati
       DataModels::Client.instances.reject! { |_, ap| ap.presence.dead? }
     end
 
-    def self.report_recently_seen
-      @next_recent_msg ||= Time.now.to_i + 240
-
-      if @next_recent_msg <= Time.now.to_i
-        @next_recent_msg = Time.now.to_i + 240
-        cutoff_time = Time.now.to_i - 300
-
-        aps = DataModels::AccessPoint.instances.map do |bssid, ap|
-          next unless ap.active? && ap.presence.visible_since?(cutoff_time)
-          bssid
-        end.compact
-
-        clients = DataModels::Client.instances.map do |mac, client|
-          next unless client.active? && client.presence.visible_since?(cutoff_time)
-          mac
-        end.compact
-
-        return if clients.empty? && aps.empty?
-        PatronusFati.event_handler.event(
-          :sync,
-          :recent,
-          { access_points: aps, clients: clients }
-        )
-      end
-    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!
@@ -74,7 +48,6 @@ module PatronusFati
       @last_msg_received = Time.now.to_f
 
       periodic_flush
-      report_recently_seen
       result = factory(class_to_name(message_obj), message_obj)
       cleanup_models
       result
@@ -106,13 +79,13 @@ module PatronusFati
         clients = []
 
         PatronusFati::DataModels::AccessPoint.instances.each do |bssid, access_point|
-          next unless access_point.active?
+          next unless access_point.sync_flag?(:syncedOnline)
           PatronusFati.event_handler.event(:access_point, :sync, access_point.full_state, access_point.diagnostic_data)
           access_points << bssid
         end
 
         PatronusFati::DataModels::Client.instances.each do |mac, client|
-          next unless client.active?
+          next unless client.sync_flag?(:syncedOnline)
           PatronusFati.event_handler.event(:client, :sync, client.full_state, client.diagnostic_data)
           clients << mac
         end

data/lib/patronus_fati/version.rb

@@ -1,3 +1,3 @@
 module PatronusFati
-  VERSION = '1.3.5'
+  VERSION = '1.3.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: patronus_fati
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.3.6
 platform: ruby
 authors:
 - Sam Stelfox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-09 00:00:00.000000000 Z
+date: 2018-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: louis
@@ -133,6 +133,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".yardopts"
+- DATA_CLEANUP_TASKS.md
 - Gemfile
 - LICENSE
 - README.md