Do not prefix Windows paths if UNC prefix already exists

While VirtualBox has commented that they do not support UNC remote
paths (but do for long paths) it seems that remote paths can work.
If user provides UNC path, allow it to be used as-is.

Fixes #7011
This commit is contained in:
Chris Roberts 2017-04-20 16:28:39 -07:00
parent 3e0f21bd7f
commit a8b2f78f59
2 changed files with 17 additions and 4 deletions

View File

@ -188,12 +188,17 @@ module Vagrant
def windows_unc_path(path) def windows_unc_path(path)
path = path.gsub("/", "\\") path = path.gsub("/", "\\")
# If the path is just a drive letter, then return that as-is
return path + "\\" if path =~ /^[a-zA-Z]:\\?$/
# Convert to UNC path # Convert to UNC path
if path =~ /^[a-zA-Z]:\\?$/
# If the path is just a drive letter, then return that as-is
path + "\\"
elsif path.start_with?("\\\\")
# If the path already starts with `\\` assume UNC and return as-is
path
else
"\\\\?\\" + path.gsub("/", "\\") "\\\\?\\" + path.gsub("/", "\\")
end end
end
# Returns a boolean noting whether the terminal supports color. # Returns a boolean noting whether the terminal supports color.
# output. # output.

View File

@ -55,5 +55,13 @@ describe Vagrant::Util::Platform do
it "correctly converts a path" do it "correctly converts a path" do
expect(described_class.windows_unc_path("c:/foo").to_s).to eql("\\\\?\\c:\\foo") expect(described_class.windows_unc_path("c:/foo").to_s).to eql("\\\\?\\c:\\foo")
end end
context "when given a UNC path" do
let(:unc_path){ "\\\\srvname\\path" }
it "should not modify the path" do
expect(described_class.windows_unc_path(unc_path).to_s).to eql(unc_path)
end
end
end end
end end