sparoid 1.0.17 → 1.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8747bc66fcbc1b4f3e31d7246d2608298a882df7d5661aef6d51c7f7b99f406c
-  data.tar.gz: 99e0f9044333f8d17e022f406e519abcd9977c420a86003fb4d69d891ba92475
+  metadata.gz: 9d3f9a0d1d95953662422a99f8d0170ce0db8df6ec82042e7f7d6d32e1721853
+  data.tar.gz: b2f702533aa2d6e1a96aed917a8cc77f8aa8916395944174c74644379392d7b8
 SHA512:
-  metadata.gz: 16095424a1dce5589c2922191ce96a380dd0e973dcc77c1715ec0fe9af376b4caf3127645808c2d87a161797d7d929135fa80d32be8fd06e7ef14a86cefad72f
-  data.tar.gz: 2a56181b6d57bc511ea35e10128f9536ad4bc480fb8fae007facd5e2ee7feb8cee3a7b4aeae910b1c03c5670b20de35f7f470e495d1b5a57dd3b5a422f0cc288
+  metadata.gz: c1803bdedaca58f7e172516864f502693e2478e43b7d9d5b8a0b5f306bb6284d4d19066e23235e9825c5f87ba0567f71388f19df52148cbce2637a17b8afd6d3
+  data.tar.gz: beb7813a740aa8d52d2689ee26c65872a45f991a9c2d2b937a46ba9451926471a064ca6635056441609a7bc8dfade4ef97aed2de130615b23d269e4ef308469e

data/.github/workflows/main.yml

@@ -4,15 +4,15 @@ on: [push,pull_request]
 
 jobs:
   build:
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [ 2.7, '3.0', 3.1, ruby-head ]
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
+    - uses: actions/checkout@v3
+    - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.7.2
-    - name: Run the default task
-      run: |
-        gem install bundler -v 2.2.14
-        bundle install
-        bundle exec rake
+        ruby-version: ${{ matrix.ruby }}
+    - run: bundle install
+    - run: bundle exec rake

data/.rubocop.yml

@@ -1,6 +1,7 @@
 AllCops:
   TargetRubyVersion: 2.5
   NewCops: enable
+  SuggestExtensions: false
 
 Style/StringLiterals:
   Enabled: true

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## [1.0.18] - 2022-10-10
+
+- Only resolv the IP(s) once
+- TCP connect to IPs in parallel
+- Fix bug where 3 UDP packets was sent to each IP
+
 ## [1.0.17] - 2021-11-15
 
 - Raise more specific error when failing to resolv hostname

data/lib/sparoid/cli.rb

@@ -21,12 +21,8 @@ module Sparoid
     desc "connect HOST PORT [SPA-PORT]", "Send a SPA, TCP connect, and then pass the FD back to the parent"
     method_option :config, desc: "Path to a config file, INI format, with key and hmac-key", default: "~/.sparoid.ini"
     def connect(host, port, spa_port = 8484)
-      begin
-        send_auth(host, spa_port, options[:config])
-      rescue Errno::ENOENT
-        warn "Sparoid: Config not found"
-      end
-      Sparoid.fdpass(host, port)
+      ips = send_auth(host, spa_port, options[:config])
+      Sparoid.fdpass(ips, port)
     rescue StandardError => e
       abort "Sparoid: #{e.message} (#{host})"
     end
@@ -56,8 +52,8 @@ module Sparoid
       File.readlines(File.expand_path(path)).map! { |line| line.split("=", 2).map!(&:strip) }.to_h
     rescue Errno::ENOENT
       {
-        "key" => ENV["SPAROID_KEY"],
-        "hmac-key" => ENV["SPAROID_HMAC_KEY"]
+        "key" => ENV.fetch("SPAROID_KEY", nil),
+        "hmac-key" => ENV.fetch("SPAROID_HMAC_KEY", nil)
       }
     end
 

data/lib/sparoid/version.rb

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

data/lib/sparoid.rb

@@ -13,17 +13,19 @@ module Sparoid
 
   # Send an authorization packet
   def auth(key, hmac_key, host, port)
-    ips = Resolv.getaddresses(host)
-    raise(ResolvError, "Sparoid failed to resolv #{host}") if ips.empty?
+    addrs = Addrinfo.getaddrinfo(host, port, :INET, :DGRAM)
+    raise(ResolvError, "Sparoid failed to resolv #{host}") if addrs.empty?
 
     msg = message(cached_public_ip)
     data = prefix_hmac(hmac_key, encrypt(key, msg))
-    sendmsg(ips, port, data)
+    sendmsg(addrs, data)
 
     # 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.map(&:ip_address) # return resolved IP(s)
   end
 
   # Generate new aes and hmac keys, print to stdout
@@ -36,23 +38,42 @@ module Sparoid
   end
 
   # Connect to a TCP server and pass the FD to the parent
-  def fdpass(host, port, connect_timeout: 20)
-    tcp = Socket.tcp host, port, connect_timeout: connect_timeout
-    parent = Socket.for_fd(1)
-    parent.sendmsg "\0", 0, nil, Socket::AncillaryData.unix_rights(tcp)
+  def fdpass(ips, port, connect_timeout: 10)
+    # try connect to all IPs
+    sockets = ips.map do |ip|
+      Socket.new(Socket::AF_INET, Socket::SOCK_STREAM).tap do |s|
+        s.connect_nonblock(Socket.sockaddr_in(port, ip), exception: false)
+      end
+    end
+    # wait for any socket to be connected
+    until sockets.empty?
+      _, writeable, = IO.select(nil, sockets, nil, connect_timeout)
+      writeable.each do |s|
+        idx = sockets.index(s)
+        sockets.delete_at(idx) # don't retry this socket again
+        ip = ips.delete_at(idx) # find the IP for the socket
+        s.connect_nonblock(Socket.sockaddr_in(port, ip)) # check for errors
+        # pass the connected FD to the parent process over STDOUT
+        Socket.for_fd(1).sendmsg "\0", 0, nil, Socket::AncillaryData.unix_rights(s)
+        exit 0 # exit as fast as possible so that other sockets don't connect
+      rescue SystemCallError
+        next # ignore connection errors, hopefully at least one succeeds
+      end
+    end
+    exit 1 # all connections failed
   end
 
   private
 
-  def sendmsg(ips, port, data)
-    UDPSocket.open do |socket|
-      ips.each do |ip|
-        socket.connect ip, port
-        socket.sendmsg data, 0
-      rescue StandardError => e
-        warn "Sparoid error: #{e.message}"
-      end
+  def sendmsg(addrs, data)
+    socket = Socket.new Socket::AF_INET, Socket::SOCK_DGRAM
+    addrs.each do |addr|
+      socket.sendmsg data, 0, addr
+    rescue StandardError => e
+      warn "Sparoid error: #{e.message}"
     end
+  ensure
+    socket.close
   end
 
   def encrypt(key, data)

data/sparoid.gemspec

@@ -27,4 +27,5 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "thor"
+  spec.metadata["rubygems_mfa_required"] = "true"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sparoid
 version: !ruby/object:Gem::Version
-  version: 1.0.17
+  version: 1.0.18
 platform: ruby
 authors:
 - Carl Hörberg
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-15 00:00:00.000000000 Z
+date: 2022-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -54,6 +54,7 @@ metadata:
   homepage_uri: https://github.com/84codes/sparoid.rb
   source_code_uri: https://github.com/84codes/sparoid.rb
   changelog_uri: https://raw.githubusercontent.com/84codes/sparoid.rb/main/CHANGELOG.md
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -69,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Single Packet Authorisation client