diff options
| author | Josh Cooper <josh@puppetlabs.com> | 2011-07-18 22:44:10 -0700 |
|---|---|---|
| committer | Jacob Helwig <jacob@puppetlabs.com> | 2011-08-19 13:48:29 -0700 |
| commit | bfeb33734358528209221be09b97ffc8513d3f87 (patch) | |
| tree | 3d5de01cb25e8deeecaa18605b8af7249f6ebb2f /lib/puppet/node/environment.rb | |
| parent | fe81decc5336a540ba9e65e0da48f5a5e3b52274 (diff) | |
| download | puppet-bfeb33734358528209221be09b97ffc8513d3f87.tar.gz puppet-bfeb33734358528209221be09b97ffc8513d3f87.tar.xz puppet-bfeb33734358528209221be09b97ffc8513d3f87.zip | |
(#8268) Require windows drive letters in absolute file paths
When testing whether a file path is absolute, the regexp was only
handling POSIX style file paths. This commit requires Windows
style file paths to start with a drive letter. A future commit
will refacter the various places we do path validation to
support both Windows drive letters and UNC paths.
Reviewed-by: Jacob Helwig <jacob@puppetlabs.com>
(cherry picked from commit 45ae5b4a9ced26dfcd3e324391f9a26cb02bf93d)
Diffstat (limited to 'lib/puppet/node/environment.rb')
| -rw-r--r-- | lib/puppet/node/environment.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/puppet/node/environment.rb b/lib/puppet/node/environment.rb index dc631979e..96fdc3c1e 100644 --- a/lib/puppet/node/environment.rb +++ b/lib/puppet/node/environment.rb @@ -136,14 +136,15 @@ class Puppet::Node::Environment end def validate_dirs(dirs) + dir_regex = Puppet.features.microsoft_windows? ? /^[A-Za-z]:#{File::SEPARATOR}/ : /^#{File::SEPARATOR}/ dirs.collect do |dir| - if dir !~ /^#{File::SEPARATOR}/ + if dir !~ dir_regex File.join(Dir.getwd, dir) else dir end end.find_all do |p| - p =~ /^#{File::SEPARATOR}/ && FileTest.directory?(p) + p =~ dir_regex && FileTest.directory?(p) end end |