sparoid 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97ffed008109eb32f070fc300c536cd29f000c6ff943b67bff64658c218f70ce
-  data.tar.gz: 87fcc661eb04ee0a79b9d9cbd4ef12b5f80c8a4c1856569076f1eac57a37c41b
+  metadata.gz: 6069344b10804fda4024554fc6bfb9490c52ef0ef197dfcb598724cb760f587d
+  data.tar.gz: 35cc6eec43bb0b03fd2938166628618936c9659768b5454d880d96b942da04d1
 SHA512:
-  metadata.gz: ded717258409725cbf49b97fd9c704dbbe550a024f4ce09b484640306079f67ccfd43f64d063326c787ed700cef4db09179b6facb98c7403304dad0a861216ea
-  data.tar.gz: 180a6a9ae33549e198130f73e3e4bd5e9ce4e63727668e6ea2124e22ade18b4e7324efb15abf00053fc22b0728a05d17f49cff353a6f68cdf6b3bf9709b5fab4
+  metadata.gz: c361191ea89d2c980dc89a639c11cdf77575006526560f00ae4a200e79b9ba5a66b282d1f2b9b750af5135652316cbffc87476100af6799dc904e8aa8b5f2ffb
+  data.tar.gz: 3b6df9484af0ee540bedff510f9643642151da0558767d9a20de4dfb7d8217df5ff25623802ccba00c5855ba3e002c22743eac0bbfff9322480b86d2ce4e2c3d

data/README.md

@@ -20,7 +20,15 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+...
+
+Can be used with OpenSSH's ProxyCommand/ProxyUseFdpass to send the packet before connecting, open the TCP connection and that pass that connection back to the SSH client.
+
+```
+Host *.example.com
+  ProxyCommand sparoid send %h --passfd %p
+  ProxyUseFdpass yes
+```
 
 ## Development
 

data/lib/sparoid.rb

@@ -68,5 +68,11 @@ module Sparoid
     puts "hmac-key = #{hmac_key}"
   end
 
+  def self.fdpass(host, port)
+    ssh = Socket.tcp host, port
+    parent = Socket.for_fd(1)
+    parent.sendmsg "\0", 0, nil, Socket::AncillaryData.unix_rights(ssh)
+  end
+
   class Error < StandardError; end
 end

data/lib/sparoid/cli.rb

@@ -7,12 +7,18 @@ module Sparoid
   # CLI
   class CLI < Thor
     desc "send HOST [PORT]", "Send a packet"
-    method_option :config, default: "~/.sparoid.ini"
+    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"
     def send(host, port = 8484)
-      abort "Config not found" unless File.exist? options[:config]
+      config = File.expand_path(options[:config] || "~/.sparoid.ini")
+      abort "Config '#{config}' not found" unless File.exist? config
 
-      key, hmac_key = get_keys(parse_ini(options[:config]))
+      key, hmac_key = get_keys(parse_ini(config))
       Sparoid.send(key, hmac_key, host, port.to_i)
+      Sparoid.fdpass(host, options[:fdpass]) if options[:fdpass]
     end
 
     desc "keygen", "Generate an encryption key and a HMAC key"

data/lib/sparoid/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sparoid
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Carl Hörberg
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-11 00:00:00.000000000 Z
+date: 2021-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor