haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #4422 from crystax/master

This commit is contained in:
Seth Vargo 2015-05-31 09:34:44 -07:00
parent 3d66e16240 26e3994319
commit 95c9638e14
6 changed files with 39 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/vagrant/action/builtin/box_add.rb
View File

@ -404,6 +404,7 @@ module Vagrant
downloader_options[:client_cert] = env[:box_download_client_cert] downloader_options[:client_cert] = env[:box_download_client_cert]
downloader_options[:headers] = ["Accept: application/json"] if opts[:json] downloader_options[:headers] = ["Accept: application/json"] if opts[:json]
downloader_options[:ui] = env[:ui] if opts[:ui] downloader_options[:ui] = env[:ui] if opts[:ui]
downloader_options[:location_trusted] = env[:box_download_location_trusted]
Util::Downloader.new(url, temp_path, downloader_options) Util::Downloader.new(url, temp_path, downloader_options)
end end

2
lib/vagrant/action/builtin/handle_box.rb
View File

@ -66,6 +66,7 @@ module Vagrant
box_download_insecure = machine.config.vm.box_download_insecure box_download_insecure = machine.config.vm.box_download_insecure
box_download_checksum_type = machine.config.vm.box_download_checksum_type box_download_checksum_type = machine.config.vm.box_download_checksum_type
box_download_checksum = machine.config.vm.box_download_checksum box_download_checksum = machine.config.vm.box_download_checksum
box_download_location_trusted = machine.config.vm.box_download_location_trusted
box_formats = machine.provider_options[:box_format] || box_formats = machine.provider_options[:box_format] ||
machine.provider_name machine.provider_name
@ -90,6 +91,7 @@ module Vagrant
box_download_insecure: box_download_insecure, box_download_insecure: box_download_insecure,
box_checksum_type: box_download_checksum_type, box_checksum_type: box_download_checksum_type,
box_checksum: box_download_checksum, box_checksum: box_download_checksum,
box_download_location_trusted: box_download_location_trusted,
})) }))
rescue Errors::BoxAlreadyExists rescue Errors::BoxAlreadyExists
# Just ignore this, since it means the next part will succeed! # Just ignore this, since it means the next part will succeed!

2
lib/vagrant/util/downloader.rb
View File

@ -49,6 +49,7 @@ module Vagrant
@insecure = options[:insecure] @insecure = options[:insecure]
@ui = options[:ui] @ui = options[:ui]
@client_cert = options[:client_cert] @client_cert = options[:client_cert]
@location_trusted = options[:location_trusted]
end end
# This executes the actual download, downloading the source file # This executes the actual download, downloading the source file
@ -224,6 +225,7 @@ module Vagrant
options << "--insecure" if @insecure options << "--insecure" if @insecure
options << "--cert" << @client_cert if @client_cert options << "--cert" << @client_cert if @client_cert
options << "-u" << @auth if @auth options << "-u" << @auth if @auth
options << "--location-trusted" if @location_trusted
if @headers if @headers
Array(@headers).each do |header| Array(@headers).each do |header|

5
plugins/commands/box/command/add.rb
View File

@ -38,6 +38,10 @@ module VagrantPlugins
options[:client_cert] = c options[:client_cert] = c
end end
o.on("--location-trusted", "Trust 'Location' header from HTTP redirects and use the same credentials for subsequent urls as for the initial one") do |l|
options[:location_trusted] = l
end
o.on("--provider PROVIDER", String, "Provider the box should satisfy") do |p| o.on("--provider PROVIDER", String, "Provider the box should satisfy") do |p|
options[:provider] = p options[:provider] = p
end end
@ -95,6 +99,7 @@ module VagrantPlugins
box_download_ca_path: options[:ca_path], box_download_ca_path: options[:ca_path],
box_download_client_cert: options[:client_cert], box_download_client_cert: options[:client_cert],
box_download_insecure: options[:insecure], box_download_insecure: options[:insecure],
box_download_location_trusted: options[:location_trusted],
ui: Vagrant::UI::Prefixed.new(@env.ui, "box"), ui: Vagrant::UI::Prefixed.new(@env.ui, "box"),
}) })

41
plugins/kernel_v2/config/vm.rb
View File

