sparoid 1.0.11 → 1.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b933d6729f0ce76259c272550548532b15a206218239b9f824cd58b0deec6ee3
-  data.tar.gz: 61a1ec401ecebf13674e3b66e684df99ea5007f051e91b5bf98cc783e9f91c15
+  metadata.gz: a696807043c46908b4bbeeb6e8636e33cea95673930442bfc24a3151fc190d28
+  data.tar.gz: 5e2b64879d91183c6248e28f7fb6faf95ad8f249983f1d675ea17a4c74970758
 SHA512:
-  metadata.gz: 173cb6c71c46ba88153306d5124879ade2f53eedda41da85b58475abc3fddc0e0d5dee00ab459e546ab0b283411044dbaa016369ccb74a791a22126dc5dc99dd
-  data.tar.gz: 71318184eb58dbcbcc713aebd1c2e22375562af77ae29083b90f0933bc078991f1860fc00fbccad5e55396f37845b098f3c4494cae381c71e79b30a8e6a8124a
+  metadata.gz: a9a278830be195e3534b076860bd775406bfd338dae9f5e1083f0bf7f66c17d779c169b5dde140e54690b544363a64538f91f108b3178f053714a362d960d1a2
+  data.tar.gz: 32a8a77fb600b7f294b57a30f290e4fa9541ce27a94672173788db61211e2d9101ff7867476cbba08be3e38619cd5709534b2ad8caa896a6396e7280c6c03f51

data/CHANGELOG.md

@@ -1,10 +1,27 @@
+## [1.0.15] - 2021-08-11
+
+- Raise an exception, don't abort, when resolving hostname fails
+
+## [1.0.14] - 2021-07-26
+
+- Send UDP packets to all resolved IPs for a hostname
+
+## [1.0.13] - 2021-06-30
+
+- Do not warn on empty public ip cache file
+- The public ip cache file path can be controlled using the `SPAROID_CACHE_PATH` environment variable
+
+## [1.0.12] - 2021-06-14
+
+- Use file locking to prevent multiple processes/threads to write to the public ip cache file
+
 ## [1.0.11] - 2021-06-14
 
 - Log hostname when reporting unhandled exceptions
 
 ## [1.0.10] - 2021-06-09
 
-- Cache public IP in /tmp/.sparoid_public_ip for 1 min
+- Cache public IP in `/tmp/.sparoid_public_ip` for 1 min
 
 ## [1.0.9] - 2021-05-23
 

data/Gemfile

@@ -5,12 +5,9 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in sparoid.gemspec
 gemspec
 
-gem "rake", "~> 13.0"
-
 gem "minitest", "~> 5.0"
-
+gem "minitest-stub-const"
+gem "rake", "~> 13.0"
 gem "rubocop", "~> 1.7"
-
 gem "rubocop-minitest", require: false
-
 gem "rubocop-rake", require: false

data/lib/sparoid.rb

@@ -9,6 +9,8 @@ require "resolv"
 module Sparoid
   extend self
 
+  SPAROID_CACHE_PATH = ENV.fetch("SPAROID_CACHE_PATH", "/tmp/.sparoid_public_ip")
+
   # Send an authorization packet
   def auth(key, hmac_key, host, port)
     msg = message(cached_public_ip)
@@ -39,11 +41,18 @@ module Sparoid
 
   private
 
-  def sendmsg(host, port, data)
+  def sendmsg(host, port, data) # rubocop:disable Metrics/MethodLength
+    ok = false
     UDPSocket.open do |socket|
-      socket.connect host, port
-      socket.sendmsg data, 0
+      Resolv.each_address(host) do |ip|
+        ok = true
+        socket.connect ip, port
+        socket.sendmsg data, 0
+      rescue StandardError => e
+        warn "Sparoid error: #{e.message}"
+      end
     end
+    raise Error, "Sparoid failed to resolv #{host}" unless ok
   end
 
   def encrypt(key, data)
@@ -76,23 +85,42 @@ module Sparoid
   end
 
   def cached_public_ip
-    File.open("/tmp/.sparoid_public_ip", "a+") do |f|
-      if f.size.zero? || (Time.now - f.mtime) > 60 # cache for 1min max
-        update_cache(f)
-      else
-        Resolv::IPv4.create f.read
-      end
+    if up_to_date_cache?
+      read_cache
+    else
+      write_cache
     end
   rescue StandardError => e
     warn "Sparoid: #{e.inspect}"
     public_ip
   end
 
-  def update_cache(file)
-    ip = public_ip
-    file.truncate(0)
-    file.write ip.to_s
-    ip
+  def up_to_date_cache?
+    mtime = File.mtime(SPAROID_CACHE_PATH)
+    (Time.now - mtime) <= 60 # cache is valid for 1 min
+  rescue Errno::ENOENT
+    false
+  end
+
+  def read_cache
+    File.open(SPAROID_CACHE_PATH, "r") do |f|
+      f.flock(File::LOCK_SH)
+      Resolv::IPv4.create f.read
+    end
+  rescue ArgumentError => e
+    return write_cache if e.message =~ /cannot interpret as IPv4 address/
+
+    raise e
+  end
+
+  def write_cache
+    File.open(SPAROID_CACHE_PATH, File::WRONLY | File::CREAT, 0o0644) do |f|
+      f.flock(File::LOCK_EX)
+      ip = public_ip
+      f.truncate(0)
+      f.write ip.to_s
+      ip
+    end
   end
 
   def public_ip

data/lib/sparoid/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sparoid
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.15
 platform: ruby
 authors:
 - Carl Hörberg
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-14 00:00:00.000000000 Z
+date: 2021-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor