vpndetection 5.6.0 → 5.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af30c794b9bdfb02657775e5e1fd768fa77855d97b1c4f8c2ea3ee4b9319380f
-  data.tar.gz: dab0d13a90c8f25adb6d6e2ecbafa524d62f1629bcb65e1e4cc55101fe81321d
+  metadata.gz: 12d734b2b201e4ec11c2d0562d1c188bc26417064a2230c120f197c50d81f975
+  data.tar.gz: a04054e2f2786070bef386c3abb2e63ca06975cfa6429df62cdb0cfb4f6e91b4
 SHA512:
-  metadata.gz: 3432eaf4c3bed7d1659898e61a2ce8d9918035e84a39c721e31958cafc97703cb3222c87ab0ed083f2ab02c422b0c737931da0a81b13950877fcb070e5c7df0f
-  data.tar.gz: 8152326e9e5b8e8e20d170be7dbd950b8ff5bd077eb6327857e4697898a4a87ebc642a5e104bdcd4d78d579ff785315bb7501f8001ecc3ccf91d042c80781f91
+  metadata.gz: 642c2248cf17028bcaee8b70501bb7acbfde2cdb2141c31b6f2e87702ee8abe450e645677ee62a0e3e8f0239d61752da26dc0c77707bedab39b9d792ccaf85b1
+  data.tar.gz: 252d9c789ae4c2c354cbcc52dea4ecf55ce3e3ecc582f085c1a5b5486e26e8e1fc9fe5b439ed049295586a4bce725371bd9a472330eccddad59f255db4404701

data/lib/vpndetection/client.rb

@@ -340,15 +340,17 @@ module VPNDetection
     end
 
     # Every address lands in exactly one of `results` and `errors`; an address in
-    # neither is the server breaking its own contract, and is reported as such
-    # rather than lost.
+    # neither, or with an entry that is not an answer, is the server breaking its
+    # own contract, and is reported as that address's error rather than lost.
     def batch_answer(ip, body)
-      if (served = body['results'][ip])
+      served = body['results'][ip]
+      failed = body['errors'][ip]
+      if Transport.lookup_answer?(served)
         Result.new(served)
-      elsif (failed = body['errors'][ip])
+      elsif failed.is_a?(Hash)
         Error.from_entry(failed['status'], failed['error'])
       else
-        Error.new(:server_error, "the batch answer did not include #{ip}", status: 200)
+        Error.new(:server_error, "the batch answer carried no readable entry for #{ip}", status: 200)
       end
     end
   end

data/lib/vpndetection/database_api.rb

@@ -181,8 +181,8 @@ module VPNDetection
     # every non-2xx as a failure, so it arrives as an ApiError carrying the
     # Location header.
     def redirect_location(id, format, timeout)
-      @api.download_database(id, format, timeout: timeout)
-      raise Error.new(:server_error, 'expected a redirect to object storage')
+      _, status, = @api.download_database_with_http_info(id, format, timeout: timeout)
+      raise Error.new(:server_error, 'expected a redirect to object storage', status: status)
     rescue ApiError => e
       raise unless e.code == 302
 

data/lib/vpndetection/errors.rb

@@ -97,11 +97,12 @@ module VPNDetection
       message.is_a?(String) ? message : nil
     end
 
+    # Seconds as digits, or an HTTP date, and nothing else: `Float()` would also
+    # read `0x10`, `1_0` and `1e3` as a wait.
     def self.parse_retry_after(value)
-      return nil if value.nil? || value.to_s.strip.empty?
-
-      seconds = Float(value, exception: false)
-      return seconds if seconds && seconds >= 0
+      value = value.to_s.strip
+      return nil if value.empty?
+      return Integer(value, 10) if value.match?(/\A\d+\z/)
 
       # The header also permits an HTTP date.
       when_at = Time.httpdate(value) rescue nil

data/lib/vpndetection/transport.rb

@@ -80,6 +80,24 @@ module VPNDetection
       request
     end
 
+    # A 2xx the generated client cannot read as the answer it promises is the
+    # server's fault, and a retryable :server_error, as it is on the OAuth calls:
+    # a proxy's HTML page, a cut-off or empty body, or an object missing a member
+    # the spec requires. The generated reader raised a RuntimeError, a
+    # JSON::ParserError or an ArgumentError for those, none of them retried, and
+    # handed an empty or non-object body back as nil, as if it were the answer.
+    def deserialize(response, return_type)
+      data = super
+      return data unless data.nil?
+
+      raise Error.new(:server_error, "the API answered with no #{return_type}", status: response.code)
+    rescue Error
+      raise
+    rescue StandardError => e
+      raise Error.new(:server_error, "could not read the answer as #{return_type}: #{e.message}",
+                      status: response.code)
+    end
+
     # A GET for the presigned link the download endpoint hands out.
     #
     # Built here rather than through {#build_request} so it carries NO
@@ -162,22 +180,43 @@ module VPNDetection
       raise Error.from_transport(response) if transport_failure?(response)
       raise Error.from_status(response.code, response.headers, response.body) unless response.success?
 
-      Entitlement.build_from_hash(parse_object(response))
+      body = parse_object(response)
+      begin
+        Entitlement.build_from_hash(body)
+      rescue StandardError => e
+        raise Error.new(:server_error, "could not read the answer as Entitlement: #{e.message}",
+                        status: response.code)
+      end
     end
 
     def self.lookup_result(response)
       raise Error.from_transport(response) if transport_failure?(response)
       raise Error.from_status(response.code, response.headers, response.body) unless response.success?
 
-      Result.new(parse_object(response))
+      body = parse_object(response)
+      return Result.new(body) if lookup_answer?(body)
+
+      raise Error.new(:server_error, 'the answer carried no ip and is_vpn', status: response.code)
+    end
+
+    # Whether a parsed body is a lookup's answer: every plan's carries `ip` and
+    # `is_vpn`, so one without them is a 2xx the call cannot read.
+    def self.lookup_answer?(body)
+      body.is_a?(Hash) && body['ip'].is_a?(String) && [true, false].include?(body['is_vpn'])
     end
 
-    # The two maps of a batch answer, each present even when empty.
+    # The two maps of a batch answer, each present even when empty. An answer
+    # carrying neither is unreadable as a whole, and is retried as one.
     def self.batch_body(response)
       raise Error.from_transport(response) if transport_failure?(response)
       raise Error.from_status(response.code, response.headers, response.body) unless response.success?
 
       body = parse_object(response)
+      unless body['results'].is_a?(Hash) || body['errors'].is_a?(Hash)
+        raise Error.new(:server_error, 'the batch answer carried neither results nor errors',
+                        status: response.code)
+      end
+
       {
         'results' => body['results'].is_a?(Hash) ? body['results'] : {},
         'errors' => body['errors'].is_a?(Hash) ? body['errors'] : {},

data/lib/vpndetection/version.rb

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

metadata

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