@ -27,6 +27,7 @@ module VagrantPlugins
attr_accessor :box_download_checksum_type attr_accessor :box_download_checksum_type
attr_accessor :box_download_client_cert attr_accessor :box_download_client_cert
attr_accessor :box_download_insecure attr_accessor :box_download_insecure
attr_accessor :box_download_location_trusted
attr_accessor :communicator attr_accessor :communicator
attr_accessor :graceful_halt_timeout attr_accessor :graceful_halt_timeout
attr_accessor :guest attr_accessor :guest
@ -36,25 +37,26 @@ module VagrantPlugins
attr_reader :provisioners attr_reader :provisioners
def initialize def initialize
@base_mac = UNSET_VALUE @base_mac = UNSET_VALUE
@boot_timeout = UNSET_VALUE @boot_timeout = UNSET_VALUE
@box = UNSET_VALUE @box = UNSET_VALUE
@box_check_update = UNSET_VALUE @box_check_update = UNSET_VALUE
@box_download_ca_cert = UNSET_VALUE @box_download_ca_cert = UNSET_VALUE
@box_download_ca_path = UNSET_VALUE @box_download_ca_path = UNSET_VALUE
@box_download_checksum = UNSET_VALUE @box_download_checksum = UNSET_VALUE
@box_download_checksum_type = UNSET_VALUE @box_download_checksum_type = UNSET_VALUE
@box_download_client_cert = UNSET_VALUE @box_download_client_cert = UNSET_VALUE
@box_download_insecure = UNSET_VALUE @box_download_insecure = UNSET_VALUE
@box_url = UNSET_VALUE @box_download_location_trusted = UNSET_VALUE
@box_version = UNSET_VALUE @box_url = UNSET_VALUE
@communicator = UNSET_VALUE @box_version = UNSET_VALUE
@graceful_halt_timeout = UNSET_VALUE @communicator = UNSET_VALUE
@guest = UNSET_VALUE @graceful_halt_timeout = UNSET_VALUE
@hostname = UNSET_VALUE @guest = UNSET_VALUE
@post_up_message = UNSET_VALUE @hostname = UNSET_VALUE
@provisioners = [] @post_up_message = UNSET_VALUE
@usable_port_range = UNSET_VALUE @provisioners = []
@usable_port_range = UNSET_VALUE
# Internal state # Internal state
@__compiled_provider_configs = {} @__compiled_provider_configs = {}
@ -357,6 +359,7 @@ module VagrantPlugins
@box_download_checksum_type = nil if @box_download_checksum_type == UNSET_VALUE @box_download_checksum_type = nil if @box_download_checksum_type == UNSET_VALUE
@box_download_client_cert = nil if @box_download_client_cert == UNSET_VALUE @box_download_client_cert = nil if @box_download_client_cert == UNSET_VALUE
@box_download_insecure = false if @box_download_insecure == UNSET_VALUE @box_download_insecure = false if @box_download_insecure == UNSET_VALUE
@box_download_location_trusted = false if @box_download_location_trusted == UNSET_VALUE
@box_url = nil if @box_url == UNSET_VALUE @box_url = nil if @box_url == UNSET_VALUE
@box_version = nil if @box_version == UNSET_VALUE @box_version = nil if @box_version == UNSET_VALUE
@communicator = nil if @communicator == UNSET_VALUE @communicator = nil if @communicator == UNSET_VALUE

7
website/docs/source/v2/vagrantfile/machine_settings.html.md
View File

@ -73,6 +73,13 @@ URL, then SSL certs will be verified.
<hr> <hr>
`config.vm.box_download_location_trusted` - If true, then all HTTP redirects will be
treated as trusted. That means credentials used for initial URL will be used for
all subsequent redirects. By default, redirect locations are untrusted so credentials
(if specified) used only for initial HTTP request.
<hr>
`config.vm.box_url` - The URL that the configured box can be found at. `config.vm.box_url` - The URL that the configured box can be found at.
If `config.vm.box` is a shorthand to a box in [HashiCorp's Atlas](https://atlas.hashicorp.com) If `config.vm.box` is a shorthand to a box in [HashiCorp's Atlas](https://atlas.hashicorp.com)
then this value doesn't need to be specified. Otherwise, it should then this value doesn't need to be specified. Otherwise, it should