Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Find and replace Msf::Config.install_root, "data" #2426

Merged
merged 4 commits into from

4 participants

@Meatballs1
Collaborator

Was annoying me...

@wchen-r7
Collaborator

github says can't merge, I wonder why.

@todb-r7
Owner

In order to resolve, @wchen-r7 , you'll want to merge to a test branch and see what is conflicting. It's often whitespace changes.

@Meatballs1
Collaborator

I imagine lib/msf/core/exe or lib/msf/util/exe are conflicting, I can deconflict in a few days but probably easier to do it as todb says.

@wvu-r7
Collaborator

I did a test merge a couple days ago, and I'm pretty sure it was all whitespace.

@Meatballs1 Meatballs1 Merge branch 'master' into data_dir
Conflicts:
	modules/exploits/windows/local/always_install_elevated.rb
	plugins/sounds.rb
	scripts/meterpreter/powerdump.rb
	scripts/shell/spawn_meterpreter.rb
c460f94
@wvu-r7
Collaborator

One more conflict: lib/msf/core/auxiliary/jtr.rb.

@Meatballs1 Meatballs1 Merge branch 'master' into data_dir
Conflicts:
	lib/msf/core/auxiliary/jtr.rb
9ca9b4a
@wchen-r7
Collaborator

Checking this out...

@wchen-r7 wchen-r7 merged commit 9ca9b4a into rapid7:master

1 check passed

Details default The Travis CI build passed
@Meatballs1 Meatballs1 deleted the Meatballs1:data_dir branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Sep 26, 2013
  1. @Meatballs1

    Find and replace

    Meatballs1 authored
Commits on Sep 27, 2013
  1. @Meatballs1
Commits on Oct 2, 2013
  1. @Meatballs1

    Merge branch 'master' into data_dir

    Meatballs1 authored
    Conflicts:
    	modules/exploits/windows/local/always_install_elevated.rb
    	plugins/sounds.rb
    	scripts/meterpreter/powerdump.rb
    	scripts/shell/spawn_meterpreter.rb
Commits on Oct 10, 2013
  1. @Meatballs1

    Merge branch 'master' into data_dir

    Meatballs1 authored
    Conflicts:
    	lib/msf/core/auxiliary/jtr.rb
This page is out of date. Refresh to see the latest.
Showing with 172 additions and 172 deletions.
  1. +1 −1  lib/msf/core/auxiliary/jtr.rb
  2. +1 −1  lib/msf/core/auxiliary/mime_types.rb
  3. +1 −1  lib/msf/core/db.rb
  4. +1 −1  lib/msf/core/exploit/cmdstager_debug_asm.rb
  5. +1 −1  lib/msf/core/exploit/cmdstager_debug_write.rb
  6. +1 −1  lib/msf/core/exploit/cmdstager_vbs.rb
  7. +1 −1  lib/msf/core/exploit/cmdstager_vbs_adodb.rb
  8. +1 −1  lib/msf/core/exploit/java.rb
  9. +1 −1  lib/msf/core/exploit/mssql.rb
  10. +1 −1  lib/msf/core/exploit/mssql_sqli.rb
  11. +1 −1  lib/msf/core/exploit/mysql.rb
  12. +1 −1  lib/msf/core/exploit/sunrpc.rb
  13. +1 −1  modules/auxiliary/admin/http/tomcat_utf8_traversal.rb
  14. +1 −1  modules/auxiliary/admin/http/trendmicro_dlp_traversal.rb
  15. +1 −1  modules/auxiliary/admin/oracle/oraenum.rb
  16. +1 −1  modules/auxiliary/client/smtp/emailer.rb
  17. +1 −1  modules/auxiliary/crawler/msfcrawler.rb
  18. +1 −1  modules/auxiliary/docx/word_unc_injector.rb
  19. +1 −1  modules/auxiliary/dos/windows/browser/ms09_065_eot_integer.rb
  20. +1 −1  modules/auxiliary/gather/dns_bruteforce.rb
  21. +1 −1  modules/auxiliary/gather/enum_dns.rb
  22. +3 −3 modules/auxiliary/scanner/couchdb/couchdb_login.rb
  23. +3 −3 modules/auxiliary/scanner/db2/db2_auth.rb
  24. +1 −1  modules/auxiliary/scanner/http/apache_userdir_enum.rb
  25. +1 −1  modules/auxiliary/scanner/http/brute_dirs.rb
  26. +1 −1  modules/auxiliary/scanner/http/copy_of_file.rb
  27. +2 −2 modules/auxiliary/scanner/http/dell_idrac.rb
  28. +1 −1  modules/auxiliary/scanner/http/dir_scanner.rb
  29. +2 −2 modules/auxiliary/scanner/http/dir_webdav_unicode_bypass.rb
  30. +1 −1  modules/auxiliary/scanner/http/dlink_dir_300_615_http_login.rb
  31. +1 −1  modules/auxiliary/scanner/http/dlink_dir_615h_http_login.rb
  32. +1 −1  modules/auxiliary/scanner/http/dlink_dir_session_cgi_http_login.rb
  33. +3 −3 modules/auxiliary/scanner/http/dolibarr_login.rb
  34. +1 −1  modules/auxiliary/scanner/http/ektron_cms400net.rb
  35. +2 −2 modules/auxiliary/scanner/http/files_dir.rb
  36. +3 −3 modules/auxiliary/scanner/http/hp_sys_mgmt_login.rb
  37. +3 −3 modules/auxiliary/scanner/http/http_login.rb
  38. +1 −1  modules/auxiliary/scanner/http/joomla_plugins.rb
  39. +1 −1  modules/auxiliary/scanner/http/linksys_e1500_traversal.rb
  40. +1 −1  modules/auxiliary/scanner/http/mod_negotiation_brute.rb
  41. +1 −1  modules/auxiliary/scanner/http/netgear_sph200d_traversal.rb
  42. +1 −1  modules/auxiliary/scanner/http/ntlm_info_enumeration.rb
  43. +1 −1  modules/auxiliary/scanner/http/replace_ext.rb
  44. +3 −3 modules/auxiliary/scanner/http/splunk_web_login.rb
  45. +1 −1  modules/auxiliary/scanner/http/svn_scanner.rb
  46. +1 −1  modules/auxiliary/scanner/http/tomcat_enum.rb
  47. +3 −3 modules/auxiliary/scanner/http/tomcat_mgr_login.rb
  48. +1 −1  modules/auxiliary/scanner/http/tplink_traversal_noauth.rb
  49. +3 −3 modules/auxiliary/scanner/http/vcms_login.rb
  50. +1 −1  modules/auxiliary/scanner/http/web_vulndb.rb
  51. +2 −2 modules/auxiliary/scanner/misc/cctv_dvr_login.rb
  52. +1 −1  modules/auxiliary/scanner/oracle/isqlplus_login.rb
  53. +1 −1  modules/auxiliary/scanner/oracle/oracle_login.rb
  54. +1 −1  modules/auxiliary/scanner/oracle/sid_brute.rb
  55. +3 −3 modules/auxiliary/scanner/postgres/postgres_login.rb
  56. +1 −1  modules/auxiliary/scanner/snmp/snmp_login.rb
  57. +1 −1  modules/auxiliary/scanner/tftp/tftpbrute.rb
  58. +3 −3 modules/auxiliary/server/capture/http.rb
  59. +1 −1  modules/auxiliary/sniffer/psnuffle.rb
  60. +1 −1  modules/auxiliary/spoof/wifi/airpwn.rb
  61. +1 −1  modules/auxiliary/spoof/wifi/dnspwn.rb
  62. +1 −1  modules/exploits/freebsd/local/mmap.rb
  63. +1 −1  modules/exploits/linux/browser/adobe_flashplayer_aslaunch.rb
  64. +1 −1  modules/exploits/multi/browser/firefox_svg_plugin.rb
  65. +1 −1  modules/exploits/multi/browser/java_atomicreferencearray.rb
  66. +1 −1  modules/exploits/multi/browser/java_calendar_deserialize.rb
  67. +1 −1  modules/exploits/multi/browser/java_getsoundbank_bof.rb
  68. +5 −5 modules/exploits/multi/browser/java_jre17_driver_manager.rb
  69. +1 −1  modules/exploits/multi/browser/java_jre17_exec.rb
  70. +2 −2 modules/exploits/multi/browser/java_jre17_glassfish_averagerangestatisticimpl.rb
  71. +1 −1  modules/exploits/multi/browser/java_jre17_jaxws.rb
  72. +2 −2 modules/exploits/multi/browser/java_jre17_jmxbean.rb
  73. +1 −1  modules/exploits/multi/browser/java_jre17_jmxbean_2.rb
  74. +2 −2 modules/exploits/multi/browser/java_jre17_method_handle.rb
  75. +3 −3 modules/exploits/multi/browser/java_jre17_provider_skeleton.rb
  76. +4 −4 modules/exploits/multi/browser/java_jre17_reflection_types.rb
  77. +1 −1  modules/exploits/multi/browser/java_rhino.rb
  78. +1 −1  modules/exploits/multi/browser/java_rmi_connection_impl.rb
  79. +1 −1  modules/exploits/multi/browser/java_setdifficm_bof.rb
  80. +3 −3 modules/exploits/multi/browser/java_storeimagearray.rb
  81. +1 −1  modules/exploits/multi/browser/java_trusted_chain.rb
  82. +1 −1  modules/exploits/multi/browser/java_verifier_field_access.rb
  83. +1 −1  modules/exploits/multi/browser/qtjava_pointer.rb
  84. +1 −1  modules/exploits/multi/http/axis2_deployer.rb
  85. +1 −1  modules/exploits/multi/http/jboss_invoke_deploy.rb
  86. +2 −2 modules/exploits/multi/http/openfire_auth_bypass.rb
  87. +1 −1  modules/exploits/multi/misc/batik_svg_java.rb
  88. +1 −1  modules/exploits/unix/webapp/google_proxystylesheet_exec.rb
  89. +1 −1  modules/exploits/unix/webapp/php_include.rb
  90. +1 −1  modules/exploits/windows/browser/adobe_cooltype_sing.rb
  91. +1 −1  modules/exploits/windows/browser/adobe_flash_mp4_cprt.rb
  92. +1 −1  modules/exploits/windows/browser/adobe_flash_otf_font.rb
  93. +1 −1  modules/exploits/windows/browser/adobe_flash_rtmp.rb
  94. +1 −1  modules/exploits/windows/browser/adobe_flash_sps.rb
  95. +1 −1  modules/exploits/windows/browser/adobe_flashplayer_arrayindexing.rb
  96. +1 −1  modules/exploits/windows/browser/adobe_flashplayer_avm.rb
  97. +1 −1  modules/exploits/windows/browser/adobe_flashplayer_flash10o.rb
  98. +1 −1  modules/exploits/windows/browser/adobe_flashplayer_newfunction.rb
  99. +1 −1  modules/exploits/windows/browser/adobe_shockwave_rcsl_corruption.rb
  100. +1 −1  modules/exploits/windows/browser/honeywell_tema_exec.rb
  101. +4 −4 modules/exploits/windows/browser/java_cmm.rb
  102. +1 −1  modules/exploits/windows/browser/java_mixer_sequencer.rb
  103. +2 −2 modules/exploits/windows/browser/keyhelp_launchtripane_exec.rb
  104. +1 −1  modules/exploits/windows/browser/ms10_022_ie_vbscript_winhlp32.rb
  105. +1 −1  modules/exploits/windows/browser/ms10_026_avi_nsamplespersec.rb
  106. +1 −1  modules/exploits/windows/browser/ms11_093_ole32.rb
  107. +1 −1  modules/exploits/windows/browser/vlc_amv.rb
  108. +1 −1  modules/exploits/windows/fileformat/adobe_cooltype_sing.rb
  109. +1 −1  modules/exploits/windows/fileformat/adobe_flashplayer_button.rb
  110. +1 −1  modules/exploits/windows/fileformat/adobe_flashplayer_newfunction.rb
  111. +1 −1  modules/exploits/windows/fileformat/altap_salamander_pdb.rb
  112. +1 −1  modules/exploits/windows/fileformat/apple_quicktime_pnsize.rb
  113. +1 −1  modules/exploits/windows/local/bypassuac.rb
  114. +1 −1  modules/exploits/windows/local/ppr_flatten_rec.rb
  115. +1 −1  modules/exploits/windows/local/s4u_persistence.rb
  116. +1 −1  modules/exploits/windows/ssh/freesshd_authbypass.rb
  117. +1 −1  modules/exploits/windows/winrm/winrm_script_exec.rb
  118. +1 −1  modules/payloads/singles/java/shell_reverse_tcp.rb
  119. +1 −1  modules/payloads/stagers/android/reverse_tcp.rb
  120. +1 −1  modules/payloads/stages/linux/x86/meterpreter.rb
  121. +1 −1  modules/payloads/stages/osx/armle/execute.rb
  122. +1 −1  modules/payloads/stages/osx/x86/isight.rb
  123. +1 −1  modules/payloads/stages/windows/vncinject.rb
  124. +1 −1  modules/payloads/stages/windows/x64/vncinject.rb
  125. +1 −1  modules/post/multi/gather/dns_bruteforce.rb
  126. +1 −1  plugins/sounds.rb
  127. +1 −1  scripts/meterpreter/metsvc.rb
  128. +1 −1  scripts/meterpreter/powerdump.rb
  129. +1 −1  scripts/shell/spawn_meterpreter.rb
