em-wssh 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd71c6b444c01d0a53369ee3a19b4e249117fa87
-  data.tar.gz: a0e23c5ad1d09084ae419ff505358ca87094aad1
+  metadata.gz: 565319173ca1f911be46fe7cc4493be5d6b06e22
+  data.tar.gz: 50601f66b068bfa8d31d1e9db41377c2bec3286f
 SHA512:
-  metadata.gz: 3e807d7f77ffaed65ce0e065f2266735fe3290e2e01bef37e83ebcdaaa81c99bfb3ce599ab12f7751d11f726c3693b4023210b7ec78621e4f825e90b4013b6f5
-  data.tar.gz: a4576f6827cd4722b4a7fb64f54558386a4c4bab8ece93db875239ce4150ea086e9c23b3287b3b6171a078c57d58c5b57218773d561de51f5617b94a9a964085
+  metadata.gz: 4f340eb263ae672fcf55aa8067a3308e1c7af99622bb5d5442ae2da6607bd9a1e7d100472b39d039565d4ecc25a3594a3757ff5b3b70f2f0b3ac8c647e4aab8f
+  data.tar.gz: b7ef678358ed0f5452ac97886f276e6142db5f9d4df4898dbe1556af6f4cb6e28b5466a14495c853594073465817dd13d21e5137e08f34b6cbc39fb53fdfc48f

data/lib/em/wssh.rb

@@ -1,5 +1,5 @@
 module EventMachine
   module Wssh
-    VERSION = "0.7.0"
+    VERSION = "0.7.1"
   end
 end

data/lib/em/wssh/all.rb

@@ -1 +1 @@
-Dir.glob(File.expand_path '../*.rb', __FILE__){|f|require f}
+Dir.glob(File.expand_path '../*.rb', __FILE__){|f|require f}

data/lib/em/wssh/version.rb

@@ -1,12 +1,12 @@
-require_relative '../wssh'
-
-module EventMachine::Wssh
-module Version
-
-  Title = 'Show WSSH version'
-
-  def self.go!
-    puts VERSION
-  end
-end
-end
+require_relative '../wssh'
+
+module EventMachine::Wssh
+module Version
+
+  Title = 'Show WSSH version'
+
+  def self.go!
+    puts VERSION
+  end
+end
+end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: em-wssh
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Stas Ukolov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-23 00:00:00.000000000 Z
+date: 2016-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-websocket
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: faye-websocket
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: openssl-win-root
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Proxy SSH connection through Websocket (nginx)
@@ -88,15 +88,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- FarMenu.ini
-- Gemfile
-- LICENSE.txt
-- README.md
-- Rakefile
 - bin/wssh
-- em-wssh.gemspec
-- hosts.yml
 - lib/em/wssh.rb
 - lib/em/wssh/all.rb
 - lib/em/wssh/client.rb
@@ -109,7 +101,6 @@ files:
 - lib/em/wssh/tls.rb
 - lib/em/wssh/uri.rb
 - lib/em/wssh/version.rb
-- nginx/ssh
 homepage: https://github.com/ukoloff/em-wssh
 licenses:
 - MIT
@@ -120,17 +111,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: ''

data/.gitignore

@@ -1,18 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-log

data/FarMenu.ini

@@ -1,17 +0,0 @@
-I:  Install dependencies
-    bundle install
---:
-B:  Build gem
-    bundle exec rake build
-L:  Install gem locally
-    bundle exec rake install
-U:  Uninstall gem
-    gem uninstall -ax em-wssh
---:
-S:  Start server
-    bundle exec ruby bin/wssh server -new_console:cb
-C:  Start CONNECT proxy
-    bundle exec ruby bin/wssh connect ws://localhost:4567/test -new_console:cb
-2:  Start both servers
-    bundle exec ruby bin/wssh server -new_console:cb
-    bundle exec ruby bin/wssh connect ws://localhost:4567/test -new_console:cb

data/Gemfile

@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in em-wssh.gemspec
-gemspec

data/LICENSE.txt

