ip2proxy_ruby 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42164edc7ec22e5c5d26f1d6bf3283dda4ab5ecb08dd1e02e4ff9971ec96319a
-  data.tar.gz: 28340d9b35b272b98f9d8c5a1616e4dfd1d077c57c2e2a25661f94e428631c48
+  metadata.gz: 1dc20326c582b22c3ada59ab4987c530b54a4c1693546783fe03ac0afa4d7c3d
+  data.tar.gz: e40ee8fc6baec6675fbe8375646d78a3e7d38f0b37f5fb7d8840fbc6b78a7026
 SHA512:
-  metadata.gz: 22ee83b9ea0d240269eb1b9f77e0f9f57031ceb7a2a2e59e51d2ea684467eca3317c717df1045e69d70e4affb24d9039ff86631f6294306c2d16254593eaf20e
-  data.tar.gz: 4fe19be02e16b65d5852b2086c39720de28ddba5ce14a7456bd70a3551c74aaf299c5c8af5775acd02d23dd3fa41b14e112d0f5325eb0c058ebed81e158277c3
+  metadata.gz: 947b66ffec9139e7531e9569c9da945b056c842304ab4d866b918995cfb20834d439197d7c7b1119c6a2611fbe2c4fff60ea69126960ef916f1c1e6ea1eb05ce
+  data.tar.gz: e182e739e69e2160610b911e67d51997b4a41f58f851d526ea3742b1ddc692aa31cd10790984fad532d0bc92750d7096d2f7aa6201af361e6f7678a39e8e64be

data/example.rb

@@ -1,7 +1,7 @@
 require 'ip2proxy_ruby'
 
 # open IP2Proxy BIN database for proxy lookup
-i2p = Ip2proxy.new.open("./data/IP2PROXY-IP-PROXYTYPE-COUNTRY-REGION-CITY-ISP-DOMAIN-USAGETYPE-ASN-LASTSEEN.BIN")
+i2p = Ip2proxy.new.open("./data/IP2PROXY-LITE-PX1.BIN")
 
 # get versioning information
 print 'Module Version: ' + i2p.get_module_version + "\n"

data/ip2proxy_ruby.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name          = "ip2proxy_ruby"
-  s.version       = "2.0.0"
+  s.version       = "2.1.0"
   s.authors       = ["ip2location"]
   s.email         = ["support@ip2location.com"]
 
@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
     "spec/assets/IP2PROXY-IP-PROXYTYPE-COUNTRY-REGION-CITY-ISP.SAMPLE.BIN",
     "spec/ip2proxy_ruby_spec.rb",
     "spec/spec_helper.rb",
-    "rb/data/IP2PROXY-IP-PROXYTYPE-COUNTRY-REGION-CITY-ISP.SAMPLE.BIN"
+    "rb/data/IP2PROXY-LITE-PX1.BIN"
   ]
 
   if s.respond_to?(:metadata=)

data/lib/ip2proxy_ruby.rb

@@ -9,7 +9,7 @@ require_relative 'ip2proxy_ruby/ip2proxy_record'
 class Ip2proxy
   attr_accessor :record_class4, :record_class6, :v4, :file, :db_index, :count, :base_addr, :ipno, :record, :database, :columns, :ip_version, :ipv4databasecount, :ipv4databaseaddr, :ipv4indexbaseaddr, :ipv6databasecount, :ipv6databaseaddr, :ipv6indexbaseaddr, :databaseyear, :databasemonth, :databaseday 
 
-  VERSION = '2.0.0'
+  VERSION = '2.1.0'
   FIELD_NOT_SUPPORTED = 'NOT SUPPORTED'
   INVALID_IP_ADDRESS = 'INVALID IP ADDRESS'
 
@@ -51,23 +51,28 @@ class Ip2proxy
 
   def get_record(ip)
     ipno = IPAddr.new(ip, Socket::AF_UNSPEC)
-    self.ip_version = ipno.ipv4? ? 4 : 6
-    self.v4 = ipno.ipv4?
-    self.count = ipno.ipv4? ? self.ipv4databasecount + 0 : self.ipv6databasecount + 0
-    self.base_addr = (ipno.ipv4? ? self.ipv4databaseaddr - 1 : self.ipv6databaseaddr - 1)
-
-    ipnum = ipno.to_i + 0
+    self.ip_version, ipnum = validateip(ipno)
+    self.v4 = ip_version == 4 ? true : false
+    self.count = v4 ? self.ipv4databasecount + 0 : self.ipv6databasecount + 0
+    self.base_addr = (v4 ? self.ipv4databaseaddr - 1 : self.ipv6databaseaddr - 1)
     col_length = columns * 4
