RubyGems - tcell_agent - Versions diffs - 0.2.26 → 0.2.27 - Mend

tcell_agent 0.2.26 → 0.2.27

Files changed (10) hide show

checksums.yaml +4 -4
data/lib/tcell_agent/configuration.rb +3 -2
data/lib/tcell_agent/rails/dlp.rb +6 -0
data/lib/tcell_agent/rails/middleware/body_filter_middleware.rb +9 -2
data/lib/tcell_agent/rails/middleware/headers_middleware.rb +5 -5
data/lib/tcell_agent/rails/responses.rb +19 -0
data/lib/tcell_agent/start_background_thread.rb +11 -0
data/lib/tcell_agent/version.rb +1 -1
data/spec/lib/tcell_agent/rails/responses_spec.rb +120 -0
metadata +5 -2

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 114c035f2c7d834c3f6a5d5efb731f070d694c3b
-  data.tar.gz: a9c1a9c1bfe681b5cda4fdcc23b0a00eca1e8534
+  metadata.gz: 6e93674e3ce539710e90605fc2655eff1d988017
+  data.tar.gz: 482dd34778a453b1a63c6e0bc7976b1c893bb9af
 SHA512:
-  metadata.gz: 3d75e5ccfa17437f4b4d90cc4c5fd6524fd083c7fbd0b738d50b5248d5859073c1d63bf9358c2989973022d6ae24b9344de5c256d2c2c6744040f685ceacfdbf
-  data.tar.gz: c3442c4da0fd92ee41732ac5a24afaf620a647b1d9f1a76cea8697ba5de371d628692ea35303ecc6acb9a5812e834918f1f1d9a47fe16f5bd5abb4e7f1445ef3
+  metadata.gz: 6432e1455a95c5c28c62c7ff85f367316f4ad78d58fc5ffdb03b83b9fb9ffbb21137fd9c9d34423a01ffd00ad10f18d9a19cd9dc93f5ab20b7cfdc4806eb65fd
+  data.tar.gz: ecac85ac908c46e83a5f850005bef88565955af581512c31ee63e45c1ef3147771780e90fb6db166dbd30fab8c928de0c3086cb8829fd701312c4dbf25f9b064

data/lib/tcell_agent/configuration.rb CHANGED Viewed

@@ -159,8 +159,6 @@ module TCellAgent
       @allow_unencrypted_appfirewall_payloads = false
-      # Because ENV can override this one
-      env_unencrypted_firewall =
       if (ENV["TCELL_AGENT_ALLOW_UNENCRYPTED_APPSENSOR_PAYLOADS"] != nil)
         @allow_unencrypted_appfirewall_payloads = [true, "true", "yes", "1"].include?(ENV["TCELL_AGENT_ALLOW_UNENCRYPTED_APPSENSOR_PAYLOADS"])
       end
@@ -250,7 +248,10 @@ module TCellAgent
             @agent_home_owner = app_data.fetch("agent_home_owner",@agent_home_owner)
             @logging_options = app_data.fetch("logging_options", {})
+            # DEPRECATED: this was incorrectly placed here. Keep it here until we can
+            # be sure that no customers are relying on this
             @agent_log_dir = @logging_options.fetch("log_dir", @agent_log_dir)
+            @agent_log_dir = app_data.fetch("log_dir", @agent_log_dir)
             @log_file_name = @logging_options.fetch("filename", @log_file_name)
             @tcell_api_url = app_data.fetch("tcell_api_url", @tcell_api_url)

data/lib/tcell_agent/rails/dlp.rb CHANGED Viewed

@@ -28,6 +28,7 @@ require 'cgi'
 require 'thread'
 require 'tcell_agent/configuration'
+require 'tcell_agent/rails/responses'
 module TCellAgent
