sparoid 1.0.5 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10aba94e127e9bfb74963c3e88276ef11879e16db16cb6e44fd8e01476c747b7
-  data.tar.gz: 4b64175b2dbc751bd409624f48b11fb2629268f1b42d81df8cf1b410bf579507
+  metadata.gz: 864cabc794097c6a5f46cef69a72031f133d4bb1534193fce13319030ee09181
+  data.tar.gz: c5c7a75a8eea8eca65e29cea1e82f82aa16643d36a42dcbbceb7cf061d9755c1
 SHA512:
-  metadata.gz: 3218c0a291f09ac0b66ca26c0fe5f7d5675d6aacc7dab69e72e3a645ebfea828eacadd62ce477634ebb3be245ddd23b05955a439ea637af32e45ec3c5adb89f2
-  data.tar.gz: e6e7c9f967abce41da45a20066e448351279720f231af9cfb49b62e46090360093411f84537b25a5329e3792447f4a8e0305d450bc8ab210441421521bcbba0b
+  metadata.gz: 6bfe6cfcd4dd1ad2b4577eda01b6972b7c36f8f418d64b5bbc2966e5cfc3538a1cf647ec8389108c5ecfc082cd420bb5d3483d4ae9f4d76e9b62709e865e4683
+  data.tar.gz: 82e84fc4deb3251d6c6c270cf5404da15ab91746bfd9d8de3a7f62152e8cccffa30dd43da7a8157f2a10627cefae79cc4dea5160fabfec3c0005c46202568568

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.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
+
 ## [1.0.5] - 2021-04-12
 
 - Prefix all logging with `Sparoid: `

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,11 +72,31 @@ 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
-    Resolv::DNS.open(nameserver: ["resolver1.opendns.com"]) do |dns|
+    Resolv::DNS.open(nameserver: ["208.67.222.222", "208.67.220.220"]) do |dns|
       dns.getresource("myip.opendns.com", Resolv::DNS::Resource::IN::A).address
     end
   end

data/lib/sparoid/cli.rb

@@ -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.5"
+  VERSION = "1.0.10"
 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.5
+  version: 1.0.10
 platform: ruby
 authors:
 - Carl Hörberg
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-12 00:00:00.000000000 Z
+date: 2021-06-09 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