patronus_fati 0.8.7 → 0.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2766e0c2b0611d3128030f8ef94cb253ec0e5d53
-  data.tar.gz: e713ce49e98c54b182b99ee27ffba61cea4a7df9
+  metadata.gz: f846c13ed96d628de8bb8f4cc5d4db5dba18a18f
+  data.tar.gz: 213e462efeca90304442a3cdd0567d788e0c5e44
 SHA512:
-  metadata.gz: 66dae983e670375c70f47c940b51549d4fff543815d1897451b8679704eee99f54909128a3bf24b01cf6bd9611e2ce6c55d9e27faf9ae4101102da0e592274f5
-  data.tar.gz: b12896f06236ebbac36d7ce9c2e178102887c8cd2e65a5ff9de0476b65408541552ebbc8431d2048d557417f86dd6ac8518529b2e51a40d71397a41cc33b8208
+  metadata.gz: c01c8e041b55e645506de4c3d1004afe258d19dd8208cc3b1e1f0e3b5a175fa387491fe8420cbcfdcfacc2a78d9ecc85a9aa2af432893b8fd5f4356b09dae912
+  data.tar.gz: 65fe59c2a5c91caa39d25c8aa1b8c7e9024a157f4e0af4159765b212ce61054baf0dbb20875db24cdd99732f6cf461649df98510aaf8444d9c810ac42b63f30d

data/lib/patronus_fati/data_models/access_point.rb

@@ -7,9 +7,9 @@ module PatronusFati::DataModels
 
     property  :id,                Serial
 
-    property  :bssid,             String, :length   => 17,
-                                          :required => true,
-                                          :unique   => true
+    property  :bssid,             String, :length       => 17,
+                                          :required     => true,
+                                          :unique_index => true
 
     property  :channel,           Integer
     property  :max_seen_rate,     Integer
@@ -31,8 +31,6 @@ module PatronusFati::DataModels
     has n, :connections,    :constraint => :destroy,
                             :child_key  => :access_point_id
     has n, :ssids,          :constraint => :destroy
-    has n, :ap_frequencies, :constraint => :destroy
-    has n, :ap_signals,     :constraint => :destroy
 
     belongs_to :mac, :required => false
     before :save do
@@ -63,20 +61,8 @@ module PatronusFati::DataModels
           active: active?,
           connected_clients: connected_clients.map(&:bssid),
           vendor: mac.vendor,
-          signal_dbm: (ap_signals.any? ? ap_signals.last.dbm : nil),
           ssids: current_ssids.map(&:full_state)
         )
     end
-
-    def record_signal(dbm)
-      PatronusFati::DataModels::ApSignal.create(access_point: self, dbm: dbm)
-    end
-
-    def update_frequencies(freq_hsh)
-      freq_hsh.each do |freq, packet_count|
-        f = ap_frequencies.first_or_create({mhz: freq}, {packet_count: packet_count})
-        f.update({packet_count: packet_count})
-      end
-    end
   end
 end

data/lib/patronus_fati/data_models/client.rb

@@ -6,7 +6,7 @@ module PatronusFati::DataModels
     include PatronusFati::DataModels::ReportedAttributes
 
     property  :id,              Serial
-    property  :bssid,           String,   :length => 17, :unique => true
+    property  :bssid,           String,   :length => 17, :unique_index => true
     property  :channel,         Integer
 
     property  :crypt_packets,   Integer,  :default => 0
@@ -24,8 +24,6 @@ module PatronusFati::DataModels
     has n, :connections,    :constraint => :destroy
     has n, :access_points,  :through    => :connections
 
-    has n, :client_frequencies, :constraint => :destroy
-    has n, :client_signals,     :constraint => :destroy
     has n, :probes,             :constraint => :destroy
 
     belongs_to :mac, :required => false
@@ -52,20 +50,8 @@ module PatronusFati::DataModels
         active: active?,
         connected_access_points: connected_access_points.map(&:bssid),
         probes: probes.map(&:essid),
-        signal_dbm: (client_signals.any? ? client_signals.last.dbm : nil),
         vendor: mac.vendor
       )
     end
-
-    def record_signal(dbm)
-      PatronusFati::DataModels::ClientSignal.create(client: self, dbm: dbm)
-    end
-
-    def update_frequencies(freq_hsh)
-      freq_hsh.each do |freq, packet_count|
-        f = client_frequencies.first_or_create({mhz: freq}, {packet_count: packet_count})
-        f.update({packet_count: packet_count})
-      end
-    end
   end
 end

data/lib/patronus_fati/data_models/ssid.rb

@@ -11,7 +11,7 @@ module PatronusFati::DataModels
     property :beacon_info,  String
 
     property :cloaked,      Boolean,  :default => false
-    property :essid,        String,   :length  => 64
+    property :essid,        String,   :length  => 64, :index => true
     property :crypt_set,    CryptFlags
     property :max_rate,     Integer
 

data/lib/patronus_fati/message_processor/bssid.rb

