ssh_tunnels 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b02037bed34da5ad832e27db6175c5cfb9dc22ed945aea8b06132d11b3b1cf40
-  data.tar.gz: afdc8849d8297603f943056c32bfbd75a20f02ab6ac420f99411193570b1ac52
+  metadata.gz: 9bcdb9b758ed9d27d0e81ba9bafbf8e50273fa38c2c954b332b916fccb7cc699
+  data.tar.gz: 42d49d0040704dbe2ca4c51040ccfffc797eb2f5cf4dbdc7c322aa51a9f26c27
 SHA512:
-  metadata.gz: 448766cc0443b44c59798e1f1efc71a5e6f3e955f778df03ce1682a7d7467ab42e0c390aaff4524697f7cba8fc10e936dd16e93570efcafcf2604023146065af
-  data.tar.gz: c54e62eb16ad72a4ef0698be1a5b1a2b9b8e07b09d4d574df444194a3f83b755ef18477af1e04f7ce8b9a7fd8d6117657d39d3c93741af0a7c22d83e47dc83bc
+  metadata.gz: 109da60813a282a22c54b91075112e9a2bf5408e2490abe7c625aae87ef7c45ef3633ab698cdfd5f82fa24cf2a0fae04e32a6c86ba9a66b275b2eba97621e4c3
+  data.tar.gz: 117a4e60567f1763cf7c55ca024e4a1a9fc00e4b187209aff3e57edb288b209dd18ab217e958d505a4837b5daab1a8bd9502e098d1640080c091633b60b6f282

data/.rubocop.yml

@@ -0,0 +1,4 @@
+AllCops:
+  NewCops: enable
+  TargetRubyVersion: 3.3
+  SuggestExtensions: false

data/.ruby-version

@@ -1 +1 @@
-2.7.7
+3.3.9

data/Gemfile

@@ -3,3 +3,9 @@
 source 'https://rubygems.org'
 
 gemspec
+
+group :development do
+  gem 'rspec', '~> 3.13'
+  gem 'rubocop', '~> 1.86'
+  gem 'strong_versions', '~> 0.4.5'
+end

data/Gemfile.lock

@@ -1,73 +1,79 @@
 PATH
   remote: .
   specs:
-    ssh_tunnels (0.2.1)
+    ssh_tunnels (0.3.0)
       bcrypt_pbkdf (~> 1.1)
-      curses (~> 1.3)
+      curses (~> 1.4)
       ed25519 (~> 1.3)
-      net-ssh-gateway (~> 2.0)
+      net-ssh (~> 7.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.2)
-    bcrypt_pbkdf (1.1.0)
-    concurrent-ruby (1.2.3)
-    curses (1.4.4)
-    diff-lcs (1.5.1)
-    ed25519 (1.3.0)
-    i18n (1.14.4)
+    ast (2.4.3)
+    bcrypt_pbkdf (1.1.2)
+    concurrent-ruby (1.3.6)
+    curses (1.6.0)
+    diff-lcs (1.6.2)
+    ed25519 (1.4.0)
+    i18n (1.14.8)
       concurrent-ruby (~> 1.0)
-    net-ssh (7.2.3)
-    net-ssh-gateway (2.0.0)
-      net-ssh (>= 4.0.0)
+    json (2.19.7)
+    language_server-protocol (3.17.0.5)
+    lint_roller (1.1.0)
+    net-ssh (7.3.2)
     paint (2.3.0)
-    parallel (1.24.0)
-    parser (3.3.0.5)
+    parallel (2.1.0)
+    parser (3.3.11.1)
       ast (~> 2.4.1)
       racc
-    racc (1.7.3)
+    prism (1.9.0)
+    racc (1.8.1)
     rainbow (3.1.1)
-    regexp_parser (2.9.0)
-    rexml (3.2.6)
-    rspec (3.13.0)
+    regexp_parser (2.12.0)
+    rspec (3.13.2)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.0)
+    rspec-core (3.13.6)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.0)
+    rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.0)
+    rspec-mocks (3.13.8)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.1)
-    rubocop (0.86.0)
-      parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+    rspec-support (3.13.7)
+    rubocop (1.86.2)
+      json (~> 2.3)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
+      parallel (>= 1.10)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
-      rexml
-      rubocop-ast (>= 0.0.3, < 1.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.49.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.8.0)
-      parser (>= 2.7.1.5)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.49.1)
+      parser (>= 3.3.7.2)
+      prism (~> 1.7)
     ruby-progressbar (1.13.0)
     strong_versions (0.4.5)
       i18n (>= 0.5)
       paint (~> 2.0)
