soar_auditing_provider 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebfdb8104eec62c09b2cededb46baf15deef4b7d
-  data.tar.gz: 40402d8ca6b5ba7c9fec5af4d1c4176699fac30d
+  metadata.gz: fa21dcc13f23cdb76ed8a5e73fe8a61e55e31613
+  data.tar.gz: c9817e2b952fab882ed024dcdc6a41db402f4454
 SHA512:
-  metadata.gz: c36e13ea97ff6c23aea46a1f68a01da06dd5de11fe14b8a887852d4de0a3d594cbeb8a482d4e845e22a067b26baa40647f9891eb8f135cfff9647d4897b6a4ff
-  data.tar.gz: dc8575546159d0118be6912b8f31845dfab2eea588817c1cef9038d0cd16120bf4bb35806f0b0c598cee2010cd8abaf83464a9269a69152c92dd16dd420bef29
+  metadata.gz: d09d988d482f05af2a3fef01e46d00e96195ea88411877d71859927ccc149953ea17dd75a847bd74846809991bd08275364d6f3772cfb271485c78f9ce39c3ab
+  data.tar.gz: 91a9f79b34e03b04a5167553db5690286681c276b474069503f2e54b981283de7730dc73b4c08164864600e9f0e2f72741e97e8e96ce6f854a9859cc7f918de6

data/lib/soar_auditing_provider/auditing_provider.rb

@@ -19,6 +19,7 @@ module SoarAuditingProvider
     public
 
     DEFAULT_FLOW_ID_GENERATOR = -> { SoarFlow::ID::generate_flow_id } unless defined?(DEFAULT_FLOW_ID_GENERATOR)
+    DEFAULT_LEVEL = :info unless defined?(DEFAULT_LEVEL)
 
     attr_accessor :service_identifier
     attr_reader   :configuration
@@ -42,7 +43,7 @@ module SoarAuditingProvider
 
     def select_auditor(nfrs)
       select(nfrs)
-      set_audit_level(@configuration['level'].to_sym)
+      set_audit_level(configured_audit_level)
     end
 
     def set_audit_level(level)
@@ -81,7 +82,9 @@ module SoarAuditingProvider
     end
 
     def flush(timeout: 1)
-      @worker.flush(timeout: timeout)
+      if @worker
+        @worker.flush(timeout: timeout)
+      end
     end
 
     def audit_exception(exception:, level: :error, flow_id: nil, message: nil)
@@ -123,10 +126,10 @@ module SoarAuditingProvider
     end
 
     def audit_formatted(level, data)
-      if 'true' == @configuration['direct_auditor_call']
-        super_class_caller(level, data)
-      else
+      if @worker
         enqueue(level, data)
+      else
+        super_class_caller(level, data)
       end
     end
 
@@ -143,7 +146,7 @@ module SoarAuditingProvider
     end
 
     def validate_provider_configuration(configuration)
-      raise 'Missing auditing level' if configuration['level'].nil?
+      raise 'queue_worker required when direct_auditor_call is false' if configuration['direct_auditor_call'] != 'true' and !configuration['queue_worker']
     end
 
     def format(level, data, flow_identifier)
@@ -151,9 +154,13 @@ module SoarAuditingProvider
     end
 
     def create_auditing_worker
-      @worker = AuditingWorker.instance
-      @worker.configure(queue_worker_configuration: @configuration['queue_worker'], auditor_audit_method: method(:super_class_caller))
-      @worker.start
+      if 'true' != @configuration['direct_auditor_call']
+        @worker = AuditingWorker.instance
+        @worker.configure(queue_worker_configuration: @configuration['queue_worker'], auditor_audit_method: method(:super_class_caller))
+        @worker.start
+      else
+        @worker = nil
+      end
     end
 
     def super_class_caller(level, data)
@@ -186,9 +193,13 @@ module SoarAuditingProvider
       @enqueued_audit_events = 0
     end
 
+    def configured_audit_level
+      (@configuration["level"] || DEFAULT_LEVEL).to_sym
+    end
+
     def verbose_status_detail
       {
-        'worker' => @worker.status_detail
+        'worker' => (@worker.status_detail if @worker)
       }
     end
 

data/lib/soar_auditing_provider/version.rb

@@ -1,3 +1,3 @@
 module SoarAuditingProvider
-  VERSION = "1.7.0"
+  VERSION = "1.8.0"
 end

data/sanity/Gemfile

@@ -3,5 +3,3 @@ source 'https://rubygems.org'
 gem 'soar_auditing_provider', :path => "../"
 gem "log4r_auditor", "~> 1.0.0"
 gem "soar_flow", "~> 0.1.1"
-gem "logstash_auditor", "~> 1.0.1"
-gem 'configuration_service-provider-vault'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: soar_auditing_provider
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Ernst van Graan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-01 00:00:00.000000000 Z
+date: 2017-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -223,3 +223,4 @@ signing_key:
 specification_version: 4
 summary: SOAR architecture auditing provider
 test_files: []
+has_rdoc: