patronus_fati 0.9.24 → 0.9.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16a317acf1d621054cb167f661a59626b6abd5f9
-  data.tar.gz: f6a7904b7301861e0866cb87b0ea78f090acc514
+  metadata.gz: 4504c4467db0ddf6060de0a08568462ac8eef16d
+  data.tar.gz: 04b5dbd957cc2c07eee869bd3b65819765c19c99
 SHA512:
-  metadata.gz: bbe5e2c8f3c1fad88e4f1c406b5a572b546d9940e6cf947fcd3e998da7e3ceb4751c26a9db7df9235288e6b5b72dce5f97a98d5154c1d8dd3fb54a4c9febf446
-  data.tar.gz: 093f50a97c650e4bf05ac1998b10c6eb87513501a96bd49e7d48180b053fb846623f8d4ce8bd320f2d17484252622bb996b7a71883f653e17ef8a132748733e5
+  metadata.gz: ab7e424bf53de49f26a09894ce09a53e0d186038340a6dea6085cb278f091073b1079d11c1d11bac10f843908d42bd10d4b6dc6b3a5f510a18193776f3893381
+  data.tar.gz: 27cf289e7c84b3ae0565e171480b289e7407d8d7cdb97e954401f40a6140a5fdabb97e1682001f09c2ae1881d87266b98c06d914002dc36c555f1f30906251bf

data/lib/patronus_fati.rb

@@ -3,6 +3,7 @@ STDOUT.sync = true
 require 'date'
 require 'digest'
 require 'json'
+require 'logger'
 require 'openssl'
 require 'socket'
 require 'timeout'
@@ -52,7 +53,6 @@ module PatronusFati
   end
 
   def self.setup(kismet_server, kismet_port, database_uri)
-    #DataMapper::Logger.new('pf-db.log', :debug)
     DataMapper.setup(:default, database_uri)
     DataMapper.repository(:default).adapter.resource_naming_convention = PatronusFati::NullTablePrefix
     DataMapper.finalize
@@ -61,6 +61,13 @@ module PatronusFati
     PatronusFati::Connection.new(kismet_server, kismet_port)
   end
 
+  def logger
+    @logger ||= Logger.new
+  end
+
+  def logger=(logger)
+    @logger = logger
+
   def self.startup_time
     @@startup_time
   end

data/lib/patronus_fati/connection.rb

@@ -60,8 +60,10 @@ module PatronusFati
         rescue IOError, EOFError => e
           raise DisconnectError
         rescue => e
-          $stderr.puts format('Error in read thread: %s %s', e.class.to_s, e.message)
-          $stderr.puts e.backtrace
+          PatronusFati.logger.error(format('Error in read thread: %s %s', e.class.to_s, e.message))
+          e.backtrace.each do |l|
+            PatronusFati.logger.error(l)
+          end
         ensure
           socket.close if socket && !socket.closed?
         end
@@ -77,8 +79,10 @@ module PatronusFati
             count += 1
           end
         rescue => e
-          $stderr.puts format('Error in write thread: %s %s', e.class.to_s, e.message)
-          $stderr.puts e.backtrace
+          PatronusFati.logger.error(format('Error in write thread: %s %s', e.class.to_s, e.message))
+          e.backtrace.each do |l|
+            PatronusFati.logger.error(l)
+          end
         ensure
           socket.close if socket && !socket.closed?
         end

data/lib/patronus_fati/data_observers/connection_observer.rb

@@ -42,7 +42,7 @@ module PatronusFati::DataObservers
           )
         else
           # Weird situation, new record that is already disconnected...
-          warn('Connection (%i) created that is already disconnected' % id)
+          PatronusFati.logger.warn('Connection (%i) created that is already disconnected' % id)
         end
       else
         if @change_list.keys.include?('disconnected_at') && @change_list['disconnected_at'][0] == nil && !disconnected_at.nil?
@@ -52,7 +52,7 @@ module PatronusFati::DataObservers
             self.full_state.merge(duration: duration)
           )
         else
