beckermj/vaguerent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #11654 from jbonhag/fix/loopback-forward

Browse Source 
Fix #11640: Check port of loopback address
This commit is contained in:
Jeff Bonhag 2020-06-16 14:54:16 -04:00 committed by GitHub
commit f9f2fc0dd5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/vagrant/action/builtin/handle_forwarded_port_collisions.rb
View File

@ -269,7 +269,8 @@ module Vagrant
end
else
# Do a regular check
if test_host_ip == "0.0.0.0" || Vagrant::Util::IPv4Interfaces.ipv4_interfaces.detect { |iface| iface[1] == test_host_ip }
if test_host_ip == "0.0.0.0" || Addrinfo.ip(test_host_ip).ipv4_loopback? ||
Vagrant::Util::IPv4Interfaces.ipv4_interfaces.detect { |iface| iface[1] == test_host_ip }
Vagrant::Util::IsPortOpen.is_port_open?(test_host_ip, host_port)
else
raise Errors::ForwardPortHostIPNotFound, name: machine.name, host_ip: host_ip

14
test/unit/vagrant/action/builtin/handle_forwarded_port_collisions_test.rb
View File

@ -195,12 +195,22 @@ describe Vagrant::Action::Builtin::HandleForwardedPortCollisions do
end
context "when host ip does not exist" do
let(:host_ip) { "127.0.0.2" }
let(:host_ip) { "192.168.99.100" }
let(:name) { "default" }
it "should raise an error including the machine name" do
allow(machine).to receive(:name).and_return(name)
expect{ instance.send(:port_check, host_ip, host_port) }.to raise_error(Vagrant::Errors::ForwardPortHostIPNotFound, /#{name}/)
expect{ instance.send(:port_check, host_ip, host_port) }.
to raise_error(Vagrant::Errors::ForwardPortHostIPNotFound, /#{name}/)
end
end
context "with loopback address" do
let (:host_ip) { "127.1.2.40" }
it "should check if the port is open" do
expect(Vagrant::Util::IsPortOpen).to receive(:is_port_open?).with(host_ip, host_port).and_return(true)
instance.send(:port_check, host_ip, host_port)
end
end
end