sparoid 1.0.20 → 1.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd5b6193a911ddfbe06a7a01a2ad1abe3b2c4f60c090aaac4b6b2b6c6ac3dd3e
-  data.tar.gz: 622b9465e33bc1b69072450cf619ac2dcf7bf6ac3b1a70276a5f56c4c0d36907
+  metadata.gz: 71a3d6d8370df36acaad83f5f03c0b29c6e5037856c33fcfa3e17a16c6f678ac
+  data.tar.gz: d1d2cd45e4c503af8e0390c5466ec113abfbbeab62a045d3edee274ac888557d
 SHA512:
-  metadata.gz: 8e773ffe52658eecff5b673f0b886a7bd40118654d24602b5c7bd50dbd1dd9a37561b28d51e9dcc2d93557212081f282a6b855f026a22ef646e013ea4c827755
-  data.tar.gz: bff75047af985b79ee7a1fc53c40abb3f6d15f5cad4cff86f94430cb599c246ce0a240e20e6c8fd1c4c53a8f79c447b142c69669093409979d10265ce6aa34f9
+  metadata.gz: e45e3482c4c500914b12764ea4f1a16e0bde44a4de1119b3b6884a2ba29264de0ad8be169d1c24e3be5c43c8da891d55177491e13229184000fb68b284857487
+  data.tar.gz: c52b06c69dc47867a73a3178172bf2279840ac3228fb74ace9a3fde7159b2e0af26af39d0c86dcba423c4f6ceb2f50fd5fe511072f9a2be3a00665883899e8f3

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [1.0.22] - 2023-02-01
+
+- Fix `Addrinfo SocketError` should raise `Sparoid::ResolvError` (#10)
+
+## [1.0.21] - 2022-10-12
+
+- Fix where Sparoid::Instance returned nil for public_ip
+
 ## [1.0.20] - 2022-10-11
 
 - Ignore EISCONN errors (already connected) error as BSD raises on second connect_nonblock

data/lib/sparoid/version.rb

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

data/lib/sparoid.rb

@@ -13,8 +13,7 @@ module Sparoid # rubocop:disable Metrics/ModuleLength
 
   # Send an authorization packet
   def auth(key, hmac_key, host, port)
-    addrs = Addrinfo.getaddrinfo(host, port, :INET, :DGRAM)
-    raise(ResolvError, "Sparoid failed to resolv #{host}") if addrs.empty?
+    addrs = resolve_ip_addresses(host, port)
 
     msg = message(cached_public_ip)
     data = prefix_hmac(hmac_key, encrypt(key, msg))
@@ -71,7 +70,8 @@ module Sparoid # rubocop:disable Metrics/ModuleLength
   private
 
   def sendmsg(addrs, data)
-    socket = Socket.new Socket::AF_INET, Socket::SOCK_DGRAM
+    socket = UDPSocket.new
+    socket.nonblock = false
     addrs.each do |addr|
       socket.sendmsg data, 0, addr
     rescue StandardError => e
@@ -155,6 +155,15 @@ module Sparoid # rubocop:disable Metrics/ModuleLength
     end
   end
 
+  def resolve_ip_addresses(host, port)
+    addresses = Addrinfo.getaddrinfo(host, port, :INET, :DGRAM)
+    raise(ResolvError, "Sparoid failed to resolv #{host}") if addresses.empty?
+
+    addresses
+  rescue SocketError
+    raise(ResolvError, "Sparoid failed to resolv #{host}")
+  end
+
   class Error < StandardError; end
 
   class ResolvError < Error; end
@@ -170,7 +179,7 @@ module Sparoid # rubocop:disable Metrics/ModuleLength
     end
 
     def cached_public_ip
-      @public_ip
+      public_ip
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sparoid
 version: !ruby/object:Gem::Version
-  version: 1.0.20
+  version: 1.0.22
 platform: ruby
 authors:
 - Carl Hörberg
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-11 00:00:00.000000000 Z
+date: 2023-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -70,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.5
 signing_key:
 specification_version: 4
 summary: Single Packet Authorisation client