tcell_agent 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a8919fddc03b6bf97fc9a8c6bd48d9703d870b9
-  data.tar.gz: df20c9fadd9142dda76a34e9d37b90a351ef781d
+  metadata.gz: f2e3e8eaef2cd61c9cc3effe2b97fa731eeebecf
+  data.tar.gz: a10e24f2d47029ade958ac9b75ebb7f287abd825
 SHA512:
-  metadata.gz: 3fe7bbdebfdb3e6c240e365b8b13a1ebc159e07f8481e9431fc7eb8bda7c61b1054e3d84a282b8c36731aec9bd5ebd8d1bbd369e89a52329ba0f46c884f9e340
-  data.tar.gz: b1c209b6a3ad6dc3e2ceaffcd59e56de1c15fecf0d06a11c75250ae955ca38b62ed7655afedb349eb267c3b88451019c2cd029f66cc883f4470725d804ab7659
+  metadata.gz: e5f0910986b130a99684b68ed99fe5af1bef89f82a9a555a4dc6f233e4580d7ceeaa2b335fe02e85a79a34407d5f41202c14d5c7f3bb7151215a94e04e22e640
+  data.tar.gz: 79176adc5b5892cafcc7da924d1f0fcbcea066af31f2615c1744117975e8eae0a2a91b56f6a32b6638c778f60e09531e703d43275558c04a8d533327a69b7dca

data/lib/tcell_agent.rb

@@ -3,14 +3,6 @@
 require 'tcell_agent/logger'
 require 'tcell_agent/configuration'
 
-module TCellAgent
-  TCellAgent.logger.debug("Instrumenting")
-  if (TCellAgent.configuration.enabled && TCellAgent.configuration.instrument_for_events)
-      require 'tcell_agent/rails' if defined?(Rails)
-      require 'tcell_agent/sinatra' if defined?(Sinatra)
-  end
-end
-
 require 'tcell_agent/agent'
 
 require 'tcell_agent/policies/content_security_policy'

data/lib/tcell_agent/start_background_thread.rb

@@ -5,35 +5,74 @@ require 'tcell_agent/agent'
 require 'tcell_agent/configuration'
 require 'thread'
 
-TCellAgent.thread_agent.start
+module TCellAgent
+  def self.run_instrumentation
+    TCellAgent.logger.debug("Instrumenting")
+    if (TCellAgent.configuration.enabled && TCellAgent.configuration.instrument_for_events)
+        require 'tcell_agent/rails' if defined?(Rails)
+        require 'tcell_agent/sinatra' if defined?(Sinatra)
+    end
+  end
+end
 
 # creates a fork and pipes a string from parent to child
 if File.basename($0) != 'rake'
-  if (File.basename($0) == 'rails' && 
-     ((defined?(Thin) && (Rack::Handler.default == Rack::Handler::Thin)) ||
-      (defined?(WEBrick) && (Rack::Handler.default == Rack::Handler::WEBrick))))
-    TCellAgent.logger.debug("Initializing background thread: Thin")
-    begin
-        TCellAgent.thread_agent.start
-        #TCellAgent.ensure_event_processor_running
-    rescue Exception => e
-      TCellAgent.logger.error("Could not start worker.", e.message)
+  tcell_server = ENV["TCELL_AGENT_SERVER"]
+  if tcell_server == nil
+    if (File.basename($0) == 'rails' && 
+        Rack::Handler.default &&
+       ((defined?(Thin) && (Rack::Handler.default == Rack::Handler::Thin)) ||
+        (defined?(WEBrick) && (Rack::Handler.default == Rack::Handler::WEBrick))))
+      tcell_server = "thin"
+    elsif defined?(Puma) && defined?(Puma.cli_config) && Puma.cli_config.options[:workers] > 1
+      tcell_server = "puma"
+    elsif defined?(Unicorn)
+      tcell_server = "unicorn"
+    elsif defined?(Puma)
+      tcell_server = "thin" 
+    else
+      puts "[tCell.io] **********************************************************************"
+      puts "[tCell.io] Server used to launch rails not recognized."
+      puts "[tCell.io] You can override this with the env variable"
+      puts "[tCell.io]       TCELL_AGENT_SERVER=thin|puma|unicorn"
+      puts "[tCell.io] **********************************************************************"
     end
-  elsif defined?(Puma) && defined?(Puma.cli_config) && Puma.cli_config.options[:workers] > 1
-      agent.start_event_processor(false)
-      # preload app
+  end
+  if tcell_server != nil
+    if (tcell_server == "mock")
+    elsif (tcell_server == "thin" || tcell_server == "webrick")
+      TCellAgent.run_instrumentation
+      TCellAgent.logger.debug("Initializing background thread: Thin or webrick")
+      begin
+          TCellAgent.thread_agent.start
+      rescue Exception => e
+        TCellAgent.logger.error("Could not start worker.", e.message)
+      end
+    elsif (tcell_server == "puma") 
+      TCellAgent.run_instrumentation
       TCellAgent.logger.debug("Initializing background thread: Puma Preload")
+      begin
+          TCellAgent.thread_agent.start
+      rescue Exception => e
+        TCellAgent.logger.error("Could not start worker.", e.message)
+      end
+      # preload app
       puma_worker_start = Proc.new do
         begin
             TCellAgent.thread_agent.start
-            #TCellAgent.ensure_event_processor_running
         rescue Exception => e
           TCellAgent.logger.error("Could not start worker." + e.message)
         end
       end
       Puma.cli_config.options[:before_worker_boot].push(puma_worker_start)
