tcell_agent 2.1.2 → 2.2.0

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/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,9 +17,9 @@ 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.cache_dir = 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'
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tcell_agent
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.0
 platform: ruby
 authors:
 - Rafael
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-11 00:00:00.000000000 Z
+date: 2020-06-24 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.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-5.0.2.dylib
+- lib/tcell_agent/rust/libtcellagent-5.0.2.so
+- lib/tcell_agent/rust/libtcellagent-alpine-5.0.2.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/rust/tcellagent-5.0.2.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
@@ -187,12 +188,10 @@ 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/instrumentation/cmdi/io_cmdi_spec.rb
@@ -226,6 +225,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
@@ -266,7 +266,6 @@ 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/instrumentation/cmdi/io_cmdi_spec.rb
@@ -300,6 +299,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

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

data/lib/tcell_agent/config/unknown_options.rb

@@ -1,119 +0,0 @@
-require 'set'
-
-module TCellAgent
-  module Config
-    module Validate
-      def self.get_unknown_options(config_json)
-        messages = []
-
-        known_tcell_env_vars = Set.new(
-          [
-            'TCELL_AGENT_SERVER', # this is only meant for specs
-            'TCELL_AGENT_APP_ID',
-            'TCELL_AGENT_API_KEY',
-            'TCELL_HMAC_KEY',
-            'TCELL_PASSWORD_HMAC_KEY',
-            'TCELL_AGENT_HOST_IDENTIFIER',
-            'TCELL_API_URL',
-            'TCELL_INPUT_URL',
-            'TCELL_DEMOMODE',
-            'TCELL_AGENT_HOME',
-            'TCELL_AGENT_LOG_DIR',
-            'TCELL_AGENT_CONFIG',
-            'TCELL_AGENT_ALLOW_PAYLOADS',
-            'TCELL_AGENT_LOG_LEVEL',
-            'TCELL_AGENT_LOG_FILENAME',
-            'TCELL_AGENT_LOG_ENABLED'
-          ]
-        )
-
-        ENV.keys.each do |environment_key|
-          if environment_key =~ /^TCELL_/ && !known_tcell_env_vars.include?(environment_key)
-            messages << "Unrecognized environment parameter (TCELL_*) found: #{environment_key}"
-          end
-        end
-
-        begin
-          key_differences = []
-
-          if config_json
-            first_level_keys = %w[version applications]
-
-            key_differences = config_json.keys - first_level_keys
-
-            applications = config_json.fetch('applications', nil)
-            if applications
-
-              if applications.size > 1
-                messages << 'Multiple applications detected in config file'
-
-              elsif applications.size == 1
-                application = applications[0]
-
-                second_level_keys = %w[
-                  name
-                  app_id
-                  api_key
-                  fetch_policies_from_tcell
-                  preload_policy_filename
-                  log_dir
-                  tcell_api_url
-                  tcell_input_url
-                  host_identifier
-                  hipaaSafeMode
-                  hmac_key
-                  password_hmac_key
-                  js_agent_api_base_url
-                  js_agent_url
-                  max_csp_header_bytes
-                  event_batch_size_limit
-                  allow_payloads
-                  reverse_proxy
-                  reverse_proxy_ip_address_header
-                  demomode
-                  logging_options
-                  data_exposure
-                  disable_all
-                  enabled
-                  enable_event_manager
-                  enable_policy_polling
-                  enable_instrumentation
-                  enable_intercept_requests
-                  instrument_for_events
-                  enabled_instrumentations
-                  stdout_logger
-                ]
-
-                key_differences += (application.keys - second_level_keys)
-
-                if application.fetch('logging_options', nil)
-                  logging_options = application['logging_options']
-                  key_differences += (logging_options.keys - %w[enabled level filename])
-                end
-
-                if application.fetch('data_exposure', nil)
-                  data_exposure = application['data_exposure']
-                  key_differences += (data_exposure.keys - ['max_data_ex_db_records_per_request'])
-                end
-
-                if application.fetch('enabled_instrumentations', nil)
-                  enabled_instrumentations = application['enabled_instrumentations']
-                  key_differences += (enabled_instrumentations.keys - %w[doorkeeper devise authlogic])
-                end
-              end
-            end
-
-            key_differences.each do |key|
-              messages << "Unrecognized config setting key: #{key}"
-            end
-
-          end
-        rescue StandardError => exception
-          messages << "Something went wrong verifying config file: #{exception}"
-        end
-
-        messages
-      end
-    end
-  end
-end

data/lib/tcell_agent/devise.rb

