tcell_agent 2.1.1 → 2.4.0

data/spec/lib/tcell_agent/tcell_context_spec.rb

@@ -4,9 +4,9 @@ module TCellAgent
   describe MetaData do
     describe '#set_headers_dict' do
       it 'should set all headers that start with http and skip cookies' do
-        method = remote_address = route_id = session_id = user_id = transaction_id = location = nil
+        method = remote_address = route_id = session_id = user_id = transaction_id = location = reverse_proxy_header_value = nil
 
-        meta = MetaData.new(method, remote_address, route_id, session_id, user_id, transaction_id, location)
+        meta = MetaData.new(method, remote_address, route_id, session_id, user_id, transaction_id, location, reverse_proxy_header_value)
         meta.headers_dict = {
           'rack.version' => [1, 2],
           'REQUEST_METHOD' => 'POST',
@@ -24,9 +24,9 @@ module TCellAgent
       end
 
       it 'should set all headers that start with http and include content_length and content_type' do
-        method = remote_address = route_id = session_id = user_id = transaction_id = location = nil
+        method = remote_address = route_id = session_id = user_id = transaction_id = location = reverse_proxy_header_value = nil
 
-        meta = MetaData.new(method, remote_address, route_id, session_id, user_id, transaction_id, location)
+        meta = MetaData.new(method, remote_address, route_id, session_id, user_id, transaction_id, location, reverse_proxy_header_value)
         meta.headers_dict = {
           'REQUEST_METHOD' => 'POST',
           'HTTP_VERSION' => 'HTTP/1.1',
@@ -71,7 +71,8 @@ module TCellAgent
           'session_id',
           'user_id',
           'transaction_id',
-          'http://test.com'
+          'http://test.com',
+          '0.0.0.0'
         )
       end
 

data/spec/spec_helper.rb

@@ -12,11 +12,19 @@ end
 ENV['TCELL_AGENT_SERVER'] = 'mock'
 require File.join(File.dirname(__FILE__), '..', 'lib', 'tcell_agent')
 
-Dir[File.join(File.dirname(__FILE__), 'support', '**', '*.rb')].each { |f| require f }
+Dir[File.join(File.dirname(__FILE__), 'support', '**', '*.rb')].sort.each { |f| require f }
 
 def get_test_resource_path(name)
   File.join(File.dirname(__FILE__), 'support', 'resources', name)
 end
 
+NEW_FILE_NAME ||= "/tmp/#{SecureRandom.uuid}".freeze
+
 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)
@@ -73,7 +73,8 @@ module TCellAgent
           'session-id',
           'user-id',
           SecureRandom.uuid,
-          'http://domain.com/some/path?hide-my-value=sensitive'
+          'http://domain.com/some/path?hide-my-value=sensitive',
+          '0.0.0.0'
         )
 
         @meta_data.path = '/some/path'

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,21 @@
+# 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
+
+  module Const
+    PUMA_VERSION = "5.1.0"
+  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

data/spec/support/shared_spec.rb

@@ -0,0 +1,29 @@
+def test_ruby2_ruby3_keywords(cls, func, args, options, res, min_ruby = '2.0.0')
+  ruby_version = Gem::Version.new(RUBY_VERSION)
+
+  context 'using ruby2_3 helper function' do
+    after(:each) do
+      expect(@result).to eq res unless res.nil?
+    end
+
+    if ruby_version >= Gem::Version.new(min_ruby) && \
+       ruby_version < Gem::Version.new('3.0.0')
+      # This spec tests the following format:
+      #   File.new('/dev/null', 'w', 0o644, { :binmode => true })
+      it 'behaves correctly in ruby < 2.7' do
+        args_cp = Array.new(args)
+        args_cp << options
+
+        @result = cls.send(func, *args_cp)
+      end
+    end
+
+    if ruby_version >= Gem::Version.new(min_ruby)
+      # This spec tests the following format:
+      #   File.new('/dev/null', 'w', 0o644, :binmode => true )
+      it 'behaves correctly in ruby >= 3.0' do
+        @result = cls.send(func, *args, **options)
+      end
+    end
+  end
+end

data/tcell_agent.gemspec

@@ -6,23 +6,23 @@ require 'tcell_agent/version'
 Gem::Specification.new do |spec|
   spec.name          = 'tcell_agent'
   spec.version       = TCellAgent::VERSION