-  elsif defined?(Unicorn)
-      TCellAgent.logger.debug("Initializing background thread: Unicorn Preload")
+    elsif (tcell_server == "unicorn")
+      TCellAgent.run_instrumentation
+      TCellAgent.logger.debug("Initializing background thread: Unicorn")
+      begin
+        TCellAgent.thread_agent.start
+      rescue Exception => e
+        TCellAgent.logger.error("Could not start worker.", e.message)
+      end
       class Unicorn::HttpServer
         alias _tcell_start spawn_missing_workers
         def spawn_missing_workers
@@ -48,20 +87,19 @@ if File.basename($0) != 'rake'
                 TCellAgent.thread_agent.policy_polling_worker_mutex = Mutex.new
                 TCellAgent.thread_agent.policy_polling_thread = nil
                 TCellAgent.thread_agent.start
-                #TCellAgent.ensure_event_processor_running
             rescue Exception => e
                 TCellAgent.logger.error("Could not start worker.")
             end
             start_process
         end
       end
-  else
-      TCellAgent.logger.debug("Initializing background thread (no-preload).")
-      begin
-          TCellAgent.thread_agent.start
-      rescue Exception => e
-        TCellAgent.logger.error("Could not start worker.")
-      end
+    else
+      puts "[tCell.io] **********************************************************************"
+      puts "[tCell.io] Unknown Server for starting rails: #{tcell_server}"
+      puts "[tCell.io] You can override this with the env variable"
+      puts "[tCell.io]       TCELL_AGENT_SERVER=thin|puma|unicorn"
+      puts "[tCell.io] **********************************************************************"    
+    end
   end
 end
 

data/lib/tcell_agent/version.rb

@@ -1,5 +1,5 @@
 # See the file "LICENSE" for the full license governing this code.
 
 module TCellAgent
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/spec/spec_helper.rb

@@ -1,6 +1,8 @@
 require 'rspec'
 require 'rails'
 require 'webmock/rspec'
+
+ENV['TCELL_AGENT_SERVER'] = "mock"
 require File.join(File.dirname(__FILE__), '..', 'lib', 'tcell_agent')
 
 module TCellAgent
@@ -18,3 +20,5 @@ module TCellAgent
     self.thread_agent = thread_agent
   end
 end
+
+TCellAgent.run_instrumentation

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tcell_agent
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Garrett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-08 00:00:00.000000000 Z
+date: 2016-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -117,24 +117,20 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- LICENSE
-- README.md
 - Rakefile
-- bin/tcell_agent
-- lib/tcell_agent.rb
-- lib/tcell_agent/agent.rb
 - lib/tcell_agent/agent/event_processor.rb
 - lib/tcell_agent/agent/fork_pipe_manager.rb
 - lib/tcell_agent/agent/policy_manager.rb
 - lib/tcell_agent/agent/policy_types.rb
 - lib/tcell_agent/agent/route_manager.rb
 - lib/tcell_agent/agent/static_agent.rb
+- lib/tcell_agent/agent.rb
 - lib/tcell_agent/api.rb
-- lib/tcell_agent/appsensor.rb
 - lib/tcell_agent/appsensor/cmdi.rb
 - lib/tcell_agent/appsensor/path_traversal.rb
 - lib/tcell_agent/appsensor/sqli.rb
 - lib/tcell_agent/appsensor/xss.rb
+- lib/tcell_agent/appsensor.rb
 - lib/tcell_agent/authlogic.rb
 - lib/tcell_agent/configuration.rb
 - lib/tcell_agent/devise.rb
@@ -149,7 +145,6 @@ files:
 - lib/tcell_agent/policies/http_tx_policy.rb
 - lib/tcell_agent/policies/login_fraud_policy.rb
 - lib/tcell_agent/policies/secure_headers_policy.rb
-- lib/tcell_agent/rails.rb
 - lib/tcell_agent/rails/auth/authlogic.rb
 - lib/tcell_agent/rails/auth/devise.rb
 - lib/tcell_agent/rails/dlp.rb
@@ -159,6 +154,7 @@ files:
 - lib/tcell_agent/rails/middleware/headers_middleware.rb
 - lib/tcell_agent/rails/routes.rb
 - lib/tcell_agent/rails/settings_reporter.rb
+- lib/tcell_agent/rails.rb
 - lib/tcell_agent/routes/table.rb
 - lib/tcell_agent/sensor_events/app_config.rb
 - lib/tcell_agent/sensor_events/app_sensor.rb
@@ -177,6 +173,7 @@ files:
 - lib/tcell_agent/userinfo.rb
 - lib/tcell_agent/utils/queue_with_timeout.rb
 - lib/tcell_agent/version.rb
+- lib/tcell_agent.rb
 - spec/controllers/application_controller.rb
 - spec/lib/tcell_agent/api/api_spec.rb
 - spec/lib/tcell_agent/appsensor_spec.rb
@@ -198,7 +195,10 @@ files:
 - spec/lib/tcell_agent_spec.rb
 - spec/resources/normal_config.json
 - spec/spec_helper.rb
+- README.md
+- LICENSE
 - tcell_agent.gemspec
+- bin/tcell_agent
 homepage: https://www.tcell.io
 licenses:
 - Copyright (c) 2015 tCell.io (see LICENSE file)
@@ -221,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: tCell.io Agent for Rails & Sinatra