patronus_fati 0.9.6 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77314a1f422b9406896be845097f3e34caac361d
-  data.tar.gz: dfc19b91d08947979be7c5d9846f4dbead43b4fc
+  metadata.gz: 1876ad36866eee6d82f0cb3b740f6b5ac0e460e6
+  data.tar.gz: edbc4d0d8d8a159f72ea951dc654013d6640dfe7
 SHA512:
-  metadata.gz: 33790fafdb8dc74d96e912293684046e21bff2a817872a4ba5d237dce4fe833dba4c2d66341e30d7f52e08c8576e1f641b3c0f727d4ee5bfcc4981a5dfb21d86
-  data.tar.gz: 5e85898991dd325cf5a8923fbef0dc6cf22748981672ab85bb43a6c68fcbd8b265275f194d3aff167d4b3af310e11fe4580ee290f17b19b34482e65f2b9aa805
+  metadata.gz: dd68e48ee06cc05affc19167124f95b61faa092daf3f924b94f49a35851c2ed53119b1b7192af0c69b573795bf42bb820079c1d9824f4721809ac13598136c01
+  data.tar.gz: b42937fd98ba1422cfaeb4fc236434555e36a2c7a94169cdf769ef84e7338dacf2d98d337a20d91f05036f7b0f31f45f9383629c3b5e8cd7130bb6ad61d84586

data/lib/patronus_fati/message_models/bssid.rb

@@ -36,7 +36,7 @@ module PatronusFati
     Bssid.set_data_filter(:rangeip, :netmaskip, :gatewayip) { |val| (val == "0.0.0.0") ? nil : val }
 
     Bssid.set_data_filter(:freqmhz) do |val|
-      raw = val.to_s.split('*').compact.reject { |i| i.strip.empty? }.map { |v| v.split(':').map(&:to_i) }
+      raw = val.to_s.split('*').compact.reject { |i| (i || '').strip.empty? }.map { |v| v.split(':').map(&:to_i) }
       Hash[raw]
     end
   end

data/lib/patronus_fati/message_models/client.rb

@@ -35,10 +35,10 @@ module PatronusFati
     Client.set_data_filter(:gpsfixed) { |val| val.to_i == 1 }
 
     Client.set_data_filter(:ip, :gatewayip) { |val| (val == "0.0.0.0") ? nil : val }
-    Client.set_data_filter(:dhcphost) { |val| val.strip.empty? ? nil : val }
+    Client.set_data_filter(:dhcphost) { |val| (val || '').strip.empty? ? nil : val }
 
     Client.set_data_filter(:freqmhz) do |val|
-      raw = val.to_s.split('*').compact.reject { |i| i.strip.empty? }.map { |v| v.split(':').map(&:to_i) }
+      raw = val.to_s.split('*').compact.reject { |i| (i || '').strip.empty? }.map { |v| v.split(':').map(&:to_i) }
       Hash[raw]
     end
   end

data/lib/patronus_fati/message_processor/bssid.rb

@@ -5,6 +5,10 @@ module PatronusFati::MessageProcessor::Bssid
     # We don't care about objects that would have expired already...
     return if obj[:lasttime] < (Time.now.to_i - PatronusFati::AP_EXPIRATION)
 
+    # Some messages from kismet come in corrupted with partial MACs. We care
+    # not for them, just drop the bad data.
+    return unless obj[:mac].match(/^([0-9a-f]{2}[:-]){5}[0-9a-f]{2}$/)
+
     # Ignore probe requests as their BSSID information is useless (the ESSID
     # isn't present and it's coming from a client).
     return unless %w(infrastructure adhoc).include?(obj.type.to_s)

data/lib/patronus_fati/message_processor/client.rb

@@ -9,6 +9,10 @@ module PatronusFati::MessageProcessor::Client
     # devices not following the 802.11 spec.
     return if %w( unknown from_ds ).include?(obj[:type])
 
+    # Some messages from kismet come in corrupted with partial MACs. We care
+    # not for them, just drop the bad data.
+    return unless obj[:mac].match(/^([0-9a-f]{2}[:-]){5}[0-9a-f]{2}$/)
+
     client_info = client_data(obj.attributes)
     client = PatronusFati::DataModels::Client.first_or_create({bssid: obj[:mac]}, client_info)
     client.update(client_info)

data/lib/patronus_fati/version.rb

@@ -1,3 +1,3 @@
 module PatronusFati
-  VERSION = '0.9.6'
+  VERSION = '0.9.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: patronus_fati
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors:
 - Sam Stelfox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-20 00:00:00.000000000 Z
+date: 2016-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dm-constraints