puppet 4.1.0 → 5.0.0

data/lib/puppet/file_serving/http_metadata.rb

@@ -0,0 +1,46 @@
+require 'puppet/file_serving/metadata'
+
+# Simplified metadata representation, suitable for the information
+# that is available from HTTP headers.
+class Puppet::FileServing::HttpMetadata < Puppet::FileServing::Metadata
+
+  def initialize(http_response, path = '/dev/null')
+    super(path)
+
+    # ignore options that do not apply to HTTP metadata
+    @owner = @group = @mode = nil
+
+    # hash available checksums for eventual collection
+    @checksums = {}
+    # use a default mtime in case there is no usable HTTP header
+    @checksums[:mtime] = "{mtime}#{Time.now}"
+
+    if checksum = http_response['content-md5']
+      # convert base64 digest to hex
+      checksum = checksum.unpack("m0").first.unpack("H*").first
+      @checksums[:md5] = "{md5}#{checksum}"
+    end
+
+    if last_modified = http_response['last-modified']
+      mtime = DateTime.httpdate(last_modified).to_time
+      @checksums[:mtime] = "{mtime}#{mtime.utc}"
+    end
+
+    @ftype = 'file'
+
+    self
+  end
+
+  # Override of the parent class method. Does not call super!
+  # We can only return metadata that was extracted from the
+  # HTTP headers during #initialize.
+  def collect
+    # Prefer the checksum_type from the indirector request options
+    # but fall back to the alternative otherwise
+    [ @checksum_type, :md5, :mtime ].each do |type|
+      @checksum_type = type
+      @checksum = @checksums[type]
+      return if @checksum
+    end
+  end
+end

data/lib/puppet/file_serving/metadata.rb

@@ -3,6 +3,7 @@ require 'puppet/indirector'
 require 'puppet/file_serving'
 require 'puppet/file_serving/base'
 require 'puppet/util/checksums'
+require 'uri'
 
 # A class that handles retrieving file metadata.
 class Puppet::FileServing::Metadata < Puppet::FileServing::Base
@@ -12,22 +13,34 @@ class Puppet::FileServing::Metadata < Puppet::FileServing::Base
   extend Puppet::Indirector
   indirects :file_metadata, :terminus_class => :selector
 
-  attr_reader :path, :owner, :group, :mode, :checksum_type, :checksum, :ftype, :destination, :source_permissions
+  attr_reader :path, :owner, :group, :mode, :checksum_type, :checksum, :ftype, :destination, :source_permissions, :content_uri
 
   PARAM_ORDER = [:mode, :ftype, :owner, :group]
 
   def checksum_type=(type)
-    raise(ArgumentError, "Unsupported checksum type #{type}") unless Puppet::Util::Checksums.respond_to?("#{type}_file")
+    raise(ArgumentError, _("Unsupported checksum type %{type}") % { type: type }) unless Puppet::Util::Checksums.respond_to?("#{type}_file")
 
     @checksum_type = type
   end
 
   def source_permissions=(source_permissions)
-    raise(ArgumentError, "Unsupported source_permission #{source_permissions}") unless [:use, :use_when_creating, :ignore].include?(source_permissions.intern)
+    raise(ArgumentError, _("Unsupported source_permission %{source_permissions}") % { source_permissions: source_permissions }) unless [:use, :use_when_creating, :ignore].include?(source_permissions.intern)
 
     @source_permissions = source_permissions.intern
   end
 
+  def content_uri=(path)
+    begin
+      uri = URI.parse(Puppet::Util.uri_encode(path))
+    rescue URI::InvalidURIError => detail
+      raise(ArgumentError, _("Could not understand URI %{path}: %{detail}") % { path: path, detail: detail })
+    end
+    raise(ArgumentError, _("Cannot use opaque URLs '%{path}'") % { path: path }) unless uri.hierarchical?
+    raise(ArgumentError, _("Must use URLs of type puppet as content URI")) if uri.scheme != "puppet"
+
+    @content_uri = path.encode(Encoding::UTF_8)
+  end
+
   class MetaStat
     extend Forwardable
 
@@ -59,7 +72,7 @@ class Puppet::FileServing::Metadata < Puppet::FileServing::Base
     def initialize(stat, path, source_permissions)
       super(stat, source_permissions)
       @path = path
