sparoid 1.0.2 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9949f3421911f8f9d588b87ba8955407b68ac62bae5ad7f53ef5b707077ef60
-  data.tar.gz: 06b115e1db22eb0222dd9f7a439024e18d8579255324aaff1bb1c935e35c10f4
+  metadata.gz: 2a97b0d586778f3f851e5c42039bffaf461bb2e8927d9fea86cd69c8cfa0e1e9
+  data.tar.gz: b66ff9a2c806838408c546d38c3698c7bc5334d3b11aba00d1e4de8f9e848f05
 SHA512:
-  metadata.gz: d6ef1abb4e1c01d435f771ffbf779aeced9a04a2384a309c623fef0546d8cf8adae7ab76a86ba60b485c49ddbd386e545ecc9ce7c62efdcec465732c23cd1f59
-  data.tar.gz: f616bb367217c07aa36865be2c1eaeeecce685c260911aaf6a97f1e8cb80f8652d906944edca1954d1f161a123bcf333945947992c40ea289be0911e40be7c29
+  metadata.gz: 1f2643b8599ab7c78e30b3e6927ad79e405becebfa8cfe617a0d7245e82ec4d0b11c9fcbf9cff2365403b59d2472260b4ab8b290e897991d8f3e6b1b19736e1e
+  data.tar.gz: '048ecd5b85d177c044626fb11cf304fbbc14b906d366566e34c7afa535ec419ba4b8a9369108ab67fc121496908e4a3ac0f42a2821db723bb7771a46ab26ab7e'

data/.gitignore

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

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+## [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
+
 ## [1.0.2] - 2021-03-15
 
 - `sparoid send` renamed to `sparoid auth`

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,24 +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 :fdpass,
-                  type: :numeric,
-                  desc: "After sending, open a TCP connection and pass the FD back to the calling process. \
-                         For use with OpenSSH ProxyCommand and ProxyUseFdpass"
+    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)
-      Sparoid.fdpass(host, options[:fdpass]) if options[:fdpass]
+      send_auth(host, port, options[:config])
+    rescue Errno::ENOENT
+      abort "Sparoid: Config not found"
+    rescue StandardError => e
+      abort "Sparoid: #{e.message}"
     end
 
-    desc "connect", "Send a SPA, TCP connect, and then pass the FD back to the parent"
+    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 "Sparoid: #{e.message}"
     end
 
     desc "keygen", "Generate an encryption key and a HMAC key"
@@ -38,8 +40,15 @@ module Sparoid
 
     private
 
+    def send_auth(host, port, config)
+      key = ENV["SPAROID_KEY"]
+      hmac_key = ENV["SPAROID_HMAC_KEY"]
+      key, hmac_key = get_keys(parse_ini(config)) if 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
     end
 
     def get_keys(config)

data/lib/sparoid/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sparoid
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.7
 platform: ruby
 authors:
 - Carl Hörberg
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-15 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