@@ -281,6 +282,11 @@ module TCellAgent
               TCellAgent.configuration.should_intercept_requests?
             TCellAgent::Instrumentation.safe_block("Running DLP Logging Filters") {
+              if TCellAgent::Utils::Rails.empty_content?(response.status, response.headers) ||
+                  TCellAgent::Utils::Rails.streaming_response?(response.headers)
+                return
+              end
               tcell_context = request.env[TCellAgent::Instrumentation::TCELL_ID]
               if tcell_context
                 response.body = tcell_context.filter_body(response.body)

data/lib/tcell_agent/rails/middleware/body_filter_middleware.rb CHANGED Viewed

@@ -11,6 +11,7 @@ require 'tcell_agent/sensor_events/util/redirect_utils'
 require 'tcell_agent/configuration'
 require 'tcell_agent/instrumentation'
+require 'tcell_agent/rails/responses'
 module TCellAgent
   module Instrumentation
@@ -66,8 +67,13 @@ module TCellAgent
               body.sub!(BodyFilterMiddleware::HEAD_SEARCH_REGEX,"<head>#{script_insert}")
           end
           def _handle_js_agent_add(request, response)
-            TCellAgent::Instrumentation.safe_block("Handling JSAgent add") {
+            TCellAgent::Instrumentation.safe_block("Handling JSAgent add") do
               status, headers, rack_body = response
+              if TCellAgent::Utils::Rails.empty_content?(status, headers) ||
+                  TCellAgent::Utils::Rails.streaming_response?(headers)
+                return response
+              end
               if (headers.fetch("Content-Type","").start_with?'text/html')
                   script_tag_policy = TCellAgent.policy(TCellAgent::PolicyTypes::CSP)
                   if (script_tag_policy &&
@@ -80,7 +86,8 @@ module TCellAgent
                     response = [status, headers, newbody]
                   end
               end
-            }
+            end
             response
           end
         end

data/lib/tcell_agent/rails/middleware/headers_middleware.rb CHANGED Viewed

@@ -13,6 +13,7 @@ require 'tcell_agent/userinfo'
 require 'cgi'
 require 'tcell_agent/instrumentation'
+require 'tcell_agent/rails/responses'
 module TCellAgent
   module Instrumentation
@@ -33,7 +34,6 @@ module TCellAgent
             response = @app.call(env)
             if TCellAgent.configuration.should_intercept_requests?
-              status, headers, active_response = response
               TCellAgent::Instrumentation.safe_block("Handling Request") {
                 tcell_response = response
                 unless request.env[TCellAgent::Instrumentation::TCELL_ID].ip_blocking_triggered
@@ -138,15 +138,15 @@ module TCellAgent
           end
           def _handle_appsensor(request, response)
-            TCellAgent::Instrumentation.safe_block("Handling AppSensor") {
+            TCellAgent::Instrumentation.safe_block("Handling AppSensor") do
               status_code, response_headers, response_body = response
               content_length = 0
               if response_headers['Content-Length']
                 content_length = response_headers['Content-Length'].to_i
-              elsif STATUSES_MISSING_CONTENT_LENGTH.include?(status_code.to_i) ||
-                  TCellAgent::Utils::Strings.present?(response_headers['Transfer-Encoding'])
+              elsif TCellAgent::Utils::Rails.empty_content?(status_code, response_headers) ||
+                  TCellAgent::Utils::Rails.streaming_response?(response_headers)
                 content_length = 0
               elsif response_body.respond_to?(:to_ary) || response_body.is_a?(Rack::BodyProxy)
@@ -169,7 +169,7 @@ module TCellAgent
               )
               TCellAgent.send_event(event)
               return [status_code, response_headers, response_body]
-            }
+            end
             response
           end

data/lib/tcell_agent/rails/responses.rb ADDED Viewed

@@ -0,0 +1,19 @@
+module TCellAgent
+  module Utils
+    module Rails
+      STATUSES_MISSING_CONTENT_LENGTH = Set.new((100..199).to_a + [204, 205, 304])
+      def self.empty_content?(status_code, headers)
+        return STATUSES_MISSING_CONTENT_LENGTH.include?(status_code.to_i) ||
+          (!!headers['Content-Length'] && headers['Content-Length'].to_i == 0)
+      end
+      def self.streaming_response?(headers)
+        return TCellAgent::Utils::Strings.present?(headers['Transfer-Encoding']) ||
+          TCellAgent::Utils::Strings.present?(headers['Content-Transfer-Encoding'])
+      end
+    end
+  end
+end

data/lib/tcell_agent/start_background_thread.rb CHANGED Viewed

@@ -87,6 +87,17 @@ if (TCellAgent.configuration.disable_all == false)
                   logging_options[:level] || logging_options["level"] || "INFO"
                 )
               )
