tcell_agent 2.2.1 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e056172b2170f472b95d9dc96f082b2d881e38d8b066ed82b8c4175157c0d04
-  data.tar.gz: 6e6a4fc3062d22415489aa75fad2cc15e7c8d9dcd9fc6a80aeb7ce6116dd784e
+  metadata.gz: 4460b2fd01c8b788c8139cbeb2cee7f8a2505e4cc365c279a518778766d9cdb0
+  data.tar.gz: 18dfdd5e944e91155d6b58fa22262b027292038192fac0b6afd4693314f74fd8
 SHA512:
-  metadata.gz: 87a540297c00aedca95f5905687e511233a960ede19aca99cdac65935828bce009413493a8c22af7a33ef59808910df69f9a169274f7f8aec13cdf84c8a361e4
-  data.tar.gz: 9ea327f2786185b027263c74d7d7428aa6c1a5cf7e54ce2bcf070eed2a15630f370984297f1a804aebbd97569379916e6973a337b42be8f2e9e211499422bae9
+  metadata.gz: a2404786f0663783fd45194043c4a12efda21db0e933c14aca5f2d4532e900aac3b3f700ca8282b1995b38c718b6e0eade2a2b1ffbc9df467bf8ab5b4f144b18
+  data.tar.gz: 5021cff2601b66fd94a41b710ab0ab0211be35b2bd442afc0ca992ce4236d6c65e3ef69e14cd2ca9455fb4282d8affa1ba3e7aa3f05c75e4285ff6b5ab77e871

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (C) 2015 tCell.io, Inc. - All Rights Reserved
+Copyright (C) 2020 Rapid7, Inc. - All Rights Reserved
 Proprietary and confidential
 
-http://choosealicense.com/licenses/no-license/
+https://docs.rapid7.com/tcell/ruby-agent-install/

data/bin/tcell_agent

@@ -9,7 +9,7 @@ options = {}
 def yesno(default = true)
   begin
     system('stty raw -echo')
-    str = STDIN.getc
+    str = $stdin.getc
   ensure
     system('stty -raw echo')
   end
@@ -33,8 +33,6 @@ global = OptionParser.new do |opts|
     Kernel.exit(1)
   end
 
-  opts.on('test', 'Run diagnostics and test event sending') do |_v|
-  end
   opts.separator ''
   opts.separator subtext
 end