-  spec.authors       = %w[Rafael]
-  spec.email         = ['rafael@tcell.io']
-  spec.summary       = 'tCell.io Agent for Rails'
-  spec.description   = 'This agent allows users to use the tCell.io service with their Rails app.'
-  spec.homepage      = 'https://www.tcell.io'
-  spec.license       = 'Copyright (c) 2017 tCell.io (see LICENSE file)'
+  spec.authors       = 'Rapid7, Inc.'
+  spec.summary       = 'tCell Agent for Rails'
+  spec.description   = 'This agent allows users to use the tCell service with their Rails app.'
+  spec.homepage      = 'https://www.rapid7.com/tcell'
+  spec.license       = 'Copyright (c) 2020 Rapid7, Inc. (see LICENSE file)'
 
   spec.files = Dir[
-    'Rakefile',
+    'README.md',
+    'LICENSE',
+    'tcell_agent.gemspec',
+    'spec/**/*',
     'lib/tcell_agent.rb',
-    '{lib/tcell_agent,spec}/**/*',
-    'lib/tcell_agent/rust/libtcellagent-*.so',
-    'lib/tcell_agent/rust/libtcellagent-*.dylib',
-    'lib/tcell_agent/rust/tcellagent-*.dll',
-    'README*',
-    'LICENSE*',
-    'tcell_agent.gemspec'
+    'lib/tcell_agent/**/*rb',
+    'lib/tcell_agent/rust/libtcellagent.dylib',
+    'lib/tcell_agent/rust/libtcellagent.so',
+    'lib/tcell_agent/rust/libtcellagent-alpine.so',
+    'lib/tcell_agent/rust/libtcellagent-x64.dll',
   ]
   spec.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tcell_agent
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.4.0
 platform: ruby
 authors:
-- Rafael
+- Rapid7, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-26 00:00:00.000000000 Z
+date: 2021-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -94,10 +94,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: This agent allows users to use the tCell.io service with their Rails
-  app.
-email:
-- rafael@tcell.io
+description: This agent allows users to use the tCell service with their Rails app.
+email: 
 executables:
 - tcell_agent
 extensions: []
@@ -105,24 +103,24 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
-- Rakefile
 - bin/tcell_agent
 - lib/tcell_agent.rb
 - 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
 - lib/tcell_agent/instrumentation/cmdi.rb
 - lib/tcell_agent/instrumentation/lfi.rb
-- lib/tcell_agent/instrumentation/monkey_patches/file.rb
-- lib/tcell_agent/instrumentation/monkey_patches/io.rb
-- lib/tcell_agent/instrumentation/monkey_patches/kernel.rb
+- lib/tcell_agent/instrumentation/monkey_patches/ruby_2/file.rb
+- lib/tcell_agent/instrumentation/monkey_patches/ruby_2/io.rb
+- lib/tcell_agent/instrumentation/monkey_patches/ruby_2/kernel.rb
+- lib/tcell_agent/instrumentation/monkey_patches/ruby_3/file.rb
+- lib/tcell_agent/instrumentation/monkey_patches/ruby_3/io.rb
+- lib/tcell_agent/instrumentation/monkey_patches/ruby_3/kernel.rb
 - lib/tcell_agent/logger.rb
 - lib/tcell_agent/patches.rb
 - lib/tcell_agent/policies/appfirewall_policy.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.18.0.dylib
-- lib/tcell_agent/rust/libtcellagent-4.18.0.so
-- lib/tcell_agent/rust/libtcellagent-alpine-4.18.0.so
+- lib/tcell_agent/rust/libtcellagent-alpine.so
+- lib/tcell_agent/rust/libtcellagent-x64.dll
+- lib/tcell_agent/rust/libtcellagent.dylib
+- lib/tcell_agent/rust/libtcellagent.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.18.0.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,14 @@ 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/cruby_spec_helper.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 +228,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,11 +241,17 @@ 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/shared_spec.rb
 - spec/support/static_agent_overrides.rb
 - tcell_agent.gemspec
-homepage: https://www.tcell.io
+homepage: https://www.rapid7.com/tcell
 licenses:
-- Copyright (c) 2017 tCell.io (see LICENSE file)
+- Copyright (c) 2020 Rapid7, Inc. (see LICENSE file)
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -261,14 +270,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
-summary: tCell.io Agent for Rails
+summary: tCell Agent for Rails
 test_files:
-- spec/lib/tcell_agent/config/unknown_options_spec.rb
+- spec/cruby_spec_helper.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 +310,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 +323,10 @@ 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/shared_spec.rb
 - spec/support/static_agent_overrides.rb

data/Rakefile

@@ -1,18 +0,0 @@
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new(:spec)
-
-desc 'Run tests'
-task :default => [:spec]
-task :test => :spec
-
-task 'init-integration-tests' do
-  system('docker-compose run railsintegration224 bundle install')
-  system('docker-compose run railsintegration224 bundle exec rake db:create db:setup')
-  system('docker-compose stop')
-end
-
-task 'integration-test' do
-  system('docker-compose up railsintegration224')
-  system('docker-compose stop')
-end

data/lib/tcell_agent/authlogic.rb

@@ -1,23 +0,0 @@
-if TCellAgent.configuration.should_instrument_authlogic? && defined?(Authlogic)
-
-  require 'tcell_agent/userinfo'
-
-  module TCellAgent
-    TCellAgent::UserInformation.class_eval do
-      class << self
-        alias_method :original_get_user_from_request, :get_user_from_request
-        def get_user_from_request(request)
-          orig_user_id = original_get_user_from_request(request)
-          begin
-            if request.session && request.session.key?('user_credentials_id')
-              return request.session['user_credentials_id'].to_s
-            end
-          rescue StandardError
-            return orig_user_id
-          end
-          orig_user_id
-        end
-      end
-    end
-  end
-end