tcell_agent 2.1.0 → 2.3.0

data/spec/lib/tcell_agent/instrumentation/lfi_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 module TCellAgent
   module Instrumentation
     module Lfi
-      describe 'extract path and mode' do
+      describe '.extract_path_mode' do
         context 'with path' do
           it 'should extract the path correctly' do
             args = '/path-to-file'
@@ -34,51 +34,91 @@ module TCellAgent
               args = '/path-to-file', 'r'
               _path, mode = TCellAgent::Instrumentation::Lfi.extract_path_mode(*args)
               expect(mode).to eq('Read')
+
+              args = '/path-to-file', { :mode => 'r' }
+              _path, mode = TCellAgent::Instrumentation::Lfi.extract_path_mode(*args)
+              expect(mode).to eq('Read')
             end
             it 'should return Write for mode w' do
               args = '/path-to-file', 'w'
               _path, mode = TCellAgent::Instrumentation::Lfi.extract_path_mode(*args)
               expect(mode).to eq('Write')
+
+              args = '/path-to-file', { :mode => 'w' }
+              _path, mode = TCellAgent::Instrumentation::Lfi.extract_path_mode(*args)
+              expect(mode).to eq('Write')
             end
             it 'should return Write for mode a' do
               args = '/path-to-file', 'a'
               _path, mode = TCellAgent::Instrumentation::Lfi.extract_path_mode(*args)
               expect(mode).to eq('Write')
+
+              args = '/path-to-file', { :mode => 'a' }
+              _path, mode = TCellAgent::Instrumentation::Lfi.extract_path_mode(*args)
+              expect(mode).to eq('Write')
             end
             it 'should return ReadWrite for mode r+' do
               args = '/path-to-file', 'r+'
               _path, mode = TCellAgent::Instrumentation::Lfi.extract_path_mode(*args)
               expect(mode).to eq('ReadWrite')
+
+              args = '/path-to-file', { :mode => 'r+' }
+              _path, mode = TCellAgent::Instrumentation::Lfi.extract_path_mode(*args)
+              expect(mode).to eq('ReadWrite')
             end
             it 'should return ReadWrite for mode w+' do
               args = '/path-to-file', 'w+'
               _path, mode = TCellAgent::Instrumentation::Lfi.extract_path_mode(*args)
               expect(mode).to eq('ReadWrite')
+
+              args = '/path-to-file', { :mode => 'w+' }
+              _path, mode = TCellAgent::Instrumentation::Lfi.extract_path_mode(*args)
+              expect(mode).to eq('ReadWrite')
             end
             it 'should return ReadWrite for mode a+' do
               args = '/path-to-file', 'a+'
               _path, mode = TCellAgent::Instrumentation::Lfi.extract_path_mode(*args)
               expect(mode).to eq('ReadWrite')
+
+              args = '/path-to-file', { :mode => 'a+' }
+              _path, mode = TCellAgent::Instrumentation::Lfi.extract_path_mode(*args)
+              expect(mode).to eq('ReadWrite')
             end
             it 'should return Read for mode ::File::RDONLY (0)' do
               args = '/path-to-file', ::File::RDONLY
               _path, mode = TCellAgent::Instrumentation::Lfi.extract_path_mode(*args)
               expect(mode).to eq('Read')
+
+              args = '/path-to-file', { :mode => ::File::RDONLY }
+              _path, mode = TCellAgent::Instrumentation::Lfi.extract_path_mode(*args)
+              expect(mode).to eq('Read')
             end
             it 'should return Write for mode ::File::WRONLY (1)' do
               args = '/path-to-file', ::File::WRONLY
               _path, mode = TCellAgent::Instrumentation::Lfi.extract_path_mode(*args)
               expect(mode).to eq('Write')
+
+              args = '/path-to-file', { :mode => ::File::WRONLY }
+              _path, mode = TCellAgent::Instrumentation::Lfi.extract_path_mode(*args)
+              expect(mode).to eq('Write')
             end
             it 'should return ReadWrite for mode ::File::RDWR (2)' do
               args = '/path-to-file', ::File::RDWR
               _path, mode = TCellAgent::Instrumentation::Lfi.extract_path_mode(*args)
               expect(mode).to eq('ReadWrite')
