aws_ssh 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a29fb3972592fe9a5515f6b0980977736c7b150e
-  data.tar.gz: 13272a3858270e3a3daeabac3c7c2b82846d544f
+  metadata.gz: 97208487d2c251e27a81c10301c979da01928ea2
+  data.tar.gz: 57e6395a053378cf986101bd2df3bb684a0c9782
 SHA512:
-  metadata.gz: e942774c61463151f57ee62eb45d4c4414047b4b5caeb797792ac9845d9cdf5a2dddf356ac79277213d33f853d1d4ac87bbc83e0c45ea0d54c85e1be8b357ea7
-  data.tar.gz: c724c62b75f28e1557fcef2ceaebc7b615f448afbca89e57607d90cf7e425f738ace9e4467ec66c0d41d11ce48883dcecc7bb7cd91da7ad623d378add763f309
+  metadata.gz: ba46265e16998b3d7f6b81d222df06fe28a7293566197f8d7b926c818bc8e95009824f151b478348396f4b06ca0f952dcb04dd0ab5e60ad8ccf17d30d2ae67e2
+  data.tar.gz: 046b002281cbf84fb4db793006bf53ada5e8eb451af88e3bb2fb1104df94f951c40ecced47eddea8fc9f6219af51b8235af99ca2cc384b470777bb5188da5331

data/README.md

@@ -8,7 +8,7 @@ It does assume that you are using SSH key based authentication to access the ser
 
 Ruby, version 2.0 onwards, is required along with the standard bundler gem.
 
-At the moment, this code is only tested with bash based shells.
+At the moment, this code is only tested with bash based shells whose ssh config is setup around their user (non root, local, not global ssh config etc).
 
 ## AWS Configuration ##
 

data/lib/aws_ssh.rb

@@ -5,6 +5,7 @@ module AWS_SSH
   require "aws_ssh/exceptions"
   require "aws_ssh/files"
   require "aws_ssh/cmds"
+  require "aws_ssh/ssh"
   require "aws_ssh/terminal_formats"
   require "aws_ssh/ec2"
   require "aws_ssh/setup"

data/lib/aws_ssh/ec2.rb

@@ -8,6 +8,7 @@ module AWS_SSH
     attr_accessor :StrictHostKeyChecking
     attr_accessor :UserKnownHostsFile
     attr_accessor :LogLevel
+    attr_accessor :ProxyCommand
     ### class values
     # aws api object
     attr_accessor :api
@@ -34,6 +35,7 @@ module AWS_SSH
       @StrictHostKeyChecking = "no"
       @UserKnownHostsFile = "/dev/null"
       @LogLevel = "quiet"
+      @ProxyCommand = AWS_SSH::SSH.proxy
 
       @seperator = "."
       @ssh_key_suffixes = [".pem", ""]
@@ -107,6 +109,7 @@ module AWS_SSH
         config += "  StrictHostKeyChecking #{@StrictHostKeyChecking}\n"
         config += "  UserKnownHostsFile #{@UserKnownHostsFile}\n"
         config += "  LogLevel #{@LogLevel}\n"
+        config += if ! @ProxyCommand.nil? then "  ProxyCommand #{@ProxyCommand}\n" else "" end
         config += "\n\n"
       end
       # write to file

data/lib/aws_ssh/runner.rb

@@ -2,6 +2,8 @@ require "aws_ssh/files"
 require "aws_ssh/cache"
 module AWS_SSH
   class Run
+
+
     def generate
       config = ENV['HOME']+"/.ssh/"+AWS_SSH::HOSTS_FILE
       # 4 hour cache

data/lib/aws_ssh/ssh.rb

@@ -0,0 +1,39 @@
+module AWS_SSH
+
+  class SSH
+
+    def self.proxy
+      if AWS_SSH::SSH.ssh_proxy_per_host? && (cmd = AWS_SSH::SSH.existing_proxy_command) && ! cmd.nil?
+        return cmd
+      else
+        return nil
+      end
+    end
+
+    # scan original ssh config file for a proxy command, offer to use that
+    def self.existing_proxy_command
+      cmd = nil
+      found = ""
+      filename = ENV['HOME']+"/.ssh/"+AWS_SSH::BASE_HOSTS_FILE
+      if File.exists?(filename)
+        content = File.open(filename, "r"){ |f| f.read}
+        found = content[/ProxyCommand.*/i,0].gsub!("ProxyCommand", "").to_s.strip
+      end
+      extras = if found.length > 0 then "(Found '#{found}', enter y to use, fill in your own or leave blank for no)" else "" end
+      puts "Do you want to use a ProxyCommand? #{extras}: ".colorize(:yellow)
+      newcmd = gets.chomp
+      cmd = if newcmd.length > 0 && newcmd == "y" && ! found.nil? then found elsif newcmd.length >0 then newcmd else "" end
+      return cmd
+    end
+
+    def self.ssh_version
+      return `ssh -V 2>&1`[/[0-9]\.[0-9]/i, 0].to_f
+    end
+
+    def self.ssh_proxy_per_host?
+      no_proxy_version = 6.6
+      return AWS_SSH::SSH.ssh_version < no_proxy_version
+    end
+
+  end
+end

data/lib/aws_ssh/version.rb

@@ -1,3 +1,3 @@
 module AWS_SSH
-  VERSION="0.1.2"
+  VERSION="0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws_ssh
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Charles Marshall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-22 00:00:00.000000000 Z
+date: 2014-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -92,6 +92,7 @@ files:
 - lib/aws_ssh/files.rb
 - lib/aws_ssh/runner.rb
 - lib/aws_ssh/setup.rb
+- lib/aws_ssh/ssh.rb
 - lib/aws_ssh/teardown.rb
 - lib/aws_ssh/terminal_formats.rb
 - lib/aws_ssh/version.rb