-    unicode-display_width (1.8.0)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.2.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  rspec (~> 3.9)
-  rubocop (~> 0.86.0)
+  rspec (~> 3.13)
+  rubocop (~> 1.86)
   ssh_tunnels!
-  strong_versions (~> 0.4.4)
+  strong_versions (~> 0.4.5)
 
 BUNDLED WITH
-   2.1.4
+  4.0.12

data/README.md

@@ -63,6 +63,17 @@ The `tunnels` section is a map where each key represents a named tunnel. Each tu
 * `host`: The remote host to connect to from the gateway.
 * `remote`: The remote port to use for forwarding.
 * `local`: The local port to bind to (defaults to the `remote` port).
+* `local_ip`: The local IP address to bind to (optional, defaults to the top-level `default_local_ip` if set, otherwise `127.0.0.1`). Equivalent to the `<local-ip>` component in `ssh -L <local-ip>:<local-port>:<remote-host>:<remote-port>`. Takes precedence over `default_local_ip`.
+
+### Default local IP
+
+The top-level `default_local_ip` option sets the local bind IP address used for all tunnels that do not specify their own `local_ip`:
+
+```yaml
+# config.yml
+
+default_local_ip: 0.0.0.0
+```
 
 ```yaml
 # config.yml
@@ -85,6 +96,11 @@ tunnels:
     local: 1111
     host: other.host.example.com
     remote: 5555
+  bound_host:
+    local_ip: 192.168.1.100
+    local: 2222
+    host: internal.host.example.com
+    remote: 8080
 ```
 
 ## Contributing

data/bin/ssh_tunnels

@@ -27,11 +27,12 @@ unless File.exist?(config_path)
   exit 1
 end
 
-config = YAML.safe_load(File.read(config_path))
+config = YAML.safe_load_file(config_path)
 
 begin
   default_gateway = config.fetch('default_gateway', nil)
-  if !config.key?('tunnels')
+  default_local_ip = config.fetch('default_local_ip', nil)
+  unless config.key?('tunnels')
     warn('Configuration file must provide `tunnels` section. Exiting.')
     exit 1
   end
@@ -51,14 +52,14 @@ begin
   end
 
   if error
-    warn("Configuration errors detected. Exiting.")
+    warn('Configuration errors detected. Exiting.')
     exit 1
   end
 end
 
 user = ENV.fetch('USER')
 print 'Enter SSH key passphrase (leave blank if not required): '
-passphrase = STDIN.noecho(&:gets).chomp
+passphrase = $stdin.noecho(&:gets).chomp
 puts
 
 begin
@@ -68,7 +69,8 @@ begin
               else
                 default_gateway
               end
-    SshTunnels::Tunnel.new(name, user, tunnel_config, gateway, passphrase)
+    config = { 'local_ip' => default_local_ip }.merge(tunnel_config)
+    SshTunnels::Tunnel.new(name, user, config, gateway, passphrase)
   end
   ui = SshTunnels::UI.new(tunnels)
   ui.run

data/lib/ssh_tunnels/tunnel.rb

@@ -10,13 +10,18 @@ module SshTunnels
       @user = user
       @config = config
       @passphrase = passphrase
-      @config = config
       @gateway = gateway
-      @connection = nil
+      @session = nil
+      @thread = nil
+      @active = false
     end
 
     def to_s
-      base = "#{local_port}:#{remote_host}:#{remote_port}"
+      base = if local_host
+               "#{local_host}:#{local_port}:#{remote_host}:#{remote_port}"
+             else
+               "#{local_port}:#{remote_host}:#{remote_port}"
+             end
       return base unless @error
 
       "#{base} (#{@error})"
@@ -27,25 +32,35 @@ module SshTunnels
     end
 
     def open
-      @connection = Net::SSH::Gateway.new(@gateway.fetch('host'), @gateway.fetch('user', @user), options)
-      @connection.open(remote_host, remote_port, local_port)
-    rescue StandardError => e
+      @session = Net::SSH.start(@gateway.fetch('host'), @gateway.fetch('user', @user), options)
+      forward_local
+      @active = true
+      @thread = Thread.new { @session.loop(0.001) { @active } }
+    rescue StandardError
       shutdown
       raise
     end
 
     def active?
-      return false if @connection.nil?
-
-      @connection.active?
+      @active && @thread&.alive?
     end
 
     def shutdown
