Land rapid7#6052, organize tools into the new structure

Brent Cook · Brent Cook · commit d26a299a14f8 · 2015-10-07T16:17:42.000-05:00
diff --git a/spec/tools/cpassword_decrypt_spec.rb b/spec/tools/cpassword_decrypt_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-load Metasploit::Framework.root.join('tools/cpassword_decrypt.rb').to_path
+load Metasploit::Framework.root.join('tools/password/cpassword_decrypt.rb').to_path
 
 require 'msfenv'
 require 'msf/base'
diff --git a/spec/tools/egghunter_spec.rb b/spec/tools/egghunter_spec.rb
@@ -1,4 +1,4 @@
-load Metasploit::Framework.root.join('tools/egghunter.rb').to_path
+load Metasploit::Framework.root.join('tools/exploit/egghunter.rb').to_path
 
 require 'stringio'
 
diff --git a/spec/tools/java_deserializer_spec.rb b/spec/tools/java_deserializer_spec.rb
@@ -1,7 +1,7 @@
 require 'rex/java'
 require 'stringio'
 
-load Metasploit::Framework.root.join('tools/java_deserializer.rb').to_path
+load Metasploit::Framework.root.join('tools/exploit/java_deserializer.rb').to_path
 
 describe JavaDeserializer do
 
diff --git a/spec/tools/jsobfu_spec.rb b/spec/tools/jsobfu_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-load Metasploit::Framework.root.join('tools/jsobfu.rb').to_path
+load Metasploit::Framework.root.join('tools/exploit/jsobfu.rb').to_path
 
 require 'stringio'
 
diff --git a/spec/tools/md5_lookup_spec.rb b/spec/tools/md5_lookup_spec.rb
@@ -1,4 +1,4 @@
-load Metasploit::Framework.root.join('tools/md5_lookup.rb').to_path
+load Metasploit::Framework.root.join('tools/password/md5_lookup.rb').to_path
 
 require 'rex/proto/http/response'
 require 'stringio'
diff --git a/spec/tools/msu_finder_spec.rb b/spec/tools/msu_finder_spec.rb
@@ -1,4 +1,4 @@
-load Metasploit::Framework.root.join('tools/msu_finder.rb').to_path
+load Metasploit::Framework.root.join('tools/exploit/msu_finder.rb').to_path
 
 require 'nokogiri'
 require 'uri'
diff --git a/spec/tools/virustotal_spec.rb b/spec/tools/virustotal_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-load Metasploit::Framework.root.join('tools/virustotal.rb').to_path
+load Metasploit::Framework.root.join('tools/exploit/virustotal.rb').to_path
 
 require 'msfenv'
 require 'msf/base'
diff --git a/tools/exploit/egghunter.rb b/tools/exploit/egghunter.rb
@@ -4,8 +4,7 @@
 while File.symlink?(msfbase)
   msfbase = File.expand_path(File.readlink(msfbase), File.dirname(msfbase))
 end
-$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', 'lib')))
-require 'msfenv'
+$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', '..', 'lib')))
 require 'rex'
 require 'msf/core'
 require 'msf/base'
diff --git a/tools/exploit/exe2vba.rb b/tools/exploit/exe2vba.rb
@@ -13,7 +13,7 @@
   msfbase = File.expand_path(File.readlink(msfbase), File.dirname(msfbase))
 end
 
-$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', 'lib')))
+$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', '..', 'lib')))
 require 'msfenv'
 
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
diff --git a/tools/exploit/exe2vbs.rb b/tools/exploit/exe2vbs.rb
@@ -12,7 +12,7 @@
   msfbase = File.expand_path(File.readlink(msfbase), File.dirname(msfbase))
 end
 
-$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', 'lib')))
+$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', '..', 'lib')))
 require 'msfenv'
 
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
diff --git a/tools/exploit/extract_msu.bat b/tools/exploit/extract_msu.bat
diff --git a/tools/exploit/find_badchars.rb b/tools/exploit/find_badchars.rb
@@ -13,7 +13,7 @@
   msfbase = File.expand_path(File.readlink(msfbase), File.dirname(msfbase))
 end
 
