NuKVM/vagrant-libvirt
3
0
Fork 0
mirror of https://github.com/vagrant-libvirt/vagrant-libvirt.git synced 2025-02-25 18:55:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Ensure usernames with at symbols handled (#1558)

Browse Source 
Domain usernames may use '@' as part of the username, which requires
encoding to be able to be used within an URI.
This commit is contained in:
Darragh Bailey
2022-08-24 18:16:14 +01:00
committed by GitHub
parent 1945754f67
commit 8673fa2791
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/vagrant-libvirt/config.rb
View File

@@ -782,7 +782,7 @@ module VagrantPlugins
finalize_id_ssh_key_file finalize_id_ssh_key_file
uri += '+ssh://' uri += '+ssh://'
uri += "#{@username}@" if @username && @username != UNSET_VALUE uri += "#{URI.encode_www_form_component(@username)}@" if @username && @username != UNSET_VALUE
uri += (@host && @host != UNSET_VALUE ? @host : 'localhost') uri += (@host && @host != UNSET_VALUE ? @host : 'localhost')

7
spec/unit/config_spec.rb
View File

@@ -197,6 +197,13 @@ describe VagrantPlugins::ProviderLibvirt::Config do
:env => {'LIBVIRT_DEFAULT_URI' => 'qemu:///custom'}, :env => {'LIBVIRT_DEFAULT_URI' => 'qemu:///custom'},
} }
], ],
[ # when username explicitly set with @ symbol for domains
{:username => 'my_user@my_domain', :host => 'remote'},
{:uri => %r{qemu://remote/(system|session)}, :username => 'my_user@my_domain'},
{
:env => {'LIBVIRT_DEFAULT_URI' => 'qemu:///custom'},
}
],
[ # when username explicitly set with host but without ssh [ # when username explicitly set with host but without ssh
{:username => 'my_user', :host => 'remote'}, {:username => 'my_user', :host => 'remote'},
{:uri => %r{qemu://remote/(system|session)}, :username => 'my_user'}, {:uri => %r{qemu://remote/(system|session)}, :username => 'my_user'},