-      @connection&.shutdown!
+      @active = false
+      @thread&.join
+      @session&.close
+      @session = nil
+      @thread = nil
     end
 
     private
 
+    def forward_local
+      args = [local_port, remote_host, remote_port]
+      args.unshift(local_host) if local_host
+      @session.forward.local(*args)
+    end
+
     def remote_host
       @config.fetch('host')
     end
@@ -54,6 +69,10 @@ module SshTunnels
       @config.fetch('remote_port')
     end
 
+    def local_host
+      @config.fetch('local_ip', nil)
+    end
+
     def local_port
       @config.fetch('local_port', remote_port)
     end

data/lib/ssh_tunnels/ui.rb

@@ -91,16 +91,14 @@ module SshTunnels
       tunnel = @tunnels[IDENTIFIERS.index { |value| value == input }]
       return status("Unrecognized tunnel: #{input}") if tunnel.nil?
 
-      if tunnel.active?
-        status("Disconnecting: #{tunnel}")
-      else
-        status("Connecting: #{tunnel}")
-      end
-      begin
-        tunnel.toggle
-      rescue StandardError => e
-        status("Error: #{e}")
-      end
+      toggle_tunnel(tunnel)
+    end
+
+    def toggle_tunnel(tunnel)
+      status("#{tunnel.active? ? 'Disconnecting' : 'Connecting'}: #{tunnel}")
+      tunnel.toggle
+    rescue StandardError => e
+      status("Error: #{e}")
     end
 
     def tunnel_color(tunnel)

data/lib/ssh_tunnels/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SshTunnels
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

data/lib/ssh_tunnels.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'curses'
-require 'net/ssh/gateway'
+require 'net/ssh'
 
 require 'ssh_tunnels/version'
 require 'ssh_tunnels/tunnel'

data/ssh_tunnels.gemspec

@@ -12,11 +12,12 @@ Gem::Specification.new do |spec|
   spec.description   = 'Conveniently manage numerous SSH tunnels with ncurses'
   spec.homepage      = 'https://github.com/bobf/ssh_tunnels'
   spec.license       = 'MIT'
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.3.0')
+  spec.required_ruby_version = Gem::Requirement.new('>= 3.3.0')
 
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = spec.homepage
   spec.metadata['changelog_uri'] = 'https://github.com/bobf/ssh_tunnels/blob/master/CHANGELOG.md'
+  spec.metadata['rubygems_mfa_required'] = 'true'
 
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
@@ -25,12 +26,8 @@ Gem::Specification.new do |spec|
   spec.executables   = 'ssh_tunnels'
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'curses', '~> 1.3'
-  spec.add_runtime_dependency 'net-ssh-gateway', '~> 2.0'
-  spec.add_runtime_dependency 'ed25519', '~> 1.3'
-  spec.add_runtime_dependency 'bcrypt_pbkdf', '~> 1.1'
-
-  spec.add_development_dependency 'rspec', '~> 3.9'
-  spec.add_development_dependency 'rubocop', '~> 0.86.0'
-  spec.add_development_dependency 'strong_versions', '~> 0.4.4'
+  spec.add_dependency 'bcrypt_pbkdf', '~> 1.1'
+  spec.add_dependency 'curses', '~> 1.4'
+  spec.add_dependency 'ed25519', '~> 1.3'
+  spec.add_dependency 'net-ssh', '~> 7.0'
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: ssh_tunnels
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Bob Farrell
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-10 00:00:00.000000000 Z
+date: 2026-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: curses
+  name: bcrypt_pbkdf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: net-ssh-gateway
+  name: curses
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: ed25519
   requirement: !ruby/object:Gem::Requirement
@@ -53,61 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: bcrypt_pbkdf
+  name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.9'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.86.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.86.0
-- !ruby/object:Gem::Dependency
-  name: strong_versions
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: '7.0'
 description: Conveniently manage numerous SSH tunnels with ncurses
 email:
 - git@bob.frl
@@ -118,6 +76,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".ruby-version"
 - Gemfile
 - Gemfile.lock
@@ -141,6 +100,7 @@ metadata:
   homepage_uri: https://github.com/bobf/ssh_tunnels
   source_code_uri: https://github.com/bobf/ssh_tunnels
   changelog_uri: https://github.com/bobf/ssh_tunnels/blob/master/CHANGELOG.md
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -149,14 +109,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 3.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.13
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Interactive SSH tunnel management