-$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', 'lib')))
+$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', '..', 'lib')))
 require 'msfenv'
 
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
diff --git a/tools/exploit/install_msf_apk.sh b/tools/exploit/install_msf_apk.sh
diff --git a/tools/exploit/java_deserializer.rb b/tools/exploit/java_deserializer.rb
@@ -10,7 +10,7 @@
   msf_base = File.expand_path(File.readlink(msf_base), File.dirname(msf_base))
 end
 
-$:.unshift(File.expand_path(File.join(File.dirname(msf_base), '..', 'lib')))
+$:.unshift(File.expand_path(File.join(File.dirname(msf_base), '..', '..', 'lib')))
 require 'rex/java/serialization'
 require 'pp'
 require 'optparse'
diff --git a/tools/exploit/jsobfu.rb b/tools/exploit/jsobfu.rb
@@ -4,7 +4,7 @@
 while File.symlink?(msfbase)
   msfbase = File.expand_path(File.readlink(msfbase), File.dirname(msfbase))
 end
-$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', 'lib')))
+$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', '..', 'lib')))
 require 'msfenv'
 require 'rex'
 require 'msf/core'
diff --git a/tools/exploit/metasm_shell.rb b/tools/exploit/metasm_shell.rb
@@ -20,7 +20,7 @@
   msfbase = File.expand_path(File.readlink(msfbase), File.dirname(msfbase))
 end
 
-$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', 'lib')))
+$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', '..', 'lib')))
 require 'msfenv'
 
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
diff --git a/tools/exploit/msf_irb_shell.rb b/tools/exploit/msf_irb_shell.rb
@@ -9,7 +9,7 @@
   msfbase = File.expand_path(File.readlink(msfbase), File.dirname(msfbase))
 end
 
-$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', 'lib')))
+$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', '..', 'lib')))
 require 'msfenv'
 
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
diff --git a/tools/exploit/msu_finder.rb b/tools/exploit/msu_finder.rb
@@ -14,7 +14,7 @@
 while File.symlink?(msfbase)
   msfbase = File.expand_path(File.readlink(msfbase), File.dirname(msfbase))
 end
-$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', 'lib')))
+$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', '..', 'lib')))
 require 'rex'
 require 'nokogiri'
 require 'uri'
diff --git a/tools/exploit/nasm_shell.rb b/tools/exploit/nasm_shell.rb
@@ -14,7 +14,7 @@
   msfbase = File.expand_path(File.readlink(msfbase), File.dirname(msfbase))
 end
 
-$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', 'lib')))
+$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', '..', 'lib')))
 require 'msfenv'
 
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
diff --git a/tools/exploit/pattern_create.rb b/tools/exploit/pattern_create.rb
@@ -9,7 +9,7 @@
   msfbase = File.expand_path(File.readlink(msfbase), File.dirname(msfbase))
 end
 
-$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', 'lib')))
+$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', '..', 'lib')))
 require 'msfenv'
 
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
diff --git a/tools/exploit/pattern_offset.rb b/tools/exploit/pattern_offset.rb
@@ -7,7 +7,7 @@
   msfbase = File.expand_path(File.readlink(msfbase), File.dirname(msfbase))
 end
 
-$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', 'lib')))
+$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', '..', 'lib')))
 require 'msfenv'
 
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
diff --git a/tools/exploit/pdf2xdp.rb b/tools/exploit/pdf2xdp.rb
diff --git a/tools/exploit/psexec.rb b/tools/exploit/psexec.rb
@@ -9,7 +9,7 @@
   msfbase = File.expand_path(File.readlink(msfbase), File.dirname(msfbase))
 end
 
-$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', 'lib')))
+$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', '..', 'lib')))
 require 'msfenv'
 
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
diff --git a/tools/exploit/reg.rb b/tools/exploit/reg.rb
@@ -12,7 +12,7 @@
   msfbase = File.expand_path(File.readlink(msfbase), File.dirname(msfbase))
 end
 
-$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', 'lib')))
+$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', '..', 'lib')))
 require 'msfenv'
 
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
diff --git a/tools/exploit/virustotal.rb b/tools/exploit/virustotal.rb
@@ -33,7 +33,7 @@
   msfbase = File.expand_path(File.readlink(msfbase), File.dirname(msfbase))
 end
 