-
     if ipv4indexbaseaddr > 0 || ipv6indexbaseaddr > 0
         indexpos = 0
         case ip_version
         when 4
-            ipnum1_2 = (ipnum >> 16)
-            indexpos = ipv4indexbaseaddr + (ipnum1_2 << 3)
+            indexpos = ipv4indexbaseaddr + ((ipnum >> 16) << 3)
+            realipno = ipnum
+            # if ipnum reach MAX_IPV4_RANGE
+            if realipno == 4294967295
+                ipnum = realipno - 1
+            end
         when 6
-            ipnum1 = (ipnum / (2**112))
-            indexpos = ipv6indexbaseaddr + (ipnum1 << 3)
+            indexpos = ipv6indexbaseaddr + ((ipnum >> 112) << 3)
+            realipno = ipnum
+            # if ipnum reach MAX_IPV6_RANGE
+            if realipno == 340282366920938463463374607431768211455
+                ipnum = realipno - 1
+            end
         end
         low = read32(indexpos)
         high = read32(indexpos + 4)
@@ -277,7 +282,6 @@ class Ip2proxy
             asn = (defined?(rec.asn) && rec.asn != '') ? rec.asn : FIELD_NOT_SUPPORTED
             as = (defined?(rec.as) && rec.as != '') ? rec.as : FIELD_NOT_SUPPORTED
             last_seen = (defined?(rec.lastseen) && rec.lastseen != '') ? rec.lastseen : FIELD_NOT_SUPPORTED
-
             if self.db_index == 1
                 isproxy = (rec.country_short == '-') ? 0 : 1
             else
@@ -311,7 +315,6 @@ class Ip2proxy
         last_seen = INVALID_IP_ADDRESS
         isproxy = -1
     end
-
     results = {}
     results['is_proxy'] = isproxy
     results['proxy_type'] = proxytype
@@ -325,7 +328,6 @@ class Ip2proxy
     results['asn'] = asn
     results['as'] = as
     results['last_seen'] = last_seen
-
     return results
   end
 
@@ -348,7 +350,7 @@ class Ip2proxy
                 low = mid + 1
             end
         end
-    end    
+    end
   end
 
   def get_from_to(mid, base_addr, col_length)
@@ -360,6 +362,38 @@ class Ip2proxy
     [ip_from, ip_to]
   end
 
+  def validateip(ip)
+    if ip.ipv4?
+        ipv = 4
+        ipnum = ip.to_i + 0
+    else
+        ipv = 6
+        ipnum = ip.to_i + 0
+        #reformat ipv4 address in ipv6 
+        if ipnum >= 281470681743360 && ipnum <= 281474976710655
+            ipv = 4
+            ipnum = ipnum - 281470681743360
+        end
+        #reformat 6to4 address to ipv4 address 2002:: to 2002:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF
+        if ipnum >= 42545680458834377588178886921629466624 && ipnum <= 42550872755692912415807417417958686719
+            ipv = 4
+            #bitshift right 80 bits
+            ipnum = ipnum >> 80
+            #bitwise modulus to get the last 32 bit
+            ipnum = ipnum % 4294967296
+        end
+        #reformat Teredo address to ipv4 address 2001:0000:: to 2001:0000:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:
+        if ipnum >= 42540488161975842760550356425300246528 && ipnum <= 42540488241204005274814694018844196863
+            ipv = 4
+            #bitwise not to invert binary
+            ipnum = ~ipnum
+            #bitwise modulus to get the last 32 bit
+            ipnum = ipnum % 4294967296
+        end
+    end
+    [ipv, ipnum]
+  end
+
   def read32(indexp)
     file.seek(indexp - 1)
     return file.read(4).unpack('V').first

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ip2proxy_ruby
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - ip2location
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-13 00:00:00.000000000 Z
+date: 2019-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
@@ -120,7 +120,7 @@ files:
 - lib/ip2proxy_ruby/i2p_string_data.rb
 - lib/ip2proxy_ruby/ip2proxy_config.rb
 - lib/ip2proxy_ruby/ip2proxy_record.rb
-- rb/data/IP2PROXY-IP-PROXYTYPE-COUNTRY-REGION-CITY-ISP.SAMPLE.BIN
+- rb/data/IP2PROXY-LITE-PX1.BIN
 - spec/assets/IP2PROXY-IP-PROXYTYPE-COUNTRY-REGION-CITY-ISP.SAMPLE.BIN
 - spec/ip2proxy_ruby_spec.rb
 - spec/spec_helper.rb
@@ -146,8 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: IP2Proxy Ruby library