sparoid 2.1.2 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9b409fe26f6c1e4e114ef772a721c55fe5c33c41ad1e45319cdf391074d084b
-  data.tar.gz: 4eaf23fb8ed1afb254bfce4956d68618eb5c31581cd5e36174ef950eaec87320
+  metadata.gz: 71eaf9ec6bae245550f5134ddd360754aa3b360342551676bea056083a56ee8b
+  data.tar.gz: d97abd87405cd9c65bc96583648f6f2075867b08bab919e8871ed95de5e2e4f0
 SHA512:
-  metadata.gz: 8cda0c092e0fcea01748df2a4b5d26f480f6162135aea3b9863e39c8a224f7ed7ca4e105b982f032605b49dd0a7fa467ea92a3776b16592c858f7b38bb1ce2b4
-  data.tar.gz: ddb2ac64f0db2115b49712c6d7aebac1e29bed8dbf52354ee806282be72955f6a08a35794965f727221152de360796c82ceb4a79554f2c95283fce4ffc12cb9c
+  metadata.gz: 4a4426c422d8c973596758cdfeed9e23a256aa697605e9beaa9c1aa6b06f14d2fbcf5712a8fd44e25d830ed97f47912e0b707e5006d52139f686efdcf288cec9
+  data.tar.gz: b7df47069061130c91155b86fa8385f8ca2c77919baf1189c7513db3f2aca7fc1bff06f8b8e8911184ef8c2014bf8092e9b1933af6692a4137a5155c1923a7d1

data/.github/workflows/main.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ 3.2, 3.3, 3.4, 4.0, ruby-head ]
+        ruby: [ "3.2", "3.3", "3.4", "4.0", ruby-head ]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [2.2.1] - 2026-06-30
+
+- Make Sparoid::Instance public-IP resolution thread-safe and empty-aware; raise Sparoid::PublicIPError when no public IP resolves (#25)
+
+## [2.2.0] - 2026-05-06
+
+- Raise when sendmsg fails for every resolved address (#23)
+
 ## [2.1.2] - 2026-04-30
 
 - Skip addresses that fail synchronous connect in fdpass (#20)

data/Gemfile

@@ -11,3 +11,4 @@ gem "rake", "~> 13.0"
 gem "rubocop", "~> 1.7"
 gem "rubocop-minitest", require: false
 gem "rubocop-rake", require: false
+gem "webmock"

data/lib/sparoid/version.rb

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

data/lib/sparoid.rb

@@ -22,20 +22,27 @@ module Sparoid # rubocop:disable Metrics/ModuleLength
   # Send an authorization packet
   def auth(key, hmac_key, host, port, open_for_ip: nil)
     addrs = resolve_ip_addresses(host, port)
-    addrs.each do |addr|
+    errors = []
+    successful_addrs = addrs.filter_map do |addr|
       messages = generate_messages(open_for_ip)
       data = messages.map do |message|
         prefix_hmac(hmac_key, encrypt(key, message))
       end
       sendmsg(addr, data)
+      addr
+    rescue SystemCallError => e
+      errors << "#{addr.ip_address}: #{e.message}"
+      nil
     end
 
+    raise Error, "Sparoid failed to send to any address for #{host}: #{errors.join("; ")}" if successful_addrs.empty?
+
     # wait some time for the server to actually open the port
     # if we don't wait the next SYN package will be dropped
     # and it have to be redelivered, adding 1 second delay
     sleep 0.02
 
-    addrs
+    successful_addrs
   end
 
   # Generate new aes and hmac keys, print to stdout
@@ -96,6 +103,8 @@ module Sparoid # rubocop:disable Metrics/ModuleLength
         ips = ips.grep_v(Resolv::IPv6)
         ips << Resolv::IPv6.create(native_ipv6)
       end
+      raise PublicIPError, "Sparoid could not resolve a public IP to knock from" if ips.empty?
+
       ips.map { |i| message(i) }
     end
   end
@@ -105,11 +114,9 @@ module Sparoid # rubocop:disable Metrics/ModuleLength
     socket.nonblock = false
     data.each do |packet|
       socket.sendmsg packet, 0, addr
-    rescue StandardError => e
-      warn "Sparoid error: #{e.message}"
     end
   ensure
-    socket.close
+    socket&.close
   end
 
   def encrypt(key, data)
@@ -248,16 +255,31 @@ module Sparoid # rubocop:disable Metrics/ModuleLength
 
   class ResolvError < Error; end
 
-  # Instance of SPAroid that only resolved public_ips once
+  class PublicIPError < Error; end
+
+  # Instance of SPAroid that resolves its public IP once and reuses it
   class Instance
     include Sparoid
 
-    def public_ips(*args)
-      @public_ips ||= super
+    def initialize
+      @resolve_mutex = Mutex.new
+      @public_ips = []
     end
 
     def cached_public_ips
-      public_ips
+      return @public_ips if @public_ips.any?
+
+      @resolve_mutex.synchronize do
+        return @public_ips if @public_ips.any?
+
+        ips = public_ips
+        if ips.empty?
+          warn "Sparoid: Failed to retrieve public IPs"
+        else
+          @public_ips = ips
+        end
+        ips
+      end
     end
   end
 end

metadata

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