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

Change allowed auth hosts to list

This commit is contained in:
Justin Campbell 2017-11-07 10:32:33 -05:00
parent b3b98e77ed
commit c5266e98b8
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/commands/login/middleware/add_authentication.rb
View File

@ -6,8 +6,10 @@ require_relative "../client"
module VagrantPlugins module VagrantPlugins
module LoginCommand module LoginCommand
class AddAuthentication class AddAuthentication
VCLOUD = "vagrantcloud.com".freeze ALLOWED_AUTHENTICATION_HOSTS = %w[
ATLAS = "atlas.hashicorp.com".freeze atlas.hashicorp.com
vagrantcloud.com
].freeze
def initialize(app, env) def initialize(app, env)
@app = app @app = app
@ -25,12 +27,8 @@ module VagrantPlugins
replace = u.host == server_uri.host replace = u.host == server_uri.host
if !replace if !replace
# We need this in here for the transition we made from if ALLOWED_AUTHENTICATION_HOSTS.include?(u.host) &&
# Vagrant Cloud to Atlas. This preserves access tokens ALLOWED_AUTHENTICATION_HOSTS.include?(server_uri.host)
# appending to both without leaking access tokens to
# unsavory URLs.
if (u.host == VCLOUD && server_uri.host == ATLAS) ||
(u.host == ATLAS && server_uri.host == VCLOUD)
replace = true replace = true
end end
end end