shaddox 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5453ebbc5938bd3524a2717fbd412b3c6cbae940
-  data.tar.gz: e29e70aef8c4ea1a13630d9d2876753175eda65f
+  metadata.gz: 57d55169746bf088a8f1808239e6bce9246bb3b2
+  data.tar.gz: 1b1e3f67edf2df39bcb17d271fc0dcff7dc3111d
 SHA512:
-  metadata.gz: 3c4948e0476e99926f220e62382ca39507b866140d4a0f4e52aa57efafc12967880dcfbe00a69222a7dfa8accaea43ff2d4bfe4a92c9c6c49c0a2b4e335db479
-  data.tar.gz: 20af0a2218f08ed384007ed82e7a488cd60453c4802827f8d9312798bdadf87a62a696d162fad214c682b559d1834edcb1e8fd7c28962d265d2ade70202814bb
+  metadata.gz: 91135741672ec330d1ec135f70a4d0e7cdc813b54683c7c12eaf2c61b701aab83bb5eaa02d1d713f6cc026a2a9a71083c3e75107c445d1ca9f6b9df942712f4c
+  data.tar.gz: c9ea2e0fd3834a5f774f3c2741d89cb1a1ac2e5d8bc31a3d96ac8b1d87363f238c6774394576940321cdaf775762e0b9d43db787acf12af8bc967106a143e9cf

data/Doxfile

@@ -33,7 +33,7 @@ task :broken => :foo do
 end
 
 task :sudo do
-	sh "sudo -S echo 'this is a sudo echo'"
+	sh "sudo echo 'this is a sudo echo'"
 end
 
 task :git_clone do

data/lib/shaddox/target.rb

@@ -35,14 +35,17 @@ module Shaddox
 					shaddox_installed = lambda { exec 'gem list shaddox -i >/dev/null' }
 					if shaddox_installed.call()
 						info "Updating shaddox...", 1
-						updated = exec "gem update shaddox"
+						updated = exec "gem update shaddox", :quiet => true
+						updated = exec "sudo gem update shaddox" unless updated
 						warn "Shaddox could not be automatically updated. Please update it manually with 'gem update shaddox'.", 1 unless updated
 					else
 						info "Installing shaddox...", 1
-						exec "gem install shaddox"
+						installed = exec "gem install shaddox", :quiet => true
+						installed = exec "sudo gem install shaddox" unless installed
+						warn "Shaddox could not be automatically installed. Please update it manually with 'gem update shaddox'.", 1 unless installed
 					end
 					unless shaddox_installed.call()
-						raise TargetError, "Shaddox could not be automatically installed. Please install manually with 'gem install shaddox'."
+						raise TargetError, "Shaddox was not found on this target."
 					end
 
 					# Push the shadow script to tmpdir:
@@ -117,17 +120,21 @@ module Shaddox
 					super(&block)
 				end
 			end
-			def exec(command)
+			def exec(command, opts = {})
 				exit_code = nil
 				@ssh.open_channel do |channel|
 					channel.request_pty do |c, success|
 						raise "SSH could not obtain a pty." unless success
 						channel.exec(command)
 						channel.on_data do |c_, data|
-							$stdout.print data
-							if data =~ /^\[sudo\]|Password/i
-								warning "Target is asking for password: ", 1
-								channel.send_data(gets.strip + "\n")
+							if data =~ /\[sudo\]/ || data =~ /Password/i
+								warn "Target is asking for password: ", 1
+								$stdout.print data
+								puts ""
+								pass = $stdin.gets.chomp
+								channel.send_data "#{pass}\n"
+							else
+								$stdout.print data unless opts[:quiet]
 							end
 						end
 						channel.on_request('exit-status') do |ch, data|

data/lib/shaddox/version.rb

@@ -1,3 +1,3 @@
 module Shaddox
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shaddox
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - joshglendenning