-      raise(ArgumentError, "Unsupported Windows source permissions option #{source_permissions}") unless @source_permissions_ignore
+      raise(ArgumentError, _("Unsupported Windows source permissions option %{source_permissions}") % { source_permissions: source_permissions }) unless @source_permissions_ignore
     end
 
     { :owner => 'S-1-5-32-544',
@@ -106,7 +119,7 @@ class Puppet::FileServing::Metadata < Puppet::FileServing::Base
       @destination = Puppet::FileSystem.readlink(real_path)
       @checksum = ("{#{@checksum_type}}") + send("#{@checksum_type}_file", real_path).to_s rescue nil
     else
-      raise ArgumentError, "Cannot manage files of type #{stat.ftype}"
+      raise ArgumentError, _("Cannot manage files of type %{file_type}") % { file_type: stat.ftype }
     end
   end
 
@@ -121,6 +134,8 @@ class Puppet::FileServing::Metadata < Puppet::FileServing::Base
     @checksum_type ||= Puppet[:digest_algorithm]
     @ftype       = data.delete('type')
     @destination = data.delete('destination')
+    @source      = data.delete('source')
+    @content_uri = data.delete('content_uri')
     super(path,data)
   end
 
@@ -136,7 +151,8 @@ class Puppet::FileServing::Metadata < Puppet::FileServing::Base
         },
         'type'         => ftype,
         'destination'  => destination,
-      }
+      }.merge(content_uri ? {'content_uri' => content_uri} : {})
+       .merge(source ? {'source' => source} : {})
     )
   end
 

data/lib/puppet/file_serving/mount/file.rb

@@ -15,7 +15,7 @@ class Puppet::FileServing::Mount::File < Puppet::FileServing::Mount
   def complete_path(relative_path, node)
     full_path = path(node)
 
-    raise ArgumentError.new("Mounts without paths are not usable") unless full_path
+    raise ArgumentError.new(_("Mounts without paths are not usable")) unless full_path
 
     # If there's no relative path name, then we're serving the mount itself.
     return full_path unless relative_path
@@ -23,7 +23,7 @@ class Puppet::FileServing::Mount::File < Puppet::FileServing::Mount
     file = ::File.join(full_path, relative_path)
 
     if !(Puppet::FileSystem.exist?(file) or Puppet::FileSystem.symlink?(file))
-      Puppet.info("File does not exist or is not accessible: #{file}")
+      Puppet.info(_("File does not exist or is not accessible: %{file}") % { file: file })
       return nil
     end
 
@@ -52,8 +52,8 @@ class Puppet::FileServing::Mount::File < Puppet::FileServing::Mount
       # Mark that we're expandable.
       @expandable = true
     else
-      raise ArgumentError, "#{path} does not exist or is not a directory" unless FileTest.directory?(path)
-      raise ArgumentError, "#{path} is not readable" unless FileTest.readable?(path)
+      raise ArgumentError, _("%{path} does not exist or is not a directory") % { path: path } unless FileTest.directory?(path)
+      raise ArgumentError, _("%{path} is not readable") % { path: path } unless FileTest.readable?(path)
       @expandable = false
     end
     @path = path
@@ -67,7 +67,7 @@ class Puppet::FileServing::Mount::File < Puppet::FileServing::Mount
   # Verify our configuration is valid.  This should really check to
   # make sure at least someone will be allowed, but, eh.
   def validate
-    raise ArgumentError.new("Mounts without paths are not usable") if @path.nil?
+    raise ArgumentError.new(_("Mounts without paths are not usable")) if @path.nil?
   end
 
   private
@@ -89,7 +89,7 @@ class Puppet::FileServing::Mount::File < Puppet::FileServing::Mount
     if node
       map = clientmap(node)
     else
-      Puppet.notice "No client; expanding '#{path}' with local host"
+      Puppet.notice _("No client; expanding '%{path}' with local host") % { path: path }
       # Else, use the local information
       map = localmap
     end

data/lib/puppet/file_serving/mount/modules.rb

@@ -5,7 +5,7 @@ require 'puppet/file_serving/mount'
 class Puppet::FileServing::Mount::Modules < Puppet::FileServing::Mount
   # Return an instance of the appropriate class.
   def find(path, request)
-    raise "No module specified" if path.to_s.empty?
+    raise _("No module specified") if path.to_s.empty?
     module_name, relative_path = path.split("/", 2)
     return nil unless mod = request.environment.module(module_name)
 

data/lib/puppet/file_serving/mount.rb

@@ -18,7 +18,7 @@ class Puppet::FileServing::Mount < Puppet::Network::AuthStore
   # Create our object.  It must have a name.
   def initialize(name)
     unless name =~ %r{^[-\w]+$}