+
+              args = '/path-to-file', { :mode => ::File::RDWR }
+              _path, mode = TCellAgent::Instrumentation::Lfi.extract_path_mode(*args)
+              expect(mode).to eq('ReadWrite')
             end
             it 'should return Write for mode ::File::CREAT | ::File::EXCL | ::File::WRONLY (2561)' do
               args = '/path-to-file', ::File::CREAT | ::File::EXCL | ::File::WRONLY
               _path, mode = TCellAgent::Instrumentation::Lfi.extract_path_mode(*args)
               expect(mode).to eq('Write')
+
+              args = '/path-to-file', { :mode => ::File::CREAT | ::File::EXCL | ::File::WRONLY }
+              _path, mode = TCellAgent::Instrumentation::Lfi.extract_path_mode(*args)
+              expect(mode).to eq('Write')
             end
           end
           context 'with an invalid mode' do
@@ -87,11 +127,16 @@ module TCellAgent
               _path, mode = TCellAgent::Instrumentation::Lfi.extract_path_mode(*args)
               expect(mode).to eq('Read')
             end
-            it 'should return Read when mode is a hash' do
+            it 'should return Read when mode is an empty hash' do
               args = '/path-to-file', {}
               _path, mode = TCellAgent::Instrumentation::Lfi.extract_path_mode(*args)
               expect(mode).to eq('Read')
             end
+            it 'should return Read when mode is a hash without a :mode key' do
+              args = '/path-to-file', { :placeholder => 'testing' }
+              _path, mode = TCellAgent::Instrumentation::Lfi.extract_path_mode(*args)
+              expect(mode).to eq('Read')
+            end
             it 'should return Read when mode is an array' do
               args = '/path-to-file', []
               _path, mode = TCellAgent::Instrumentation::Lfi.extract_path_mode(*args)

data/spec/lib/tcell_agent/rust/agent_config_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+module TCellAgent
+  module Rust
+    describe AgentConfig do
+      context 'with initializers set' do
+        before do
+          TCellAgent.configure do |config|
+            config.app_id = 'initializer_app_id_set'
+            config.api_key = 'initializer_api_key_set'
+            config.enabled_instrumentations = { 'authlogic' => false, :devise => false, 'doorkeeper' => false }
+            config.hmac_key = config.app_id
+          end
+        end
+        it 'should return the correct values' do
+          config = AgentConfig.new(TCellAgent.initializer_configuration)
+
+          expect(config['agent_type']).to eq 'Ruby'
+          expect(config['overrides']['disabled_instrumentation']).to contain_exactly('authlogic', 'devise', 'doorkeeper')
+          expect(config['overrides']['applications'][0][:api_key]).to eq 'initializer_api_key_set'
+          expect(config['overrides']['applications'][0][:app_id]).to eq 'initializer_app_id_set'
+          expect(config['overrides']['applications'][0][:api_key]).to eq 'initializer_api_key_set'
+        end
+      end
+    end
+  end
+end

data/spec/lib/tcell_agent/settings_reporter_spec.rb

@@ -14,7 +14,6 @@ module TCellAgent
                              :reverse_proxy => true,
                              :reverse_proxy_ip_address_header => nil,
                              :log_filename => 'log-filename',
-                             :config_filename => 'config-filename',
                              :agent_log_dir => 'agent-log-dir',
                              :agent_home_dir => 'agent-home-dir',
                              :agent_home_owner => nil,
@@ -57,78 +56,6 @@ module TCellAgent
           'value' => 'true'
         }
       )