+              # Deprecated: this is so we can ensure no one is using this setting so we can remove
+              # the code altogether in the future
+              if logging_options.has_key?(:log_dir) || logging_options.has_key?("log_dir")
+                TCellAgent.send_event(
+                  TCellAgent::SensorEvents::TCellAgentSettingEvent.new(
+                    "deprecated_log_dir",
+                    logging_options[:log_dir] || logging_options["log_dir"]
+                  )
+                )
+              end
             else
               TCellAgent.send_event(
                 TCellAgent::SensorEvents::TCellAgentSettingEvent.new("logging_enabled", "false")

data/lib/tcell_agent/version.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 # See the file "LICENSE" for the full license governing this code.
 module TCellAgent
-  VERSION = "0.2.26"
+  VERSION = "0.2.27"
 end

data/spec/lib/tcell_agent/rails/responses_spec.rb ADDED Viewed

@@ -0,0 +1,120 @@
+require 'spec_helper'
+module TCellAgent
+  module Utils
+    describe ".responses" do
+      context ".empty_content?" do
+        context "with nil status code" do
+          context "with empty headers" do
+            it "should return false" do
+              expect(Rails.empty_content?(nil, {})).to eq(false)
+            end
+          end
+          context "with Content-Length header" do
+            context "that is zero" do
+              it "should return true" do
+                expect(Rails.empty_content?(nil, {'Content-Length' => 0})).to eq(true)
+              end
+            end
+            context "that is non zero" do
+              it "should return false" do
+                expect(Rails.empty_content?(nil, {'Content-Length' => 1})).to eq(false)
+              end
+            end
+          end
+        end
+        context "with a status code" do
+          context "that contains no content" do
+            context "with empty headers" do
+              it "should return true" do
+                expect(Rails.empty_content?(204, {})).to eq(true)
+              end
+            end
+            context "with Content-Length header" do
+              context "that is zero" do
+                it "should return true" do
+                  expect(Rails.empty_content?(204, {'Content-Length' => 0})).to eq(true)
+                end
+              end
+              context "that is non zero" do
+                it "should return true" do
+                  expect(Rails.empty_content?(204, {'Content-Length' => 1})).to eq(true)
+                end
+              end
+            end
+          end
+          context "that contains content" do
+            context "with empty headers" do
+              it "should return false" do
+                expect(Rails.empty_content?(200, {})).to eq(false)
+              end
+            end
+            context "with Content-Length header" do
+              context "that is zero" do
+                it "should return true" do
+                  expect(Rails.empty_content?(200, {'Content-Length' => 0})).to eq(true)
+                end
+              end
+              context "that is non zero" do
+                it "should return false" do
+                  expect(Rails.empty_content?(200, {'Content-Length' => 1})).to eq(false)
+                end
+              end
+            end
+          end
+        end
+      end
+      context ".streaming_response?" do
+        context "with empty headers" do
+          it "should return false" do
+            expect(Rails.streaming_response?({})).to eq(false)
+          end
+        end
+        context "with headers" do
+          context "that are missing Transfer-Encoding" do
+            context "that are missing Content-Transfer-Encoding" do
+              it "should return false" do
+                expect(Rails.streaming_response?({})).to eq(false)
+              end
+            end
+            context "that have Content-Transfer-Encoding" do
+              it "should return true" do
+                expect(Rails.streaming_response?({"Content-Transfer-Encoding" => "chunked"})).to eq(true)
+              end
+            end
+          end
+        end
+        context "that have Transfer-Encoding" do
+          context "that are missing Content-Transfer-Encoding" do
+            it "should return true" do
+              expect(Rails.streaming_response?({"Transfer-Encoding" => "chunked"})).to eq(true)
+            end
+          end
+          context "that have Content-Transfer-Encoding" do
+            it "should return true" do
+              expect(Rails.streaming_response?({
+                "Transfer-Encoding" => "chunked",
+                "Content-Transfer-Encoding" => "chunked"})).to eq(true)
+            end
+          end
+        end
+      end
+    end
+  end
+end

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tcell_agent
 version: !ruby/object:Gem::Version
-  version: 0.2.26
+  version: 0.2.27
 platform: ruby
 authors:
 - Garrett
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-01-30 00:00:00.000000000 Z
+date: 2017-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -196,6 +196,7 @@ files:
 - 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/responses.rb
 - lib/tcell_agent/rails/routes/grape.rb
 - lib/tcell_agent/rails/routes/route_id.rb
 - lib/tcell_agent/rails/routes.rb
@@ -320,6 +321,7 @@ files:
 - spec/lib/tcell_agent/rails/middleware/dlp_middleware_spec.rb
 - spec/lib/tcell_agent/rails/middleware/global_middleware_spec.rb
 - spec/lib/tcell_agent/rails/middleware/redirect_middleware_spec.rb
+- spec/lib/tcell_agent/rails/responses_spec.rb
 - spec/lib/tcell_agent/rails/routes/grape_spec.rb
 - spec/lib/tcell_agent/rails/routes/route_id_spec.rb
 - spec/lib/tcell_agent/rails/routes/routes_spec.rb
@@ -470,6 +472,7 @@ test_files:
 - spec/lib/tcell_agent/rails/middleware/dlp_middleware_spec.rb
 - spec/lib/tcell_agent/rails/middleware/global_middleware_spec.rb
 - spec/lib/tcell_agent/rails/middleware/redirect_middleware_spec.rb
+- spec/lib/tcell_agent/rails/responses_spec.rb
 - spec/lib/tcell_agent/rails/routes/grape_spec.rb
 - spec/lib/tcell_agent/rails/routes/route_id_spec.rb
 - spec/lib/tcell_agent/rails/routes/routes_spec.rb