-$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', 'lib')))
+$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', '..', 'lib')))
 require 'msfenv'
 require 'rex'
 require 'msf/core'
diff --git a/tools/modules/committer_count.rb b/tools/modules/committer_count.rb
diff --git a/tools/modules/missing_payload_tests.rb b/tools/modules/missing_payload_tests.rb
@@ -10,7 +10,7 @@
   msfbase = File.expand_path(File.readlink(msfbase), File.dirname(msfbase))
 end
 
-$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', 'lib')))
+$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', '..', 'lib')))
 require 'msfenv'
 require 'msf/core'
 require 'msf/base'
diff --git a/tools/modules/module_author.rb b/tools/modules/module_author.rb
@@ -12,7 +12,7 @@
   msfbase = File.expand_path(File.readlink(msfbase), File.dirname(msfbase))
 end
 
-$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', 'lib')))
+$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', '..', 'lib')))
 require 'msfenv'
 
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
diff --git a/tools/modules/module_commits.rb b/tools/modules/module_commits.rb
diff --git a/tools/modules/module_count.rb b/tools/modules/module_count.rb
@@ -7,7 +7,7 @@
   msfbase = File.expand_path(File.readlink(msfbase), File.dirname(msfbase))
 end
 
-$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', 'lib')))
+$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', '..', 'lib')))
 require 'msfenv'
 
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
diff --git a/tools/modules/module_disclodate.rb b/tools/modules/module_disclodate.rb
@@ -11,7 +11,7 @@
   msfbase = File.expand_path(File.readlink(msfbase), File.dirname(msfbase))
 end
 
-$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', 'lib')))
+$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', '..', 'lib')))
 require 'msfenv'
 
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
diff --git a/tools/modules/module_license.rb b/tools/modules/module_license.rb
@@ -12,7 +12,7 @@
   msfbase = File.expand_path(File.readlink(msfbase), File.dirname(msfbase))
 end
 
-$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', 'lib')))
+$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', '..', 'lib')))
 require 'msfenv'
 
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
diff --git a/tools/modules/module_mixins.rb b/tools/modules/module_mixins.rb
@@ -12,7 +12,7 @@
   msfbase = File.expand_path(File.readlink(msfbase), File.dirname(msfbase))
 end
 
-$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', 'lib')))
+$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', '..', 'lib')))
 require 'msfenv'
 
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
diff --git a/tools/modules/module_payloads.rb b/tools/modules/module_payloads.rb
@@ -12,7 +12,7 @@
   msfbase = File.expand_path(File.readlink(msfbase), File.dirname(msfbase))
 end
 
-$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', 'lib')))
+$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', '..', 'lib')))
 require 'msfenv'
 
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
diff --git a/tools/modules/module_ports.rb b/tools/modules/module_ports.rb
@@ -12,7 +12,7 @@
   msfbase = File.expand_path(File.readlink(msfbase), File.dirname(msfbase))
 end
 
-$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', 'lib')))
+$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', '..', 'lib')))
 require 'msfenv'
 
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
diff --git a/tools/modules/module_rank.rb b/tools/modules/module_rank.rb
@@ -12,7 +12,7 @@
   msfbase = File.expand_path(File.readlink(msfbase), File.dirname(msfbase))
 end
 
-$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', 'lib')))
+$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', '..', 'lib')))
 require 'msfenv'
 
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
diff --git a/tools/modules/module_reference.rb b/tools/modules/module_reference.rb
@@ -8,7 +8,7 @@
   msfbase = File.expand_path(File.readlink(msfbase), File.dirname(msfbase))
 end
 
-$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', 'lib')))
+$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', '..', 'lib')))
 require 'msfenv'
 
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
diff --git a/tools/modules/module_targets.rb b/tools/modules/module_targets.rb
@@ -12,7 +12,7 @@
   msfbase = File.expand_path(File.readlink(msfbase), File.dirname(msfbase))
 end
 
-$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', 'lib')))
+$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', '..', 'lib')))
 require 'msfenv'
 
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
diff --git a/tools/modules/msftidy.rb b/tools/modules/msftidy.rb
diff --git a/tools/modules/payload_lengths.rb b/tools/modules/payload_lengths.rb
@@ -12,7 +12,7 @@
   msfbase = File.expand_path(File.readlink(msfbase), File.dirname(msfbase))
 end
 
