extra more password stuff to util, fix for ftp to use util

1 files changed, 2 insertions, 4 deletions

diff --git a/lib/chef/provider/remote_file/content.rb b/lib/chef/provider/remote_file/content.rb
index 795da787f2..ca8e2744d5 100644
--- a/lib/chef/provider/remote_file/content.rb
+++ b/lib/chef/provider/remote_file/content.rb
@@ -21,6 +21,7 @@ require 'rest_client'
 require 'uri'
 require 'tempfile'
 require 'chef/provider/file_content_base'
+require 'chef/provider/remote_file/util'
 
 class Chef
   class Provider
@@ -61,10 +62,7 @@ class Chef
               raise e
             end
           end
-          if uri.userinfo
-            uri.password = "********"
-          end
-          return raw_file, uri.to_s
+          return raw_file, Chef::Provider::RemoteFile::Util.uri_for_cache(uri)
         end
 
         # Given a source uri, return a Tempfile, or a File that acts like a Tempfile (close! method)