sparoid 1.0.6 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9c9e31643c35e5466c71be88339a2c7999e401d893b6c7364597380def920cf
-  data.tar.gz: 237a5a03c2b3a306b25ad947754ce92acb866dcf2985650e27720773edc1f39e
+  metadata.gz: b933d6729f0ce76259c272550548532b15a206218239b9f824cd58b0deec6ee3
+  data.tar.gz: 61a1ec401ecebf13674e3b66e684df99ea5007f051e91b5bf98cc783e9f91c15
 SHA512:
-  metadata.gz: a417c0b53950536d98a43f417690952e2b4bf41b3bcb72b13e8bd52e367f9a0a814b7e10ce9072b57098b48cd8ee36c41166f354f6eb6b0782430e4a945e7bf3
-  data.tar.gz: fc30ef678295a18379cd770840f702c2c328047fcbe9bbaa6fd65514c95105a29b88fd946a0c7bcf0cf93703dba2a6cd547a81ec6dc9c31e73f7bf06626e9c45
+  metadata.gz: 173cb6c71c46ba88153306d5124879ade2f53eedda41da85b58475abc3fddc0e0d5dee00ab459e546ab0b283411044dbaa016369ccb74a791a22126dc5dc99dd
+  data.tar.gz: 71318184eb58dbcbcc713aebd1c2e22375562af77ae29083b90f0933bc078991f1860fc00fbccad5e55396f37845b098f3c4494cae381c71e79b30a8e6a8124a

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.5
   NewCops: enable
 
 Style/StringLiterals:

data/CHANGELOG.md

@@ -1,3 +1,24 @@
+## [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
+
+## [1.0.9] - 2021-05-23
+
+- Exit gracefully on abort (ctrl-c) instead of dumping huge stacktrace
+- Sleep 20ms aftering sending UDP package to allow for remote host to open its firewall
+
+## [1.0.8] - 2021-04-27
+
+- Get ENV variables if config file is missing
+
+## [1.0.7] - 2021-04-27
+
+- Get key and hmac key from ENV variables
+
 ## [1.0.6] - 2021-04-13
 
 - Use static IP for opendns resolver, saves one DNS lookup

data/README.md

@@ -26,7 +26,7 @@ Can be used with OpenSSH's ProxyCommand/ProxyUseFdpass to send the packet before
 
 ```
 Host *.example.com
-  ProxyCommand sparoid send %h --passfd %p
+  ProxyCommand sparoid connect %h %p
   ProxyUseFdpass yes
 ```
 

data/exe/sparoid

@@ -1,5 +1,9 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require_relative "../lib/sparoid/cli"
-Sparoid::CLI.start
+begin
+  require_relative "../lib/sparoid/cli"
+  Sparoid::CLI.start
+rescue Interrupt
+  exit 1
+end

data/lib/sparoid.rb

@@ -11,9 +11,14 @@ module Sparoid
 
   # Send an authorization packet
   def auth(key, hmac_key, host, port)
-    msg = message(public_ip)
+    msg = message(cached_public_ip)
     data = prefix_hmac(hmac_key, encrypt(key, msg))
     sendmsg(host, 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
+    # and it have to be redelivered, adding 1 second delay
+    sleep 0.02
   end
 
   # Generate new aes and hmac keys, print to stdout
@@ -67,7 +72,27 @@ module Sparoid
     version = 1
     ts = (Time.now.utc.to_f * 1000).floor
     nounce = OpenSSL::Random.random_bytes(16)
-    [version, ts, nounce, ip.address].pack("Nq>a16a4")
+    [version, ts, nounce, ip.address].pack("N q> a16 a4")
+  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
+    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
   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"
@@ -47,6 +47,11 @@ module Sparoid
 
     def parse_ini(path)
       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"]
+      }
     end
 
     def get_keys(config)

data/lib/sparoid/version.rb

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

data/sparoid.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.summary       = "Single Packet Authorisation client"
   spec.homepage      = "https://github.com/84codes/sparoid.rb"
   spec.license       = "MIT"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sparoid
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.11
 platform: ruby
 authors:
 - Carl Hörberg
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-13 00:00:00.000000000 Z
+date: 2021-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -62,14 +62,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: Single Packet Authorisation client