-      raise ArgumentError, "Invalid mount name format '#{name}'"
+      raise ArgumentError, _("Invalid mount name format '%{name}'") % { name: name }
     end
     @name = name
 

data/lib/puppet/file_serving/terminus_selector.rb

@@ -21,10 +21,12 @@ module Puppet::FileServing::TerminusSelector
       else
         Puppet[:default_file_terminus]
       end
+   when "http","https"
+     :http
     when nil
       :file_server
     else
-      raise ArgumentError, "URI protocol '#{request.protocol}' is not currently supported for file serving"
+      raise ArgumentError, _("URI protocol '%{protocol}' is not currently supported for file serving") % { protocol: request.protocol }
     end
   end
 end

data/lib/puppet/file_system/file_impl.rb

@@ -14,7 +14,7 @@ class Puppet::FileSystem::FileImpl
     if path.respond_to?(:to_str)
       Pathname.new(path)
     else
-      raise ArgumentError, "FileSystem implementation expected Pathname, got: '#{path.class}'"
+      raise ArgumentError, _("FileSystem implementation expected Pathname, got: '%{klass}'") % { klass: path.class }
     end
   end
 
@@ -22,6 +22,11 @@ class Puppet::FileSystem::FileImpl
     path.to_s
   end
 
+  def expand_path(path, dir_string = nil)
+    # ensure `nil` values behave like underlying File.expand_path
+    ::File.expand_path(path.nil? ? nil : path_string(path), dir_string)
+  end
+
   def open(path, mode, options, &block)
     ::File.open(path, options, mode, &block)
   end
@@ -56,7 +61,7 @@ class Puppet::FileSystem::FileImpl
           timeout -= wait
           wait *= 2
           if timeout < 0
-            raise Timeout::Error, "Timeout waiting for exclusive lock on #{@path}"
+            raise Timeout::Error, _("Timeout waiting for exclusive lock on %{path}") % { path: @path }
           end
         end
       end
@@ -71,8 +76,8 @@ class Puppet::FileSystem::FileImpl
     end
   end
 
-  def read(path)
-    path.read
+  def read(path, opts = {})
+    path.read(opts)
   end
 
   def read_preserve_line_endings(path)

data/lib/puppet/file_system/memory_impl.rb

@@ -3,6 +3,10 @@ class Puppet::FileSystem::MemoryImpl
     @files = files + all_children_of(files)
   end
 
+  def expand_path(path, dir_string = nil)
+    File.expand_path(path, dir_string)
+  end
+
   def exist?(path)
     path.exist?
   end
@@ -39,7 +43,7 @@ class Puppet::FileSystem::MemoryImpl
     object.path
   end
 
-  def read(path)
+  def read(path, opts = {})
     handle = assert_path(path).handle
     handle.read
   end
@@ -61,7 +65,7 @@ class Puppet::FileSystem::MemoryImpl
     if path.is_a?(Puppet::FileSystem::MemoryFile)
       path
     else
-      find(path) or raise ArgumentError, "Unable to find registered object for #{path.inspect}"
+      find(path) or raise ArgumentError, _("Unable to find registered object for %{path}") % { path: path.inspect }
     end
   end
 

data/lib/puppet/file_system/path_pattern.rb

@@ -1,4 +1,5 @@
 require 'pathname'
+require 'puppet/error'
 
 module Puppet::FileSystem
   class PathPattern
@@ -47,12 +48,12 @@ module Puppet::FileSystem
     def validate
       @pathname.each_filename do |e|
         if e =~ TRAVERSAL
-          raise(InvalidPattern, "PathPatterns cannot be created with directory traversals.")
+          raise(InvalidPattern, _("PathPatterns cannot be created with directory traversals."))
         end
       end
       case @pathname.to_s
       when CURRENT_DRIVE_RELATIVE_WINDOWS
-        raise(InvalidPattern, "A PathPattern cannot be a Windows current drive relative path.")
+        raise(InvalidPattern, _("A PathPattern cannot be a Windows current drive relative path."))
       end
     end
 
@@ -60,7 +61,7 @@ module Puppet::FileSystem
       begin
         @pathname = Pathname.new(pattern.strip)
       rescue ArgumentError => error
-        raise InvalidPattern.new("PathPatterns cannot be created with a zero byte.", error)
+        raise InvalidPattern.new(_("PathPatterns cannot be created with a zero byte."), error)
       end
       validate
     end