-      expect(TCellAgent).to receive(:send_event).with(
-        {
-          'event_type' => 'app_config_setting',
-          'package' => 'tcell',
-          'section' => 'config',
-          'name' => 'allow_payloads',
-          'value' => 'true'
-        }
-      )
-      expect(TCellAgent).to receive(:send_event).with(
-        {
-          'event_type' => 'app_config_setting',
-          'package' => 'tcell',
-          'section' => 'config',
-          'name' => 'reverse_proxy',
-          'value' => 'true'
-        }
-      )
-      expect(TCellAgent).to receive(:send_event).with(
-        {
-          'event_type' => 'app_config_setting',
-          'package' => 'tcell',
-          'section' => 'config',
-          'name' => 'config_filename',
-          'value' => 'config-filename'
-        }
-      )
-      expect(TCellAgent).to receive(:send_event).with(
-        {
-          'event_type' => 'app_config_setting',
-          'package' => 'tcell',
-          'section' => 'config',
-          'name' => 'logging_directory',
-          'value' => 'agent-log-dir'
-        }
-      )
-      expect(TCellAgent).to receive(:send_event).with(
-        {
-          'event_type' => 'app_config_setting',
-          'package' => 'tcell',
-          'section' => 'config',
-          'name' => 'agent_home_directory',
-          'value' => 'agent-home-dir'
-        }
-      )
-      expect(TCellAgent).to receive(:send_event).with(
-        {
-          'event_type' => 'app_config_setting',
-          'package' => 'tcell',
-          'section' => 'config',
-          'name' => 'logging_enabled',
-          'value' => 'true'
-        }
-      )
-      expect(TCellAgent).to receive(:send_event).with(
-        {
-          'event_type' => 'app_config_setting',
-          'package' => 'tcell',
-          'section' => 'config',
-          'name' => 'logging_level',
-          'value' => 'INFO'
-        }
-      )
-      expect(TCellAgent).to receive(:send_event).with(
-        {
-          'event_type' => 'app_config_setting',
-          'package' => 'tcell',
-          'section' => 'config',
-          'name' => 'reverse_proxy_ip_address_header',
-          'value' => ''
-        }
-      )
 
       TCellAgent.report_settings
     end

data/spec/spec_helper.rb

@@ -20,3 +20,9 @@ end
 
 require 'tcell_agent/agent'
 require 'tcell_agent/rails/routes'
+
+TCellAgent.configuration.enabled = true
+TCellAgent.configuration.instrument = true
+TCellAgent.configuration.enable_intercept_requests = true
+TCellAgent.configuration.disabled_instrumentation = []
+TCellAgent.thread_agent.instrument_built_ins

data/spec/support/builders.rb

@@ -1,12 +1,11 @@
 require 'spec_helper'
+require 'tcell_agent/config_initializer'
+
 module TCellAgent
   module Tests
     class ConfigurationBuilder
       def initialize
-        @configuration = TCellAgent::Configuration.new
-        @configuration.config_filename = 'tcell_agent.config'
-        @configuration.demomode = false
-        @configuration.enable_event_manager = false
+        @configuration = TCellAgent::ConfigInitializer.new
         @configuration.fetch_policies_from_tcell = false
         @configuration.max_csp_header_bytes = nil
         @configuration.app_id = 'TestAppId-AppId'
@@ -18,11 +17,12 @@ module TCellAgent
         @configuration.allow_payloads = true
         @configuration.js_agent_api_base_url = @configuration.tcell_api_url
         @configuration.js_agent_url = 'https://jsagent.tcell.io/tcellagent.min.js'
-        @configuration.cache_folder = nil
         @configuration.agent_log_dir = 'tcell/logs'
-        @configuration.logging_options = { 'enabled' => false }
+        @configuration.logging_options = { :enabled => false }
         @configuration.host_identifier = 'python-test-suite'
         @configuration.reverse_proxy_ip_address_header = 'X-Forwarded-For'
+        @configuration.enable_intercept_requests = true
+        @configuration.enabled = true
       end
 
       def update_attribute(attribute, setting)

data/spec/support/server_mocks/passenger_mock.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module PhusionPassenger
+  module LoaderSharedHelpers
+    def before_handling_requests; end
+  end
+end

data/spec/support/server_mocks/puma_mock.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Puma
+  class Server
+    def run; end
+  end
+
+  class Config
+    def self.options
+      {}
+    end
+  end
+
+  def self.cli_config
+    Config
+  end
+end

data/spec/support/server_mocks/rails_mock.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Rails
+  module Server
+    def build_app; end
+  end
+end

data/spec/support/server_mocks/thin_mock.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Thin
+  module Server
+    def start; end
+  end
+end

