Use `CURL_CA_BUNDLE` environment variable inplace of building path at runtime
This commit is contained in:
parent
52824f20b4
commit
06e3185eb1
|
@ -297,8 +297,7 @@ module Vagrant
|
||||||
# If we're in Vagrant, then we use the packaged CA bundle
|
# If we're in Vagrant, then we use the packaged CA bundle
|
||||||
if Vagrant.in_installer?
|
if Vagrant.in_installer?
|
||||||
subprocess_options[:env] ||= {}
|
subprocess_options[:env] ||= {}
|
||||||
subprocess_options[:env]["CURL_CA_BUNDLE"] =
|
subprocess_options[:env]["CURL_CA_BUNDLE"] = ENV["CURL_CA_BUNDLE"]
|
||||||
File.expand_path("cacert.pem", ENV["VAGRANT_INSTALLER_EMBEDDED_DIR"])
|
|
||||||
end
|
end
|
||||||
|
|
||||||
return [options, subprocess_options]
|
return [options, subprocess_options]
|
||||||
|
|
|
@ -210,4 +210,32 @@ describe Vagrant::Util::Downloader do
|
||||||
expect(subject.head).to eq("foo")
|
expect(subject.head).to eq("foo")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
describe "#options" do
|
||||||
|
describe "CURL_CA_BUNDLE" do
|
||||||
|
let(:ca_bundle){ "CUSTOM_CA_BUNDLE" }
|
||||||
|
|
||||||
|
context "when running within the installer" do
|
||||||
|
before do
|
||||||
|
allow(Vagrant).to receive(:in_installer?).and_return(true)
|
||||||
|
allow(ENV).to receive(:[]).with("CURL_CA_BUNDLE").and_return(ca_bundle)
|
||||||
|
end
|
||||||
|
|
||||||
|
it "should set custom CURL_CA_BUNDLE in subprocess ENV" do
|
||||||
|
_, subprocess_opts = subject.send(:options)
|
||||||
|
expect(subprocess_opts[:env]).not_to be_nil
|
||||||
|
expect(subprocess_opts[:env]["CURL_CA_BUNDLE"]).to eql(ca_bundle)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context "when not running within the installer" do
|
||||||
|
before{ allow(Vagrant).to receive(:installer?).and_return(false) }
|
||||||
|
|
||||||
|
it "should not set custom CURL_CA_BUNDLE in subprocess ENV" do
|
||||||
|
_, subprocess_opts = subject.send(:options)
|
||||||
|
expect(subprocess_opts[:env]).to be_nil
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue