vcap_common 3.0.1 → 4.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmZmY2Q4Njk2OGJhZWUyNGVkZDA0MWIwNjNkNzBiNTgwMThhY2ViNg==
+    OTQ2YjBjZWRmYTgyZmRmZmI5MWExNDA1MGE1NjZkMTFkNGE4ZDY2MA==
   data.tar.gz: !binary |-
-    NWQ2ZTkyZTNmMjE5NDgwYzRhNmExOWJjNjIwNzczYzUxN2E3NWI2OQ==
+    MGQzY2E0ODY2YzBjMjMxOTEwOGNlZGM2ZmY0MTJmNTFlNmIzOTE2OA==
 SHA512:
   metadata.gz: !binary |-
-    NWI5MDQyN2QzNjE0ZmQzMTczYmNkMzE1YzFiOGJhZTljZDg4ODVmZTdhZmYx
-    M2ZhMTg1MTg4NzViNzFjNDEwZDM3YmE4MjIzYmU5ZDAyYTRiOWU3MzNmMmYz
-    YzA1MjQ5ZjQ2M2JmODYxMmE5MzgwNTQ4M2FjZDc0NDFkZjFlZWM=
+    YjU3NDYwZGYxMjNhZmEwODRiZTg3ZTJmZDllZmVkODg3NjJkYTYzYmJmNTYx
+    YzhiZGQ5MGRkZTk5OTIxNTA0MGU0ZmY5OTQ2ZWE4Y2Q5NDhjNDVlYWVlMzgx
+    YzRjMDY4N2Q4Njg2OGY1MjgyYWE4NzExNWJjNTkwYTc3MzM2NjI=
   data.tar.gz: !binary |-
-    MmI2ZjQ4Nzg5MWJlNzZiOTAyNDk2MzAzN2Q3NGRjZGIyNzgxZGM4N2Y2OWNj
-    ODM3NGJlOTkzNWU4MTUwMmM3NGFkMDkyMjVlZTcxZDllZmQ4ZTliYjI2MzU2
-    ZmVhYmY1ZDc3NjhmZDk5YzhkYTRiODg4N2NjNTFmZDBhMmI5MGQ=
+    MDMxMGJlY2IxZGRhYzRjYTBiYjA2ZjlkMmRhMjc5NWQ4YjE0OTEwNDYxZjgx
+    ZGFjMDBmMTAyYmFlYzBlMGJhMzg1MWViZDJlNGUwYTUyYzY4MzhjOWJiMzAy
+    MzJlMDY1OTMzNTRkYjM2Yzg3OTQ4YmU0OWE4YTAxMzFjM2FiNTA=

data/lib/cf/version.rb

@@ -1,3 +1,3 @@
 module Cf
-  VERSION = "3.0.1".freeze
+  VERSION = "4.0.0".freeze
 end

data/lib/vcap/component.rb

@@ -45,10 +45,6 @@ module VCAP
 
   # Common component setup for discovery and monitoring
   class Component
-
-    # We will suppress these from normal varz reporting by default.
-    CONFIG_SUPPRESS = Set.new([:message_bus_servers, :mbus, :service_mbus, :keys, :database_environment, :password, :pass, :token])
-
     class SafeHash < BasicObject
       def initialize(hash = {})
         @hash = hash
@@ -156,6 +152,8 @@ module VCAP
       # Returns the published configuration of the component,
       # including the ephemeral port and credentials.
       def register(opts)
+        disallow_exposing_of_config!(opts)
+
         uuid = VCAP.secure_uuid
         type = opts[:type]
         index = opts[:index]
@@ -181,7 +179,6 @@ module VCAP
         varz.synchronize do
           varz.merge!(@discover.dup)
           varz[:num_cores] = VCAP.num_cores
-          varz[:config] = sanitize_config(opts[:config]) if opts[:config]
           varz[:log_counts] = log_counter if log_counter
         end
 
@@ -209,28 +206,11 @@ module VCAP
         @discover[:uptime] = VCAP.uptime_string(Time.now - @discover[:start])
       end
 
-      def clear_level(h)
-        h.each do |k, v|
-          if CONFIG_SUPPRESS.include?(k.to_sym)
-            h.delete(k)
-          else
-            clear_level(h[k]) if v.instance_of? Hash
-          end
-        end
-      end
+      private
 
-      def sanitize_config(config)
-        # Can't Marshal/Deep Copy logger instances that services use
-        if config[:logger]
-          config = config.dup
-          config.delete(:logger)
-        end
-        # Deep copy
-        config = Marshal.load(Marshal.dump(config))
-        clear_level(config)
-        config
+      def disallow_exposing_of_config!(opts)
+        raise ArgumentError.new("Exposing the config is a security concern, and disallowed.") if opts.has_key?(:config)
       end
-
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vcap_common
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 4.0.0
 platform: ruby
 authors:
 - Cloud Foundry Core Team