data/spec/support/server_mocks/unicorn_mock.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Unicorn
+  class HttpServer
+    START_CTX = {}.freeze
+
+    def init_worker_process; end
+
+    def load_config!; end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tcell_agent
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Rafael
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-08 00:00:00.000000000 Z
+date: 2020-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -111,10 +111,8 @@ files:
 - lib/tcell_agent/agent.rb
 - lib/tcell_agent/agent/route_manager.rb
 - lib/tcell_agent/agent/static_agent.rb
-- lib/tcell_agent/authlogic.rb
-- lib/tcell_agent/config/unknown_options.rb
+- lib/tcell_agent/config_initializer.rb
 - lib/tcell_agent/configuration.rb
-- lib/tcell_agent/devise.rb
 - lib/tcell_agent/hooks/login_fraud.rb
 - lib/tcell_agent/instrument_servers.rb
 - lib/tcell_agent/instrumentation.rb
@@ -140,8 +138,11 @@ files:
 - lib/tcell_agent/policies/policy_types.rb
 - lib/tcell_agent/policies/system_enablements.rb
 - lib/tcell_agent/rails/auth/authlogic.rb
+- lib/tcell_agent/rails/auth/authlogic_helper.rb
 - lib/tcell_agent/rails/auth/devise.rb
+- lib/tcell_agent/rails/auth/devise_helper.rb
 - lib/tcell_agent/rails/auth/doorkeeper.rb
+- lib/tcell_agent/rails/auth/userinfo.rb
 - lib/tcell_agent/rails/better_ip.rb
 - lib/tcell_agent/rails/csrf_exception.rb
 - lib/tcell_agent/rails/dlp.rb
@@ -152,24 +153,24 @@ files:
 - lib/tcell_agent/rails/middleware/context_middleware.rb
 - lib/tcell_agent/rails/middleware/global_middleware.rb
 - lib/tcell_agent/rails/middleware/headers_middleware.rb
-- lib/tcell_agent/rails/on_start.rb
+- lib/tcell_agent/rails/railties/tcell_agent_railties.rb
+- lib/tcell_agent/rails/railties/tcell_agent_unicorn_railties.rb
 - lib/tcell_agent/rails/responses.rb
 - lib/tcell_agent/rails/routes.rb
 - lib/tcell_agent/rails/routes/grape.rb
 - lib/tcell_agent/rails/routes/route_id.rb
 - lib/tcell_agent/rails/settings_reporter.rb
-- lib/tcell_agent/rails/start_agent_after_initializers.rb
 - lib/tcell_agent/rails/tcell_body_proxy.rb
 - lib/tcell_agent/routes/table.rb
 - lib/tcell_agent/rust/agent_config.rb
-- lib/tcell_agent/rust/libtcellagent-4.17.1.dylib
-- lib/tcell_agent/rust/libtcellagent-4.17.1.so
-- lib/tcell_agent/rust/libtcellagent-alpine-4.17.1.so
+- lib/tcell_agent/rust/libtcellagent-6.2.1.dylib
+- lib/tcell_agent/rust/libtcellagent-6.2.1.so
+- lib/tcell_agent/rust/libtcellagent-alpine-6.2.1.so
 - lib/tcell_agent/rust/models.rb
 - lib/tcell_agent/rust/native_agent.rb
 - lib/tcell_agent/rust/native_agent_response.rb
 - lib/tcell_agent/rust/native_library.rb
-- lib/tcell_agent/rust/tcellagent-4.17.1.dll
+- lib/tcell_agent/rust/tcellagent-6.2.1.dll
 - lib/tcell_agent/sensor_events/agent_setting_event.rb
 - lib/tcell_agent/sensor_events/app_config_setting_event.rb
 - lib/tcell_agent/sensor_events/discovery.rb
@@ -180,6 +181,7 @@ files:
 - lib/tcell_agent/sensor_events/util/utils.rb
 - lib/tcell_agent/servers/passenger.rb
 - lib/tcell_agent/servers/puma.rb
