From 4694ef6723e1ceb49c18c201b21c79357dd81fe4 Mon Sep 17 00:00:00 2001 From: bwatters-r7 Date: Tue, 6 Mar 2018 14:54:00 -0600 Subject: [PATCH] Make Rubocop less angy --- test/modules/post/test/cmd_exec.rb | 57 ++++++++++++++---------------- 1 file changed, 27 insertions(+), 30 deletions(-) diff --git a/test/modules/post/test/cmd_exec.rb b/test/modules/post/test/cmd_exec.rb index 961fdf3d82..876cfc47c7 100644 --- a/test/modules/post/test/cmd_exec.rb +++ b/test/modules/post/test/cmd_exec.rb @@ -1,21 +1,20 @@ require 'rex' lib = File.join(Msf::Config.install_root, "test", "lib") -$:.push(lib) unless $:.include?(lib) +$LOAD_PATH.push(lib) unless $LOAD_PATH.include?(lib) require 'module_test' class MetasploitModule < Msf::Post - include Msf::ModuleTest::PostTest include Msf::Post::File - def initialize(info={}) - super( update_info( info, + def initialize(info = {}) + super(update_info(info, 'Name' => 'Meterpreter cmd_exec test', - 'Description' => %q{ This module will test the meterpreter cmd_exec API }, + 'Description' => %q( This module will test the meterpreter cmd_exec API ), 'License' => MSF_LICENSE, - 'Platform' => [ 'windows', 'linux', 'unix' ], - 'SessionTypes' => [ 'meterpreter' ] + 'Platform' => ['windows', 'linux', 'unix'], + 'SessionTypes' => ['meterpreter'] )) end @@ -24,7 +23,7 @@ class MetasploitModule < Msf::Post it "should return the result of echo" do test_string = Rex::Text.rand_text_alpha(4) - if session.platform.eql?'windows' + if session.platform.eql? 'windows' output = cmd_exec('cmd.exe', "/c echo #{test_string}") else output = cmd_exec("echo #{test_string}") @@ -33,29 +32,29 @@ class MetasploitModule < Msf::Post end # trying to do a sleep in windows without trashing stdout is hard - unless session.platform.eql?'windows' - it "should return the result after sleeping" do - test_string = Rex::Text.rand_text_alpha(4) - output = cmd_exec("sleep 1; echo #{test_string}") - output == test_string - end - - it "should return the full response after sleeping" do - test_string = Rex::Text.rand_text_alpha(4) - test_string2 = Rex::Text.rand_text_alpha(4) - if session.platform.eql?'windows' - output = cmd_exec('cmd.exe', "/c echo #{test_string} & timeout 1 > null & echo #{test_string2}") - else - output = cmd_exec("echo #{test_string}; sleep 1; echo #{test_string2}") - end - output.delete("\r") == "#{test_string}\n#{test_string2}" - end + unless session.platform.eql? 'windows' + it "should return the result after sleeping" do + test_string = Rex::Text.rand_text_alpha(4) + output = cmd_exec("sleep 1; echo #{test_string}") + output == test_string + end + end + + it "should return the full response after sleeping" do + test_string = Rex::Text.rand_text_alpha(4) + test_string2 = Rex::Text.rand_text_alpha(4) + if session.platform.eql? 'windows' + output = cmd_exec('cmd.exe', "/c echo #{test_string} & timeout 1 > null & echo #{test_string2}") + else + output = cmd_exec("echo #{test_string}; sleep 1; echo #{test_string2}") + end + output.delete("\r") == "#{test_string}\n#{test_string2}" end it "should return the result of echo 10 times" do 10.times do test_string = Rex::Text.rand_text_alpha(4) - if session.platform.eql?'windows' + if session.platform.eql? 'windows' output = cmd_exec("cmd.exe", "/c echo #{test_string}") else output = cmd_exec("echo #{test_string}") @@ -64,7 +63,6 @@ class MetasploitModule < Msf::Post end true end - vprint_status("Finished cmd_exec tests") end @@ -73,7 +71,7 @@ class MetasploitModule < Msf::Post it "should return the result of echo with single quotes" do test_string = Rex::Text.rand_text_alpha(4) - if session.platform.eql?'windows' + if session.platform.eql? 'windows' output = cmd_exec("cmd.exe", "/c echo '#{test_string}'") output == "'" + test_string + "'" else @@ -84,7 +82,7 @@ class MetasploitModule < Msf::Post it "should return the result of echo with double quotes" do test_string = Rex::Text.rand_text_alpha(4) - if session.platform.eql?'windows' + if session.platform.eql? 'windows' output = cmd_exec("cmd.exe", "/c echo \"#{test_string}\"") output == "\"" + test_string + "\"" else @@ -93,5 +91,4 @@ class MetasploitModule < Msf::Post end end end - end