@@ -1,33 +0,0 @@
-if TCellAgent.configuration.should_instrument_devise? && defined?(Devise)
-  require 'devise'
-  require 'devise/rails'
-  require 'devise/strategies/database_authenticatable'
-  require 'tcell_agent/userinfo'
-
-  module TCellAgent
-    if defined?(Devise)
-      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?('warden.user.user.key')
-                userkey = request.session['warden.user.user.key']
-                user_id = if userkey.length == 2
-                            userkey[0][0]
-                          else
-                            userkey[1][0]
-                          end
-                return user_id.to_s if user_id.is_a? Integer
-              end
-            rescue StandardError
-              return orig_user_id
-            end
-            orig_user_id
-          end
-        end
-      end
-    end
-  end
-end

data/lib/tcell_agent/rails/start_agent_after_initializers.rb

@@ -1,12 +0,0 @@
-module TCellAgent
-  class TCellAgentStartupRailtie < Rails::Railtie
-    # TCellAgent config can be specified thru Rails initializer's
-    # (https://guides.rubyonrails.org/v2.3/configuring.html#using-initializers)
-    # so those need to run first before the agent is started
-    initializer :start_tcell_agent,
-                :after => :load_config_initializers,
-                :before => :tcell_instrument_auth_frameworks do |_app|
-      TCellAgent.thread_agent.start('Unicorn')
-    end
-  end
-end

data/spec/lib/tcell_agent/config/unknown_options_spec.rb