-          warn('Connection (%i) updated in a weird way: %s' % [id, @change_list.inspect])
+          PatronusFati.logger.warn('Connection (%i) updated in a weird way: %s' % [id, @change_list.inspect])
         end
       end
 

data/lib/patronus_fati/factory_base.rb

@@ -21,8 +21,7 @@ module PatronusFati
     def factory(type, opts = {})
       return if ignored_types.include?(type)
       if registered_factories[type].nil?
-        warn("Unknown factory #{type} (Available: #{registered_factories.keys})")
-        #puts opts.inspect
+        PatronusFati.logger.warn("Unknown factory #{type} (Available: #{registered_factories.keys})")
         return
       end
       registered_factories[type].process(opts)

data/lib/patronus_fati/message_parser.rb

@@ -9,7 +9,7 @@ module PatronusFati
       return unless (raw_data = handle_msg(msg))
 
       unless (cap = get_model(raw_data[0]))
-        warn('Message received had unknown message type: ' + raw_data[0])
+        PatronusFati.logger.warn('Message received had unknown message type: ' + raw_data[0])
         return
       end
 

data/lib/patronus_fati/message_processor.rb

@@ -86,14 +86,16 @@ module PatronusFati
     rescue DataObjects::SyntaxError => e
       # SQLite dropped our database. We need to log the condition and bail out
       # of the program completely.
-      puts 'SQLite dropped our database: %s: %s' % [e.class, e.message]
-      puts 'Exiting since we don\'t have a database...'
+      PatronusFati.logger.error('SQLite dropped our database: %s: %s' % [e.class, e.message])
+      PatronusFati.logger.error('Exiting since we don\'t have a database...')
       exit 1
     rescue => e
-      puts 'Error processing the following message object:'
-      puts message_obj.inspect
-      puts '%s: %s' % [e.class, e.message]
-      puts e.backtrace.join("\n")
+      PatronusFati.logger.error('Error processing the following message object:')
+      PatronusFati.logger.error(message_obj.inspect)
+      PatronusFati.logger.error('%s: %s' % [e.class, e.message])
+      e.backtrace.each do |l|
+        PatronusFati.logger.error(l)
+      end
     end
 
     def self.ignored_types

data/lib/patronus_fati/message_processor/critfail.rb

@@ -2,7 +2,7 @@ module PatronusFati::MessageProcessor::Critfail
   include PatronusFati::MessageProcessor
 
   def self.process(opts)
-    puts ('Critical fail message: %s' % opts.message)
+    PatronusFati.logger.error('Critical fail message: %s' % opts.message)
     nil
   end
 end

data/lib/patronus_fati/message_processor/error.rb

@@ -2,6 +2,6 @@ module PatronusFati::MessageProcessor::Error
   include PatronusFati::MessageProcessor
 
   def self.process(opts)
-    warn('Failed command ID %i with error: %s' % [opts.cmdid, opts.text])
+    PatronusFati.logger.warn('Failed command ID %i with error: %s' % [opts.cmdid, opts.text])
   end
 end

data/lib/patronus_fati/message_processor/ssid.rb

@@ -29,9 +29,6 @@ module PatronusFati::MessageProcessor::Ssid
 
       return if obj[:ssid].nil? || obj[:ssid].empty?
       client.probes.first_or_create(essid: obj[:ssid])
-    else
-      # The only thing left is the 'file' type which no one seems to understand
-      #puts ('Unknown SSID type (%s): %s' % [obj[:type], obj.inspect])
     end
 
     nil

data/lib/patronus_fati/message_processor/terminate.rb

@@ -2,8 +2,7 @@ module PatronusFati::MessageProcessor::Terminate
   include PatronusFati::MessageProcessor
 
   def self.process(obj)
-    puts 'Kismet announced it\'s intention to gracefully terminate'
-
+    PatronusFati.logger.info('Kismet announced it\'s intention to gracefully terminate')
     nil
   end
 end

data/lib/patronus_fati/version.rb

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