@@ -53,15 +51,11 @@ subcommands = {
 
 global.order!
 command = ARGV.shift
-deprecated_commands = %w[setup loglevel preload demomode enable disable]
 if command.nil?
   puts global
   Kernel.exit(1)
 elsif subcommands[command]
   subcommands[command].order!
-elsif !deprecated_commands.include?(command)
-  puts global
-  Kernel.exit(1)
 end
 
 if command == 'setup'
@@ -87,9 +81,9 @@ if command == 'setup'
     end
   end
   print 'Enter your API Key (ie gAABAAAA...): '
-  api_key = STDIN.gets.chomp
+  api_key = $stdin.gets.chomp
   print 'Enter your App ID (ie MyApp-Fdk4j): '
-  app_id = STDIN.gets.chomp
+  app_id = $stdin.gets.chomp
   config_hash = {
     'version' => 1,
     'applications' => [
@@ -176,10 +170,11 @@ elsif command == 'demomode'
   puts 'done.'
 
 elsif command == 'test'
-  Dir[Dir.pwd + '/config/initializers/*.rb'].sort.each do |f|
+  Dir["#{Dir.pwd}/config/initializers/*.rb"].sort.each do |f|
     begin
       require f
-    rescue NameError # rubocop: disable Lint/HandleExceptions
+    rescue NameError
+      # do nothing
     rescue StandardError => e
       puts "[ERROR] Loading initializers failed. #{e}"
     end

data/lib/tcell_agent/agent.rb

@@ -56,19 +56,25 @@ module TCellAgent
       require 'tcell_agent/instrumentation/cmdi'
       require 'tcell_agent/instrumentation/lfi'
 
+      variant = if RUBY_VERSION.start_with?('3')
+                  'ruby_3'
+                else
+                  'ruby_2'
+                end
+
       if TCellAgent.configuration.should_instrument?('io')
         module_logger.info('Instrumenting Ruby Class: IO')
-        require 'tcell_agent/instrumentation/monkey_patches/io'
+        require "tcell_agent/instrumentation/monkey_patches/#{variant}/io"
       end
 
       if TCellAgent.configuration.should_instrument?('file')
         module_logger.info('Instrumenting Ruby Class: File')
-        require 'tcell_agent/instrumentation/monkey_patches/file'
+        require "tcell_agent/instrumentation/monkey_patches/#{variant}/file"
       end
 
       if TCellAgent.configuration.should_instrument?('kernel') # rubocop:disable Style/GuardClause
         module_logger.info('Instrumenting Ruby Module: Kernel')
-        require 'tcell_agent/instrumentation/monkey_patches/kernel'
+        require "tcell_agent/instrumentation/monkey_patches/#{variant}/kernel"
       end
     end
 
@@ -100,18 +106,18 @@ module TCellAgent
       @native_agent.send_sanitized_events(
         [event]
       )
-    rescue StandardError => standard_error
-      module_logger.error("Error sending event: (#{standard_error.class}) #{standard_error.message}")
-      module_logger.exception(standard_error)
+    rescue StandardError => e
+      module_logger.error("Error sending event: (#{e.class}) #{e.message}")
+      module_logger.exception(e)
     end
 
     def report_metrics(request_time, tcell_context)
       @native_agent.report_metrics(
         request_time, tcell_context
       )
-    rescue StandardError => standard_error
-      module_logger.error("Error reporting metric: (#{standard_error.class}) #{standard_error.message}")
-      module_logger.exception(standard_error)
+    rescue StandardError => e
+      module_logger.error("Error reporting metric: (#{e.class}) #{e.message}")
+      module_logger.exception(e)
     end
 
     def start(server_name)
@@ -135,12 +141,11 @@ module TCellAgent
 
       module_logger.info("Started thread agent: #{server_name}")
       TCellAgent.report_settings
-      TCellAgent::Instrumentation::Rails.send_framework_info
       TCellAgent::Instrumentation::Rails.send_settings
-    rescue StandardError => standard_error
+    rescue StandardError => e
       TCellAgent.configuration.enabled = false
-      module_logger.error("Error starting agent: (#{standard_error.class}) #{standard_error.message}")
-      module_logger.exception(standard_error)
+      module_logger.error("Error starting agent: (#{e.class}) #{e.message}")
+      module_logger.exception(e)
     end
   end
 end

data/lib/tcell_agent/config_initializer.rb

@@ -9,7 +9,8 @@ module TCellAgent
                   :reverse_proxy_ip_address_header, :host_identifier,
                   :hmac_key, :password_hmac_key,
                   :js_agent_url, :js_agent_api_base_url,
-                  :max_csp_header_bytes, :allow_payloads
+                  :max_csp_header_bytes, :allow_payloads,
+                  :proxy_url, :proxy_username, :proxy_password
 
     attr_reader :logging_options
 
@@ -58,9 +59,5 @@ module TCellAgent
     def enable_intercept_requests=(bool)
       @disabled_instrumentation << 'intercept_requests' unless TCellAgent.configuration.to_bool(bool)
     end
-
-    def get_config_file_dir
-      super
-    end
   end
 end

data/lib/tcell_agent/configuration.rb

@@ -64,11 +64,11 @@ module TCellAgent
       check_for_disabled_instrumentation(get_config_file_name)
     end
 
-    def get_config_file_dir
+    def get_config_file_path
       return nil unless ENV['TCELL_AGENT_HOME']
       return nil if ENV['TCELL_AGENT_CONFIG']
 
-      File.join(Dir.getwd, '/config')
+      File.join(Dir.getwd, '/config/tcell_agent.config')
     end
 
     def get_config_file_name
@@ -85,7 +85,8 @@ module TCellAgent
           app_data = config['applications'][0]
           @disable_all = to_bool(app_data.fetch('disable_all', @disable_all))
         end
-      rescue StandardError # rubocop:disable Lint/HandleExceptions
+      rescue StandardError
+        # do nothing
       end
     end
 
@@ -108,9 +109,8 @@ module TCellAgent
       @password_hmac_key = apps['password_hmac_key']
 
       # proxy config
-      proxy_config = apps['proxy_config'] || {}
-      @reverse_proxy = proxy_config['reverse_proxy']
-      @reverse_proxy_ip_address_header = proxy_config['reverse_proxy_ip_address_header']
+      @reverse_proxy = apps['reverse_proxy']
+      @reverse_proxy_ip_address_header = apps['reverse_proxy_ip_address_header']
 
       # endpoint config
       endpoint = native_agent_config_response['endpoint_config'] || {}

data/lib/tcell_agent/hooks/login_fraud.rb

@@ -3,7 +3,7 @@ require 'tcell_agent/agent'
 module TCellAgent
   module Hooks
     module LoginFraud
-      # Note: mock out in tests
+      # NOTE: mock out in tests
       def self.get_logger
         unless defined?(@login_fraud_logger)
           @login_fraud_logger = TCellAgent::ModuleLogger.new(TCellAgent.logger, name)

data/lib/tcell_agent/instrumentation/cmdi.rb

@@ -56,5 +56,37 @@ module TCellAgent
 
       cmd
     end
+
+    def self.raise_if_block(cmd)
+      return unless TCellAgent::Cmdi.block_command?(cmd)
+
+      raise "tCell.io Agent: Command not allowed by policy: #{cmd}"
+    end
+
+    def self.default_cmdi_handler(args)
+      cmd = TCellAgent::Cmdi.parse_command(*args)
+
+      raise_if_block(cmd)
+    end
+
+    def self.popen_cmdi_handler(args)
+      return if args.empty?
+
+      cmd = ''
+
+      TCellAgent::Instrumentation.safe_block('CMDI Parsing popen *args') do
+        args_copy = Array.new(args)
+        args_copy.shift if args_copy.first.is_a?(Hash)
+        args_copy.pop if args_copy.last.is_a?(Hash)
+
+        cmd = if args_copy.first.is_a?(String)
+                args_copy.shift
+              else
+                TCellAgent::Cmdi.parse_command(*args_copy.shift)
+              end
+      end
+
+      raise_if_block(cmd)
+    end
   end
 end

data/lib/tcell_agent/instrumentation/lfi.rb

@@ -5,6 +5,8 @@ require 'tcell_agent/configuration'
 module TCellAgent
   module Instrumentation
     module Lfi
+      extend TCellAgent::ModuleLoggerAccess
+
       def self.block_file_access?(path, mode)
         TCellAgent::Instrumentation.safe_block('Checking Local Files Policy') do
           if TCellAgent::Utils::Strings.present?(path)
@@ -54,17 +56,27 @@ module TCellAgent
         mode = 'Read'
 
         TCellAgent::Instrumentation.safe_block('LFI Parsing ARGF') do
-          if ARGF.eof? && !ARGV.empty?
-            argv_copy = Array.new(ARGV)
-            path = argv_copy.shift
-          else
-            path = ARGF.filename
-          end
+          begin
+            return ['', ''] if ARGF.file == $stdin
 
-          if path && path.to_s[0] != '|'
-            [File.expand_path(path.to_s), mode]
-          else
+            if ARGF.eof? && !ARGV.empty?
+              argv_copy = Array.new(ARGV)
+              path = argv_copy.shift
+            else
+              path = ARGF.filename
+            end
+
+            if path && path.to_s[0] != '|'
+              [File.expand_path(path.to_s), mode]
+            else
+              ['', '']
+            end
+          rescue Errno::ENOENT
+            module_logger.debug('LFI Parsing ARGF: attempted to read a non-existent file')
             ['', '']
+          rescue Errno::EISDIR
+            module_logger.debug('LFI Parsing ARGF: attempted to read a directory')
+            [ARGF.filename, mode]
           end
         end
       end
@@ -79,6 +91,40 @@ module TCellAgent
         end
         'Read'
       end
+
+      def self.raise_if_block(path, mode)
+        return unless block_file_access?(path, mode)
+
+        raise IOError, "tCell.io Agent: Attempted access to file #{path} with mode #{mode} denied"
+      end
+
+      def self.default_open_handler(args, override_mode = '')
+        path, mode = extract_path_mode(*args)
+
+        mode = override_mode unless override_mode.empty?
+
+        raise_if_block(path, mode)
+      end
+
+      def self.argf_open_handler
+        path, mode = TCellAgent::Instrumentation::Lfi.extract_path_mode_argf
+
+        raise_if_block(path, mode)
+      end
+
+      def self.cmdi_open_handler(args, override_mode = '')
+        path, mode = extract_path_mode(*args)
+
+        mode = override_mode unless override_mode.empty?
+
+        raise_if_block(path, mode)
+
+        return unless path.empty?
+
+        cmd = TCellAgent::Cmdi.parse_command_from_open(*args)
+
+        TCellAgent::Cmdi.raise_if_block(cmd) if cmd
+      end
     end
   end
 end

data/lib/tcell_agent/instrumentation/monkey_patches/ruby_2/file.rb

@@ -0,0 +1,21 @@
+class File
+  class << self
+    if TCellAgent.configuration.should_instrument?('File::new')
+      alias_method :tcell_original_new, :new
+      def new(*args, &block)
+        TCellAgent::Instrumentation::Lfi.default_open_handler(args)
+
+        tcell_original_new(*args, &block)
+      end
+    end
+
+    if TCellAgent.configuration.should_instrument?('File::open')
+      alias_method :tcell_original_open, :open
+      def open(*args, &block)
+        TCellAgent::Instrumentation::Lfi.default_open_handler(args)
+
+        tcell_original_open(*args, &block)
+      end
+    end
+  end
+end

data/lib/tcell_agent/instrumentation/monkey_patches/ruby_2/io.rb

@@ -0,0 +1,75 @@
+class IO
+  class << self
+    if TCellAgent.configuration.should_instrument?('IO::binread')
+      alias_method :tcell_original_binread, :binread
+      def binread(*args, &block)
+        TCellAgent::Instrumentation::Lfi.cmdi_open_handler(args)
+
+        tcell_original_binread(*args, &block)
+      end
+    end
+
+    if TCellAgent.configuration.should_instrument?('IO::binwrite')
+      alias_method :tcell_original_binwrite, :binwrite
+      def binwrite(*args, &block)
+        TCellAgent::Instrumentation::Lfi.default_open_handler(args, 'Write')
+
+        tcell_original_binwrite(*args, &block)
+      end
+    end
+
+    if TCellAgent.configuration.should_instrument?('IO::foreach')
+      alias_method :tcell_original_foreach, :foreach
+      def foreach(*args, &block)
+        TCellAgent::Instrumentation::Lfi.default_open_handler(args, 'Read')
+
+        tcell_original_foreach(*args, &block)
+      end
+    end
+
+    if TCellAgent.configuration.should_instrument?('IO::popen')
+      alias_method :tcell_original_popen, :popen
+      def popen(*args, &block)
+        TCellAgent::Cmdi.popen_cmdi_handler(args)
+
+        tcell_original_popen(*args, &block)
+      end
+    end
+
+    if TCellAgent.configuration.should_instrument?('IO::read')
+      alias_method :tcell_original_read, :read
+      def read(*args, &block)
+        TCellAgent::Instrumentation::Lfi.cmdi_open_handler(args, 'Read')
+
+        tcell_original_read(*args, &block)
+      end
+    end
+
+    if TCellAgent.configuration.should_instrument?('IO::readlines')
+      alias_method :tcell_original_readlines, :readlines
+      def readlines(*args, &block)
+        TCellAgent::Instrumentation::Lfi.cmdi_open_handler(args, 'Read')
+
+        tcell_original_readlines(*args, &block)
+      end
+    end
+
+    if TCellAgent.configuration.should_instrument?('IO::sysopen')
+      alias_method :tcell_original_sysopen, :sysopen
+      def sysopen(*args, &block)
+        TCellAgent::Instrumentation::Lfi.default_open_handler(args)
+
+        tcell_original_sysopen(*args, &block)
+      end
+    end
+
+    if TCellAgent.configuration.should_instrument?('IO::write')
+      alias_method :tcell_original_write, :write
+      def write(*args, &block)
+        TCellAgent::Instrumentation::Lfi.default_open_handler(args, 'Write')
+
+        tcell_original_write(*args, &block)
+      end
+    end
+  end
+end

data/lib/tcell_agent/instrumentation/monkey_patches/ruby_2/kernel.rb

@@ -0,0 +1,80 @@
+module Kernel
+  private
+
+  if TCellAgent.configuration.should_instrument?('Kernel#`')
+    alias_method :tcell_original_backtick, :`
+    def `(cmd)
+      TCellAgent::Cmdi.raise_if_block(cmd)
+
+      tcell_original_backtick(cmd)
+    end
+
+    module_function :`
+  end
+
+  if TCellAgent.configuration.should_instrument?('Kernel#exec')
+    alias_method :tcell_original_exec, :exec
+    def exec(*args)
+      TCellAgent::Cmdi.default_cmdi_handler(args)
+
+      tcell_original_exec(*args)
+    end
+
+    module_function :exec
+  end
+
+  if TCellAgent.configuration.should_instrument?('Kernel#gets')
+    alias_method :tcell_original_gets, :gets
+    def gets(*args, &block)
+      TCellAgent::Instrumentation::Lfi.argf_open_handler
+
+      tcell_original_gets(*args, &block)
+    end
+
+    module_function :gets
+  end
+
+  if TCellAgent.configuration.should_instrument?('Kernel#open')
+    alias_method :tcell_original_open, :open
+    def open(*args, &block)
+      TCellAgent::Instrumentation::Lfi.cmdi_open_handler(args)
+
+      tcell_original_open(*args, &block)
+    end
+
+    module_function :open
+  end
+
+  if TCellAgent.configuration.should_instrument?('Kernel#readline')
+    alias_method :tcell_original_readline, :readline
+    def readline(*args, &block)
+      TCellAgent::Instrumentation::Lfi.argf_open_handler
+
+      tcell_original_readline(*args, &block)
+    end
+
+    module_function :readline
+  end
+
+  if TCellAgent.configuration.should_instrument?('Kernel#spawn')
+    alias_method :tcell_original_spawn, :spawn
+    def spawn(*args)
+      TCellAgent::Cmdi.default_cmdi_handler(args)
+
+      tcell_original_spawn(*args)
+    end
+
+    module_function :spawn
+  end
+
+  if TCellAgent.configuration.should_instrument?('Kernel#system')
+    alias_method :tcell_original_system, :system
+    def system(*args)
+      TCellAgent::Cmdi.default_cmdi_handler(args)
+
+      tcell_original_system(*args)
+    end
+
+    module_function :system
+  end
+end