@@ -11,10 +11,7 @@ module PatronusFati::MessageProcessor::Bssid
 
     ap_info = ap_data(obj.attributes)
     access_point = PatronusFati::DataModels::AccessPoint.first_or_create({bssid: obj.bssid}, ap_info)
-
     access_point.update(ap_info)
-    access_point.record_signal(obj.signal_dbm)
-    access_point.update_frequencies(obj.freqmhz)
 
     nil
   end

data/lib/patronus_fati/message_processor/client.rb

@@ -7,10 +7,7 @@ module PatronusFati::MessageProcessor::Client
 
     client_info = client_data(obj.attributes)
     client = PatronusFati::DataModels::Client.first_or_create({bssid: obj[:mac]}, client_info)
-
     client.update(client_info)
-    client.record_signal(obj.signal_dbm)
-    client.update_frequencies(obj.freqmhz)
 
     # Don't deal in associations that are outside of our connection expiration
     # time...

data/lib/patronus_fati/message_processor.rb

@@ -3,7 +3,7 @@ module PatronusFati
     extend FactoryBase
 
     def self.cleanup_models
-      @next_cleanup ||= 0
+      @next_cleanup ||= Time.now.to_i + 60
 
       if @next_cleanup <= Time.now.to_i
         @next_cleanup = Time.now.to_i + 10
@@ -42,7 +42,7 @@ module PatronusFati
     end
 
     def self.periodic_flush
-      @next_sync ||= 0
+      @next_sync ||= Time.now.to_i + 60
 
       if @next_sync <= Time.now.to_i
         # Add a variability of +/- half an hour within a day

data/lib/patronus_fati/version.rb

@@ -1,3 +1,3 @@
 module PatronusFati
-  VERSION = '0.8.7'
+  VERSION = '0.8.8'
 end

data/lib/patronus_fati.rb

@@ -34,12 +34,8 @@ require 'patronus_fati/message_processor'
 require 'patronus_fati/data_models/common'
 
 require 'patronus_fati/data_models/access_point'
-require 'patronus_fati/data_models/ap_frequency'
-require 'patronus_fati/data_models/ap_signal'
 require 'patronus_fati/data_models/alert'
 require 'patronus_fati/data_models/client'
-require 'patronus_fati/data_models/client_frequency'
-require 'patronus_fati/data_models/client_signal'
 require 'patronus_fati/data_models/connection'
 require 'patronus_fati/data_models/mac'
 require 'patronus_fati/data_models/probe'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: patronus_fati
 version: !ruby/object:Gem::Version
-  version: 0.8.7
+  version: 0.8.8
 platform: ruby
 authors:
 - Sam Stelfox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-08 00:00:00.000000000 Z
+date: 2015-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dm-constraints
@@ -288,11 +288,7 @@ files:
 - 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/ap_frequency.rb
-- lib/patronus_fati/data_models/ap_signal.rb
 - lib/patronus_fati/data_models/client.rb
-- lib/patronus_fati/data_models/client_frequency.rb
-- lib/patronus_fati/data_models/client_signal.rb
 - lib/patronus_fati/data_models/common.rb
 - lib/patronus_fati/data_models/connection.rb
 - lib/patronus_fati/data_models/mac.rb

data/lib/patronus_fati/data_models/ap_frequency.rb

@@ -1,14 +0,0 @@
-module PatronusFati::DataModels
-  class ApFrequency
-    include DataMapper::Resource
-
-    property :mhz,              Integer,  :key => true,
-                                          :required => true
-    property :access_point_id,  Integer,  :key => true,
-                                          :required => true
-    property :packet_count,     Integer,  :default => 0,
-                                          :required => true
-
-    belongs_to :access_point
-  end
-end

data/lib/patronus_fati/data_models/ap_signal.rb

@@ -1,12 +0,0 @@
-module PatronusFati::DataModels
-  class ApSignal
-    include DataMapper::Resource
-
-    property :id,           Serial
-    property :timestamp,    Integer,  :default => Proc.new { Time.now.to_i },
-                                      :required => true
-    property :dbm,          Integer,  :required => true
-
-    belongs_to :access_point
-  end
-end

data/lib/patronus_fati/data_models/client_frequency.rb

@@ -1,14 +0,0 @@
-module PatronusFati::DataModels
-  class ClientFrequency
-    include DataMapper::Resource
-
-    property :mhz,          Integer,  :key => true,
-                                      :required => true
-    property :client_id,    Integer,  :key => true,
-                                      :required => true
-    property :packet_count, Integer,  :default => 0,
-                                      :required => true
-
-    belongs_to :client
-  end
-end

data/lib/patronus_fati/data_models/client_signal.rb

@@ -1,12 +0,0 @@
-module PatronusFati::DataModels
-  class ClientSignal
-    include DataMapper::Resource
-
-    property :id,           Serial
-    property :timestamp,    Integer,  :default => Proc.new { Time.now.to_i },
-                                      :required => true
-    property :dbm,          Integer,  :required => true
-
-    belongs_to :client
-  end
-end