@@ -1,22 +0,0 @@
-Copyright (c) 2015 Stas Ukolov
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,256 +0,0 @@
-# em-wssh
-
-[![Gem Version](https://badge.fury.io/rb/em-wssh.svg)](http://badge.fury.io/rb/em-wssh)
-
-Ruby version of ssh thru websocket proxying.
-
-[Original version](https://github.com/ukoloff/wssh) uses Node.js
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'em-wssh'
-```
-
-And then execute:
-
-```sh
-$ bundle
-```
-
-Or install it yourself as:
-
-```sh
-$ gem install em-wssh
-```
-
-## Usage
-
-Single command `wssh` is exported. Sometimes it should be `bundle exec wssh`.
-
-### WSSH Server
-
-To run WSSH server say `wssh server`.
-
-You can set some options for server, ie:
-
-Most useful option is `--base=path` (or `-b`). It set path, where server files stored.
-By default this path is where gem installed. To use current directory say `wssh server -b.`
-
-This `base` path is used to locate `hosts.yml` file, which maps host requested by user to real servers.
-See [sample](hosts.yml). One can define direct map or regexp-style mapping (denoted by // with optional //i).
-If multiple regexps match user host, the last one wins.
-To disable connecting to host (or all hosts for regexp) map it to null or false.
-
-The `base` also is root for log file and pid file, created by server.
-
-Parameters `--listen=port` (`-l`) and `--all` (`-a`) define on what address server will listen.
-By default it is `localhost:4567`.
-
-Parameter `--daemon` will force server to go in background.
-
-### nginx
-
-Directly exposing WSSH server to Internet is not a good idea.
-One should better install nginx (with TLS) and [force it to redirect](nginx/ssh)
-WSSH connections to WSSH server.
-
-### WSSH Client
-
-Client is started with `wssh client URI`, eg `wssh client ws://localhost:4567`.
-
-Running client from terminal is not very useful. It should be called by ssh client:
-
-```sh
-ssh -o ProxyCommand='wssh client wss://server.host.com/ssh/%h' sshd.local
-```
-
-By default nginx has 60 seconds timeout. To prevent idle connection to drop,
-one can use `ServerAliveInterval` parameter:
-
-```sh
-ssh -o ProxyCommand='wssh client wss://server.host.com/ssh/%h' -o ServerAliveInterval=50 sshd.local
-```
-
-### WSSH Proxy
-
-WSSH client is in fact unusable on Windows.
-It can be impractical when we create a lot of SSH connections (eg with Capistrano mass deploy).
-
-In these cases run `wssh connect URI`, it will listen to TCP port (3122 by default) and will work
-as normal HTTP proxy, so proxy-capable clients (PuTTY/Plink and Net::SSH) can use it to connect to SSH servers.
-
-```ruby
-#!/usr/bin/env ruby
-
-require 'net/ssh'
-require 'net/ssh/proxy/http'
-
-x=Net::SSH.start 'sshd.local', 'root',
-  proxy: Net::SSH::Proxy::HTTP.new('localhost', 3122)
-
-puts x.exec! 'hostname'
-```
-
-Proxy allows the same command line parameters as server.
-For proxy parameter `--ping` may be useful,
-it forces proxy to periodically send Websocket ping packets to server
-for nginx to not drop connection on timeout.
-
-## API
-
-WSSH server, client or proxy can be start programmaticaly:
-
-```ruby
-require 'em/wssh/server'
-
-s=EventMachine::Wssh::Server
-s.options.merge! base: '.'
-s.loop!
-```
-
-```ruby
-require 'em/wssh/client'
-
-c=EventMachine::Wssh::Client
-c.options[:uri]='wss://server.host.com/ssh/sshd.local'
-c.loop!
-```
-
-```ruby
-require 'em/wssh/connect'
-
-p=EventMachine::Wssh::Connect
-p.options.merge! base: '.', all: true, uri: 'wss://server.host.com/ssh/sshd.local'
-p.loop!
-```
-
-Use `go!` method instead `loop!` to mimic cli behavour (command line parsing).
-
-Some options are not accesible to `wssh` command and can be used only programmaticaly.
-
-### Ephemeral module
-
-Eg, EventMachine::Wssh::Connect has option `onlisten` that allows listening to ephemeral port:
-
-```ruby
-#!/usr/bin/env ruby
-
-require 'net/ssh'
-require 'net/ssh/proxy/http'
-require 'em/wssh/connect'
-
-q=Queue.new
-c=EventMachine::Wssh::Connect
-c.options.merge!(
-  port: 0,
-  uri: 'wss://server.host.com/ssh',
-  onlisten: Proc.new{|port| q.push port},
-)
-
-Thread.new{c.loop!}
-
-puts "Port=#{port=q.pop}"
-
-x=Net::SSH.start 'sshd.local', 'root',
-  proxy: Net::SSH::Proxy::HTTP.new('localhost', port)
-
-puts x.exec! 'hostname'
-```
-
-Unfortunately, EventMachine fails to run in thread inside Capistrano.
-But Connect proxy still can run in separate process.
-To do this, module Ephemeral was forged:
-
-```ruby
-task :wssh do
-  require 'net/ssh/proxy/http'
-  require 'em/wssh/ephemeral'
-
-  port = EventMachine::Wssh::Ephemeral.allocate 'ws://localhost:4567/test'
-
-  proxy = Net::SSH::Proxy::HTTP.new 'localhost', port
-
-  roles(:all).each{|h| h.wssh_proxy proxy }
-end
-
-class SSHKit::Host
-  def wssh_proxy proxy
-    @ssh_options[:proxy]=proxy
-  end
-end
-```
-Use this task `cap stage wssh task(s)...` to tunnel all Capistrano ssh traffic through
-WSSH server.
-
-In addition, if WSSH URL is secure (wss: or https:) and Ephemeral module is running on Windows,
-it automagically starts small Node.js process that wraps traffic into TLS.
-This behavour can be disabled by setting Ephemeral.options[:tlswrap]=false
-
-## Data flow
-
-Normal SSH session is very simple:
-
-  * SSH Client
-  * TCP Connection
-  * SSH Server, listening on TCP port 22
-
-WSSH session is:
-
-  * SSH Client with -o ProxyCommand='wssh client WSSH-URI'
-  * WSSH client listening to its stdin
-  * Websocket (HTTP/HTTPS) connection to nginx
-  * nginx [configured](nginx/ssh) to redirect connection to WSSH server
-  * Another Websocket connection from nginx to WSSH server
-  * WSSH server, listening to dedicated TCP port (4567 by default)
-  * Normal TCP connection
-  * Normal SSH Server, listening on TCP port 22
-
-And nginx stage can be omited in development/testing scenarios.
-
-In some scenarios this path can be even longer:
-
-  * SSH Client, capable to connect via HTTP proxy (eg PuTTY/PLink or Net::SSH)
-  * TCP connection to local proxy
-  * `wssh connect` listening to dedicated port (3122 by default)
-  * Websocket (HTTP/HTTPS) connection to nginx
-  * nginx [configured](nginx/ssh) to redirect connection to WSSH server
-  * Another Websocket connection from nginx to WSSH server
-  * WSSH server, listening to dedicated TCP port (4567 by default)
-  * Normal TCP connection
-  * Normal SSH Server, listening on TCP port 22
-
-## Windows bugs
-
-Windows installation of EventMachine has a few bugs:
-
-  1. Using STDIN [blocks](https://groups.google.com/forum/#!topic/eventmachine/5rDIOA2uOoA) all other connections
-  2. By default SSL/TLS is not available
-  3. No root certificates available ([Fixed](https://github.com/ukoloff/openssl-win-root))
-
-So, this package is in fact almost unusable on MS Windows.
-
-The only exception: if you connect to Non-TLS WSSH server
-(ws: or http:, not wss: or https:), you **can** start `wssh connect`
-and then use SSH client, capable to connect via HTTP proxy.
-
-To connect to TLS WSSH server, you should use Node.js version.
-
-## See also
-
-  * [Node.js version](https://github.com/ukoloff/wssh)
-  * [Python version](https://github.com/progrium/wssh)
-
-## Credits
-
-  * [nginx](http://nginx.org/)
-  * [Ruby](https://www.ruby-lang.org/)
-  * [EventMachine](https://github.com/eventmachine/eventmachine)
-  * [EM-WebSocket](https://github.com/igrigorik/em-websocket)
-  * [faye-websocket](https://github.com/faye/faye-websocket-ruby)
-  * [Node.js](http://nodejs.org/)
-  * [OpenSSH](http://www.openssh.com/)
-  * [Net::SSH](https://github.com/net-ssh/net-ssh)
-  * [PuTTY](http://www.chiark.greenend.org.uk/~sgtatham/putty/)

data/Rakefile

@@ -1 +0,0 @@
-require "bundler/gem_tasks"

data/em-wssh.gemspec

@@ -1,27 +0,0 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'em/wssh'
-
-Gem::Specification.new do |spec|
-  spec.name          = "em-wssh"
-  spec.version       = EventMachine::Wssh::VERSION
-  spec.authors       = ["Stas Ukolov"]
-  spec.email         = ["ukoloff@gmail.com"]
-  spec.description   = 'Proxy SSH connection through Websocket (nginx)'
-  spec.summary       = ''
-  spec.homepage      = "https://github.com/ukoloff/em-wssh"
-  spec.license       = "MIT"
-
-  spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
-
-  spec.add_dependency "em-websocket"    # server side
-  spec.add_dependency "faye-websocket"  # client side
-  spec.add_dependency "openssl-win-root" if Gem.win_platform?
-
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
-end

data/hosts.yml

@@ -1,20 +0,0 @@
-# Catch all regexp
-//: localhost
-
-# Simple rule
-self: localhost
-
-# Disabled
-none: false
-
-# Allowed
-github.com: true
-gitlab.com: true
-bitbucket.org: true
-
-# Sample regexp
-/lab$/i: gitlab.com
-
-# Allow intranet IPs
-/10(?:\.\d+){3}/: true
-/192\.168(?:\.\d+){2}/: true

data/nginx/ssh

@@ -1,8 +0,0 @@
-location /ssh {
-  proxy_pass http://localhost:4567;
-  proxy_http_version 1.1;
-  proxy_set_header Upgrade $http_upgrade;
-  proxy_set_header Connection "upgrade";
-  proxy_set_header X-Real-IP $remote_addr;
-  proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-}