@@ -75,9 +76,9 @@ module Puppet::FileSystem
       super
       case @pathname.to_s
       when ABSOLUTE_WINDOWS
-        raise(InvalidPattern, "A relative PathPattern cannot be prefixed with a drive.")
+        raise(InvalidPattern, _("A relative PathPattern cannot be prefixed with a drive."))
       when ABSOLUTE_UNIX
-        raise(InvalidPattern, "A relative PathPattern cannot be an absolute path.")
+        raise(InvalidPattern, _("A relative PathPattern cannot be an absolute path."))
       end
     end
   end
@@ -90,7 +91,7 @@ module Puppet::FileSystem
     def validate
       super
       if @pathname.to_s !~ ABSOLUTE_UNIX and @pathname.to_s !~ ABSOLUTE_WINDOWS
-        raise(InvalidPattern, "An absolute PathPattern cannot be a relative path.")
+        raise(InvalidPattern, _("An absolute PathPattern cannot be a relative path."))
       end
     end
   end

data/lib/puppet/file_system/uniquefile.rb

@@ -106,7 +106,7 @@ class Puppet::FileSystem::Uniquefile < DelegateClass(File)
         prefix = prefix_suffix[0]
         suffix = prefix_suffix[1]
       else
-        raise ArgumentError, "unexpected prefix_suffix: #{prefix_suffix.inspect}"
+        raise ArgumentError, _("unexpected prefix_suffix: %{value}") % { value: prefix_suffix.inspect }
     end
     t = Time.now.strftime("%Y%m%d")
     path = "#{prefix}#{t}-#{$$}-#{rand(0x100000000).to_s(36)}"
@@ -136,7 +136,7 @@ class Puppet::FileSystem::Uniquefile < DelegateClass(File)
       n ||= 0
       n += 1
       retry if !max_try or n < max_try
-      raise "cannot generate temporary name using `#{basename}' under `#{tmpdir}'"
+      raise _("cannot generate temporary name using `%{basename}' under `%{tmpdir}'") % { basename: basename, tmpdir: tmpdir }
     end
     path
   end
@@ -156,7 +156,7 @@ class Puppet::FileSystem::Uniquefile < DelegateClass(File)
     if $SAFE > 0
       tmp = @@systmpdir
     else
-      for dir in [ENV['TMPDIR'], ENV['TMP'], ENV['TEMP'], @@systmpdir, '/tmp']
+      for dir in [ Puppet::Util.get_env('TMPDIR'), Puppet::Util.get_env('TMP'), Puppet::Util.get_env('TEMP'), @@systmpdir, '/tmp']
         if dir and stat = File.stat(dir) and stat.directory? and stat.writable?
           tmp = dir
           break
@@ -175,7 +175,7 @@ class Puppet::FileSystem::Uniquefile < DelegateClass(File)
       mkdir(lock)
       yield
     ensure
-      rmdir(lock) if lock
+      rmdir(lock) if Puppet::FileSystem.exist?(lock)
     end
 
     def mkdir(*args)
@@ -187,4 +187,4 @@ class Puppet::FileSystem::Uniquefile < DelegateClass(File)
     end
   end
 
-end
+end

data/lib/puppet/file_system/windows.rb

@@ -3,22 +3,35 @@ require 'puppet/util/windows'
 
 class Puppet::FileSystem::Windows < Puppet::FileSystem::Posix
 
-  def exist?(path)
-    if ! Puppet.features.manages_symlinks?
-      return ::File.exist?(path)
-    end
+  def open(path, mode, options, &block)
+    # PUP-6959 mode is explicitly ignored until it can be implemented
+    # Ruby on Windows uses mode for setting file attributes like read-only and
+    # archived, not for setting permissions like POSIX
+    raise TypeError.new('mode must be specified as an Integer') if mode && !mode.is_a?(Numeric)
+    ::File.open(path, options, nil, &block)
+  end
 
-    path = path.to_str if path.respond_to?(:to_str) # support WatchedFile
-    path = path.to_s # support String and Pathname
+  def expand_path(path, dir_string = nil)
+    # ensure `nil` values behave like underlying File.expand_path
+    string_path = ::File.expand_path(path.nil? ? nil : path_string(path), dir_string)
+    # if no tildes, nothing to expand, no need to call Windows API, return original string
+    return string_path if !string_path.index('~')
 
     begin
