Merge pull request #460 from will-in-wi/403-handle-ipv6-without-port

Handle IPv6 addresses without port

Author: will-in-wi

CHANGELOG.md

@@ -8,6 +8,7 @@ appear at the top.
   * Your contribution here!
   * [#455](https://github.com/capistrano/sshkit/pull/455): Ensure UUID of commands are stable in logging - [@lazyatom](https://github.com/lazyatom)
   * [#453](https://github.com/capistrano/sshkit/pull/453): `as` and `within` now properly escape their user/group/path arguments, and the command nested within an `as` block is now properly escaped before passing to `sh -c`. In the unlikely case that you were manually escaping commands passed to SSHKit as a workaround, you will no longer need to do this. See [#458](https://github.com/capistrano/sshkit/issues/458) for examples of what has been fixed. - [@grosser](https://github.com/grosser)
+  * [#460](https://github.com/capistrano/sshkit/pull/460): Handle IPv6 addresses without port - [@will-in-wi](https://github.com/will-in-wi)
 
 ## [1.18.2][] (2019-02-03)
 

lib/sshkit/host.rb

@@ -151,18 +151,20 @@ def port
   # @private
   # :nodoc:
   class IPv6HostWithPortParser < SimpleHostParser
+    IPV6_REGEX = /\[([a-fA-F0-9:]+)\](?:\:(\d+))?/
 
     def self.suitable?(host_string)
-      host_string.match(/[a-fA-F0-9:]+:\d+/)
+      host_string.match(IPV6_REGEX)
     end
 
     def port
-      @host_string.split(':').last.to_i
+      prt = @host_string.match(IPV6_REGEX)[2]
+      prt = prt.to_i unless prt.nil?
+      prt
     end
 
     def hostname
-      @host_string.gsub!(/\[|\]/, '')
-      @host_string.split(':')[0..-2].join(':')
+      @host_string.match(IPV6_REGEX)[1]
     end
 
   end

test/unit/test_host.rb

@@ -56,6 +56,11 @@ def test_does_not_confuse_ipv6_hosts_with_port_specification
       assert_equal '1fff:0:a88:85a3::ac1f', h.hostname
     end
 
+    def test_does_not_confuse_ipv6_hosts_without_port_specification
+      h = Host.new '[2001:db8:85a3:8d3:1319:8a2e:370:7348]'
+      assert_equal '2001:db8:85a3:8d3:1319:8a2e:370:7348', h.hostname
+    end
+
     def testing_host_casting_to_a_string
       assert_equal "example.com", Host.new('user@example.com:1234').to_s
     end