diff options
| author | Jacob Helwig <jacob@puppetlabs.com> | 2011-08-02 11:04:26 -0700 |
|---|---|---|
| committer | Jacob Helwig <jacob@puppetlabs.com> | 2011-08-19 13:52:58 -0700 |
| commit | 37f87b709598b48bc8b562422da27cc73cc1eff1 (patch) | |
| tree | b5f96e5e69556e6031a8533960802fac268e88b7 /lib/puppet/file_serving/indirection_hooks.rb | |
| parent | 4a6d61717eb54a0cefff87bf67ae62df1e3b4317 (diff) | |
| download | puppet-37f87b709598b48bc8b562422da27cc73cc1eff1.tar.gz puppet-37f87b709598b48bc8b562422da27cc73cc1eff1.tar.xz puppet-37f87b709598b48bc8b562422da27cc73cc1eff1.zip | |
Treat Windows absolute paths as absolute paths
Previously, we only considered files that matched the *nix concept of
'absolute' as being absolute paths. Since absolute paths on Windows
look more like URLs with this world-view, we need to specifically look
for the Windows absolute paths, and treat them as such.
We will still treat *nix absolute paths as absolute on Windows, even
though they are actually relative to the "current" drive. We do not
currently limit which "style" of absolute path is allowed based on
what the agent is.
Reviewed-by: Nick Lewis <nick@puppetlabs.com>
(cherry picked from commit 568d25ee10effd5e87c57cdc8c24280eabf9cd93)
Diffstat (limited to 'lib/puppet/file_serving/indirection_hooks.rb')
| -rw-r--r-- | lib/puppet/file_serving/indirection_hooks.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/puppet/file_serving/indirection_hooks.rb b/lib/puppet/file_serving/indirection_hooks.rb index 499767c41..bdcc8865e 100644 --- a/lib/puppet/file_serving/indirection_hooks.rb +++ b/lib/puppet/file_serving/indirection_hooks.rb @@ -13,6 +13,7 @@ module Puppet::FileServing::IndirectionHooks # Short-circuit to :file if it's a fully-qualified path or specifies a 'file' protocol. return PROTOCOL_MAP["file"] if request.key =~ /^#{::File::SEPARATOR}/ + return PROTOCOL_MAP["file"] if request.key =~ /^[a-z]:[\/\\]/i return PROTOCOL_MAP["file"] if request.protocol == "file" # We're heading over the wire the protocol is 'puppet' and we've got a server name or we're not named 'apply' or 'puppet' |