sshwrap 0.0.2 → 0.0.3

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Jason Heiss
+Copyright (c) 2013 Jason Heiss
 
 MIT License
 

data/README.md

@@ -1,7 +1,8 @@
 # SSHwrap
 
 This provides a wrapper for ssh that execute a command on multiple machines,
-optionally in parallel, and handles any sudo prompts that result.
+optionally in parallel, and handles any ssh and sudo password prompts that
+result.
 
 ## Installation
 

data/bin/sshwrap

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 
+$LOAD_PATH << File.expand_path('../lib', File.dirname(__FILE__))
 require 'sshwrap'
 require 'optparse'
 

data/lib/sshwrap/main.rb

@@ -1,24 +1,53 @@
+require 'etc'
+require 'yaml'
 require 'net/ssh'
 require 'highline/import'
+require 'sshwrap/prompter'
+
+# Monkey patch our prompt method into Net::SSH
+module Net::SSH
+  def KeyFactory.prompt(prompt, echo=true)
+    @prompter ||= SSHwrap::Prompter.new
+    @prompter.prompt(prompt + ' ', echo)
+  end
+  module Authentication::Methods
+    def KeyboardInteractive.prompt(prompt, echo=true)
+      @prompter ||= SSHwrap::Prompter.new
+      @prompter.prompt(prompt + ' ', echo)
+    end
+  end
+end
 
 class SSHwrap::Main
   def initialize(options={})
+    home = Dir.respond_to?(:home) ? Dir.home : ENV['HOME'] || ENV['LOGDIR']
+    conffile = "#{home}/.sshwrap.yaml"
+    if File.exist?(conffile)
+      conf = YAML.load_file(conffile)
+    else
+      conf = {}
+    end
+    
     @mutex = Mutex.new
     @max_workers = options[:max_workers] || 1
     @abort_on_failure = options[:abort_on_failure]
     @user = options[:user] || Etc.getlogin
     @ssh_key = options[:ssh_key]
     @debug = options[:debug]
-    @password = nil
-  end
-  
-  def get_password
-    @mutex.synchronize do
-      if !@password
-        @password = ask("Password for #{@user}: ") { |q| q.echo = "x" }
-      end
+    @prompter = SSHwrap::Prompter.new
+    @ssh_prompt = "Password for #{@user}: "
+    
+    if conf['password_regexp']
+      @password_regexp = Regexp.new('(' + conf['password_regexp'] + ')')
+    elsif options[:password_regexp]
+      @password_regexp = options[:password_regexp]
+    else
+      # sudo on Mac OS X:
+      #   Password:
+      # sudo on Red Hat, Debian, Ubuntu:
+      #   [sudo] password for <user>:
+      @password_regexp = /(Password: |\[sudo\] password for .*: )/
     end
-    @password
   end
   
   def ssh_execute(cmd, target)
@@ -31,9 +60,9 @@ class SSHwrap::Main
       params[:keys] = [@ssh_key]
     end
     using_password = false
-    if @password
+    if @prompter.passwords[@ssh_prompt]
       using_password = true
-      params[:password] = @password
+      params[:password] = @prompter.passwords[@ssh_prompt]
     end
     
     begin
@@ -63,9 +92,9 @@ class SSHwrap::Main
             # if it's a password prompt, and interactively return data if so
             # (see request_pty above).
             channel.on_data do |ch_data, data|
-              # This is the standard sudo password prompt
-              if data =~ /Password:/
-                channel.send_data "#{get_password}\n"
+              if data =~ @password_regexp
+                prompt = $1
+                channel.send_data "#{@prompter.prompt(prompt)}\n"
               else
                 stdout << data unless (data.nil? or data.empty?)
               end
@@ -85,7 +114,7 @@ class SSHwrap::Main
       end
     rescue Net::SSH::AuthenticationFailed
       if !using_password
-        get_password
+        @prompter.prompt(@ssh_prompt)
         return ssh_execute(cmd, target)
       else
         stderr << "Authentication failed to #{target}"

data/lib/sshwrap/prompter.rb

@@ -0,0 +1,15 @@
+class SSHwrap::Prompter
+  attr_reader :passwords
+  def initialize
+    @mutex = Mutex.new
+    @passwords = {}
+  end
+  def prompt(prompt, echo=false)
+    @mutex.synchronize do
+      if !@passwords[prompt]
+        @passwords[prompt] = ask(prompt) { |q| q.echo = echo }
+      end
+    end
+    @passwords[prompt]
+  end
+end

data/lib/sshwrap/version.rb

@@ -1,3 +1,3 @@
 module SSHwrap
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/sshwrap.gemspec

@@ -4,7 +4,7 @@ require File.expand_path('../lib/sshwrap/version', __FILE__)
 Gem::Specification.new do |gem|
   gem.authors       = ['Jason Heiss']
   gem.email         = ['jheiss@aput.net']
-  gem.description   = 'This provides a wrapper for ssh that execute a command on multiple machines, optionally in parallel, and handles any sudo prompts that result.'
+  gem.description   = 'This provides a wrapper for ssh that execute a command on multiple machines, optionally in parallel, and handles any ssh and sudo password prompts that result.'
   gem.summary       = 'Perform batch SSH operations, handling sudo prompts'
   gem.homepage      = 'https://github.com/jheiss/sshwrap'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sshwrap
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-13 00:00:00.000000000 Z
+date: 2013-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -44,7 +44,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: This provides a wrapper for ssh that execute a command on multiple machines,
-  optionally in parallel, and handles any sudo prompts that result.
+  optionally in parallel, and handles any ssh and sudo password prompts that result.
 email:
 - jheiss@aput.net
 executables:
@@ -61,6 +61,7 @@ files:
 - bin/sshwrap
 - lib/sshwrap.rb
 - lib/sshwrap/main.rb
+- lib/sshwrap/prompter.rb
 - lib/sshwrap/version.rb
 - sshwrap.gemspec
 - test/test_options.rb