View
2  lib/msf/core/auxiliary/jtr.rb
@@ -32,7 +32,7 @@ def initialize(info = {})
)
@run_path = nil
- @john_path = ::File.join(Msf::Config.install_root, "data", "john")
+ @john_path = ::File.join(Msf::Config.data_directory, "john")
autodetect_platform
end
View
2  lib/msf/core/auxiliary/mime_types.rb
@@ -23,7 +23,7 @@ def mime_yaml_lookup(extension)
end
def mime_load_extension_map
- path = File.join( Msf::Config.install_root, "data", "mime.yml")
+ path = File.join( Msf::Config.data_directory, "mime.yml")
@extension_map = YAML.load_file(path)
end
View
2  lib/msf/core/db.rb
@@ -3649,7 +3649,7 @@ def import_msf_collateral(args={}, &block)
data = ::File.open(args[:filename], "rb") {|f| f.read(f.stat.size)}
wspace = args[:wspace] || args['wspace'] || workspace
bl = validate_ips(args[:blacklist]) ? args[:blacklist].split : []
- basedir = args[:basedir] || args['basedir'] || ::File.join(Msf::Config.install_root, "data", "msf")
+ basedir = args[:basedir] || args['basedir'] || ::File.join(Msf::Config.data_directory, "msf")
allow_yaml = false
btag = nil
View
2  lib/msf/core/exploit/cmdstager_debug_asm.rb
@@ -19,7 +19,7 @@ def initialize(info = {})
register_advanced_options(
[
OptString.new( 'DECODERSTUB', [ true, 'The debug.exe assembly listing decoder stub to use.',
- File.join(Msf::Config.install_root, "data", "exploits", "cmdstager", "debug_asm")]),
+ File.join(Msf::Config.data_directory, "exploits", "cmdstager", "debug_asm")]),
], self.class)
end
View
2  lib/msf/core/exploit/cmdstager_debug_write.rb
@@ -19,7 +19,7 @@ def initialize(info = {})
register_advanced_options(
[
OptString.new( 'DECODERSTUB', [ true, 'The debug.exe file-writing decoder stub to use.',
- File.join(Msf::Config.install_root, "data", "exploits", "cmdstager", "debug_write")]),
+ File.join(Msf::Config.data_directory, "exploits", "cmdstager", "debug_write")]),
], self.class)
end
View
2  lib/msf/core/exploit/cmdstager_vbs.rb
@@ -19,7 +19,7 @@ def initialize(info = {})
register_advanced_options(
[
OptString.new( 'DECODERSTUB', [ true, 'The VBS base64 file decoder stub to use.',
- File.join(Msf::Config.install_root, "data", "exploits", "cmdstager", "vbs_b64")]),
+ File.join(Msf::Config.data_directory, "exploits", "cmdstager", "vbs_b64")]),
], self.class)
end
View
2  lib/msf/core/exploit/cmdstager_vbs_adodb.rb
@@ -19,7 +19,7 @@ def initialize(info = {})
register_advanced_options(
[
OptString.new( 'DECODERSTUB', [ true, 'The VBS base64 file decoder stub to use.',
- File.join(Msf::Config.install_root, "data", "exploits", "cmdstager", "vbs_b64_adodb")]),
+ File.join(Msf::Config.data_directory, "exploits", "cmdstager", "vbs_b64_adodb")]),
], self.class)
end
View
2  lib/msf/core/exploit/java.rb
@@ -51,7 +51,7 @@ def init_jvm(jvmoptions = nil)
# Instantiate the JVM with a classpath pointing to the JDK tools.jar
# and our javatoolkit jar.
- classpath = File.join(Msf::Config.install_root, "data", "exploits", "msfJavaToolkit.jar")
+ classpath = File.join(Msf::Config.data_directory, "exploits", "msfJavaToolkit.jar")
classpath += ":" + toolsjar
classpath += ":" + datastore['ADDCLASSPATH'] if datastore['ADDCLASSPATH']
View
2  lib/msf/core/exploit/mssql.rb
@@ -75,7 +75,7 @@ def initialize(info = {})
register_advanced_options(
[
OptPath.new('HEX2BINARY', [ false, "The path to the hex2binary script on the disk",
- File.join(Msf::Config.install_root, "data", "exploits", "mssql", "h2b")
+ File.join(Msf::Config.data_directory, "exploits", "mssql", "h2b")
]),
OptString.new('DOMAIN', [ true, 'The domain to use for windows authentication', 'WORKSTATION'])
], Msf::Exploit::Remote::MSSQL)
View
2  lib/msf/core/exploit/mssql_sqli.rb
@@ -34,7 +34,7 @@ def initialize(info = {})
register_advanced_options(
[
OptPath.new('HEX2BINARY', [ false, "The path to the hex2binary script on the disk",
- File.join(Msf::Config.install_root, "data", "exploits", "mssql", "h2b")
+ File.join(Msf::Config.data_directory, "exploits", "mssql", "h2b")
])
], Msf::Exploit::Remote::MSSQL_SQLI)
View
2  lib/msf/core/exploit/mysql.rb
@@ -150,7 +150,7 @@ def mysql_upload_binary(bindata)
def mysql_upload_sys_udf(arch=:win32,target_path=nil)
fname = (arch == :win32 ? "lib_mysqludf_sys_32.dll" : "lib_mysqludf_sys_64.dll")
- sys_dll = File.join( Msf::Config.install_root, "data", "exploits", "mysql", fname )
+ sys_dll = File.join( Msf::Config.data_directory, "exploits", "mysql", fname )
data = File.open(sys_dll, "rb") {|f| f.read f.stat.size}
blob = "0x"
blob << data.unpack("C*").map {|x| "%02x" % [x]}.join
View
2  lib/msf/core/exploit/sunrpc.rb
@@ -150,7 +150,7 @@ def portmap_qry()
end
def progresolv(number)
- names = File.join(Msf::Config.install_root, "data", "wordlists", "rpc_names.txt")
+ names = File.join(Msf::Config.data_directory, "wordlists", "rpc_names.txt")
File.open(names, "rb").each_line do |line|
next if line.empty? || line =~ /^\s*#/
View
2  modules/auxiliary/admin/http/tomcat_utf8_traversal.rb
@@ -42,7 +42,7 @@ def initialize
[
Opt::RPORT(8080),
OptPath.new('SENSITIVE_FILES', [ true, "File containing senstive files, one per line",
- File.join(Msf::Config.install_root, "data", "wordlists", "sensitive_files.txt") ]),
+ File.join(Msf::Config.data_directory, "wordlists", "sensitive_files.txt") ]),
OptInt.new('MAXDIRS', [ true, 'The maximum directory depth to search', 7]),
], self.class)
end
View
2  modules/auxiliary/admin/http/trendmicro_dlp_traversal.rb
@@ -43,7 +43,7 @@ def initialize
Opt::RPORT(8443),
OptBool.new('SSL', [true, 'Use SSL', true]),
OptPath.new('SENSITIVE_FILES', [ true, "File containing senstive files, one per line",
- File.join(Msf::Config.install_root, "data", "wordlists", "sensitive_files.txt") ]),
+ File.join(Msf::Config.data_directory, "wordlists", "sensitive_files.txt") ]),
], self.class)
end
View
2  modules/auxiliary/admin/oracle/oraenum.rb
@@ -657,7 +657,7 @@ def run
FROM sys.user$
where password != 'null' and type# = 1
|
- ordfltpss = "#{File.join(Msf::Config.install_root, "data", "wordlists", "oracle_default_hashes.txt")}"
+ ordfltpss = "#{File.join(Msf::Config.data_directory, "wordlists", "oracle_default_hashes.txt")}"
returnedstring = prepare_exec(query)
accts = {}
returnedstring.each do |record|
View
2  modules/auxiliary/client/smtp/emailer.rb
@@ -38,7 +38,7 @@ def initialize(info = {})
OptString.new('RHOST', [true, "SMTP server address",'127.0.0.1']),
OptString.new('RPORT', [true, "SMTP server port",'25']),
OptString.new('YAML_CONFIG', [true, "Full path to YAML Configuration file",
- File.join(Msf::Config.install_root, "data","emailer_config.yaml")]),
+ File.join(Msf::Config.data_directory,"emailer_config.yaml")]),
], self.class)
# Hide this option from the user
View
2  modules/auxiliary/crawler/msfcrawler.rb
@@ -40,7 +40,7 @@ def initialize(info = {})
register_advanced_options([
OptPath.new('CrawlerModulesDir', [true, 'The base directory containing the crawler modules',
- File.join(Msf::Config.install_root, "data", "msfcrawler")
+ File.join(Msf::Config.data_directory, "msfcrawler")
]),
OptBool.new('EnableUl', [ false, "Enable maximum number of request per URI", true ]),
OptBool.new('StoreDB', [ false, "Store requests in database", false ]),
View
2  modules/auxiliary/docx/word_unc_injector.rb
@@ -57,7 +57,7 @@ def make_new_file
metadata_file_data << "2013-01-08T14:14:00Z</dcterms:modified></cp:coreProperties>"
#where to find the skeleton files required for creating an empty document
- data_dir = File.join(Msf::Config.install_root, "data", "exploits", "docx")
+ data_dir = File.join(Msf::Config.data_directory, "exploits", "docx")
zip_data = {}
View
2  modules/auxiliary/dos/windows/browser/ms09_065_eot_integer.rb
@@ -33,7 +33,7 @@ def initialize(info = {})
'DisclosureDate' => 'Nov 10 2009'
))
register_options([
- OptPath.new('EOTFILE', [ true, "The EOT template to use to generate the trigger", File.join(Msf::Config.install_root, "data", "exploits", "pricedown.eot")]),
+ OptPath.new('EOTFILE', [ true, "The EOT template to use to generate the trigger", File.join(Msf::Config.data_directory, "exploits", "pricedown.eot")]),
], self.class)
end
View
2  modules/auxiliary/gather/dns_bruteforce.rb
@@ -28,7 +28,7 @@ def initialize(info = {})
OptString.new('DOMAIN', [ true, "The target domain name"]),
OptAddress.new('NS', [ false, "Specify the name server to use for queries, otherwise use the system DNS" ]),
OptPath.new('WORDLIST', [ true, "Wordlist file for domain name brute force.",
- File.join(Msf::Config.install_root, "data", "wordlists", "namelist.txt")])
+ File.join(Msf::Config.data_directory, "wordlists", "namelist.txt")])
], self.class)
register_advanced_options(
View
2  modules/auxiliary/gather/enum_dns.rb
@@ -39,7 +39,7 @@ def initialize(info = {})
OptBool.new('ENUM_IP6', [ true, 'Brute force hosts with IPv6 AAAA records',false]),
OptBool.new('ENUM_RVL', [ true, 'Reverse lookup a range of IP addresses', false]),
OptBool.new('ENUM_SRV', [ true, 'Enumerate the most common SRV records', true]),
- OptPath.new('WORDLIST', [ false, "Wordlist for domain name bruteforcing", ::File.join(Msf::Config.install_root, "data", "wordlists", "namelist.txt")]),
+ OptPath.new('WORDLIST', [ false, "Wordlist for domain name bruteforcing", ::File.join(Msf::Config.data_directory, "wordlists", "namelist.txt")]),
OptAddress.new('NS', [ false, "Specify the nameserver to use for queries (default is system DNS)" ]),
OptAddressRange.new('IPRANGE', [false, "The target address range or CIDR identifier"]),
OptBool.new('STOP_WLDCRD', [ true, 'Stops bruteforce enumeration if wildcard resolution is detected', false])
View
6 modules/auxiliary/scanner/couchdb/couchdb_login.rb
@@ -33,11 +33,11 @@ def initialize(info={})
Opt::RPORT(5984),
OptString.new('TARGETURI', [false, "TARGETURI for CouchDB. Default here is /", "/"]),
OptPath.new('USERPASS_FILE', [ false, "File containing users and passwords separated by space, one pair per line",
- File.join(Msf::Config.install_root, "data", "wordlists", "http_default_userpass.txt") ]),
+ File.join(Msf::Config.data_directory, "wordlists", "http_default_userpass.txt") ]),
OptPath.new('USER_FILE', [ false, "File containing users, one per line",
- File.join(Msf::Config.install_root, "data", "wordlists", "http_default_users.txt") ]),
+ File.join(Msf::Config.data_directory, "wordlists", "http_default_users.txt") ]),
OptPath.new('PASS_FILE', [ false, "File containing passwords, one per line",
- File.join(Msf::Config.install_root, "data", "wordlists", "http_default_pass.txt") ]),
+ File.join(Msf::Config.data_directory, "wordlists", "http_default_pass.txt") ]),
OptBool.new('USER_AS_PASS', [ false, "Try the username as the password for all users", false]),
], self.class)
end
View
6 modules/auxiliary/scanner/db2/db2_auth.rb
@@ -33,11 +33,11 @@ def initialize
register_options(
[
OptPath.new('USERPASS_FILE', [ false, "File containing (space-seperated) users and passwords, one pair per line",
- File.join(Msf::Config.install_root, "data", "wordlists", "db2_default_userpass.txt") ]),
+ File.join(Msf::Config.data_directory, "wordlists", "db2_default_userpass.txt") ]),
OptPath.new('USER_FILE', [ false, "File containing users, one per line",
- File.join(Msf::Config.install_root, "data", "wordlists", "db2_default_user.txt") ]),
+ File.join(Msf::Config.data_directory, "wordlists", "db2_default_user.txt") ]),
OptPath.new('PASS_FILE', [ false, "File containing passwords, one per line",
- File.join(Msf::Config.install_root, "data", "wordlists", "db2_default_pass.txt") ]),
+ File.join(Msf::Config.data_directory, "wordlists", "db2_default_pass.txt") ]),
], self.class)
end
View
2  modules/auxiliary/scanner/http/apache_userdir_enum.rb
@@ -41,7 +41,7 @@ def initialize
[
OptString.new('URI', [true, 'The path to users Home Page', '/']),
OptPath.new('USER_FILE', [ true, "File containing users, one per line",
- File.join(Msf::Config.install_root, "data", "wordlists", "unix_users.txt") ]),
+ File.join(Msf::Config.data_directory, "wordlists", "unix_users.txt") ]),
], self.class)
deregister_options(
View
2  modules/auxiliary/scanner/http/brute_dirs.rb
@@ -37,7 +37,7 @@ def initialize(info = {})
[
OptInt.new('ErrorCode', [ true, "The expected http code for non existant directories", 404]),
OptPath.new('HTTP404Sigs', [ false, "Path of 404 signatures to use",
- File.join(Msf::Config.install_root, "data", "wmap", "wmap_404s.txt")
+ File.join(Msf::Config.data_directory, "wmap", "wmap_404s.txt")
]
),
OptBool.new('NoDetailMessages', [ false, "Do not display detailed test messages", true ]),
View
2  modules/auxiliary/scanner/http/copy_of_file.rb
@@ -36,7 +36,7 @@ def initialize(info = {})
[
OptInt.new('ErrorCode', [ true, "Error code for non existent directory", 404]),
OptPath.new('HTTP404Sigs', [ false, "Path of 404 signatures to use",
- File.join(Msf::Config.install_root, "data", "wmap", "wmap_404s.txt")
+ File.join(Msf::Config.data_directory, "wmap", "wmap_404s.txt")
]
),
OptBool.new('NoDetailMessages', [ false, "Do not display detailed test messages", true ])
View
4 modules/auxiliary/scanner/http/dell_idrac.rb
@@ -36,9 +36,9 @@ def initialize
register_options([
OptString.new('TARGETURI', [true, 'Path to the iDRAC Administration page', '/data/login']),
OptPath.new('USER_FILE', [ false, "File containing users, one per line",
- File.join(Msf::Config.install_root, "data", "wordlists", "idrac_default_user.txt") ]),
+ File.join(Msf::Config.data_directory, "wordlists", "idrac_default_user.txt") ]),
OptPath.new('PASS_FILE', [ false, "File containing passwords, one per line",
- File.join(Msf::Config.install_root, "data", "wordlists", "idrac_default_pass.txt") ]),
+ File.join(Msf::Config.data_directory, "wordlists", "idrac_default_pass.txt") ]),
OptInt.new('RPORT', [true, "Default remote port", 443])
], self.class)
View
2  modules/auxiliary/scanner/http/dir_scanner.rb
@@ -31,7 +31,7 @@ def initialize(info = {})
[
OptString.new('PATH', [ true, "The path to identify files", '/']),
OptPath.new('DICTIONARY', [ false, "Path of word dictionary to use",
- File.join(Msf::Config.install_root, "data", "wmap", "wmap_dirs.txt")
+ File.join(Msf::Config.data_directory, "wmap", "wmap_dirs.txt")
]
)
View
4 modules/auxiliary/scanner/http/dir_webdav_unicode_bypass.rb
@@ -43,11 +43,11 @@ def initialize(info = {})
OptString.new('PATH', [ true, "The path to identify files", '/']),
OptInt.new('ERROR_CODE', [ true, "Error code for non existent directory", 404]),
OptPath.new('DICTIONARY', [ false, "Path of word dictionary to use",
- File.join(Msf::Config.install_root, "data", "wmap", "wmap_dirs.txt")
+ File.join(Msf::Config.data_directory, "wmap", "wmap_dirs.txt")
]
),
OptPath.new('HTTP404S', [ false, "Path of 404 signatures to use",
- File.join(Msf::Config.install_root, "data", "wmap", "wmap_404s.txt")
+ File.join(Msf::Config.data_directory, "wmap", "wmap_404s.txt")
]
)
], self.class)
View
2  modules/auxiliary/scanner/http/dlink_dir_300_615_http_login.rb
@@ -41,7 +41,7 @@ def initialize
[
OptString.new('USERNAME', [ false, "Username for authentication (default: admin)","admin" ]),
OptPath.new('PASS_FILE', [ false, "File containing passwords, one per line",
- File.join(Msf::Config.install_root, "data", "wordlists", "http_default_pass.txt") ]),
+ File.join(Msf::Config.data_directory, "wordlists", "http_default_pass.txt") ]),
], self.class)
end
View
2  modules/auxiliary/scanner/http/dlink_dir_615h_http_login.rb
@@ -39,7 +39,7 @@ def initialize
[
OptString.new('USERNAME', [ false, "Username for authentication (default: admin)","admin" ]),
OptPath.new('PASS_FILE', [ false, "File containing passwords, one per line",
- File.join(Msf::Config.install_root, "data", "wordlists", "http_default_pass.txt") ]),
+ File.join(Msf::Config.data_directory, "wordlists", "http_default_pass.txt") ]),
], self.class)
end
View
2  modules/auxiliary/scanner/http/dlink_dir_session_cgi_http_login.rb
@@ -42,7 +42,7 @@ def initialize
[
OptString.new('USERNAME', [ false, "Username for authentication (default: admin)","admin" ]),
OptPath.new('PASS_FILE', [ false, "File containing passwords, one per line",
- File.join(Msf::Config.install_root, "data", "wordlists", "http_default_pass.txt") ]),
+ File.join(Msf::Config.data_directory, "wordlists", "http_default_pass.txt") ]),
], self.class)
end
View
6 modules/auxiliary/scanner/http/dolibarr_login.rb
@@ -28,11 +28,11 @@ def initialize(info = {})
register_options(
[
OptPath.new('USERPASS_FILE', [ false, "File containing users and passwords separated by space, one pair per line",
- File.join(Msf::Config.install_root, "data", "wordlists", "http_default_userpass.txt") ]),
+ File.join(Msf::Config.data_directory, "wordlists", "http_default_userpass.txt") ]),
OptPath.new('USER_FILE', [ false, "File containing users, one per line",
- File.join(Msf::Config.install_root, "data", "wordlists", "http_default_users.txt") ]),
+ File.join(Msf::Config.data_directory, "wordlists", "http_default_users.txt") ]),
OptPath.new('PASS_FILE', [ false, "File containing passwords, one per line",
- File.join(Msf::Config.install_root, "data", "wordlists", "http_default_pass.txt") ]),
+ File.join(Msf::Config.data_directory, "wordlists", "http_default_pass.txt") ]),
OptString.new('TARGETURI', [true, 'The URI path to dolibarr', '/dolibarr/'])
], self.class)
end
View
2  modules/auxiliary/scanner/http/ektron_cms400net.rb
@@ -35,7 +35,7 @@ def initialize(info={})
[
false,
"File containing users and passwords",
- File.join(Msf::Config.install_root, "data", "wordlists", "cms400net_default_userpass.txt")
+ File.join(Msf::Config.data_directory, "wordlists", "cms400net_default_userpass.txt")
])
], self.class)
View
4 modules/auxiliary/scanner/http/files_dir.rb
@@ -31,7 +31,7 @@ def initialize(info = {})
OptString.new('PATH', [ true, "The path to identify files", '/']),
OptString.new('EXT', [ false, "Append file extension to use", '']),
OptPath.new('DICTIONARY', [ false, "Path of word dictionary to use",
- File.join(Msf::Config.install_root, "data", "wmap", "wmap_files.txt")
+ File.join(Msf::Config.data_directory, "wmap", "wmap_files.txt")
]
)
], self.class)
@@ -40,7 +40,7 @@ def initialize(info = {})
[
OptInt.new('ErrorCode', [ true, "The expected http code for non existant files", 404]),
OptPath.new('HTTP404Sigs', [ false, "Path of 404 signatures to use",
- File.join(Msf::Config.install_root, "data", "wmap", "wmap_404s.txt")
+ File.join(Msf::Config.data_directory, "wmap", "wmap_404s.txt")
]
),
OptBool.new('NoDetailMessages', [ false, "Do not display detailed test messages", true ]),
View
6 modules/auxiliary/scanner/http/hp_sys_mgmt_login.rb
@@ -29,11 +29,11 @@ def initialize(info={})
[
Opt::RPORT(2381),
OptPath.new('USERPASS_FILE', [ false, "File containing users and passwords separated by space, one pair per line",
- File.join(Msf::Config.install_root, "data", "wordlists", "http_default_userpass.txt") ]),
+ File.join(Msf::Config.data_directory, "wordlists", "http_default_userpass.txt") ]),
OptPath.new('USER_FILE', [ false, "File containing users, one per line",
- File.join(Msf::Config.install_root, "data", "wordlists", "http_default_users.txt") ]),
+ File.join(Msf::Config.data_directory, "wordlists", "http_default_users.txt") ]),
OptPath.new('PASS_FILE', [ false, "File containing passwords, one per line",
- File.join(Msf::Config.install_root, "data", "wordlists", "http_default_pass.txt") ]),
+ File.join(Msf::Config.data_directory, "wordlists", "http_default_pass.txt") ]),
], self.class)
end
View
6 modules/auxiliary/scanner/http/http_login.rb
@@ -37,11 +37,11 @@ def initialize
register_options(
[
OptPath.new('USERPASS_FILE', [ false, "File containing users and passwords separated by space, one pair per line",
- File.join(Msf::Config.install_root, "data", "wordlists", "http_default_userpass.txt") ]),
+ File.join(Msf::Config.data_directory, "wordlists", "http_default_userpass.txt") ]),
OptPath.new('USER_FILE', [ false, "File containing users, one per line",
- File.join(Msf::Config.install_root, "data", "wordlists", "http_default_users.txt") ]),
+ File.join(Msf::Config.data_directory, "wordlists", "http_default_users.txt") ]),
OptPath.new('PASS_FILE', [ false, "File containing passwords, one per line",
- File.join(Msf::Config.install_root, "data", "wordlists", "http_default_pass.txt") ]),
+ File.join(Msf::Config.data_directory, "wordlists", "http_default_pass.txt") ]),
OptString.new('AUTH_URI', [ false, "The URI to authenticate against (default:auto)" ]),
OptString.new('REQUESTTYPE', [ false, "Use HTTP-GET or HTTP-PUT for Digest-Auth, PROPFIND for WebDAV (default:GET)", "GET" ])
], self.class)
View
2  modules/auxiliary/scanner/http/joomla_plugins.rb
@@ -27,7 +27,7 @@ def initialize
register_options(
[
OptString.new('TARGETURI', [ true, "The path to the Joomla install", '/']),
- OptPath.new('PLUGINS', [ true, "Path to list of plugins to enumerate", File.join(Msf::Config.install_root, "data", "wordlists", "joomla.txt")])
+ OptPath.new('PLUGINS', [ true, "Path to list of plugins to enumerate", File.join(Msf::Config.data_directory, "wordlists", "joomla.txt")])
], self.class)
end
View
2  modules/auxiliary/scanner/http/linksys_e1500_traversal.rb
@@ -34,7 +34,7 @@ def initialize
register_options(
[
OptPath.new('SENSITIVE_FILES', [ true, "File containing senstive files, one per line",
- File.join(Msf::Config.install_root, "data", "wordlists", "sensitive_files.txt") ]),
+ File.join(Msf::Config.data_directory, "wordlists", "sensitive_files.txt") ]),
OptString.new('USERNAME',[ true, 'User to login with', 'admin']),
OptString.new('PASSWORD',[ true, 'Password to login with', 'password']),
View
2  modules/auxiliary/scanner/http/mod_negotiation_brute.rb
@@ -32,7 +32,7 @@ def initialize(info = {})
[
OptString.new('PATH', [ true, "The path to detect mod_negotiation", '/']),
OptPath.new('FILEPATH',[true, "path to file with file names",
- File.join(Msf::Config.install_root, "data", "wmap", "wmap_files.txt")])
+ File.join(Msf::Config.data_directory, "wmap", "wmap_files.txt")])
], self.class)
end
View
2  modules/auxiliary/scanner/http/netgear_sph200d_traversal.rb
@@ -32,7 +32,7 @@ def initialize
register_options(
[
OptPath.new('FILELIST', [ true, "File containing sensitive files, one per line",
- File.join(Msf::Config.install_root, "data", "wordlists", "sensitive_files.txt") ]),
+ File.join(Msf::Config.data_directory, "wordlists", "sensitive_files.txt") ]),
OptString.new('USERNAME',[ true, 'User to login with', 'admin']),
OptString.new('PASSWORD',[ true, 'Password to login with', 'password'])
], self.class)
View
2  modules/auxiliary/scanner/http/ntlm_info_enumeration.rb
@@ -28,7 +28,7 @@ def initialize
)
register_options(
[
- OptPath.new('TARGETURIS', [ true, "Path to list of URIs to request", File.join(Msf::Config.install_root, "data", "wordlists", "http_owa_common.txt")])
+ OptPath.new('TARGETURIS', [ true, "Path to list of URIs to request", File.join(Msf::Config.data_directory, "wordlists", "http_owa_common.txt")])
], self.class)
end
View
2  modules/auxiliary/scanner/http/replace_ext.rb
@@ -38,7 +38,7 @@ def initialize(info = {})
[
OptInt.new('ErrorCode', [ true, "The expected http code for non existant files", 404]),
OptPath.new('HTTP404Sigs', [ false, "Path of 404 signatures to use",
- File.join(Msf::Config.install_root, "data", "wmap", "wmap_404s.txt")
+ File.join(Msf::Config.data_directory, "wmap", "wmap_404s.txt")
]
),
OptBool.new('NoDetailMessages', [ false, "Do not display detailed test messages", true ])
View
6 modules/auxiliary/scanner/http/splunk_web_login.rb
@@ -38,11 +38,11 @@ def initialize(info={})
Opt::RPORT(8000),
OptString.new('URI', [true, "URI for Splunk Web login. Default is /en-US/account/login", "/en-US/account/login"]),
OptPath.new('USERPASS_FILE', [ false, "File containing users and passwords separated by space, one pair per line",
- File.join(Msf::Config.install_root, "data", "wordlists", "http_default_userpass.txt") ]),
+ File.join(Msf::Config.data_directory, "wordlists", "http_default_userpass.txt") ]),
OptPath.new('USER_FILE', [ false, "File containing users, one per line",
- File.join(Msf::Config.install_root, "data", "wordlists", "http_default_users.txt") ]),
+ File.join(Msf::Config.data_directory, "wordlists", "http_default_users.txt") ]),
OptPath.new('PASS_FILE', [ false, "File containing passwords, one per line",
- File.join(Msf::Config.install_root, "data", "wordlists", "http_default_pass.txt") ])
+ File.join(Msf::Config.data_directory, "wordlists", "http_default_pass.txt") ])
], self.class)
end
View
2  modules/auxiliary/scanner/http/svn_scanner.rb
@@ -36,7 +36,7 @@ def initialize
[
OptInt.new('ErrorCode', [ true, "Error code for non existent directory", 404]),
OptPath.new('HTTP404Sigs', [ false, "Path of 404 signatures to use",
- File.join(Msf::Config.install_root, "data", "wmap", "wmap_404s.txt")
+ File.join(Msf::Config.data_directory, "wmap", "wmap_404s.txt")
]
),
OptBool.new('NoDetailMessages', [ false, "Do not display detailed test messages", true ])
View
2  modules/auxiliary/scanner/http/tomcat_enum.rb
@@ -46,7 +46,7 @@ def initialize
Opt::RPORT(8080),
OptString.new('URI', [true, 'The path of the Apache Tomcat Administration page', '/admin/j_security_check']),
OptPath.new('USER_FILE', [ true, "File containing users, one per line",
- File.join(Msf::Config.install_root, "data", "wordlists", "tomcat_mgr_default_users.txt") ]),
+ File.join(Msf::Config.data_directory, "wordlists", "tomcat_mgr_default_users.txt") ]),
], self.class)
deregister_options('PASSWORD','PASS_FILE','USERPASS_FILE','USER_AS_PASS','STOP_ON_SUCCESS','BLANK_PASSWORDS','USERNAME')
View
6 modules/auxiliary/scanner/http/tomcat_mgr_login.rb
@@ -60,11 +60,11 @@ def initialize
Opt::RPORT(8080),
OptString.new('URI', [true, "URI for Manager login. Default is /manager/html", "/manager/html"]),
OptPath.new('USERPASS_FILE', [ false, "File containing users and passwords separated by space, one pair per line",
- File.join(Msf::Config.install_root, "data", "wordlists", "tomcat_mgr_default_userpass.txt") ]),
+ File.join(Msf::Config.data_directory, "wordlists", "tomcat_mgr_default_userpass.txt") ]),
OptPath.new('USER_FILE', [ false, "File containing users, one per line",
- File.join(Msf::Config.install_root, "data", "wordlists", "tomcat_mgr_default_users.txt") ]),
+ File.join(Msf::Config.data_directory, "wordlists", "tomcat_mgr_default_users.txt") ]),
OptPath.new('PASS_FILE', [ false, "File containing passwords, one per line",
- File.join(Msf::Config.install_root, "data", "wordlists", "tomcat_mgr_default_pass.txt") ]),
+ File.join(Msf::Config.data_directory, "wordlists", "tomcat_mgr_default_pass.txt") ]),
], self.class)
register_autofilter_ports([ 80, 443, 8080, 8081, 8000, 8008, 8443, 8444, 8880, 8888, 9080, 19300 ])
View
2  modules/auxiliary/scanner/http/tplink_traversal_noauth.rb
@@ -35,7 +35,7 @@ def initialize
register_options(
[
OptPath.new('SENSITIVE_FILES', [ true, "File containing senstive files, one per line",
- File.join(Msf::Config.install_root, "data", "wordlists", "sensitive_files.txt") ]),
+ File.join(Msf::Config.data_directory, "wordlists", "sensitive_files.txt") ]),
], self.class)
end
View
6 modules/auxiliary/scanner/http/vcms_login.rb
@@ -28,11 +28,11 @@ def initialize(info = {})
register_options(
[
OptPath.new('USERPASS_FILE', [ false, "File containing users and passwords separated by space, one pair per line",
- File.join(Msf::Config.install_root, "data", "wordlists", "http_default_userpass.txt") ]),
+ File.join(Msf::Config.data_directory, "wordlists", "http_default_userpass.txt") ]),
OptPath.new('USER_FILE', [ false, "File containing users, one per line",
- File.join(Msf::Config.install_root, "data", "wordlists", "http_default_users.txt") ]),
+ File.join(Msf::Config.data_directory, "wordlists", "http_default_users.txt") ]),
OptPath.new('PASS_FILE', [ false, "File containing passwords, one per line",
- File.join(Msf::Config.install_root, "data", "wordlists", "http_default_pass.txt") ]),
+ File.join(Msf::Config.data_directory, "wordlists", "http_default_pass.txt") ]),
OptString.new('TARGETURI', [true, 'The URI path to dolibarr', '/vcms2/'])
], self.class)
end
View
2  modules/auxiliary/scanner/http/web_vulndb.rb
@@ -34,7 +34,7 @@ def initialize(info = {})
[
OptInt.new('ErrorCode', [ true, "The expected http code for non existant files", 404]),
OptPath.new('HTTP404Sigs', [ false, "Path of 404 signatures to use",
- File.join(Msf::Config.install_root, "data", "wmap", "wmap_404s.txt")
+ File.join(Msf::Config.data_directory, "wmap", "wmap_404s.txt")
]
),
OptBool.new('NoDetailMessages', [ false, "Do not display detailed test messages", true ]),
View
4 modules/auxiliary/scanner/misc/cctv_dvr_login.rb
@@ -46,14 +46,14 @@ def initialize
[
false,
"File containing usernames, one per line",
- File.join(Msf::Config.install_root, "data", "wordlists", "multi_vendor_cctv_dvr_users.txt")
+ File.join(Msf::Config.data_directory, "wordlists", "multi_vendor_cctv_dvr_users.txt")
]),
OptPath.new(
'PASS_FILE',
[
false,
"File containing passwords, one per line",
- File.join(Msf::Config.install_root, "data", "wordlists", "multi_vendor_cctv_dvr_pass.txt")
+ File.join(Msf::Config.data_directory, "wordlists", "multi_vendor_cctv_dvr_pass.txt")
]),
OptBool.new('STOP_ON_SUCCESS', [false, "Stop guessing when a credential works for a host", true]),
OptPort.new('HTTP_PORT', [true, "The HTTP port for the IE ActiveX web client interface", 80]),
View
2  modules/auxiliary/scanner/oracle/isqlplus_login.rb
@@ -42,7 +42,7 @@ def initialize
OptString.new('SID', [ false, 'Oracle SID' ]),
OptInt.new('TIMEOUT', [false, 'Time to wait for HTTP responses', 60]),
OptPath.new('USERPASS_FILE', [ false, "File containing users and passwords separated by space, one pair per line",
- File.join(Msf::Config.install_root, "data", "wordlists", "oracle_default_userpass.txt") ]),
+ File.join(Msf::Config.data_directory, "wordlists", "oracle_default_userpass.txt") ]),
OptBool.new('USER_AS_PASS', [ false, "Try the username as the password for all users", false]),
], self.class)
View
2  modules/auxiliary/scanner/oracle/oracle_login.rb
@@ -39,7 +39,7 @@ def initialize(info = {})
register_options(
[
OptPath.new('USERPASS_FILE', [ false, "File containing (space-seperated) users and passwords, one pair per line",
- File.join(Msf::Config.install_root, "data", "wordlists", "oracle_default_userpass.txt") ]),
+ File.join(Msf::Config.data_directory, "wordlists", "oracle_default_userpass.txt") ]),
OptString.new('SID', [ true, 'The instance (SID) to authenticate against', 'XE'])
], self.class)
View
2  modules/auxiliary/scanner/oracle/sid_brute.rb
@@ -30,7 +30,7 @@ def initialize(info = {})
register_options(
[
- OptPath.new('SID_FILE', [ false, "File containing instance names, one per line", File.join(Msf::Config.install_root, "data", "wordlists", "sid.txt") ]),
+ OptPath.new('SID_FILE', [ false, "File containing instance names, one per line", File.join(Msf::Config.data_directory, "wordlists", "sid.txt") ]),
OptString.new('SID', [ false, 'A specific SID to attempt.' ]),
Opt::RPORT(1521)
], self.class)
View
6 modules/auxiliary/scanner/postgres/postgres_login.rb
@@ -36,11 +36,11 @@ def initialize(info = {})
register_options(
[
OptPath.new('USERPASS_FILE', [ false, "File containing (space-seperated) users and passwords, one pair per line",
- File.join(Msf::Config.install_root, "data", "wordlists", "postgres_default_userpass.txt") ]),
+ File.join(Msf::Config.data_directory, "wordlists", "postgres_default_userpass.txt") ]),
OptPath.new('USER_FILE', [ false, "File containing users, one per line",
- File.join(Msf::Config.install_root, "data", "wordlists", "postgres_default_user.txt") ]),
+ File.join(Msf::Config.data_directory, "wordlists", "postgres_default_user.txt") ]),
OptPath.new('PASS_FILE', [ false, "File containing passwords, one per line",
- File.join(Msf::Config.install_root, "data", "wordlists", "postgres_default_pass.txt") ]),
+ File.join(Msf::Config.data_directory, "wordlists", "postgres_default_pass.txt") ]),
], self.class)
deregister_options('SQL')
View
2  modules/auxiliary/scanner/snmp/snmp_login.rb
@@ -35,7 +35,7 @@ def initialize
OptInt.new('BATCHSIZE', [true, 'The number of hosts to probe in each set', 256]),
OptString.new('PASSWORD', [ false, 'The password to test' ]),
OptPath.new('PASS_FILE', [ false, "File containing communities, one per line",
- File.join(Msf::Config.install_root, "data", "wordlists", "snmp_default_pass.txt")
+ File.join(Msf::Config.data_directory, "wordlists", "snmp_default_pass.txt")
])
], self.class)
View
2  modules/auxiliary/scanner/tftp/tftpbrute.rb
@@ -26,7 +26,7 @@ def initialize
Opt::RPORT(69),
Opt::CHOST,
OptPath.new('DICTIONARY', [ true, 'The list of filenames',
- File.join(Msf::Config.install_root, "data", "wordlists", "tftp.txt") ])
+ File.join(Msf::Config.data_directory, "wordlists", "tftp.txt") ])
], self.class)
end
View
6 modules/auxiliary/server/capture/http.rb
@@ -39,15 +39,15 @@ def initialize
[
OptPort.new('SRVPORT', [ true, "The local port to listen on.", 80 ]),
OptPath.new('TEMPLATE', [ false, "The HTML template to serve in responses",
- File.join(Msf::Config.install_root, "data", "exploits", "capture", "http", "index.html")
+ File.join(Msf::Config.data_directory, "exploits", "capture", "http", "index.html")
]
),
OptPath.new('SITELIST', [ false, "The list of URLs that should be used for cookie capture",
- File.join(Msf::Config.install_root, "data", "exploits", "capture", "http", "sites.txt")
+ File.join(Msf::Config.data_directory, "exploits", "capture", "http", "sites.txt")
]
),
OptPath.new('FORMSDIR', [ false, "The directory containing form snippets (example.com.txt)",
- File.join(Msf::Config.install_root, "data", "exploits", "capture", "http", "forms")
+ File.join(Msf::Config.data_directory, "exploits", "capture", "http", "forms")
]
),
OptAddress.new('AUTOPWN_HOST',[ false, "The IP address of the browser_autopwn service ", nil ]),
View
2  modules/auxiliary/sniffer/psnuffle.rb
@@ -47,7 +47,7 @@ def initialize
register_advanced_options([
OptPath.new('ProtocolBase', [true, 'The base directory containing the protocol decoders',
- File.join(Msf::Config.install_root, "data", "exploits", "psnuffle")
+ File.join(Msf::Config.data_directory, "exploits", "psnuffle")
]),
], self.class)
deregister_options('RHOST')
View
2  modules/auxiliary/spoof/wifi/airpwn.rb
@@ -45,7 +45,7 @@ def initialize
register_options(
[
OptPath.new('SITELIST', [ false, "YAML file of URL/Replacement pairs for GET replacement",
- File.join(Msf::Config.install_root, "data", "exploits", "wifi", "airpwn", "sitelist.yml")
+ File.join(Msf::Config.data_directory, "exploits", "wifi", "airpwn", "sitelist.yml")
]),
OptBool.new('USESITEFILE', [ true, "Use site list file for match/response", "false"]),
OptString.new('FILTER', [ true, "Default BPF filter", "port 80"]),
View
2  modules/auxiliary/spoof/wifi/dnspwn.rb
@@ -28,7 +28,7 @@ def initialize
register_options(
[
OptPath.new('DNSLIST', [ false, "YAML file of DNS entries for replacement",
- File.join(Msf::Config.install_root, "data", "exploits", "wifi", "dnspwn", "dnslist.yml")
+ File.join(Msf::Config.data_directory, "exploits", "wifi", "dnspwn", "dnslist.yml")
]),
OptBool.new('USEDNSFILE', [ true, "Use dns list file for response", "false"]),
OptString.new('FILTER', [ true, "Default BPF filter", "port 53"]),
View
2  modules/exploits/freebsd/local/mmap.rb
@@ -82,7 +82,7 @@ def generate_exploit(payload_fname)
#
# Metasm does not support FreeBSD executable generation.
#
- path = File.join(Msf::Config.install_root, "data", "exploits", "CVE-2013-2171.bin")
+ path = File.join(Msf::Config.data_directory, "exploits", "CVE-2013-2171.bin")
x = File.open(path, 'rb') { |f| f.read(f.stat.size) }
x.gsub(/MSFABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890/, payload_fname.ljust(40, "\x00"))
end
View
2  modules/exploits/linux/browser/adobe_flashplayer_aslaunch.rb
@@ -54,7 +54,7 @@ def initialize(info = {})
end
def exploit
- path = File.join( Msf::Config.install_root, "data", "exploits", "CVE-2008-5499.swf" )
+ path = File.join( Msf::Config.data_directory, "exploits", "CVE-2008-5499.swf" )
fd = File.open( path, "rb" )
@swf = fd.read(fd.stat.size)
fd.close
View
2  modules/exploits/multi/browser/firefox_svg_plugin.rb
@@ -159,7 +159,7 @@ def get_target(agent)
# @return [String] the contents of the .swf file used to trigger the exploit
def flash_trigger
- swf_path = File.join(Msf::Config.install_root, "data", "exploits", "cve-2013-0758.swf")
+ swf_path = File.join(Msf::Config.data_directory, "exploits", "cve-2013-0758.swf")
@flash_trigger ||= File.read(swf_path)
end
View
2  modules/exploits/multi/browser/java_atomicreferencearray.rb
@@ -89,7 +89,7 @@ def initialize( info = {} )
def exploit
# load the static jar file
- path = File.join( Msf::Config.install_root, "data", "exploits", "CVE-2012-0507.jar" )
+ path = File.join( Msf::Config.data_directory, "exploits", "CVE-2012-0507.jar" )
fd = File.open( path, "rb" )
@jar_data = fd.read(fd.stat.size)
fd.close
View
2  modules/exploits/multi/browser/java_calendar_deserialize.rb
@@ -85,7 +85,7 @@ def initialize( info = {} )
def exploit
# load the static jar file
- path = File.join( Msf::Config.install_root, "data", "exploits", "CVE-2008-5353.jar" )
+ path = File.join( Msf::Config.data_directory, "exploits", "CVE-2008-5353.jar" )
fd = File.open( path, "rb" )
@jar_data = fd.read(fd.stat.size)
fd.close
View
2  modules/exploits/multi/browser/java_getsoundbank_bof.rb
@@ -92,7 +92,7 @@ def initialize(info = {})
def exploit
# load the static jar
- path = File.join(Msf::Config.install_root, "data", "exploits", "CVE-2009-3867.jar")
+ path = File.join(Msf::Config.data_directory, "exploits", "CVE-2009-3867.jar")
fd = File.open(path, "rb")
@jar_data = fd.read(fd.stat.size)
fd.close
View
10 modules/exploits/multi/browser/java_jre17_driver_manager.rb
@@ -80,15 +80,15 @@ def initialize( info = {} )
def setup
- path = File.join(Msf::Config.install_root, "data", "exploits", "cve-2013-1488", "Exploit.class")
+ path = File.join(Msf::Config.data_directory, "exploits", "cve-2013-1488", "Exploit.class")
@exploit_class = File.open(path, "rb") {|fd| fd.read(fd.stat.size) }
- path = File.join(Msf::Config.install_root, "data", "exploits", "cve-2013-1488", "FakeDriver.class")
+ path = File.join(Msf::Config.data_directory, "exploits", "cve-2013-1488", "FakeDriver.class")
@driver_class = File.open(path, "rb") {|fd| fd.read(fd.stat.size) }
- path = File.join(Msf::Config.install_root, "data", "exploits", "cve-2013-1488", "FakeDriver2.class")
+ path = File.join(Msf::Config.data_directory, "exploits", "cve-2013-1488", "FakeDriver2.class")
@driver2_class = File.open(path, "rb") {|fd| fd.read(fd.stat.size) }
- path = File.join(Msf::Config.install_root, "data", "exploits", "cve-2013-1488", "META-INF", "services", "java.lang.Object")
+ path = File.join(Msf::Config.data_directory, "exploits", "cve-2013-1488", "META-INF", "services", "java.lang.Object")
@object_services = File.open(path, "rb") {|fd| fd.read(fd.stat.size) }
- path = File.join(Msf::Config.install_root, "data", "exploits", "cve-2013-1488", "META-INF", "services", "java.sql.Driver")
+ path = File.join(Msf::Config.data_directory, "exploits", "cve-2013-1488", "META-INF", "services", "java.sql.Driver")
@driver_services = File.open(path, "rb") {|fd| fd.read(fd.stat.size) }
@exploit_class_name = rand_text_alpha("Exploit".length)
View
2  modules/exploits/multi/browser/java_jre17_exec.rb
@@ -112,7 +112,7 @@ def on_request_uri( cli, request )
jar.add_file(full, '')
end
end
- fd = File.open(File.join( Msf::Config.install_root, "data", "exploits", "CVE-2012-4681", path ), "rb")
+ fd = File.open(File.join( Msf::Config.data_directory, "exploits", "CVE-2012-4681", path ), "rb")
data = fd.read(fd.stat.size)
jar.add_file(path.join("/"), data)
fd.close
View
4 modules/exploits/multi/browser/java_jre17_glassfish_averagerangestatisticimpl.rb
@@ -78,9 +78,9 @@ def initialize( info = {} )
def setup
- path = File.join(Msf::Config.install_root, "data", "exploits", "cve-2012-5076_2", "Exploit.class")
+ path = File.join(Msf::Config.data_directory, "exploits", "cve-2012-5076_2", "Exploit.class")
@exploit_class = File.open(path, "rb") {|fd| fd.read(fd.stat.size) }
- path = File.join(Msf::Config.install_root, "data", "exploits", "cve-2012-5076_2", "B.class")
+ path = File.join(Msf::Config.data_directory, "exploits", "cve-2012-5076_2", "B.class")
@loader_class = File.open(path, "rb") {|fd| fd.read(fd.stat.size) }
@exploit_class_name = rand_text_alpha("Exploit".length)
View
2  modules/exploits/multi/browser/java_jre17_jaxws.rb
@@ -96,7 +96,7 @@ def on_request_uri( cli, request )
jar.add_file(full, '')
end
end
- fd = File.open(File.join( Msf::Config.install_root, "data", "exploits", "cve-2012-5076", path ), "rb")
+ fd = File.open(File.join( Msf::Config.data_directory, "exploits", "cve-2012-5076", path ), "rb")
data = fd.read(fd.stat.size)
jar.add_file(path.join("/"), data)
fd.close
View
4 modules/exploits/multi/browser/java_jre17_jmxbean.rb
@@ -79,9 +79,9 @@ def initialize( info = {} )
def setup
- path = File.join(Msf::Config.install_root, "data", "exploits", "cve-2013-0422", "Exploit.class")
+ path = File.join(Msf::Config.data_directory, "exploits", "cve-2013-0422", "Exploit.class")
@exploit_class = File.open(path, "rb") {|fd| fd.read(fd.stat.size) }
- path = File.join(Msf::Config.install_root, "data", "exploits", "cve-2013-0422", "B.class")
+ path = File.join(Msf::Config.data_directory, "exploits", "cve-2013-0422", "B.class")
@loader_class = File.open(path, "rb") {|fd| fd.read(fd.stat.size) }
@exploit_class_name = rand_text_alpha("Exploit".length)
View
2  modules/exploits/multi/browser/java_jre17_jmxbean_2.rb
@@ -113,7 +113,7 @@ def generate_jar
jar.add_file(full, '')
end
end
- fd = File.open(File.join( Msf::Config.install_root, "data", "exploits", "cve-2013-0431", path ), "rb")
+ fd = File.open(File.join( Msf::Config.data_directory, "exploits", "cve-2013-0431", path ), "rb")
data = fd.read(fd.stat.size)
jar.add_file(path.join("/"), data)
fd.close
View
4 modules/exploits/multi/browser/java_jre17_method_handle.rb
@@ -76,9 +76,9 @@ def initialize( info = {} )
def setup
- path = File.join(Msf::Config.install_root, "data", "exploits", "cve-2012-5088", "Exploit.class")
+ path = File.join(Msf::Config.data_directory, "exploits", "cve-2012-5088", "Exploit.class")
@exploit_class = File.open(path, "rb") {|fd| fd.read(fd.stat.size) }
- path = File.join(Msf::Config.install_root, "data", "exploits", "cve-2012-5088", "B.class")
+ path = File.join(Msf::Config.data_directory, "exploits", "cve-2012-5088", "B.class")
@loader_class = File.open(path, "rb") {|fd| fd.read(fd.stat.size) }
@exploit_class_name = rand_text_alpha("Exploit".length)
View
6 modules/exploits/multi/browser/java_jre17_provider_skeleton.rb
@@ -87,11 +87,11 @@ def randomize_identifier_in_jar(jar, identifier)
def setup
- path = File.join(Msf::Config.install_root, "data", "exploits", "cve-2013-2460", "Exploit.class")
+ path = File.join(Msf::Config.data_directory, "exploits", "cve-2013-2460", "Exploit.class")
@exploit_class = File.open(path, "rb") {|fd| fd.read(fd.stat.size) }
- path = File.join(Msf::Config.install_root, "data", "exploits", "cve-2013-2460", "ExpProvider.class")
+ path = File.join(Msf::Config.data_directory, "exploits", "cve-2013-2460", "ExpProvider.class")
@provider_class = File.open(path, "rb") {|fd| fd.read(fd.stat.size) }
- path = File.join(Msf::Config.install_root, "data", "exploits", "cve-2013-2460", "DisableSecurityManagerAction.class")
+ path = File.join(Msf::Config.data_directory, "exploits", "cve-2013-2460", "DisableSecurityManagerAction.class")
@action_class = File.open(path, "rb") {|fd| fd.read(fd.stat.size) }
@exploit_class_name = rand_text_alpha(EXPLOIT_STRING.length)
View
8 modules/exploits/multi/browser/java_jre17_reflection_types.rb
@@ -81,13 +81,13 @@ def initialize( info = {} )
def setup
- path = File.join(Msf::Config.install_root, "data", "exploits", "jre7u17", "Exploit.class")
+ path = File.join(Msf::Config.data_directory, "exploits", "jre7u17", "Exploit.class")
@exploit_class = File.open(path, "rb") {|fd| fd.read(fd.stat.size) }
- path = File.join(Msf::Config.install_root, "data", "exploits", "jre7u17", "Union1.class")
+ path = File.join(Msf::Config.data_directory, "exploits", "jre7u17", "Union1.class")
@union1_class = File.open(path, "rb") {|fd| fd.read(fd.stat.size) }
- path = File.join(Msf::Config.install_root, "data", "exploits", "jre7u17", "Union2.class")
+ path = File.join(Msf::Config.data_directory, "exploits", "jre7u17", "Union2.class")
@union2_class = File.open(path, "rb") {|fd| fd.read(fd.stat.size) }
- path = File.join(Msf::Config.install_root, "data", "exploits", "jre7u17", "SystemClass.class")
+ path = File.join(Msf::Config.data_directory, "exploits", "jre7u17", "SystemClass.class")
@system_class = File.open(path, "rb") {|fd| fd.read(fd.stat.size) }
@exploit_class_name = rand_text_alpha("Exploit".length)
View
2  modules/exploits/multi/browser/java_rhino.rb
@@ -102,7 +102,7 @@ def on_request_uri( cli, request )
jar.add_file(full, '')
end
end
- fd = File.open(File.join( Msf::Config.install_root, "data", "exploits", "cve-2011-3544", path ), "rb")
+ fd = File.open(File.join( Msf::Config.data_directory, "exploits", "cve-2011-3544", path ), "rb")
data = fd.read(fd.stat.size)
jar.add_file(path.join("/"), data)
fd.close
View
2  modules/exploits/multi/browser/java_rmi_connection_impl.rb
@@ -89,7 +89,7 @@ def on_request_uri( cli, request )
jar.add_file(full, '')
end
end
- fd = File.open(File.join( Msf::Config.install_root, "data", "exploits", "cve-2010-0094", path ), "rb")
+ fd = File.open(File.join( Msf::Config.data_directory, "exploits", "cve-2010-0094", path ), "rb")
data = fd.read(fd.stat.size)
jar.add_file(path.join("/"), data)
fd.close
View
2  modules/exploits/multi/browser/java_setdifficm_bof.rb
@@ -200,7 +200,7 @@ def generate_html(pl)
def exploit
- path = File.join(Msf::Config.install_root, "data", "exploits", "CVE-2009-3869.jar")
+ path = File.join(Msf::Config.data_directory, "exploits", "CVE-2009-3869.jar")
fd = File.open(path, "rb")
@jar_data = fd.read(fd.stat.size)
fd.close
View
6 modules/exploits/multi/browser/java_storeimagearray.rb
@@ -71,11 +71,11 @@ def initialize( info = {} )
end
def setup
- path = File.join(Msf::Config.install_root, "data", "exploits", "CVE-2013-2465", "Exploit.class")
+ path = File.join(Msf::Config.data_directory, "exploits", "CVE-2013-2465", "Exploit.class")
@exploit_class = File.open(path, "rb") {|fd| fd.read(fd.stat.size) }
- path = File.join(Msf::Config.install_root, "data", "exploits", "CVE-2013-2465", "Exploit$MyColorModel.class")
+ path = File.join(Msf::Config.data_directory, "exploits", "CVE-2013-2465", "Exploit$MyColorModel.class")
@color_model_class = File.open(path, "rb") {|fd| fd.read(fd.stat.size) }
- path = File.join(Msf::Config.install_root, "data", "exploits", "CVE-2013-2465", "Exploit$MyColorSpace.class")
+ path = File.join(Msf::Config.data_directory, "exploits", "CVE-2013-2465", "Exploit$MyColorSpace.class")
@color_space_class = File.open(path, "rb") {|fd| fd.read(fd.stat.size) }
@exploit_class_name = rand_text_alpha("Exploit".length)
View
2  modules/exploits/multi/browser/java_trusted_chain.rb
@@ -96,7 +96,7 @@ def on_request_uri( cli, request )
jar.add_file(full, '')
end
end
- fd = File.open(File.join( Msf::Config.install_root, "data", "exploits", "cve-2010-0840", path ), "rb")
+ fd = File.open(File.join( Msf::Config.data_directory, "exploits", "cve-2010-0840", path ), "rb")
data = fd.read(fd.stat.size)
jar.add_file(path.join("/"), data)
fd.close
View
2  modules/exploits/multi/browser/java_verifier_field_access.rb
@@ -88,7 +88,7 @@ def initialize( info = {} )
def exploit
# load the static jar file
- path = File.join( Msf::Config.install_root, "data", "exploits", "CVE-2012-1723.jar" )
+ path = File.join( Msf::Config.data_directory, "exploits", "CVE-2012-1723.jar" )
fd = File.open( path, "rb" )
@jar_data = fd.read(fd.stat.size)
fd.close
View
2  modules/exploits/multi/browser/qtjava_pointer.rb
@@ -82,7 +82,7 @@ def initialize(info = {})
def exploit
# load the class data
- path = File.join(Msf::Config.install_root, "data", "exploits", "QTJavaExploit.class")
+ path = File.join(Msf::Config.data_directory, "exploits", "QTJavaExploit.class")
fd = File.open(path, "rb")
@class_data = fd.read(fd.stat.size)
fd.close
View
2  modules/exploits/multi/http/axis2_deployer.rb
@@ -100,7 +100,7 @@ def upload_exec(session,rpath)
# We need this class as a wrapper to run in a thread. For some reason
# the Payload class is giving illegal access exceptions without it.
- path = File.join(Msf::Config.install_root, "data", "java", "metasploit", "PayloadServlet.class")
+ path = File.join(Msf::Config.data_directory, "java", "metasploit", "PayloadServlet.class")
fd = File.open(path, "rb")
servlet = fd.read(fd.stat.size)
fd.close
View
2  modules/exploits/multi/http/jboss_invoke_deploy.rb
@@ -233,7 +233,7 @@ def generate_stager(name_param, content_param)
def send_serialized_request(file_name , replace_params = {})
- path = File.join( Msf::Config.install_root, "data", "exploits", "jboss_jmxinvoker", "DeploymentFileRepository", file_name)
+ path = File.join( Msf::Config.data_directory, "exploits", "jboss_jmxinvoker", "DeploymentFileRepository", file_name)
data = File.open( path, "rb" ) { |fd| data = fd.read(fd.stat.size) }
replace_params.each { |key, value| data.gsub!(key, value) }
View
4 modules/exploits/multi/http/openfire_auth_bypass.rb
@@ -140,12 +140,12 @@ def get_plugin_jar(plugin_name)
]
jar = Rex::Zip::Jar.new
- jar.add_files(files, File.join(Msf::Config.install_root, "data", "exploits", "CVE-2008-6508"))
+ jar.add_files(files, File.join(Msf::Config.data_directory, "exploits", "CVE-2008-6508"))
plugin_author = datastore['PLUGINAUTHOR'] || rand_text_alphanumeric(8+rand(8))
plugin_desc = datastore['PLUGINDESC'] || rand_text_alphanumeric(8+rand(8))
- plugin_xml = File.open(File.join(Msf::Config.install_root, "data", "exploits", "CVE-2008-6508", "plugin.xml"), "rb") {|fd| fd.read() }
+ plugin_xml = File.open(File.join(Msf::Config.data_directory, "exploits", "CVE-2008-6508", "plugin.xml"), "rb") {|fd| fd.read() }
plugin_xml.gsub!(/PLUGINNAME/, plugin_name)
plugin_xml.gsub!(/PLUGINDESCRIPTION/, plugin_desc)
plugin_xml.gsub!(/PLUGINAUTHOR/, plugin_author)
View
2  modules/exploits/multi/misc/batik_svg_java.rb
@@ -101,7 +101,7 @@ def on_request_uri(cli, request)
end
end
- fd = File.open(File.join( Msf::Config.install_root, "data", "exploits", "batik_svg", path ), "rb")
+ fd = File.open(File.join( Msf::Config.data_directory, "exploits", "batik_svg", path ), "rb")
data = fd.read(fd.stat.size)
jar.add_file(path.join("/"), data)
fd.close
View
2  modules/exploits/unix/webapp/google_proxystylesheet_exec.rb
@@ -91,7 +91,7 @@ def check
def exploit
# load the xml data
- path = File.join(Msf::Config.install_root, "data", "exploits", "google_proxystylesheet.xml")
+ path = File.join(Msf::Config.data_directory, "exploits", "google_proxystylesheet.xml")
fd = File.open(path, "rb")
@xml_data = fd.read(fd.stat.size)
fd.close
View
2  modules/exploits/unix/webapp/php_include.rb
@@ -54,7 +54,7 @@ def initialize(info = {})
OptString.new('POSTDATA', [false, "The POST data to send, with the include parameter changed to XXpathXX"]),
OptString.new('HEADERS', [false, "Any additional HTTP headers to send, cookies for example. Format: \"header:value,header2:value2\""]),
OptPath.new('PHPRFIDB', [false, "A local file containing a list of URLs to try, with XXpathXX replacing the URL",
- File.join(Msf::Config.install_root, "data", "exploits", "php", "rfi-locations.dat")
+ File.join(Msf::Config.data_directory, "exploits", "php", "rfi-locations.dat")
])
], self.class)
end
View
2  modules/exploits/windows/browser/adobe_cooltype_sing.rb
@@ -62,7 +62,7 @@ def initialize(info = {})
def exploit
# NOTE: The 0day used Vera.ttf (785d2fd45984c6548763ae6702d83e20)
- path = File.join( Msf::Config.install_root, "data", "exploits", "cve-2010-2883.ttf" )
+ path = File.join( Msf::Config.data_directory, "exploits", "cve-2010-2883.ttf" )
fd = File.open( path, "rb" )
@ttf_data = fd.read(fd.stat.size)
fd.close
View
2  modules/exploits/windows/browser/adobe_flash_mp4_cprt.rb
@@ -272,7 +272,7 @@ def on_request_uri(cli, request)
end
def create_swf
- path = ::File.join( Msf::Config.install_root, "data", "exploits", "CVE-2012-0754.swf" )
+ path = ::File.join( Msf::Config.data_directory, "exploits", "CVE-2012-0754.swf" )
fd = ::File.open( path, "rb" )
swf = fd.read(fd.stat.size)
fd.close
View
2  modules/exploits/windows/browser/adobe_flash_otf_font.rb
@@ -227,7 +227,7 @@ def exploit
end
def create_swf
- path = ::File.join( Msf::Config.install_root, "data", "exploits", "CVE-2012-1535", "Main.swf" )
+ path = ::File.join( Msf::Config.data_directory, "exploits", "CVE-2012-1535", "Main.swf" )
fd = ::File.open( path, "rb" )
swf = fd.read(fd.stat.size)
fd.close
View
2  modules/exploits/windows/browser/adobe_flash_rtmp.rb
@@ -424,7 +424,7 @@ def on_request_uri(cli, request)
end
def create_swf
- path = ::File.join( Msf::Config.install_root, "data", "exploits", "CVE-2012-0779.swf" )
+ path = ::File.join( Msf::Config.data_directory, "exploits", "CVE-2012-0779.swf" )
fd = ::File.open( path, "rb" )
swf = fd.read(fd.stat.size)
fd.close
View
2  modules/exploits/windows/browser/adobe_flash_sps.rb
@@ -178,7 +178,7 @@ def exploit
end
def create_swf
- path = ::File.join( Msf::Config.install_root, "data", "exploits", "mp4player.swf" )
+ path = ::File.join( Msf::Config.data_directory, "exploits", "mp4player.swf" )
fd = ::File.open( path, "rb" )
swf = fd.read(fd.stat.size)
fd.close
View
2  modules/exploits/windows/browser/adobe_flashplayer_arrayindexing.rb
@@ -70,7 +70,7 @@ def initialize(info = {})
def exploit
# src for the flash file: external/source/exploits/CVE-2011-2110/CVE-2011-2110.as
# full aslr/dep bypass using the info leak as per malware
- path = File.join( Msf::Config.install_root, "data", "exploits", "CVE-2011-2110.swf" )
+ path = File.join( Msf::Config.data_directory, "exploits", "CVE-2011-2110.swf" )
fd = File.open( path, "rb" )
@swf = fd.read(fd.stat.size)
fd.close
View
2  modules/exploits/windows/browser/adobe_flashplayer_avm.rb
@@ -67,7 +67,7 @@ def initialize(info = {})
end
def exploit
- path = File.join( Msf::Config.install_root, "data", "exploits", "CVE-2011-0609.swf" )
+ path = File.join( Msf::Config.data_directory, "exploits", "CVE-2011-0609.swf" )
fd = File.open( path, "rb" )
@swf = fd.read(fd.stat.size)
fd.close
View
2  modules/exploits/windows/browser/adobe_flashplayer_flash10o.rb
@@ -123,7 +123,7 @@ def initialize(info={})
end
def exploit
- path = File.join(Msf::Config.install_root, "data", "exploits", "CVE-2011-0611.swf")
+ path = File.join(Msf::Config.data_directory, "exploits", "CVE-2011-0611.swf")
f = File.open(path, "rb")
@trigger = f.read(f.stat.size)
f.close
View
2  modules/exploits/windows/browser/adobe_flashplayer_newfunction.rb
@@ -71,7 +71,7 @@ def initialize(info = {})
def exploit
# load the static swf file
- path = File.join( Msf::Config.install_root, "data", "exploits", "CVE-2010-1297.swf" )
+ path = File.join( Msf::Config.data_directory, "exploits", "CVE-2010-1297.swf" )
fd = File.open( path, "rb" )
@swf_data = fd.read(fd.stat.size)
fd.close
View
2  modules/exploits/windows/browser/adobe_shockwave_rcsl_corruption.rb
@@ -60,7 +60,7 @@ def check_dependencies
#
def exploit
- path = File.join( Msf::Config.install_root, "data", "exploits", "shockwave_rcsl.dir" )
+ path = File.join( Msf::Config.data_directory, "exploits", "shockwave_rcsl.dir" )
fd = File.open( path, "rb" )
@dir_data = fd.read(fd.stat.size)
fd.close
View
2  modules/exploits/windows/browser/honeywell_tema_exec.rb
@@ -123,7 +123,7 @@ def on_request_uri(cli, request)
end
if request.uri =~ /\.msi$/
- msi_source = ::File.join(Msf::Config.install_root, "data", "exploits", "exec_payload.msi")
+ msi_source = ::File.join(Msf::Config.data_directory, "exploits", "exec_payload.msi")
source = ::File.open(msi_source, "rb"){|fd| fd.read(fd.stat.size) }
print_status("Sending msi")
send_response(cli, source, {'Content-Type'=>'application/octet-stream'})
View
8 modules/exploits/windows/browser/java_cmm.rb
@@ -68,13 +68,13 @@ def initialize( info = {} )
def setup
- path = File.join(Msf::Config.install_root, "data", "exploits", "cve-2013-1493", "Init.class")
+ path = File.join(Msf::Config.data_directory, "exploits", "cve-2013-1493", "Init.class")
@init_class = File.open(path, "rb") {|fd| fd.read(fd.stat.size) }
- path = File.join(Msf::Config.install_root, "data", "exploits", "cve-2013-1493", "Leak.class")
+ path = File.join(Msf::Config.data_directory, "exploits", "cve-2013-1493", "Leak.class")
@leak_class = File.open(path, "rb") {|fd| fd.read(fd.stat.size) }
- path = File.join(Msf::Config.install_root, "data", "exploits", "cve-2013-1493", "MyBufferedImage.class")
+ path = File.join(Msf::Config.data_directory, "exploits", "cve-2013-1493", "MyBufferedImage.class")
@buffered_image_class = File.open(path, "rb") {|fd| fd.read(fd.stat.size) }
- path = File.join(Msf::Config.install_root, "data", "exploits", "cve-2013-1493", "MyColorSpace.class")
+ path = File.join(Msf::Config.data_directory, "exploits", "cve-2013-1493", "MyColorSpace.class")
@color_space_class = File.open(path, "rb") {|fd| fd.read(fd.stat.size) }
@init_class_name = rand_text_alpha("Init".length)
View
2  modules/exploits/windows/browser/java_mixer_sequencer.rb
@@ -145,7 +145,7 @@ def get_jar
jar = Rex::Zip::Jar.new
jar.add_file("META-INF/", "")
jar.add_file("META-INF/services/", "")
- jar.add_files(files, File.join(Msf::Config.install_root, "data", "exploits", "CVE-2010-0842"))
+ jar.add_files(files, File.join(Msf::Config.data_directory, "exploits", "CVE-2010-0842"))
jar.build_manifest
jar_name = "#{rand_text_alpha(rand(5) + 3)}.jar"
View
4 modules/exploits/windows/browser/keyhelp_launchtripane_exec.rb
@@ -283,7 +283,7 @@ def process_propfind(cli, request, target)
end
def generate_payload_chm(data)
- path = File.join(Msf::Config.install_root, "data", "exploits", "CVE-2012-2516", "template_payload.chm")
+ path = File.join(Msf::Config.data_directory, "exploits", "CVE-2012-2516", "template_payload.chm")
fd = File.open(path, "rb")
chm = fd.read(fd.stat.size)
fd.close
@@ -292,7 +292,7 @@ def generate_payload_chm(data)
end
def generate_mof_chm(data)
- path = File.join(Msf::Config.install_root, "data", "exploits", "CVE-2012-2516", "template_mof.chm")
+ path = File.join(Msf::Config.data_directory, "exploits", "CVE-2012-2516", "template_mof.chm")
fd = File.open(path, "rb")
chm = fd.read(fd.stat.size)
fd.close
View
2  modules/exploits/windows/browser/ms10_022_ie_vbscript_winhlp32.rb
@@ -314,7 +314,7 @@ def exploit
fail_with(Failure::Unknown, 'Using WebDAV requires SRVPORT=80 and URIPATH=/')
end
- path = File.join(Msf::Config.install_root, "data", "exploits", "runcalc.hlp")
+ path = File.join(Msf::Config.data_directory, "exploits", "runcalc.hlp")
fd = File.open(path, "rb")
@hlp_data = fd.read(fd.stat.size)
fd.close
View
2  modules/exploits/windows/browser/ms10_026_avi_nsamplespersec.rb
@@ -90,7 +90,7 @@ def exploit
@dotnet_payload = Msf::Util::EXE.to_dotnetmem(ibase, shellcode, opts)
# Load our AVI file
- path = File.join(Msf::Config.install_root, "data", "exploits", "CVE-2010-0480.avi")
+ path = File.join(Msf::Config.data_directory, "exploits", "CVE-2010-0480.avi")
f = File.open(path, "rb")
@trigger = f.read(f.stat.size)
f.close
View
2  modules/exploits/windows/browser/ms11_093_ole32.rb
@@ -174,7 +174,7 @@ def on_request_uri(cli, request)