sparoid 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df9de779b1b4fcfd29f3f0ad3ad986001ecc39b61fbe3aeff36c9b3cb5409327
-  data.tar.gz: 56789005516d3c0c2e3b4799f1cf3d6c9873465ff3516b27edee0649b2f5d373
+  metadata.gz: e31fd430f74d9eabc1cae19dfe70b1ad40511850ecf77d1e5b436e5dfc206836
+  data.tar.gz: 6fc3c4fa8f4a9e0cc2d63e26138e89b03c689481c1a3b42be46493aad653d2ae
 SHA512:
-  metadata.gz: ce6cca5c5219a9f7f99fb6fa34b16efee1d60acae4e5f6bf639524e8ebfd5d4cc805953e9df48656aae11211b25aa824b28751478691a8a293ad3704bd464416
-  data.tar.gz: bc288e38f49a5c54f10f338d943169dd662932f516fbdccc6c7d5dc75857da7e0c73dbf2dcb3e5082ee7e769f70552deb12f23a11f8f5cca7f993cc4d6104ad0
+  metadata.gz: c445dc3e34df5a0a51c654d0e8447a7d96cb8ba675d105680bfa74a0b0fdedc98364123a375ac3fe7213e1c17200b1ce1181a19f944d22f4998d2f730239bfdd
+  data.tar.gz: 3a91e79c4030419da559578051f4abef33aceaa8e20a3fd1a3202959342030941f5d6bb7c33e31fe1dfa2107dea2b63bcda1719eb2b50cd0551a23630b5f1c78

data/lib/sparoid/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sparoid
-  VERSION = "2.1.0"
+  VERSION = "2.1.1"
 end

data/lib/sparoid.rb

@@ -4,7 +4,7 @@ require_relative "sparoid/version"
 require "socket"
 require "openssl"
 require "resolv"
-require "timeout"
+require "net/http"
 
 # Single Packet Authorisation client
 module Sparoid # rubocop:disable Metrics/ModuleLength
@@ -182,25 +182,15 @@ module Sparoid # rubocop:disable Metrics/ModuleLength
     end
   end
 
-  def public_ips(port = 80) # rubocop:disable Metrics/AbcSize
+  def public_ips(port = 80)
     URLS.map do |host|
-      Timeout.timeout(5) do
-        Socket.tcp(host, port, connect_timeout: 3, resolv_timeout: 3) do |sock|
-          sock.sync = true
-          sock.print "GET / HTTP/1.1\r\nHost: #{host}\r\nConnection: close\r\n\r\n"
-          status = sock.readline(chomp: true)
-          raise(ResolvError, "#{host}:#{port} response: #{status}") unless status.start_with? "HTTP/1.1 200 "
-
-          content_length = 0
-          until (header = sock.readline(chomp: true)).empty?
-            if (m = header.match(/^Content-Length: (\d+)/))
-              content_length = m[1].to_i
-            end
-          end
-          ip = sock.read(content_length).chomp
-          string_to_ip(ip)
-        end
-      end
+      http = Net::HTTP.new(host, port)
+      http.open_timeout = 3
+      http.read_timeout = 5
+      response = http.get("/")
+      raise(ResolvError, "#{host}:#{port} response: #{response.code}") unless response.is_a?(Net::HTTPSuccess)
+
+      string_to_ip(response.body.chomp)
     rescue StandardError
       nil
     end.compact

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sparoid
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Carl Hörberg