cfoundry 2.3.6.rc1 → 2.3.6.rc2

data/lib/cfoundry/trace_helpers.rb

@@ -3,7 +3,7 @@ require "multi_json"
 
 module CFoundry
   module TraceHelpers
-    PROTECTED_ATTRIBUTES = ['Authorization']
+    PROTECTED_ATTRIBUTES = ['Authorization', 'credentials']
 
     def request_trace(request)
       return nil unless request
@@ -23,6 +23,7 @@ module CFoundry
       info << "RESPONSE_BODY:"
       begin
         parsed_body = MultiJson.load(response[:body])
+        filter_protected_attributes(parsed_body)
         info << MultiJson.dump(parsed_body, :pretty => true)
       rescue
         info << "#{response[:body]}"
@@ -41,5 +42,23 @@ module CFoundry
         end
       end
     end
+
+    def filter_protected_attributes(hash_or_array)
+      if hash_or_array.is_a? Array
+        hash_or_array.each do |value|
+          filter_protected_attributes(value)
+        end
+      else
+        hash_or_array.each do |key, value|
+          if PROTECTED_ATTRIBUTES.include? key
+            hash_or_array[key] = "[PRIVATE DATA HIDDEN]"
+          else
+            if value.is_a?(Hash) || value.is_a?(Array)
+              filter_protected_attributes(value)
+            end
+          end
+        end
+      end
+    end
   end
 end

data/lib/cfoundry/v2/user.rb

@@ -63,10 +63,10 @@ module CFoundry
       end
 
       def delete! (options = {})
-        super (options)
+        super(options)
         @client.base.uaa.delete_user(guid)
         true
       end
     end
   end
-end
+end

data/lib/cfoundry/version.rb

@@ -1,4 +1,4 @@
 module CFoundry # :nodoc:
   # CFoundry library version number.
-  VERSION = "2.3.6.rc1".freeze
+  VERSION = "2.3.6.rc2".freeze
 end

data/spec/cfoundry/trace_helpers_spec.rb

@@ -76,6 +76,13 @@ describe CFoundry::TraceHelpers do
 
       include_examples "response_trace tests"
     end
+    
+    context "with credentials in the response body" do
+      let(:response_body) { '{"resources": [{"entity": {"credentials": {"super_secret_stuff": "goes here"}, "other_stuff": "still here"}}]}' }
+      let(:response_trace) { "RESPONSE: [404]\nRESPONSE_HEADERS:\n\nRESPONSE_BODY:\n#{MultiJson.dump({"resources" => [{"entity" => {"credentials" => "[PRIVATE DATA HIDDEN]", "other_stuff" => "still here"}}]}, :pretty => true)}" }
+
+      include_examples "response_trace tests"
+    end
 
     it "returns nil if response is nil" do
       tracehelper_test_class.new.response_trace(nil).should == nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfoundry
 version: !ruby/object:Gem::Version
-  version: 2.3.6.rc1
+  version: 2.3.6.rc2
   prerelease: 6
 platform: ruby
 authors:
@@ -414,9 +414,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -59622661081407862
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: