tcell_agent 2.1.1 → 2.4.0

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

@@ -1,4 +1,3 @@
-
 require 'spec_helper'
 
 module TCellAgent
@@ -23,7 +22,7 @@ module TCellAgent
             expect(native_agent).to_not receive(:get_headers)
 
             tcell_context = double('tcell_context')
-            policy.get_headers(tcell_context)
+            policy.get_headers('text/html', tcell_context)
           end
         end
 
@@ -65,7 +64,7 @@ module TCellAgent
             expect(@policy.enabled).to eq(true)
 
             expect(
-              @policy.get_headers(@tcell_context)
+              @policy.get_headers('text/html', @tcell_context)
             ).to eq(
               [{ 'name' => 'Content-Security-Policy', 'value' => 'test321' }]
             )
@@ -92,7 +91,7 @@ module TCellAgent
               expect(@policy.enabled).to eq(true)
 
               expect(
-                @policy.get_headers(@tcell_context)
+                @policy.get_headers('text/html', @tcell_context)
               ).to eq(
                 [{ 'name' => 'Content-Security-Policy',
                    'value' => 'normalvalue; report-uri https://www.example.com/xys?sid=ab7074d0bf86c2884766d88b6ad9de4a&rid=route-id' }]
@@ -121,7 +120,7 @@ module TCellAgent
               expect(@policy.enabled).to eq(true)
 
               expect(
-                @policy.get_headers(@tcell_context)
+                @policy.get_headers('text/html', @tcell_context)
               ).to eq(
                 [{ 'name' => 'Content-Security-Policy',
                    'value' => 'normalvalue; report-uri https://www.example.com/1234567?sid=ab7074d0bf86c2884766d88b6ad9de4a&rid=route-id' }]
@@ -150,7 +149,7 @@ module TCellAgent
               expect(@policy.enabled).to eq(true)
 
               expect(
-                @policy.get_headers(@tcell_context)
+                @policy.get_headers('text/html', @tcell_context)
               ).to eq([])
             end
           end

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

@@ -78,6 +78,8 @@ module TCellAgent
               meta_data = TCellAgent::Tests::MetaDataBuilder.new.update_attribute(
                 'remote_address', nil
               ).build
+              expect(@native_agent).to receive(:apply_suspicious_quick_check).with(any_args)
+              expect(@native_agent).not_to receive(:apply_patches).with(any_args)
               resp = @policy.block_request?(meta_data)
               expect(resp).to eq(false)
             end
@@ -88,6 +90,8 @@ module TCellAgent
               meta_data = TCellAgent::Tests::MetaDataBuilder.new.update_attribute(
                 'remote_address', ''
               ).build
+              expect(@native_agent).to receive(:apply_suspicious_quick_check).with(any_args)
+              expect(@native_agent).not_to receive(:apply_patches).with(any_args)
               resp = @policy.block_request?(meta_data)
               expect(resp).to eq(false)
             end
@@ -98,20 +102,35 @@ module TCellAgent
               meta_data = TCellAgent::Tests::MetaDataBuilder.new.update_attribute(
                 'remote_address', '2.2.2.2'
               ).build
+              expect(@native_agent).to receive(:apply_suspicious_quick_check).with(any_args)
+              expect(@native_agent).not_to receive(:apply_patches).with(any_args)
               resp = @policy.block_request?(meta_data)
               expect(resp).to eq(false)
             end
           end
 
-          context 'request comes from non-blocked ip' do
-            it 'should not block request' do
+          context 'request comes from blocked ip' do
+            it 'should block request' do
               meta_data = TCellAgent::Tests::MetaDataBuilder.new.update_attribute(
                 'remote_address', '1.1.1.1'
               ).build
+              expect(@native_agent).to receive(:apply_suspicious_quick_check).with(any_args).and_return(2)
+              expect(@native_agent).not_to receive(:apply_patches).with(any_args)
               resp = @policy.block_request?(meta_data)
               expect(resp).to eq(true)
             end
           end
+
+          context 'request comes from suspcious ip' do
+            it 'should call apply_patches' do
+              meta_data = TCellAgent::Tests::MetaDataBuilder.new.update_attribute(
+                'remote_address', '1.1.1.1'
+              ).build
+              expect(@native_agent).to receive(:apply_suspicious_quick_check).with(any_args).and_return(1)
+              expect(@native_agent).to receive(:apply_patches).with(any_args).and_return('Blocked Response')
+              @policy.block_request?(meta_data)
+            end
+          end
         end
       end
     end

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

@@ -6,7 +6,7 @@ module TCellAgent
       assert_policy_state = proc do |policies, state|
         expect(policies.keys.size).to eq(10)
 
-        policies.values.each do |policy|
+        policies.each_value do |policy|
           next if policy.instance_of?(TCellAgent::Policies::LoginPolicy)
           next if policy.instance_of?(TCellAgent::Policies::SystemEnablements)
 

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/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,
@@ -28,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',
@@ -57,78 +42,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