-      if Puppet::Util::Windows::File.symlink?(path)
-        path = Puppet::Util::Windows::File.readlink(path)
-      end
-      ! Puppet::Util::Windows::File.stat(path).nil?
-    rescue # generally INVALID_HANDLE_VALUE which means 'file not found'
-      false
+      # no need to do existence check up front as GetLongPathName implies that check is performed
+      # and it should be the exception that files aren't actually present
+      string_path = Puppet::Util::Windows::File.get_long_pathname(string_path)
+    rescue Puppet::Util::Windows::Error => e
+      # preserve original File.expand_path behavior for file / path not found by returning string
+      raise if (e.code != Puppet::Util::Windows::File::ERROR_FILE_NOT_FOUND &&
+        e.code != Puppet::Util::Windows::File::ERROR_PATH_NOT_FOUND)
     end
+
+    string_path
+  end
+
+  def exist?(path)
+    return Puppet::Util::Windows::File.exist?(path)
   end
 
   def symlink(path, dest, options = {})
@@ -31,7 +44,7 @@ class Puppet::FileSystem::Windows < Puppet::FileSystem::Posix
     return 0 if dest_exists && dest_stat.ftype == 'directory'
 
     if dest_exists && dest_stat.ftype == 'file' && options[:force] != true
-      raise(Errno::EEXIST, "#{dest} already exists and the :force option was not specified")
+      raise(Errno::EEXIST, _("%{dest} already exists and the :force option was not specified") % { dest: dest })
     end
 
     if options[:noop] != true
@@ -62,7 +75,9 @@ class Puppet::FileSystem::Windows < Puppet::FileSystem::Posix
       stat = Puppet::Util::Windows::File.stat(file_name) rescue nil
 
       # sigh, Ruby + Windows :(
-      if stat && stat.ftype == 'directory'
+      if !stat
+        ::File.unlink(file_name) rescue Dir.rmdir(file_name)
+      elsif stat.ftype == 'directory'
         if Puppet::Util::Windows::File.symlink?(file_name)
           Dir.rmdir(file_name)
         else
@@ -103,12 +118,12 @@ class Puppet::FileSystem::Windows < Puppet::FileSystem::Posix
 
   def raise_if_symlinks_unsupported
     if ! Puppet.features.manages_symlinks?
-      msg = "This version of Windows does not support symlinks.  Windows Vista / 2008 or higher is required."
+      msg = _("This version of Windows does not support symlinks.  Windows Vista / 2008 or higher is required.")
       raise Puppet::Util::Windows::Error.new(msg)
     end
 
     if ! Puppet::Util::Windows::Process.process_privilege_symlink?
-      Puppet.warning "The current user does not have the necessary permission to manage symlinks."
+      Puppet.warning _("The current user does not have the necessary permission to manage symlinks.")
     end
   end
 

data/lib/puppet/file_system.rb

@@ -1,4 +1,5 @@
 module Puppet::FileSystem
+  require 'puppet/util'
   require 'puppet/file_system/path_pattern'
   require 'puppet/file_system/file_impl'
   require 'puppet/file_system/memory_file'
@@ -31,6 +32,15 @@ module Puppet::FileSystem
 
   # Opens the given path with given mode, and options and optionally yields it to the given block.
   #
+  # @param path [String, Pathname] the path to the file to operate on
+  # @param mode [Integer] The mode to apply to the file if it is created
+  # @param options [String] Extra file operation mode information to use
+  #   This is the standard mechanism Ruby uses in the IO class, and therefore
+  #   encoding may be specified explicitly as fmode : encoding or fmode : "BOM|UTF-*"
+  #   for example, a:ASCII or w+:UTF-8
+  # @yield The file handle, in the mode given by options, else read-write mode
+  # @return [Void]
+  #
   # @api public
   #
   def self.open(path, mode, options, &block)
@@ -97,10 +107,13 @@ module Puppet::FileSystem
   #
   # @param path [Pathname] the path to the file to operate on
   # @param mode [Integer] The mode to apply to the file if it is created
-  # @param options [Integer] Extra file operation mode information to use
-  #   (defaults to read-only mode)
+  # @param options [String] Extra file operation mode information to use
+  #   (defaults to read-only mode 'r')
+  #   This is the standard mechanism Ruby uses in the IO class, and therefore
+  #   encoding may be specified explicitly as fmode : encoding or fmode : "BOM|UTF-*"
+  #   for example, a:ASCII or w+:UTF-8
   # @param timeout [Integer] Number of seconds to wait for the lock (defaults to 300)