-$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', 'lib')))
+$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', '..', 'lib')))
 require 'msfenv'
 
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
diff --git a/tools/modules/profile.sh b/tools/modules/profile.sh
diff --git a/tools/modules/update_payload_cached_sizes.rb b/tools/modules/update_payload_cached_sizes.rb
@@ -8,7 +8,7 @@
   msfbase = File.expand_path(File.readlink(msfbase), File.dirname(msfbase))
 end
 
-$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', 'lib')))
+$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', '..', 'lib')))
 require 'msfenv'
 
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
diff --git a/tools/modules/verify_datastore.rb b/tools/modules/verify_datastore.rb
diff --git a/tools/password/cpassword_decrypt.rb b/tools/password/cpassword_decrypt.rb
@@ -37,7 +37,7 @@
   msfbase = File.expand_path(File.readlink(msfbase), File.dirname(msfbase))
 end
 
-$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', 'lib')))
+$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', '..', 'lib')))
 require 'msfenv'
 require 'rex'
 
diff --git a/tools/password/halflm_second.rb b/tools/password/halflm_second.rb
@@ -15,7 +15,7 @@
   msfbase = File.expand_path(File.readlink(msfbase), File.dirname(msfbase))
 end
 
-$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', 'lib')))
+$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', '..', 'lib')))
 require 'msfenv'
 
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
diff --git a/tools/password/hmac_sha1_crack.rb b/tools/password/hmac_sha1_crack.rb
@@ -15,7 +15,7 @@
   msfbase = File.expand_path(File.readlink(msfbase), File.dirname(msfbase))
 end
 
-$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', 'lib')))
+$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', '..', 'lib')))
 require 'msfenv'
 
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
diff --git a/tools/password/lm2ntcrack.rb b/tools/password/lm2ntcrack.rb
@@ -13,7 +13,7 @@
   msfbase = File.expand_path(File.readlink(msfbase), File.dirname(msfbase))
 end
 
-$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', 'lib')))
+$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', '..', 'lib')))
 require 'msfenv'
 
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
diff --git a/tools/password/md5_lookup.rb b/tools/password/md5_lookup.rb
@@ -31,7 +31,7 @@
 while File.symlink?(msfbase)
   msfbase = File.expand_path(File.readlink(msfbase), File.dirname(msfbase))
 end
-$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', 'lib')))
+$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', '..', 'lib')))
 require 'msfenv'
 require 'rex'
 require 'msf/core'
diff --git a/tools/password/vxdigger.rb b/tools/password/vxdigger.rb
diff --git a/tools/password/vxencrypt.rb b/tools/password/vxencrypt.rb
diff --git a/tools/password/vxmaster.rb b/tools/password/vxmaster.rb
diff --git a/tools/password/winscp_decrypt.rb b/tools/password/winscp_decrypt.rb
diff --git a/tools/recon/google_geolocate_bssid.rb b/tools/recon/google_geolocate_bssid.rb
@@ -8,7 +8,7 @@
   msfbase = File.expand_path(File.readlink(msfbase), File.dirname(msfbase))
 end
 
-$LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', 'lib')))
+$LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', '..','lib')))
 require 'rex/google/geolocation'
 require 'optparse'
 
diff --git a/tools/recon/list_interfaces.rb b/tools/recon/list_interfaces.rb
@@ -14,7 +14,7 @@
   msfbase = File.expand_path(File.readlink(msfbase), File.dirname(msfbase))
 end
 
-$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', 'lib')))
+$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', '..','lib')))
 require 'msfenv'
 
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
diff --git a/tools/recon/makeiplist.rb b/tools/recon/makeiplist.rb
@@ -18,7 +18,7 @@
   msfbase = File.expand_path(File.readlink(msfbase), File.dirname(msfbase))
 end
 
-$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', 'lib')))
+$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', '..', 'lib')))
 require 'msfenv'
 require 'rex'
 require 'optparse'

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-load Metasploit::Framework.root.join('tools/egghunter.rb').to_path`
	`1`	`+load Metasploit::Framework.root.join('tools/exploit/egghunter.rb').to_path`
`2`	`2`
`3`	`3`	`require 'stringio'`
`4`	`4`