+- lib/tcell_agent/servers/rack_puma_handler.rb
 - lib/tcell_agent/servers/rails_server.rb
 - lib/tcell_agent/servers/thin.rb
 - lib/tcell_agent/servers/unicorn.rb
@@ -187,14 +189,13 @@ files:
 - lib/tcell_agent/settings_reporter.rb
 - lib/tcell_agent/sinatra.rb
 - lib/tcell_agent/tcell_context.rb
-- lib/tcell_agent/userinfo.rb
 - lib/tcell_agent/utils/headers.rb
 - lib/tcell_agent/utils/params.rb
 - lib/tcell_agent/utils/strings.rb
 - lib/tcell_agent/version.rb
-- spec/lib/tcell_agent/config/unknown_options_spec.rb
 - spec/lib/tcell_agent/configuration_spec.rb
 - spec/lib/tcell_agent/hooks/login_fraud_spec.rb
+- spec/lib/tcell_agent/instrument_servers_spec.rb
 - spec/lib/tcell_agent/instrumentation/cmdi/io_cmdi_spec.rb
 - spec/lib/tcell_agent/instrumentation/cmdi/kernel_cmdi_spec.rb
 - spec/lib/tcell_agent/instrumentation/cmdi_spec.rb
@@ -226,6 +227,7 @@ files:
 - spec/lib/tcell_agent/rails/routes/route_id_spec.rb
 - spec/lib/tcell_agent/rails/routes/routes_spec.rb
 - spec/lib/tcell_agent/rails_spec.rb
+- spec/lib/tcell_agent/rust/agent_config_spec.rb
 - spec/lib/tcell_agent/sensor_events/dlp_spec.rb
 - spec/lib/tcell_agent/sensor_events/util/sanitizer_utilities_spec.rb
 - spec/lib/tcell_agent/settings_reporter_spec.rb
@@ -238,6 +240,11 @@ files:
 - spec/support/middleware_helper.rb
 - spec/support/resources/lfi_sample_file.txt
 - spec/support/resources/normal_config.json
+- spec/support/server_mocks/passenger_mock.rb
+- spec/support/server_mocks/puma_mock.rb
+- spec/support/server_mocks/rails_mock.rb
+- spec/support/server_mocks/thin_mock.rb
+- spec/support/server_mocks/unicorn_mock.rb
 - spec/support/static_agent_overrides.rb
 - tcell_agent.gemspec
 homepage: https://www.tcell.io
@@ -266,9 +273,9 @@ signing_key:
 specification_version: 4
 summary: tCell.io Agent for Rails
 test_files:
-- spec/lib/tcell_agent/config/unknown_options_spec.rb
 - spec/lib/tcell_agent/configuration_spec.rb
 - spec/lib/tcell_agent/hooks/login_fraud_spec.rb
+- spec/lib/tcell_agent/instrument_servers_spec.rb
 - spec/lib/tcell_agent/instrumentation/cmdi/io_cmdi_spec.rb
 - spec/lib/tcell_agent/instrumentation/cmdi/kernel_cmdi_spec.rb
 - spec/lib/tcell_agent/instrumentation/cmdi_spec.rb
@@ -300,6 +307,7 @@ test_files:
 - spec/lib/tcell_agent/rails/routes/route_id_spec.rb
 - spec/lib/tcell_agent/rails/routes/routes_spec.rb
 - spec/lib/tcell_agent/rails_spec.rb
+- spec/lib/tcell_agent/rust/agent_config_spec.rb
 - spec/lib/tcell_agent/sensor_events/dlp_spec.rb
 - spec/lib/tcell_agent/sensor_events/util/sanitizer_utilities_spec.rb
 - spec/lib/tcell_agent/settings_reporter_spec.rb
@@ -312,4 +320,9 @@ test_files:
 - spec/support/middleware_helper.rb
 - spec/support/resources/lfi_sample_file.txt
 - spec/support/resources/normal_config.json
+- spec/support/server_mocks/passenger_mock.rb
+- spec/support/server_mocks/puma_mock.rb
+- spec/support/server_mocks/rails_mock.rb
+- spec/support/server_mocks/thin_mock.rb
+- spec/support/server_mocks/unicorn_mock.rb
 - spec/support/static_agent_overrides.rb