-  # @yield The file handle, in read-write mode
+  # @yield The file handle, in the mode given by options, else read-write mode
   # @return [Void]
   # @raise [Timeout::Error] If the timeout is exceeded while waiting to acquire the lock
   #
@@ -122,8 +135,8 @@ module Puppet::FileSystem
   #
   # @api public
   #
-  def self.read(path)
-    @impl.read(assert_path(path))
+  def self.read(path, opts = {})
+    @impl.read(assert_path(path), opts)
   end
 
   # Read a file keeping the original line endings intact. This
@@ -329,6 +342,21 @@ module Puppet::FileSystem
     @impl.pathname(path)
   end
 
+  # Produces a string representation of the opaque path handle, with expansions
+  # performed on ~.  For Windows, this means that C:\Users\Admini~1\AppData will
+  # be expanded to C:\Users\Administrator\AppData.  On POSIX filesystems, the
+  # value ~ will be expanded to something like /Users/Foo
+  #
+  # This method exists primarlily to resolve a Ruby deficiency where
+  # File.expand_path doesn't handle ~ in each segment on a Windows path
+  #
+  # @param path [Object] a path handle produced by {#pathname}
+  # @return [String] a string representation of the path
+  #
+  def self.expand_path(path, dir_string = nil)
+    @impl.expand_path(path, dir_string)
+  end
+
   # Asserts that the given path is of the expected type produced by #pathname
   #
   # @raise [ArgumentError] when path is not of the expected type

data/lib/puppet/forge/cache.rb

@@ -24,6 +24,7 @@ class Puppet::Forge
         uri = url.is_a?(::URI) ? url : ::URI.parse(url)
         unless cached_file.file?
           if uri.scheme == 'file'
+            # CGI.unescape butchers Uris that are escaped properly
             FileUtils.cp(URI.unescape(uri.path), cached_file)
           else
             # TODO: Handle HTTPS; probably should use repository.contact

data/lib/puppet/forge/errors.rb

@@ -25,15 +25,15 @@ module Puppet::Forge::Errors
       @uri     = options[:uri]
       original = options[:original]
 
-      super("Unable to verify the SSL certificate at #{@uri}", original)
+      super(_("Unable to verify the SSL certificate at %{uri}") % { uri: @uri }, original)
     end
 
     # Return a multiline version of the error message
     #
     # @return [String] the multiline version of the error message
     def multiline
-      <<-EOS.chomp
-Could not connect via HTTPS to #{@uri}
+      _(<<-EOS).chomp % { uri: @uri }
+Could not connect via HTTPS to %{uri}
   Unable to verify the SSL certificate
     The certificate may not be signed by a valid CA
     The CA bundle included with OpenSSL may not be valid or up to date
@@ -51,7 +51,7 @@ Could not connect via HTTPS to #{@uri}
       original = options[:original]
       @detail  = original.message
 
-      message = "Unable to connect to the server at #{@uri}. Detail: #{@detail}."
+      message = _("Unable to connect to the server at %{uri}. Detail: %{detail}.") % { uri: @uri, detail: @detail }
       super(message, original)
     end
 
@@ -59,10 +59,10 @@ Could not connect via HTTPS to #{@uri}
     #
     # @return [String] the multiline version of the error message
     def multiline
-      <<-EOS.chomp
-Could not connect to #{@uri}
+      _(<<-EOS).chomp % { uri: @uri, detail: @detail }
+Could not connect to %{uri}
   There was a network communications problem
-    The error we caught said '#{@detail}'
+    The error we caught said '%{detail}'
     Check your network connection and try again
       EOS
     end
@@ -89,7 +89,7 @@ Could not connect to #{@uri}
       rescue JSON::ParserError
       end
 
-      message = "Request to Puppet Forge failed. Detail: "
+      message = _("Request to Puppet Forge failed. Detail: ")
       message << @message << " / " if @message
       message << @response << "."
       super(message, original)
@@ -99,12 +99,12 @@ Could not connect to #{@uri}
     #
     # @return [String] the multiline version of the error message
     def multiline
-      message = <<-EOS.chomp
+      message = _(<<-EOS).chomp % { uri: @uri, response: @response }
 Request to Puppet Forge failed.
-  The server being queried was #{@uri}
-  The HTTP response we received was '#{@response}'
+  The server being queried was %{uri}
+  The HTTP response we received was '%{response}'
       EOS
-      message << "\n  The message we received said '#{@message}'" if @message
+      message << _("\n  The message we received said '%{message}'") % { message: @message } if @message
       message
     end
   end