@@ -1,195 +0,0 @@
-require 'spec_helper'
-
-module TCellAgent
-  module Config
-    describe Validate do
-      describe '.get_unknown_options' do
-        context 'with an unknown tcell environment variable set' do
-          it 'should return a message about the unknown variable' do
-            orig_allow_ap = ENV.fetch('TCELL_AGENT_ALLOW_PAYLOADS', nil)
-            orig_demomode = ENV.fetch('TCELL_DEMOMODE', nil)
-            orig_agent_home = ENV.fetch('TCELL_AGENT_HOME', nil)
-            orig_agent_log_dir = ENV.fetch('TCELL_AGENT_LOG_DIR', nil)
-            orig_agent_config = ENV.fetch('TCELL_AGENT_CONFIG', nil)
-            orig_agent_app_id = ENV.fetch('TCELL_AGENT_APP_ID', nil)
-            orig_agent_api_key = ENV.fetch('TCELL_AGENT_API_KEY', nil)
-            orig_agent_host_identifier = ENV.fetch('TCELL_AGENT_HOST_IDENTIFIER', nil)
-            orig_input_url = ENV.fetch('TCELL_INPUT_URL', nil)
-            orig_hmac_key = ENV.fetch('TCELL_HMAC_KEY', nil)
-            orig_api_url = ENV.fetch('TCELL_API_URL', nil)
-            orig_password_hmac_key = ENV.fetch('TCELL_PASSWORD_HMAC_KEY', nil)
-
-            ENV['TCELL_HACK'] = 'hack the system'
-            ENV['TCELL_AGENT_ALLOW_PAYLOADS'] = 'valid'
-            ENV['TCELL_DEMOMODE'] = 'valid'
-            ENV['TCELL_AGENT_HOME'] = 'valid'
-            ENV['TCELL_AGENT_LOG_DIR'] = 'valid'
-            ENV['TCELL_AGENT_CONFIG'] = 'valid'
-            ENV['TCELL_AGENT_APP_ID'] = 'valid'
-            ENV['TCELL_AGENT_API_KEY'] = 'valid'
-            ENV['TCELL_AGENT_HOST_IDENTIFIER'] = 'valid'
-            ENV['TCELL_INPUT_URL'] = 'valid'
-            ENV['TCELL_HMAC_KEY'] = 'valid'
-            ENV['TCELL_API_URL'] = 'valid'
-            ENV['TCELL_PASSWORD_HMAC_KEY'] = 'valid'
-
-            messages = Validate.get_unknown_options(nil)
-
-            ENV.delete 'TCELL_HACK'
-
-            if orig_allow_ap
-              ENV['TCELL_AGENT_ALLOW_PAYLOADS'] = orig_allow_ap
-            else
-              ENV.delete 'TCELL_AGENT_ALLOW_PAYLOADS'
-            end
-            if orig_demomode
-              ENV['TCELL_DEMOMODE'] = orig_demomode
-            else
-              ENV.delete 'TCELL_DEMOMODE'
-            end
-            if orig_agent_home
-              ENV['TCELL_AGENT_HOME'] = orig_agent_home
-            else
-              ENV.delete 'TCELL_AGENT_HOME'
-            end
-            if orig_agent_log_dir
-              ENV['TCELL_AGENT_LOG_DIR'] = orig_agent_log_dir
-            else
-              ENV.delete 'TCELL_AGENT_LOG_DIR'
-            end
-            if orig_agent_config
-              ENV['TCELL_AGENT_CONFIG'] = orig_agent_config
-            else
-              ENV.delete 'TCELL_AGENT_CONFIG'
-            end
-            if orig_agent_app_id
-              ENV['TCELL_AGENT_APP_ID'] = orig_agent_app_id
-            else
-              ENV.delete 'TCELL_AGENT_APP_ID'
-            end
-            if orig_agent_api_key
-              ENV['TCELL_AGENT_API_KEY'] = orig_agent_api_key
-            else
-              ENV.delete 'TCELL_AGENT_API_KEY'
-            end
-            if orig_agent_host_identifier
-              ENV['TCELL_AGENT_HOST_IDENTIFIER'] = orig_agent_host_identifier
-            else
-              ENV.delete 'TCELL_AGENT_HOST_IDENTIFIER'
-            end
-            if orig_input_url
-              ENV['TCELL_INPUT_URL'] = orig_input_url
-            else
-              ENV.delete 'TCELL_INPUT_URL'
-            end
-            if orig_hmac_key
-              ENV['TCELL_HMAC_KEY'] = orig_hmac_key
-            else
-              ENV.delete 'TCELL_HMAC_KEY'
-            end
-            if orig_password_hmac_key
-              ENV['TCELL_PASSWORD_HMAC_KEY'] = orig_password_hmac_key
-            else
-              ENV.delete 'TCELL_PASSWORD_HMAC_KEY'
-            end
-            if orig_api_url
-              ENV['TCELL_API_URL'] = orig_api_url
-            else
-              ENV.delete 'TCELL_API_URL'
-            end
-
-            expect(messages.sort).to eq(
-              [
-                'Unrecognized environment parameter (TCELL_*) found: TCELL_HACK'
-              ]
-            )
-          end
-        end
-
-        context 'with a config json with all options including some extra ones' do
-          it 'should report the extra options in messages' do
-            config_json = {
-              'first_level' => 'boo',
-              'version' => 1,
-              'applications' => [
-                {
-                  'second_level' => 'boo',
-                  'name' => 'name',
-                  'app_id' => 'app id',
-                  'api_key' => 'api key',
-                  'fetch_policies_from_tcell' => true,
-                  'preload_policy_filename' => 'preload policy filename',
-                  'log_dir' => 'custom log dir',
-                  'logging_options' => {
-                    'logging_level' => 'boo',
-                    'enabled' => true,
-                    'level' => 'DEBUG',
-                    'filename' => 'filename'
-                  },
-                  'tcell_api_url' => 'tcell api url',
-                  'tcell_input_url' => 'tcell input url',
-                  'host_identifier' => 'host identifier',
-                  'hipaaSafeMode' => 'hipaa safe mode',
-                  'hmac_key' => 'hmac key',
-                  'password_hmac_key' => 'password_hmac_key',
-                  'js_agent_api_base_url' => 'js agent api base url',
-                  'js_agent_url' => 'js agent url',
-                  'max_csp_header_bytes' => 512,
-                  'event_batch_size_limit' => 50,
-                  'allow_payloads' => true,
-                  'data_exposure' => {
-                    'data_ex_level' => 'boo',
-                    'max_data_ex_db_records_per_request' => 10_000
-                  },
-                  'reverse_proxy' => true,
-                  'reverse_proxy_ip_address_header' => 'reverse proxy ip address header',
-                  'demomode' => true,
-                  # Ruby only
-                  'disable_all' => false,
-                  'enabled' => true,
-                  'enable_event_manager' => true,
-                  'enable_policy_polling' => true,
-                  'enable_instrumentation' => true,
-                  'enable_intercept_requests' => true,
-                  'instrument_for_events' => true,
-                  'enabled_instrumentations' => {
-                    'enabled_instrumentations_level' => 'blah',
-                    'doorkeeper' => true,
-                    'devise' => true,
-                    'authlogic' => true
-                  }
-                }
-              ]
-            }
-
-            messages = Validate.get_unknown_options(config_json)
-
-            expect(messages.sort).to eq(
-              [
-                'Unrecognized config setting key: data_ex_level',
-                'Unrecognized config setting key: enabled_instrumentations_level',
-                'Unrecognized config setting key: first_level',
-                'Unrecognized config setting key: logging_level',
-                'Unrecognized config setting key: second_level'
-              ]
-            )
-          end
-        end
-
-        context 'with a config json that has more than one application' do
-          it 'should report the misconfiguration' do
-            config_json = { 'version' => 1, 'applications' => [{}, {}] }
-
-            messages = Validate.get_unknown_options(config_json)
-
-            expect(messages.sort).to eq(
-              [
-                'Multiple applications detected in config file'
-              ]
-            )
-          end
-        end
-      end
-    end
-  end
-end