newrelic_rpm 3.9.2.239 → 3.9.3.241

data/CHANGELOG

@@ -1,5 +1,12 @@
 # New Relic Ruby Agent Release Notes #
 
+## v3.9.3 ##
+
+  * Fix to prevent proxy credentials transmission
+
+  This update prevents proxy credentials set in the agent config file from
+  being transmitted to New Relic.
+
 ## v3.9.2 ##
 
   * Added API for ignoring transactions
@@ -63,9 +70,9 @@
   If the agent was initially disabled, and then later enabled with a call to
   manual_start, the ignore_error_filter would not work. This has been fixed.
 
-  * Fix for Capistrano 3 ignoring newrelic_revion
+  * Fix for Capistrano 3 ignoring newrelic_revision
 
-  New Relic's Capistrano recipies support passing parameters to control the
+  New Relic's Capistrano recipes support passing parameters to control the
   values recorded with deployments, but user provided :newrelic_revision was
   incorrectly overwritten. This has been fixed.
 

data/lib/new_relic/agent/configuration/default_source.rb

@@ -317,6 +317,7 @@ module NewRelic
           :allow_nil => true,
           :public => true,
           :type => String,
+          :local_only => true,
           :description => 'User for proxy server.'
         },
         :proxy_pass => {
@@ -324,6 +325,7 @@ module NewRelic
           :allow_nil => true,
           :public => true,
           :type => String,
+          :local_only => true,
           :description => 'Password for proxy server.'
         },
         :capture_params => {

data/lib/new_relic/agent/configuration/manager.rb

@@ -178,7 +178,17 @@ module NewRelic
         end
 
         def to_collector_hash
-          DottedHash.new(apply_mask(flattened)).to_hash
+          DottedHash.new(apply_mask(flattened)).to_hash.delete_if do |k, v|
+            default = DEFAULTS[k]
+            if default
+              default[:local_only]
+            else
+              # In our tests, we add totally bogus configs, because testing.
+              # In those cases, there will be no default. So we'll just let
+              # them through.
+              false
+            end
+          end
         end
 
         def app_names

data/lib/new_relic/version.rb

@@ -12,7 +12,7 @@ module NewRelic
 
     MAJOR = 3
     MINOR = 9
-    TINY  = 2
+    TINY  = 3
 
     begin
       require File.join(File.dirname(__FILE__), 'build')

data/test/new_relic/agent/configuration/manager_test.rb

@@ -151,6 +151,16 @@ module NewRelic::Agent::Configuration
       assert_equal(::Hash, @manager.to_collector_hash.class)
     end
 
+    def test_to_collector_hash_scrubs_private_settings
+      @manager.delete_all_configs_for_testing
+      @manager.add_config_for_testing(:proxy_user => 'user')
+      @manager.add_config_for_testing(:proxy_pass => 'password')
+      @manager.add_config_for_testing(:one => 1)
+      @manager.add_config_for_testing(:two => 2)
+
+      assert_equal({ :one => 1, :two => 2 }, @manager.to_collector_hash)
+    end
+
     def test_config_masks
       NewRelic::Agent::Configuration::MASK_DEFAULTS[:boo] = Proc.new { true }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 3.9.2.239
+  version: 3.9.3.241
   prerelease: 
 platform: ruby
 authors:
@@ -41,7 +41,7 @@ cert_chain:
   K0ZZTXduQWIrVm1OT2h2MVMrc0poYmpaMzBQS2d6NnZMaFQ2dW5pZUNqTGs5
   d0dHbWxTSwpZamJudkE5cXJhTExhalNqCi0tLS0tRU5EIENFUlRJRklDQVRF
   LS0tLS0K
-date: 2014-08-20 00:00:00.000000000 Z
+date: 2014-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake