sparoid 1.0.3 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 594f1917e9cea3e563dcb027f0fb0ddc9fc41e4a0240a405b7fbba8445de61d9
-  data.tar.gz: 7d39ad302157dfce633b339338e6564d407074556614422efc71b3e645272ac2
+  metadata.gz: 3c8737279c5f4eae1d6b5c38e14fc6d43ec3978bb445196a2873dbcb24c33146
+  data.tar.gz: 72b1d744ecac0c6afa993b7365f2023ba17d6306ee64d58ae5a27378d082f667
 SHA512:
-  metadata.gz: 7c037f995e1fd41822c9b726e7d79e2fc065a75dff5697df4182b6e6294889c305f2d224bf6436bd4f26e4e790316d507cffd2dc58d7f6041cf6e4a6484e3098
-  data.tar.gz: 2478cbdb04f16035a93c37711a1bb7eaab1cd7482a6c80418ba71f60c276d356513d1210b51615ea984167ba9b654cc1bf51c4d4899e37894a348abdfaa7e76a
+  metadata.gz: 671a2b3ad5df6752f29f5de76c6e3f1613088b75406d187154a4be4da514b93e1c0a9ee19b99c430133321029db3f088565d917860f9794ef15558c467ed2532
+  data.tar.gz: 57d624c615d9067eaa2d4fd6f23fe3d5213b953674b00738da08f995b917244fb85fb8e1bddf3ccd0013b292a5101ade4014b9da1b5155a35c2d78732ce5c7b6

data/.gitignore

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

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+## [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
+
 ## [1.0.3] - 2021-03-17
 
 - Nicer error handling in CLI, remove --fdpass option

data/lib/sparoid.rb

@@ -71,7 +71,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

@@ -7,23 +7,26 @@ module Sparoid
   # CLI
   class CLI < Thor
     desc "auth HOST [PORT]", "Send a authorization packet"
-    method_option :config, desc: "Path to a config file, INI format, with key and hmac-key"
+    method_option :config, desc: "Path to a config file, INI format, with key and hmac-key", default: "~/.sparoid.ini"
     def auth(host, port = 8484)
-      config = File.expand_path(options[:config] || "~/.sparoid.ini")
-      abort "Config '#{config}' not found" unless File.exist? config
-
-      key, hmac_key = get_keys(parse_ini(config))
-      Sparoid.auth(key, hmac_key, host, port.to_i)
+      send_auth(host, port, options[:config])
+    rescue Errno::ENOENT
+      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"
+    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)
-      auth(host, spa_port)
+      begin
+        send_auth(host, spa_port, options[:config])
+      rescue Errno::ENOENT
+        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"
@@ -37,8 +40,18 @@ module Sparoid
 
     private
 
+    def send_auth(host, port, config)
+      key, hmac_key = get_keys(parse_ini(config))
+      Sparoid.auth(key, hmac_key, host, port.to_i)
+    end
+
     def parse_ini(path)
-      File.readlines(path).map! { |l| l.split("=", 2).map!(&:strip) }.to_h
+      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.3"
+  VERSION = "1.0.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sparoid
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.8
 platform: ruby
 authors:
 - Carl Hörberg
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-17 00:00:00.000000000 Z
+date: 2021-04-27 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.3
 signing_key:
 specification_version: 4
 summary: Single Packet Authorisation client