tcell_agent 2.3.0 → 2.4.0

data/spec/lib/tcell_agent/policies/secure_headers_policy_spec.rb

@@ -1,4 +1,3 @@
-
 require 'spec_helper'
 
 module TCellAgent
@@ -16,13 +15,7 @@ module TCellAgent
             ).update_attribute(
               'route_id', 'route-id'
             ).build
-          end
 
-          after(:each) do
-            TCellAgent::Rust::NativeAgent.free_agent(@native_agent.agent_ptr)
-          end
-
-          it 'should return csp header' do
             enablements = @native_agent.update_policies(
               {
                 'secure-headers' => {
@@ -41,14 +34,27 @@ module TCellAgent
 
             @policy = HeadersPolicy.new(@native_agent, enablements)
             expect(@policy.enabled).to eq(true)
+          end
 
+          after(:each) do
+            TCellAgent::Rust::NativeAgent.free_agent(@native_agent.agent_ptr)
+          end
+
+          it 'should return csp header' do
             expect(
-              @policy.get_headers(@tcell_context)
+              @policy.get_headers('text/html', @tcell_context)
             ).to eq(
               [{ 'name' => 'X-Content-Type-Options',
                  'value' => 'nosniff' }]
             )
           end
+
+          it 'should not return csp header on json' do
+            expect(
+              @policy.get_headers('application/json', @tcell_context)
+            ).to eq( [] )
+
+          end
         end
       end
     end

data/spec/lib/tcell_agent/rails/better_ip_spec.rb

@@ -4,37 +4,34 @@ module TCellAgent
   module Utils
     describe '.better_ip' do
       context 'with reverse_proxy off' do
-        it 'should return the normal ip' do
+        it 'returns null' do
           configuration = double('configuration')
           request = double('request', :ip => '127.0.0.0')
 
           expect(TCellAgent).to receive(:configuration).and_return(configuration)
           expect(configuration).to receive(:reverse_proxy).and_return(false)
-          expect(Rails.better_ip(request)).to eq('127.0.0.0')
+          expect(Rails.reverse_proxy_header(request)).to eq(nil)
         end
       end
 
       context 'with reverse_proxy on' do
         context 'with empty reverse_proxy_ip_address_header' do
-          it 'should return normal ip' do
+          it 'returns null' do
             configuration = double('configuration')
             request = double('request', :ip => '127.0.0.0')
-            env = double('env')
 
             expect(TCellAgent).to receive(:configuration).and_return(configuration)
             expect(configuration).to receive(:reverse_proxy).and_return(true)
             expect(TCellAgent).to receive(:configuration).and_return(configuration)
             expect(configuration).to receive(:reverse_proxy_ip_address_header).and_return('')
-            expect(request).to receive(:env).and_return(env)
-            expect(env).to receive(:[]).with('HTTP_X_FORWARDED_FOR').and_return('')
-            expect(Rails.better_ip(request)).to eq('127.0.0.0')
+            expect(Rails.reverse_proxy_header(request)).to eq(nil)
           end
         end
 
         context "with reverse_proxy_ip_address_header that doesn't exist" do
-          it 'should return normal ip' do
+          it 'returns null' do
             configuration = double('configuration')
-            request = double('request', :ip => '127.0.0.0')
+            request = double('request', :ip => '127.0.0.0', :env => {})
             env = double('env')
 
             expect(TCellAgent).to receive(:configuration).and_return(configuration)
@@ -45,7 +42,7 @@ module TCellAgent
             )
             expect(request).to receive(:env).and_return(env)
             expect(env).to receive(:[]).with('HTTP_WEIRD_HTTP_PROXY_HEADER').and_return(nil)
-            expect(Rails.better_ip(request)).to eq('127.0.0.0')
+            expect(Rails.reverse_proxy_header(request)).to eq(nil)
           end
         end
 
@@ -57,13 +54,14 @@ module TCellAgent
 
             expect(TCellAgent).to receive(:configuration).and_return(configuration)
             expect(configuration).to receive(:reverse_proxy).and_return(true)
+
             expect(TCellAgent).to receive(:configuration).and_return(configuration)
             expect(configuration).to receive(:reverse_proxy_ip_address_header).and_return(
               'X-Real-IP'
             )
             expect(request).to receive(:env).and_return(env)
             expect(env).to receive(:[]).with('HTTP_X_REAL_IP').and_return('192.168.99.100')
-            expect(Rails.better_ip(request)).to eq('192.168.99.100')
+            expect(Rails.reverse_proxy_header(request)).to eq('192.168.99.100')
           end
         end
       end

data/spec/lib/tcell_agent/rails/csrf_exception_spec.rb

@@ -1,13 +1,13 @@
 require 'spec_helper'
 
-module TCellAgent
-  describe 'CsrfExceptionReporter' do
-    class WrapperClass
-      include TCellAgent::CsrfExceptionReporter
+class WrapperClass
+  include TCellAgent::CsrfExceptionReporter
 
-      def request; end
-    end
+  def request; end
+end
 
+module TCellAgent
+  describe 'CsrfExceptionReporter' do
     before(:all) do
       @csrf_class = WrapperClass.new
     end

data/spec/lib/tcell_agent/rails/dlp_spec.rb

@@ -4,6 +4,7 @@ module TCellAgent
   module DLP
     class SomeColumn
       attr_accessor :name
+
       def initialize(name = nil)
         @name = name
       end

data/spec/lib/tcell_agent/rails/js_agent_insert_spec.rb

@@ -127,10 +127,10 @@ module TCellAgent
         end
 
         context 'with a <HEAD> tag' do
-          it 'should not append script after <HEAD> tag' do
+          it 'should append script after <HEAD> tag' do
             response = JSAgent.handle_js_agent_insert('SCRIPT', 'i am the <HEAD> response')
 
-            expect(response).to eq('i am the <HEAD> response')
+            expect(response).to eq('i am the <HEAD>SCRIPT response')
           end
         end
 
@@ -142,6 +142,14 @@ module TCellAgent
           end
         end
 
+        context 'with a <HEAD\n> tag' do
+          it 'should append script after <HEAD\n> tag' do
+            response = JSAgent.handle_js_agent_insert('SCRIPT', "i am the <HEAD\n> response")
+
+            expect(response).to eq("i am the <HEAD\n>SCRIPT response")
+          end
+        end
+
         context 'with invalid parameters' do
           context 'with nil response' do
             it 'should return the unmodified response' do

data/spec/lib/tcell_agent/rails/middleware/tcell_body_proxy_spec.rb

@@ -13,7 +13,8 @@ module TCellAgent
               'session_id',
               'user_id',
               'transaction_id',
-              'http://test.com/'
+              'http://test.com/',
+              '0.0.0.0'
             )
           end
 

data/spec/lib/tcell_agent/rails/routes/route_id_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 module TCellAgent
   module Instrumentation
     describe RouteId do
-      TCELL_CONTEXT_KEY = TCellAgent::Instrumentation::TCELL_ID
+      tcell_context_key = TCellAgent::Instrumentation::TCELL_ID
 
       describe '.update_context' do
         context 'with nil route' do
@@ -11,7 +11,7 @@ module TCellAgent
             tcell_context = TCellData.new
             tcell_context.route_id = nil
 
-            RouteId.update_context({ TCELL_CONTEXT_KEY => tcell_context }, {}, nil)
+            RouteId.update_context({ tcell_context_key => tcell_context }, {}, nil)
 
             expect(tcell_context.route_id).to eq(nil)
             expect(tcell_context.grape_mount_endpoint).to eq(nil)
@@ -41,7 +41,7 @@ module TCellAgent
 
             expect(TCellAgent::Instrumentation).to receive(:grape_route?).with(route).and_return(false)
 
-            RouteId.update_context({ TCELL_CONTEXT_KEY => tcell_context }, { :id => 1 }, route)
+            RouteId.update_context({ tcell_context_key => tcell_context }, { :id => 1 }, route)
 
             expect(tcell_context.route_id).to eq(
               TCellAgent::SensorEvents::Util.calculate_route_id('GET', '/some/regular/path')
@@ -64,7 +64,7 @@ module TCellAgent
 
             expect(TCellAgent::Instrumentation).to receive(:grape_route?).with(route).and_return(true)
 
-            RouteId.update_context({ TCELL_CONTEXT_KEY => tcell_context }, { :id => 1 }, route)
+            RouteId.update_context({ tcell_context_key => tcell_context }, { :id => 1 }, route)
 
             expect(tcell_context.route_id).to eq(nil)
             expect(tcell_context.grape_mount_endpoint).to eq('/grape_api')

data/spec/lib/tcell_agent/settings_reporter_spec.rb

@@ -27,26 +27,12 @@ module TCellAgent
       ).at_least(:once)
       expect(TCellAgent).to receive(:logger).and_return(logger).at_least(:once)
       expect(Thread).to receive(:new).and_yield
-      expect(logger).to receive(:debug).with('TCellAgent::SensorEvents::ServerAgentDetailsSensorEvent', 'User unknown')
-      expect(logger).to receive(:debug).with('TCellAgent::SensorEvents::ServerAgentDetailsSensorEvent', 'Group unknown')
-      expect(TCellAgent).to receive(:send_event).with(
-        {
-          'event_type' => 'server_agent_details',
-          'user' => 'unknown',
-          'group' => 'unknown'
-        }
-      )
+
       expect(logger).to receive(:debug).with(anything, anything).at_least(:once)
       expect(TCellAgent).to receive(:send_event).with(
         hash_including('event_type' => 'server_agent_packages')
-      ) # packages event
-      expect(TCellAgent).to receive(:send_event).with(
-        {
-          'event_type' => 'server_agent_details',
-          'language' => 'Ruby',
-          'language_version' => RUBY_VERSION
-        }
       )
+
       expect(TCellAgent).to receive(:send_event).with(
         {
           'event_type' => 'app_config_setting',

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,12 +12,14 @@ 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'
 

data/spec/support/builders.rb

@@ -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/puma_mock.rb

@@ -14,4 +14,8 @@ module Puma
   def self.cli_config
     Config
   end
+
+  module Const
+    PUMA_VERSION = "5.1.0"
+  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.3.0
+  version: 2.4.0
 platform: ruby
 authors:
-- Rafael
+- Rapid7, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-20 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,7 +103,6 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
-- Rakefile
 - bin/tcell_agent
 - lib/tcell_agent.rb
 - lib/tcell_agent/agent.rb
@@ -118,9 +115,12 @@ files:
 - 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
@@ -163,14 +163,14 @@ files:
 - 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-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/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-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
@@ -193,6 +193,7 @@ files:
 - lib/tcell_agent/utils/params.rb
 - lib/tcell_agent/utils/strings.rb
 - lib/tcell_agent/version.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
@@ -245,11 +246,12 @@ files:
 - 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: []
@@ -268,11 +270,12 @@ 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/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
@@ -325,4 +328,5 @@ test_files:
 - 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