vpndetection 5.5.0 → 5.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 421b5ad5b26181627790d77ee1399551115e37480c46574220a35513721d631b
-  data.tar.gz: 585d8a6143276bb0f1920794963d47fc3a35e077bdead41ba0e3d87e8e9da08d
+  metadata.gz: 0f1b1aeb8a3c63721e409832879f7e12383b9ab81b50448dd1ae961efc2e68c5
+  data.tar.gz: a2478e011ccc7b22d7ae8a267dc3561a4bad18bc8f768dccb3aa8d2e8d24988a
 SHA512:
-  metadata.gz: 3d499d7612a20b70a85712a7d364178dac45652f6fde6b2df324d3750ca3565d7910aad88d7727b9be8827eead9e61c95fde2e3221474d306ac26bdcae2241b3
-  data.tar.gz: f3df262d110d0d314890db27d20b6f1ae681d0a40eb019ab630fb21b7694e416a99ecd97bd9b6347610dbc0e6f3b397e4d302843af811bfdda0af9731be03238
+  metadata.gz: 0153bf1aabac68578a6951e9f00568ac8059d3030ac8427b1745c23ae474d90188360a87139cfaee3d9acbfb6dbaff4d233844c7cd8e4ccd2894a77d0b068832
+  data.tar.gz: aa3f85f7db3f517447a65b5d20f7e1134c030a7e1ea6b330021290e51502fd31b4a38b4cfb477eaeef63636e16ea74afd79ca5526a03d33a3e46b4870b0b37d7

data/lib/vpndetection/bogon.rb

@@ -16,12 +16,21 @@ module VPNDetection
       addr = parse(ip)
       return false if addr.nil?
 
-      # An IPv4-mapped address stays in the v6 table, which is where the
-      # canonical ranges put ::ffff:0:0/96. Unmapping it first would match it
-      # against the v4 table and disagree with every other SDK.
+      addr = addr.native if addr.ipv4_mapped?
       (addr.ipv4? ? v4 : v6).any? { |range| range.include?(addr) }
     end
 
+    # The IPv4 address an IPv4-mapped IPv6 address (::ffff:a.b.c.d, in any
+    # spelling) carries, dotted, and any other address as given. A server
+    # listening on :: sees every IPv4 visitor in that form, which read whole is
+    # inside ::ffff:0:0/96, so judging it whole would answer every such visitor
+    # locally as a bogon. ::a.b.c.d is IPv4-compatible rather than mapped, and
+    # stays IPv6: IPAddr#native alone would unwrap that too.
+    def unmapped(ip)
+      addr = ip.to_s.include?(':') ? parse(ip) : nil
+      addr&.ipv4_mapped? ? addr.native.to_s : ip
+    end
+
     # The answer a bogon gets, in the full shape the API serves at its widest
     # plan: every flag present and false, every detail object present and empty.
     #

data/lib/vpndetection/bogons.rb

@@ -13,13 +13,14 @@ module VPNDetection
       '172.16.0.0/12',
       '192.0.0.0/24',
       '192.0.2.0/24',
+      '192.88.99.2/32',
       '192.168.0.0/16',
       '198.18.0.0/15',
       '198.51.100.0/24',
       '203.0.113.0/24',
       '224.0.0.0/4',
-      '240.0.0.0/4',
       '255.255.255.255/32',
+      '240.0.0.0/4',
     ].freeze
 
     V6 = [
@@ -27,41 +28,66 @@ module VPNDetection
       '::1/128',
       '::ffff:0:0/96',
       '::/96',
+      '64:ff9b::/96',
+      '64:ff9b:1::/48',
       '100::/64',
+      '100:0:0:1::/64',
+      '2001:2::/48',
       '2001:10::/28',
       '2001:db8::/32',
+      '3fff::/20',
+      '5f00::/16',
       'fc00::/7',
       'fe80::/10',
       'fec0::/10',
       'ff00::/8',
       '2002::/24',
       '2002:a00::/24',
+      '2002:6440::/26',
       '2002:7f00::/24',
       '2002:a9fe::/32',
       '2002:ac10::/28',
       '2002:c000::/40',
       '2002:c000:200::/40',
+      '2002:c058:6302::/48',
       '2002:c0a8::/32',
       '2002:c612::/31',
       '2002:c633:6400::/40',
       '2002:cb00:7100::/40',
       '2002:e000::/20',
-      '2002:f000::/20',
       '2002:ffff:ffff::/48',
+      '2002:f000::/20',
       '2001::/40',
       '2001:0:a00::/40',
+      '2001:0:6440::/42',
       '2001:0:7f00::/40',
       '2001:0:a9fe::/48',
       '2001:0:ac10::/44',
       '2001:0:c000::/56',
       '2001:0:c000:200::/56',
+      '2001:0:c058:6302::/64',
       '2001:0:c0a8::/48',
       '2001:0:c612::/47',
       '2001:0:c633:6400::/56',
       '2001:0:cb00:7100::/56',
       '2001:0:e000::/36',
-      '2001:0:f000::/36',
       '2001:0:ffff:ffff::/64',
+      '2001:0:f000::/36',
+      '2001:1::/32',
+      '2001:2::/31',
+      '2001:4::/30',
+      '2001:8::/29',
+      '2001:20::/27',
+      '2001:40::/26',
+      '2001:80::/25',
+      '2001:100::/24',
+      '::/3',
+      '4000::/3',
+      '6000::/3',
+      '8000::/3',
+      'a000::/3',
+      'c000::/3',
+      'e000::/3',
     ].freeze
   end
 end

data/lib/vpndetection/client.rb

@@ -79,6 +79,8 @@ module VPNDetection
     def lookup(ip, retries: nil, timeout: nil)
       # Here as well as in the transport: a bogon or a cached answer returns before any request.
       Transport.checked_timeout(timeout) unless timeout.nil?
+      # Judged, cached and sent as the IPv4 address it carries, if it is mapped.
+      ip = Bogon.unmapped(ip)
       return Bogon.result(ip) if Bogon.bogon?(ip)
 
       loop do
@@ -167,7 +169,10 @@ module VPNDetection
       end
       Transport.checked_timeout(timeout) unless timeout.nil?
 
-      addresses = ips.to_a.uniq
+      # An IPv4-mapped address is sent as the address it carries, once however
+      # many of its spellings were asked, and answered under each one asked.
+      asked = ips.to_a.uniq
+      addresses = asked.map { |ip| Bogon.unmapped(ip) }.uniq
       answers = {}
       pending = []
 
@@ -199,7 +204,7 @@ module VPNDetection
 
       # Reinstated in input order: a hydra settles in completion order, and a
       # caller iterating the hash should see what they passed in.
-      addresses.to_h { |ip| [ip, answers[ip]] }
+      asked.to_h { |ip| [ip, answers[Bogon.unmapped(ip)]] }
     end
 
     private

data/lib/vpndetection/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module VPNDetection
-  VERSION = '5.5.0'
+  VERSION = '5.5.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vpndetection
 version: !ruby/object:Gem::Version
-  version: 5.5.0
+  version: 5.5.1
 platform: ruby
 authors:
 - Mslm Dev