sparoid 1.0.10 → 1.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 864cabc794097c6a5f46cef69a72031f133d4bb1534193fce13319030ee09181
-  data.tar.gz: c5c7a75a8eea8eca65e29cea1e82f82aa16643d36a42dcbbceb7cf061d9755c1
+  metadata.gz: 23058be45d03e24a374cdf7c2e1854f10c5c997eb8654a7af620a532a486cfd5
+  data.tar.gz: 38144ffb7b371f5c439efec31fd4c04323cf72ec4642f2b2b50da84dad7f7a25
 SHA512:
-  metadata.gz: 6bfe6cfcd4dd1ad2b4577eda01b6972b7c36f8f418d64b5bbc2966e5cfc3538a1cf647ec8389108c5ecfc082cd420bb5d3483d4ae9f4d76e9b62709e865e4683
-  data.tar.gz: 82e84fc4deb3251d6c6c270cf5404da15ab91746bfd9d8de3a7f62152e8cccffa30dd43da7a8157f2a10627cefae79cc4dea5160fabfec3c0005c46202568568
+  metadata.gz: '0860c3a2edea2a2f35628941f790846985683d6df89a66f6ac6a714af1e3eae1dd4618e6d58de620fc48d85c4da5bf35b6d9470597942b9fdb4f3382cbe1ff3c'
+  data.tar.gz: 22b61f2d97b87b3dbf2458df57177f0122ee9dd87c837c86da366a5bcf34d7c531cfa15fe60f2bb6959b9b939ca30175ae0b1f954ca0534512b821c11f20a578

data/CHANGELOG.md

@@ -1,6 +1,23 @@
+## [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)
@@ -40,10 +42,17 @@ module Sparoid
   private
 
   def sendmsg(host, port, data)
+    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
+    abort "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/cli.rb

@@ -13,7 +13,7 @@ module Sparoid
     rescue Errno::ENOENT
       abort "Sparoid: Config not found"
     rescue StandardError => e
-      abort "Sparoid: #{e.message}"
+      abort "Sparoid: #{e.message} (#{host})"
     end
 
     desc "connect HOST PORT [SPA-PORT]", "Send a SPA, TCP connect, and then pass the FD back to the parent"
@@ -26,7 +26,7 @@ module Sparoid
       end
       Sparoid.fdpass(host, port)
     rescue StandardError => e
-      abort "Sparoid: #{e.message}"
+      abort "Sparoid: #{e.message} (#{host})"
     end
 
     desc "keygen", "Generate an encryption key and a HMAC key"

data/lib/sparoid/version.rb

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

metadata

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