data/spec/data_models/access_point_spec.rb

@@ -15,12 +15,4 @@ RSpec.describe 'DataModels::AccessPoint' do
   it { expect(subject).to have_many(:ssids) }
 
   it { expect(subject).to have_many(:clients).through(:connections) }
-
-  it { expect(subject).to belong_to(:mac) }
-
-  it 'should associate to a MAC object before saving' do
-    expect(unsaved_instance.mac).to be_nil
-    unsaved_instance.save
-    expect(unsaved_instance.mac).to be_instance_of(PatronusFati::DataModels::Mac)
-  end
 end

data/spec/data_models/client_spec.rb

@@ -14,12 +14,4 @@ RSpec.describe 'DataModels::Client' do
 
   it { expect(subject).to have_many(:connections) }
   it { expect(subject).to have_many(:access_points).through(:connections) }
-
-  it { expect(subject).to belong_to(:mac) }
-
-  it 'should associate to a MAC object before saving' do
-    expect(unsaved_instance.mac).to be_nil
-    unsaved_instance.save
-    expect(unsaved_instance.mac).to be_instance_of(PatronusFati::DataModels::Mac)
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: patronus_fati
 version: !ruby/object:Gem::Version
-  version: 0.9.24
+  version: 0.9.30
 platform: ruby
 authors:
 - Sam Stelfox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-25 00:00:00.000000000 Z
+date: 2017-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dm-constraints
@@ -345,10 +345,8 @@ files:
 - lib/patronus_fati/version.rb
 - patronus_fati.gemspec
 - spec/data_models/access_point_spec.rb
-- spec/data_models/alert_spec.rb
 - spec/data_models/client_spec.rb
 - spec/data_models/connection_spec.rb
-- spec/data_models/mac_spec.rb
 - spec/patronus_fati_spec.rb
 - spec/spec_helper.rb
 homepage: ''
@@ -371,15 +369,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A ruby implementation of the Kismet client protocol.
 test_files:
 - spec/data_models/access_point_spec.rb
-- spec/data_models/alert_spec.rb
 - spec/data_models/client_spec.rb
 - spec/data_models/connection_spec.rb
-- spec/data_models/mac_spec.rb
 - spec/patronus_fati_spec.rb
 - spec/spec_helper.rb
+has_rdoc: 

data/spec/data_models/alert_spec.rb

@@ -1,12 +0,0 @@
-require 'spec_helper'
-
-RSpec.describe 'DataModels::Alert' do
-  subject { PatronusFati::DataModels::Alert }
-
-  it { expect(subject).to have_property(:created_at) }
-  it { expect(subject).to have_property(:message) }
-
-  it { expect(subject).to belong_to(:src_mac) }
-  it { expect(subject).to belong_to(:dst_mac) }
-  it { expect(subject).to belong_to(:other_mac) }
-end

data/spec/data_models/mac_spec.rb

@@ -1,26 +0,0 @@
-require 'spec_helper'
-
-RSpec.describe 'DataModels::Mac' do
-  subject { PatronusFati::DataModels::Mac }
-
-  let(:unsaved_instance) { subject.new(mac: '00:12:34:00:00:00') }
-  let(:saved_instance)   { unsaved_instance.save }
-
-  it { expect(subject).to have_property(:mac) }
-  it { expect(subject).to have_property(:vendor) }
-
-  it { expect(subject).to have_many(:access_points) }
-  it { expect(subject).to have_many(:clients) }
-
-  it { expect(subject).to have_many(:dst_alerts) }
-  it { expect(subject).to have_many(:other_alerts) }
-  it { expect(subject).to have_many(:src_alerts) }
-
-  # This is a tad bit annoying, data mapper generates Ruby warnings about
-  # uninitialized instance variables.
-  it 'should set the vendor on the MAC object before saving' do
-    expect(unsaved_instance.vendor).to be_nil
-    unsaved_instance.save
-    expect(unsaved_instance.vendor).to_not be_nil
-  end
-end