sparoid 1.0.4 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6bceab7682e1a59d1da6f51276f580f11c50456625ea57b1633dd8862f9045df
-  data.tar.gz: 97f3594df9310bd90472d6909e3a2f7ba719c43638d53cc12e5464cd2634bd8f
+  metadata.gz: 3e5d9f60a2c48147b21a1bd2970f9b495b8f28d6627b3783e27870fd7572e87e
+  data.tar.gz: 5448587233f343935ea5bd5ccc0484f24f852b90d129a0192627847b32c14032
 SHA512:
-  metadata.gz: 668b9744c1f4e4c77cf91f5f351b23444f0e7a325fb6af0c834fe7d255273afa70b21455318c0979933dca994151ea17cb63f9db4ee5cc74d9e2b146f3e745b0
-  data.tar.gz: 040e356d56e371eb487079d6beb286b9dec64287f57301aa235e5cdadd8b6116839b564ffca7d894b93d151f2520a3af589b46962c0592974ca796363885242d
+  metadata.gz: ba3a127fc5d7ec9cd6c5e859a467e65428a4597eb5069f32c06e69504aca2aeecdb7fcab691c781d07fd7c1c00df0dd04555780f51f5da7678626fa41bf87f33
+  data.tar.gz: b7f356bb8018f0a653263103adbd22da116b4f0ea6bd03a646ecd43c3b61f79429b38e7597e20b9d0ea7401074f6043ad3fa9c122dda0a9af3ba0c285952201c

data/.gitignore

@@ -6,3 +6,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+Gemfile.lock

data/CHANGELOG.md

@@ -1,3 +1,24 @@
+## [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: `
+
 ## [1.0.4] - 2021-03-25
 
 - Only warn if config is missing when connecting with CLI

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

@@ -14,6 +14,11 @@ module Sparoid
     msg = message(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
@@ -71,7 +76,7 @@ module Sparoid
   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

@@ -11,9 +11,9 @@ module Sparoid
     def auth(host, port = 8484)
       send_auth(host, port, options[:config])
     rescue Errno::ENOENT
-      abort "Config not found"
+      abort "Sparoid: Config not found"
     rescue StandardError => e
-      abort e.message
+      abort "Sparoid: #{e.message}"
     end
 
     desc "connect HOST PORT [SPA-PORT]", "Send a SPA, TCP connect, and then pass the FD back to the parent"
@@ -22,11 +22,11 @@ module Sparoid
       begin
         send_auth(host, spa_port, options[:config])
       rescue Errno::ENOENT
-        warn "Config not found"
+        warn "Sparoid: Config not found"
       end
       Sparoid.fdpass(host, port)
     rescue StandardError => e
-      abort e.message
+      abort "Sparoid: #{e.message}"
     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.4"
+  VERSION = "1.0.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sparoid
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.9
 platform: ruby
 authors:
 - Carl Hörberg
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-25 00:00:00.000000000 Z
+date: 2021-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -69,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: Single Packet Authorisation client