sparoid 1.0.12 → 1.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12dad3dbab45bb38650465dab2b26f356c051569b06d20ba1bcfd6af11eb9701
-  data.tar.gz: 0b17fe457b36978f1b682153cb14578192cb657a846fadcbb3abb2cf82e07bb6
+  metadata.gz: 11677eb6c66244eed7b68e11a2d543db02020701b990a3fdec1c6e230df7f883
+  data.tar.gz: 3a3c8c05b72ae568bf7edb0ff95e37fa60cb9173380283e626f07455d24e9064
 SHA512:
-  metadata.gz: 1c31f7b1fa30e2d064b0e92e79b2b567bdfa4021995d7f52c25b6b4373d08062ed091aab8187aeb42051c11e0c7c1b994d158878e64311eed28e68d1e3fe4008
-  data.tar.gz: cacd2adf45ed9fa8e31b063809e01cf0371c6d13670e24b5bdb17f7c2623c2f9592c7e38b6df18a5f529db9628d4197baf323a9d58124b8eb6ea75762c3a6d78
+  metadata.gz: bc14a72d7d060bad1b0bb813987a66c9464e89cb8e8dcd58cff28a91130560d91e3a5d5c49182be4465f0a8d3499f7d87e564a78b1abcf2576c4aa0bc3610550
+  data.tar.gz: b9dffb39f58ae71e43a54aa1417c0a1f69e25f398c6354497243b01a2f5604c26023624dffc33c3b55b7f8065c29789ef34f252298feb3f883d44ac5cc58f19a

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+## [1.0.16] - 2021-08-23
+
+- Resolv host IPs before generating message (in case resolving takes a lot of time)
+
+## [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
@@ -8,7 +25,7 @@
 
 ## [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/version.rb

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

data/lib/sparoid.rb

@@ -9,11 +9,16 @@ 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)
+    ips = Resolv.getaddresses(host)
+    raise(Error, "Sparoid failed to resolv #{host}") if ips.empty?
+
     msg = message(cached_public_ip)
     data = prefix_hmac(hmac_key, encrypt(key, msg))
-    sendmsg(host, port, data)
+    sendmsg(ips, port, data)
 
     # wait some time for the server to actually open the port
     # if we don't wait the next SYN package will be dropped
@@ -39,10 +44,14 @@ module Sparoid
 
   private
 
-  def sendmsg(host, port, data)
+  def sendmsg(ips, port, data)
     UDPSocket.open do |socket|
-      socket.connect host, port
-      socket.sendmsg data, 0
+      ips.each do |ip|
+        socket.connect ip, port
+        socket.sendmsg data, 0
+      rescue StandardError => e
+        warn "Sparoid error: #{e.message}"
+      end
     end
   end
 
@@ -87,21 +96,25 @@ module Sparoid
   end
 
   def up_to_date_cache?
-    mtime = File.mtime("/tmp/.sparoid_public_ip")
+    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("/tmp/.sparoid_public_ip", "r") do |f|
+    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("/tmp/.sparoid_public_ip", File::WRONLY | File::CREAT, 0o0644) do |f|
+    File.open(SPAROID_CACHE_PATH, File::WRONLY | File::CREAT, 0o0644) do |f|
       f.flock(File::LOCK_EX)
       ip = public_ip
       f.truncate(0)

metadata

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