Handle IPv6 addresses when removing port numbers in request.location

alexreisner · Jan 2, 2018 · 650add8 · 650add8
1 parent b00d68b
commit 650add8
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/lib/geocoder/request.rb b/lib/geocoder/request.rb
@@ -81,7 +81,18 @@ def geocoder_reject_trusted_ip_addresses(ip_addresses)
     end
 
     def geocoder_remove_port_from_addresses(ip_addresses)
-      ip_addresses.map { |ip| ip.split(':').first }
+      ip_addresses.map do |ip|
+        # IPv4
+        if ip.count('.') > 0
+          ip.split(':').first
+        # IPv6 bracket notation
+        elsif match = ip.match(/\[(\S+)\]/)
+          match.captures.first
+        # IPv6 bare notation
+        else
+          ip
+        end
+      end
     end
 
     def geocoder_reject_non_ipv4_addresses(ip_addresses)

diff --git a/test/unit/request_test.rb b/test/unit/request_test.rb
@@ -72,6 +72,12 @@ def test_geocoder_remove_port_from_addresses_with_port
     req = MockRequest.new()
     assert_equal expected_ips, req.send(:geocoder_remove_port_from_addresses, ips)
   end
+  def test_geocoder_remove_port_from_ipv6_addresses_with_port
+    expected_ips = ['2600:1008:b16e:26da:ecb3:22f7:6be4:2137', '2600:1901:0:2df5::', '2001:db8:1f70::999:de8:7648:6e8', '10.128.0.2']
+    ips = ['2600:1008:b16e:26da:ecb3:22f7:6be4:2137', '2600:1901:0:2df5::', '[2001:db8:1f70::999:de8:7648:6e8]:100', '10.128.0.2']
+    req = MockRequest.new()
+    assert_equal expected_ips, req.send(:geocoder_remove_port_from_addresses, ips)
+  end
   def test_geocoder_remove_port_from_addresses_without_port
     expected_ips = ['127.0.0.1', '127.0.0.2', '127.0.0.3']
     ips = ['127.0.0.1', '127.0.0.2', '127.0.0.3']