Browse Source

Find and replace

Meatballs 6 years ago
parent
commit
7ba846ca24
100 changed files with 139 additions and 139 deletions
  1. 2
    2
      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
      lib/msf/util/exe.rb
  14. 1
    1
      modules/auxiliary/admin/http/tomcat_utf8_traversal.rb
  15. 1
    1
      modules/auxiliary/admin/http/trendmicro_dlp_traversal.rb
  16. 1
    1
      modules/auxiliary/admin/oracle/oraenum.rb
  17. 1
    1
      modules/auxiliary/client/smtp/emailer.rb
  18. 1
    1
      modules/auxiliary/crawler/msfcrawler.rb
  19. 1
    1
      modules/auxiliary/docx/word_unc_injector.rb
  20. 1
    1
      modules/auxiliary/dos/windows/browser/ms09_065_eot_integer.rb
  21. 1
    1
      modules/auxiliary/gather/dns_bruteforce.rb
  22. 1
    1
      modules/auxiliary/gather/enum_dns.rb
  23. 3
    3
      modules/auxiliary/scanner/couchdb/couchdb_login.rb
  24. 3
    3
      modules/auxiliary/scanner/db2/db2_auth.rb
  25. 1
    1
      modules/auxiliary/scanner/http/apache_userdir_enum.rb
  26. 1
    1
      modules/auxiliary/scanner/http/brute_dirs.rb
  27. 1
    1
      modules/auxiliary/scanner/http/copy_of_file.rb
  28. 2
    2
      modules/auxiliary/scanner/http/dell_idrac.rb
  29. 1
    1
      modules/auxiliary/scanner/http/dir_scanner.rb
  30. 2
    2
      modules/auxiliary/scanner/http/dir_webdav_unicode_bypass.rb
  31. 1
    1
      modules/auxiliary/scanner/http/dlink_dir_300_615_http_login.rb
  32. 1
    1
      modules/auxiliary/scanner/http/dlink_dir_615h_http_login.rb
  33. 1
    1
      modules/auxiliary/scanner/http/dlink_dir_session_cgi_http_login.rb
  34. 3
    3
      modules/auxiliary/scanner/http/dolibarr_login.rb
  35. 1
    1
      modules/auxiliary/scanner/http/ektron_cms400net.rb
  36. 2
    2
      modules/auxiliary/scanner/http/files_dir.rb
  37. 3
    3
      modules/auxiliary/scanner/http/hp_sys_mgmt_login.rb
  38. 3
    3
      modules/auxiliary/scanner/http/http_login.rb
  39. 1
    1
      modules/auxiliary/scanner/http/joomla_plugins.rb
  40. 1
    1
      modules/auxiliary/scanner/http/linksys_e1500_traversal.rb
  41. 1
    1
      modules/auxiliary/scanner/http/mod_negotiation_brute.rb
  42. 1
    1
      modules/auxiliary/scanner/http/netgear_sph200d_traversal.rb
  43. 1
    1
      modules/auxiliary/scanner/http/ntlm_info_enumeration.rb
  44. 1
    1
      modules/auxiliary/scanner/http/replace_ext.rb
  45. 3
    3
      modules/auxiliary/scanner/http/splunk_web_login.rb
  46. 1
    1
      modules/auxiliary/scanner/http/svn_scanner.rb
  47. 1
    1
      modules/auxiliary/scanner/http/tomcat_enum.rb
  48. 3
    3
      modules/auxiliary/scanner/http/tomcat_mgr_login.rb
  49. 1
    1
      modules/auxiliary/scanner/http/tplink_traversal_noauth.rb
  50. 3
    3
      modules/auxiliary/scanner/http/vcms_login.rb
  51. 1
    1
      modules/auxiliary/scanner/http/web_vulndb.rb
  52. 2
    2
      modules/auxiliary/scanner/misc/cctv_dvr_login.rb
  53. 1
    1
      modules/auxiliary/scanner/oracle/isqlplus_login.rb
  54. 1
    1
      modules/auxiliary/scanner/oracle/oracle_login.rb
  55. 1
    1
      modules/auxiliary/scanner/oracle/sid_brute.rb
  56. 3
    3
      modules/auxiliary/scanner/postgres/postgres_login.rb
  57. 1
    1
      modules/auxiliary/scanner/snmp/snmp_login.rb
  58. 1
    1
      modules/auxiliary/scanner/tftp/tftpbrute.rb
  59. 3
    3
      modules/auxiliary/server/capture/http.rb
  60. 1
    1
      modules/auxiliary/sniffer/psnuffle.rb
  61. 1
    1
      modules/auxiliary/spoof/wifi/airpwn.rb
  62. 1
    1
      modules/auxiliary/spoof/wifi/dnspwn.rb
  63. 1
    1
      modules/exploits/freebsd/local/mmap.rb
  64. 1
    1
      modules/exploits/linux/browser/adobe_flashplayer_aslaunch.rb
  65. 1
    1
      modules/exploits/multi/browser/firefox_svg_plugin.rb
  66. 1
    1
      modules/exploits/multi/browser/java_atomicreferencearray.rb
  67. 1
    1
      modules/exploits/multi/browser/java_calendar_deserialize.rb
  68. 1
    1
      modules/exploits/multi/browser/java_getsoundbank_bof.rb
  69. 5
    5
      modules/exploits/multi/browser/java_jre17_driver_manager.rb
  70. 1
    1
      modules/exploits/multi/browser/java_jre17_exec.rb
  71. 2
    2
      modules/exploits/multi/browser/java_jre17_glassfish_averagerangestatisticimpl.rb
  72. 1
    1
      modules/exploits/multi/browser/java_jre17_jaxws.rb
  73. 2
    2
      modules/exploits/multi/browser/java_jre17_jmxbean.rb
  74. 1
    1
      modules/exploits/multi/browser/java_jre17_jmxbean_2.rb
  75. 2
    2
      modules/exploits/multi/browser/java_jre17_method_handle.rb
  76. 3
    3
      modules/exploits/multi/browser/java_jre17_provider_skeleton.rb
  77. 4
    4
      modules/exploits/multi/browser/java_jre17_reflection_types.rb
  78. 1
    1
      modules/exploits/multi/browser/java_rhino.rb
  79. 1
    1
      modules/exploits/multi/browser/java_rmi_connection_impl.rb
  80. 1
    1
      modules/exploits/multi/browser/java_setdifficm_bof.rb
  81. 3
    3
      modules/exploits/multi/browser/java_storeimagearray.rb
  82. 1
    1
      modules/exploits/multi/browser/java_trusted_chain.rb
  83. 1
    1
      modules/exploits/multi/browser/java_verifier_field_access.rb
  84. 1
    1
      modules/exploits/multi/browser/qtjava_pointer.rb
  85. 1
    1
      modules/exploits/multi/http/axis2_deployer.rb
  86. 1
    1
      modules/exploits/multi/http/jboss_invoke_deploy.rb
  87. 2
    2
      modules/exploits/multi/http/openfire_auth_bypass.rb
  88. 1
    1
      modules/exploits/multi/misc/batik_svg_java.rb
  89. 1
    1
      modules/exploits/unix/webapp/google_proxystylesheet_exec.rb
  90. 1
    1
      modules/exploits/unix/webapp/php_include.rb
  91. 1
    1
      modules/exploits/windows/browser/adobe_cooltype_sing.rb
  92. 1
    1
      modules/exploits/windows/browser/adobe_flash_mp4_cprt.rb
  93. 1
    1
      modules/exploits/windows/browser/adobe_flash_otf_font.rb
  94. 1
    1
      modules/exploits/windows/browser/adobe_flash_rtmp.rb
  95. 1
    1
      modules/exploits/windows/browser/adobe_flash_sps.rb
  96. 1
    1
      modules/exploits/windows/browser/adobe_flashplayer_arrayindexing.rb
  97. 1
    1
      modules/exploits/windows/browser/adobe_flashplayer_avm.rb
  98. 1
    1
      modules/exploits/windows/browser/adobe_flashplayer_flash10o.rb
  99. 1
    1
      modules/exploits/windows/browser/adobe_flashplayer_newfunction.rb
  100. 0
    0
      modules/exploits/windows/browser/adobe_shockwave_rcsl_corruption.rb

+ 2
- 2
lib/msf/core/auxiliary/jtr.rb View File

@@ -32,13 +32,13 @@ module Auxiliary::JohnTheRipper
32 32
     )
33 33
 
34 34
     @run_path  = nil
35
-    @john_path = ::File.join(Msf::Config.install_root, "data", "john")
35
+    @john_path = ::File.join(Msf::Config.data_directory, "john")
36 36
 
37 37
     autodetect_platform
38 38
   end
39 39
 
40 40
   def autodetect_platform
41
-    cpuinfo_base = ::File.join(Msf::Config.install_root, "data", "cpuinfo")
41
+    cpuinfo_base = ::File.join(Msf::Config.data_directory, "cpuinfo")
42 42
     return @run_path if @run_path
43 43
 
44 44
     case ::RUBY_PLATFORM

+ 1
- 1
lib/msf/core/auxiliary/mime_types.rb View File

@@ -23,7 +23,7 @@ module Auxiliary::MimeTypes
23 23
   end
24 24
 
25 25
   def mime_load_extension_map
26
-    path = File.join( Msf::Config.install_root, "data", "mime.yml")
26
+    path = File.join( Msf::Config.data_directory, "mime.yml")
27 27
     @extension_map = YAML.load_file(path)
28 28
   end
29 29
 

+ 1
- 1
lib/msf/core/db.rb View File

@@ -3649,7 +3649,7 @@ class DBManager
3649 3649
     data = ::File.open(args[:filename], "rb") {|f| f.read(f.stat.size)}
3650 3650
     wspace = args[:wspace] || args['wspace'] || workspace
3651 3651
     bl = validate_ips(args[:blacklist]) ? args[:blacklist].split : []
3652
-    basedir = args[:basedir] || args['basedir'] || ::File.join(Msf::Config.install_root, "data", "msf")
3652
+    basedir = args[:basedir] || args['basedir'] || ::File.join(Msf::Config.data_directory, "msf")
3653 3653
 
3654 3654
     allow_yaml = false
3655 3655
     btag = nil

+ 1
- 1
lib/msf/core/exploit/cmdstager_debug_asm.rb View File

@@ -19,7 +19,7 @@ module Exploit::CmdStagerDebugAsm
19 19
     register_advanced_options(
20 20
       [
21 21
         OptString.new( 'DECODERSTUB',  [ true, 'The debug.exe assembly listing decoder stub to use.',
22
-          File.join(Msf::Config.install_root, "data", "exploits", "cmdstager", "debug_asm")]),
22
+          File.join(Msf::Config.data_directory, "exploits", "cmdstager", "debug_asm")]),
23 23
       ], self.class)
24 24
   end
25 25
 

+ 1
- 1
lib/msf/core/exploit/cmdstager_debug_write.rb View File

@@ -19,7 +19,7 @@ module Exploit::CmdStagerDebugWrite
19 19
     register_advanced_options(
20 20
       [
21 21
         OptString.new( 'DECODERSTUB',  [ true, 'The debug.exe file-writing decoder stub to use.',
22
-          File.join(Msf::Config.install_root, "data", "exploits", "cmdstager", "debug_write")]),
22
+          File.join(Msf::Config.data_directory, "exploits", "cmdstager", "debug_write")]),
23 23
       ], self.class)
24 24
   end
25 25
 

+ 1
- 1
lib/msf/core/exploit/cmdstager_vbs.rb View File

@@ -19,7 +19,7 @@ module Exploit::CmdStagerVBS
19 19
     register_advanced_options(
20 20
       [
21 21
         OptString.new( 'DECODERSTUB',  [ true, 'The VBS base64 file decoder stub to use.',
22
-          File.join(Msf::Config.install_root, "data", "exploits", "cmdstager", "vbs_b64")]),
22
+          File.join(Msf::Config.data_directory, "exploits", "cmdstager", "vbs_b64")]),
23 23
       ], self.class)
24 24
   end
25 25
 

+ 1
- 1
lib/msf/core/exploit/cmdstager_vbs_adodb.rb View File

@@ -19,7 +19,7 @@ module Exploit::CmdStagerVBS::ADODB
19 19
     register_advanced_options(
20 20
       [
21 21
         OptString.new( 'DECODERSTUB',  [ true, 'The VBS base64 file decoder stub to use.',
22
-          File.join(Msf::Config.install_root, "data", "exploits", "cmdstager", "vbs_b64_adodb")]),
22
+          File.join(Msf::Config.data_directory, "exploits", "cmdstager", "vbs_b64_adodb")]),
23 23
       ], self.class)
24 24
   end
25 25
 

+ 1
- 1
lib/msf/core/exploit/java.rb View File

@@ -51,7 +51,7 @@ module Exploit::Java
51 51
 
52 52
     # Instantiate the JVM with a classpath pointing to the JDK tools.jar
53 53
     # and our javatoolkit jar.
54
-    classpath  = File.join(Msf::Config.install_root, "data", "exploits", "msfJavaToolkit.jar")
54
+    classpath  = File.join(Msf::Config.data_directory, "exploits", "msfJavaToolkit.jar")
55 55
     classpath += ":" + toolsjar
56 56
     classpath += ":" + datastore['ADDCLASSPATH'] if datastore['ADDCLASSPATH']
57 57
 

+ 1
- 1
lib/msf/core/exploit/mssql.rb View File

@@ -75,7 +75,7 @@ module Exploit::Remote::MSSQL
75 75
     register_advanced_options(
76 76
       [
77 77
         OptPath.new('HEX2BINARY',   [ false, "The path to the hex2binary script on the disk",
78
-          File.join(Msf::Config.install_root, "data", "exploits", "mssql", "h2b")
78
+          File.join(Msf::Config.data_directory, "exploits", "mssql", "h2b")
79 79
         ]),
80 80
         OptString.new('DOMAIN', [ true, 'The domain to use for windows authentication', 'WORKSTATION'])
81 81
       ], Msf::Exploit::Remote::MSSQL)

+ 1
- 1
lib/msf/core/exploit/mssql_sqli.rb View File

@@ -34,7 +34,7 @@ module Exploit::Remote::MSSQL_SQLI
34 34
     register_advanced_options(
35 35
       [
36 36
         OptPath.new('HEX2BINARY',   [ false, "The path to the hex2binary script on the disk",
37
-          File.join(Msf::Config.install_root, "data", "exploits", "mssql", "h2b")
37
+          File.join(Msf::Config.data_directory, "exploits", "mssql", "h2b")
38 38
         ])
39 39
       ], Msf::Exploit::Remote::MSSQL_SQLI)
40 40
 

+ 1
- 1
lib/msf/core/exploit/mysql.rb View File

@@ -150,7 +150,7 @@ module Exploit::Remote::MYSQL
150 150
 
151 151
   def mysql_upload_sys_udf(arch=:win32,target_path=nil)
152 152
     fname = (arch == :win32 ? "lib_mysqludf_sys_32.dll" : "lib_mysqludf_sys_64.dll")
153
-    sys_dll = File.join( Msf::Config.install_root, "data", "exploits", "mysql", fname )
153
+    sys_dll = File.join( Msf::Config.data_directory, "exploits", "mysql", fname )
154 154
     data = File.open(sys_dll, "rb") {|f| f.read f.stat.size}
155 155
     blob = "0x"
156 156
     blob << data.unpack("C*").map {|x| "%02x" % [x]}.join

+ 1
- 1
lib/msf/core/exploit/sunrpc.rb View File

@@ -150,7 +150,7 @@ module Exploit::Remote::SunRPC
150 150
   end
151 151
 
152 152
   def progresolv(number)
153
-    names = File.join(Msf::Config.install_root, "data", "wordlists", "rpc_names.txt")
153
+    names = File.join(Msf::Config.data_directory, "wordlists", "rpc_names.txt")
154 154
     File.open(names, "rb").each_line do |line|
155 155
       next if line.empty? || line =~ /^\s*#/
156 156
 

+ 1
- 1
lib/msf/util/exe.rb View File

@@ -57,7 +57,7 @@ require 'msf/core/exe/segment_injector'
57 57
   end
58 58
 
59 59
   def self.read_replace_script_template(filename, hash_sub)
60
-    template_pathname = File.join(Msf::Config.install_root, "data", "templates", "scripts", filename)
60
+    template_pathname = File.join(Msf::Config.data_directory, "templates", "scripts", filename)
61 61
 
62 62
     template = ''
63 63
     File.open(template_pathname, "rb") do |f|

+ 1
- 1
modules/auxiliary/admin/http/tomcat_utf8_traversal.rb View File

@@ -42,7 +42,7 @@ class Metasploit3 < Msf::Auxiliary
42 42
       [
43 43
         Opt::RPORT(8080),
44 44
         OptPath.new('SENSITIVE_FILES',  [ true, "File containing senstive files, one per line",
45
-          File.join(Msf::Config.install_root, "data", "wordlists", "sensitive_files.txt") ]),
45
+          File.join(Msf::Config.data_directory, "wordlists", "sensitive_files.txt") ]),
46 46
         OptInt.new('MAXDIRS', [ true, 'The maximum directory depth to search', 7]),
47 47
       ], self.class)
48 48
   end

+ 1
- 1
modules/auxiliary/admin/http/trendmicro_dlp_traversal.rb View File

@@ -43,7 +43,7 @@ class Metasploit3 < Msf::Auxiliary
43 43
         Opt::RPORT(8443),
44 44
         OptBool.new('SSL', [true, 'Use SSL', true]),
45 45
         OptPath.new('SENSITIVE_FILES', [ true, "File containing senstive files, one per line",
46
-        File.join(Msf::Config.install_root, "data", "wordlists", "sensitive_files.txt") ]),
46
+        File.join(Msf::Config.data_directory, "wordlists", "sensitive_files.txt") ]),
47 47
       ], self.class)
48 48
   end
49 49
 

+ 1
- 1
modules/auxiliary/admin/oracle/oraenum.rb View File

@@ -657,7 +657,7 @@ class Metasploit3 < Msf::Auxiliary
657 657
           FROM sys.user$
658 658
           where password != 'null' and  type# = 1
659 659
         |
660
-        ordfltpss = "#{File.join(Msf::Config.install_root, "data", "wordlists", "oracle_default_hashes.txt")}"
660
+        ordfltpss = "#{File.join(Msf::Config.data_directory, "wordlists", "oracle_default_hashes.txt")}"
661 661
         returnedstring = prepare_exec(query)
662 662
         accts = {}
663 663
         returnedstring.each do |record|

+ 1
- 1
modules/auxiliary/client/smtp/emailer.rb View File

@@ -38,7 +38,7 @@ class Metasploit3 < Msf::Auxiliary
38 38
           OptString.new('RHOST', [true, "SMTP server address",'127.0.0.1']),
39 39
           OptString.new('RPORT', [true, "SMTP server port",'25']),
40 40
           OptString.new('YAML_CONFIG', [true, "Full path to YAML Configuration file",
41
-            File.join(Msf::Config.install_root, "data","emailer_config.yaml")]),
41
+            File.join(Msf::Config.data_directory,"emailer_config.yaml")]),
42 42
         ], self.class)
43 43
 
44 44
     # Hide this option from the user

+ 1
- 1
modules/auxiliary/crawler/msfcrawler.rb View File

@@ -40,7 +40,7 @@ class Metasploit3 < Msf::Auxiliary
40 40
 
41 41
     register_advanced_options([
42 42
       OptPath.new('CrawlerModulesDir', [true,	'The base directory containing the crawler modules',
43
-        File.join(Msf::Config.install_root, "data", "msfcrawler")
43
+        File.join(Msf::Config.data_directory, "msfcrawler")
44 44
       ]),
45 45
       OptBool.new('EnableUl', [ false, "Enable maximum number of request per URI", true ]),
46 46
       OptBool.new('StoreDB', [ false, "Store requests in database", false ]),

+ 1
- 1
modules/auxiliary/docx/word_unc_injector.rb View File

@@ -57,7 +57,7 @@ class Metasploit3 < Msf::Auxiliary
57 57
     metadata_file_data << "2013-01-08T14:14:00Z</dcterms:modified></cp:coreProperties>"
58 58
 
59 59
     #where to find the skeleton files required for creating an empty document
60
-    data_dir = File.join(Msf::Config.install_root, "data", "exploits", "docx")
60
+    data_dir = File.join(Msf::Config.data_directory, "exploits", "docx")
61 61
 
62 62
     zip_data = {}
63 63
 

+ 1
- 1
modules/auxiliary/dos/windows/browser/ms09_065_eot_integer.rb View File

@@ -33,7 +33,7 @@ class Metasploit3 < Msf::Auxiliary
33 33
       'DisclosureDate' => 'Nov 10 2009'
34 34
     ))
35 35
     register_options([
36
-      OptPath.new('EOTFILE', [ true, "The EOT template to use to generate the trigger", File.join(Msf::Config.install_root, "data", "exploits", "pricedown.eot")]),
36
+      OptPath.new('EOTFILE', [ true, "The EOT template to use to generate the trigger", File.join(Msf::Config.data_directory, "exploits", "pricedown.eot")]),
37 37
     ], self.class)
38 38
 
39 39
   end

+ 1
- 1
modules/auxiliary/gather/dns_bruteforce.rb View File

@@ -28,7 +28,7 @@ class Metasploit3 < Msf::Auxiliary
28 28
         OptString.new('DOMAIN', [ true, "The target domain name"]),
29 29
         OptAddress.new('NS', [ false, "Specify the name server to use for queries, otherwise use the system DNS" ]),
30 30
         OptPath.new('WORDLIST', [ true, "Wordlist file for domain name brute force.",
31
-              File.join(Msf::Config.install_root, "data", "wordlists", "namelist.txt")])
31
+              File.join(Msf::Config.data_directory, "wordlists", "namelist.txt")])
32 32
       ], self.class)
33 33
 
34 34
     register_advanced_options(

+ 1
- 1
modules/auxiliary/gather/enum_dns.rb View File

@@ -39,7 +39,7 @@ class Metasploit3 < Msf::Auxiliary
39 39
         OptBool.new('ENUM_IP6', [ true, 'Brute force hosts with IPv6 AAAA records',false]),
40 40
         OptBool.new('ENUM_RVL', [ true, 'Reverse lookup a range of IP addresses', false]),
41 41
         OptBool.new('ENUM_SRV', [ true, 'Enumerate the most common SRV records', true]),
42
-        OptPath.new('WORDLIST', [ false, "Wordlist for domain name bruteforcing", ::File.join(Msf::Config.install_root, "data", "wordlists", "namelist.txt")]),
42
+        OptPath.new('WORDLIST', [ false, "Wordlist for domain name bruteforcing", ::File.join(Msf::Config.data_directory, "wordlists", "namelist.txt")]),
43 43
         OptAddress.new('NS', [ false, "Specify the nameserver to use for queries (default is system DNS)" ]),
44 44
         OptAddressRange.new('IPRANGE', [false, "The target address range or CIDR identifier"]),
45 45
         OptBool.new('STOP_WLDCRD', [ true, 'Stops bruteforce enumeration if wildcard resolution is detected', false])

+ 3
- 3
modules/auxiliary/scanner/couchdb/couchdb_login.rb View File

@@ -33,11 +33,11 @@ class Metasploit3 < Msf::Auxiliary
33 33
         Opt::RPORT(5984),
34 34
         OptString.new('TARGETURI', [false, "TARGETURI for CouchDB. Default here is /", "/"]),
35 35
         OptPath.new('USERPASS_FILE',  [ false, "File containing users and passwords separated by space, one pair per line",
36
-          File.join(Msf::Config.install_root, "data", "wordlists", "http_default_userpass.txt") ]),
36
+          File.join(Msf::Config.data_directory, "wordlists", "http_default_userpass.txt") ]),
37 37
         OptPath.new('USER_FILE',  [ false, "File containing users, one per line",
38
-          File.join(Msf::Config.install_root, "data", "wordlists", "http_default_users.txt") ]),
38
+          File.join(Msf::Config.data_directory, "wordlists", "http_default_users.txt") ]),
39 39
         OptPath.new('PASS_FILE',  [ false, "File containing passwords, one per line",
40
-          File.join(Msf::Config.install_root, "data", "wordlists", "http_default_pass.txt") ]),
40
+          File.join(Msf::Config.data_directory, "wordlists", "http_default_pass.txt") ]),
41 41
         OptBool.new('USER_AS_PASS', [ false, "Try the username as the password for all users", false]),
42 42
       ], self.class)
43 43
   end

+ 3
- 3
modules/auxiliary/scanner/db2/db2_auth.rb View File

@@ -33,11 +33,11 @@ class Metasploit3 < Msf::Auxiliary
33 33
     register_options(
34 34
       [
35 35
         OptPath.new('USERPASS_FILE',  [ false, "File containing (space-seperated) users and passwords, one pair per line",
36
-          File.join(Msf::Config.install_root, "data", "wordlists", "db2_default_userpass.txt") ]),
36
+          File.join(Msf::Config.data_directory, "wordlists", "db2_default_userpass.txt") ]),
37 37
         OptPath.new('USER_FILE',  [ false, "File containing users, one per line",
38
-          File.join(Msf::Config.install_root, "data", "wordlists", "db2_default_user.txt") ]),
38
+          File.join(Msf::Config.data_directory, "wordlists", "db2_default_user.txt") ]),
39 39
         OptPath.new('PASS_FILE',  [ false, "File containing passwords, one per line",
40
-          File.join(Msf::Config.install_root, "data", "wordlists", "db2_default_pass.txt") ]),
40
+          File.join(Msf::Config.data_directory, "wordlists", "db2_default_pass.txt") ]),
41 41
       ], self.class)
42 42
   end
43 43
 

+ 1
- 1
modules/auxiliary/scanner/http/apache_userdir_enum.rb View File

@@ -41,7 +41,7 @@ class Metasploit3 < Msf::Auxiliary
41 41
       [
42 42
         OptString.new('URI', [true, 'The path to users Home Page', '/']),
43 43
         OptPath.new('USER_FILE',  [ true, "File containing users, one per line",
44
-          File.join(Msf::Config.install_root, "data", "wordlists", "unix_users.txt") ]),
44
+          File.join(Msf::Config.data_directory, "wordlists", "unix_users.txt") ]),
45 45
       ], self.class)
46 46
 
47 47
     deregister_options(

+ 1
- 1
modules/auxiliary/scanner/http/brute_dirs.rb View File

@@ -37,7 +37,7 @@ class Metasploit3 < Msf::Auxiliary
37 37
       [
38 38
         OptInt.new('ErrorCode', [ true,  "The expected http code for non existant directories", 404]),
39 39
         OptPath.new('HTTP404Sigs',   [ false, "Path of 404 signatures to use",
40
-            File.join(Msf::Config.install_root, "data", "wmap", "wmap_404s.txt")
40
+            File.join(Msf::Config.data_directory, "wmap", "wmap_404s.txt")
41 41
           ]
42 42
         ),
43 43
         OptBool.new('NoDetailMessages', [ false, "Do not display detailed test messages", true ]),

+ 1
- 1
modules/auxiliary/scanner/http/copy_of_file.rb View File

@@ -36,7 +36,7 @@ class Metasploit3 < Msf::Auxiliary
36 36
       [
37 37
         OptInt.new('ErrorCode', [ true, "Error code for non existent directory", 404]),
38 38
         OptPath.new('HTTP404Sigs',   [ false, "Path of 404 signatures to use",
39
-            File.join(Msf::Config.install_root, "data", "wmap", "wmap_404s.txt")
39
+            File.join(Msf::Config.data_directory, "wmap", "wmap_404s.txt")
40 40
           ]
41 41
         ),
42 42
         OptBool.new('NoDetailMessages', [ false, "Do not display detailed test messages", true ])

+ 2
- 2
modules/auxiliary/scanner/http/dell_idrac.rb View File

@@ -36,9 +36,9 @@ class Metasploit3 < Msf::Auxiliary
36 36
     register_options([
37 37
       OptString.new('TARGETURI', [true, 'Path to the iDRAC Administration page', '/data/login']),
38 38
       OptPath.new('USER_FILE',  [ false, "File containing users, one per line",
39
-        File.join(Msf::Config.install_root, "data", "wordlists", "idrac_default_user.txt") ]),
39
+        File.join(Msf::Config.data_directory, "wordlists", "idrac_default_user.txt") ]),
40 40
       OptPath.new('PASS_FILE',  [ false, "File containing passwords, one per line",
41
-        File.join(Msf::Config.install_root, "data", "wordlists", "idrac_default_pass.txt") ]),
41
+        File.join(Msf::Config.data_directory, "wordlists", "idrac_default_pass.txt") ]),
42 42
       OptInt.new('RPORT', [true, "Default remote port", 443])
43 43
     ], self.class)
44 44
 

+ 1
- 1
modules/auxiliary/scanner/http/dir_scanner.rb View File

@@ -31,7 +31,7 @@ class Metasploit3 < Msf::Auxiliary
31 31
       [
32 32
         OptString.new('PATH', [ true,  "The path  to identify files", '/']),
33 33
         OptPath.new('DICTIONARY',   [ false, "Path of word dictionary to use",
34
-            File.join(Msf::Config.install_root, "data", "wmap", "wmap_dirs.txt")
34
+            File.join(Msf::Config.data_directory, "wmap", "wmap_dirs.txt")
35 35
           ]
36 36
         )
37 37
 

+ 2
- 2
modules/auxiliary/scanner/http/dir_webdav_unicode_bypass.rb View File

@@ -43,11 +43,11 @@ class Metasploit3 < Msf::Auxiliary
43 43
         OptString.new('PATH', [ true,  "The path to identify files", '/']),
44 44
         OptInt.new('ERROR_CODE', [ true, "Error code for non existent directory", 404]),
45 45
         OptPath.new('DICTIONARY',   [ false, "Path of word dictionary to use",
46
-            File.join(Msf::Config.install_root, "data", "wmap", "wmap_dirs.txt")
46
+            File.join(Msf::Config.data_directory, "wmap", "wmap_dirs.txt")
47 47
           ]
48 48
         ),
49 49
         OptPath.new('HTTP404S',   [ false, "Path of 404 signatures to use",
50
-            File.join(Msf::Config.install_root, "data", "wmap", "wmap_404s.txt")
50
+            File.join(Msf::Config.data_directory, "wmap", "wmap_404s.txt")
51 51
           ]
52 52
         )
53 53
       ], self.class)

+ 1
- 1
modules/auxiliary/scanner/http/dlink_dir_300_615_http_login.rb View File

@@ -41,7 +41,7 @@ class Metasploit3 < Msf::Auxiliary
41 41
       [
42 42
         OptString.new('USERNAME',  [ false, "Username for authentication (default: admin)","admin" ]),
43 43
         OptPath.new('PASS_FILE',  [ false, "File containing passwords, one per line",
44
-          File.join(Msf::Config.install_root, "data", "wordlists", "http_default_pass.txt") ]),
44
+          File.join(Msf::Config.data_directory, "wordlists", "http_default_pass.txt") ]),
45 45
       ], self.class)
46 46
   end
47 47
 

+ 1
- 1
modules/auxiliary/scanner/http/dlink_dir_615h_http_login.rb View File

@@ -39,7 +39,7 @@ class Metasploit3 < Msf::Auxiliary
39 39
       [
40 40
         OptString.new('USERNAME',  [ false, "Username for authentication (default: admin)","admin" ]),
41 41
         OptPath.new('PASS_FILE',  [ false, "File containing passwords, one per line",
42
-          File.join(Msf::Config.install_root, "data", "wordlists", "http_default_pass.txt") ]),
42
+          File.join(Msf::Config.data_directory, "wordlists", "http_default_pass.txt") ]),
43 43
       ], self.class)
44 44
   end
45 45
 

+ 1
- 1
modules/auxiliary/scanner/http/dlink_dir_session_cgi_http_login.rb View File

@@ -42,7 +42,7 @@ class Metasploit3 < Msf::Auxiliary
42 42
       [
43 43
         OptString.new('USERNAME',  [ false, "Username for authentication (default: admin)","admin" ]),
44 44
         OptPath.new('PASS_FILE',  [ false, "File containing passwords, one per line",
45
-          File.join(Msf::Config.install_root, "data", "wordlists", "http_default_pass.txt") ]),
45
+          File.join(Msf::Config.data_directory, "wordlists", "http_default_pass.txt") ]),
46 46
       ], self.class)
47 47
   end
48 48
 

+ 3
- 3
modules/auxiliary/scanner/http/dolibarr_login.rb View File

@@ -28,11 +28,11 @@ class Metasploit3 < Msf::Auxiliary
28 28
     register_options(
29 29
       [
30 30
         OptPath.new('USERPASS_FILE',  [ false, "File containing users and passwords separated by space, one pair per line",
31
-          File.join(Msf::Config.install_root, "data", "wordlists", "http_default_userpass.txt") ]),
31
+          File.join(Msf::Config.data_directory, "wordlists", "http_default_userpass.txt") ]),
32 32
         OptPath.new('USER_FILE',  [ false, "File containing users, one per line",
33
-          File.join(Msf::Config.install_root, "data", "wordlists", "http_default_users.txt") ]),
33
+          File.join(Msf::Config.data_directory, "wordlists", "http_default_users.txt") ]),
34 34
         OptPath.new('PASS_FILE',  [ false, "File containing passwords, one per line",
35
-          File.join(Msf::Config.install_root, "data", "wordlists", "http_default_pass.txt") ]),
35
+          File.join(Msf::Config.data_directory, "wordlists", "http_default_pass.txt") ]),
36 36
         OptString.new('TARGETURI', [true, 'The URI path to dolibarr', '/dolibarr/'])
37 37
       ], self.class)
38 38
   end

+ 1
- 1
modules/auxiliary/scanner/http/ektron_cms400net.rb View File

@@ -35,7 +35,7 @@ class Metasploit3 < Msf::Auxiliary
35 35
           [
36 36
             false,
37 37
             "File containing users and passwords",
38
-            File.join(Msf::Config.install_root, "data", "wordlists", "cms400net_default_userpass.txt")
38
+            File.join(Msf::Config.data_directory, "wordlists", "cms400net_default_userpass.txt")
39 39
           ])
40 40
       ], self.class)
41 41
 

+ 2
- 2
modules/auxiliary/scanner/http/files_dir.rb View File

@@ -31,7 +31,7 @@ class Metasploit3 < Msf::Auxiliary
31 31
         OptString.new('PATH', [ true,  "The path  to identify files", '/']),
32 32
         OptString.new('EXT', [ false, "Append file extension to use", '']),
33 33
         OptPath.new('DICTIONARY',   [ false, "Path of word dictionary to use",
34
-            File.join(Msf::Config.install_root, "data", "wmap", "wmap_files.txt")
34
+            File.join(Msf::Config.data_directory, "wmap", "wmap_files.txt")
35 35
           ]
36 36
         )
37 37
       ], self.class)
@@ -40,7 +40,7 @@ class Metasploit3 < Msf::Auxiliary
40 40
       [
41 41
         OptInt.new('ErrorCode', [ true,  "The expected http code for non existant files", 404]),
42 42
         OptPath.new('HTTP404Sigs',   [ false, "Path of 404 signatures to use",
43
-            File.join(Msf::Config.install_root, "data", "wmap", "wmap_404s.txt")
43
+            File.join(Msf::Config.data_directory, "wmap", "wmap_404s.txt")
44 44
           ]
45 45
         ),
46 46
         OptBool.new('NoDetailMessages', [ false, "Do not display detailed test messages", true ]),

+ 3
- 3
modules/auxiliary/scanner/http/hp_sys_mgmt_login.rb View File

@@ -29,11 +29,11 @@ class Metasploit3 < Msf::Auxiliary
29 29
       [
30 30
         Opt::RPORT(2381),
31 31
         OptPath.new('USERPASS_FILE',  [ false, "File containing users and passwords separated by space, one pair per line",
32
-          File.join(Msf::Config.install_root, "data", "wordlists", "http_default_userpass.txt") ]),
32
+          File.join(Msf::Config.data_directory, "wordlists", "http_default_userpass.txt") ]),
33 33
         OptPath.new('USER_FILE',  [ false, "File containing users, one per line",
34
-          File.join(Msf::Config.install_root, "data", "wordlists", "http_default_users.txt") ]),
34
+          File.join(Msf::Config.data_directory, "wordlists", "http_default_users.txt") ]),
35 35
         OptPath.new('PASS_FILE',  [ false, "File containing passwords, one per line",
36
-          File.join(Msf::Config.install_root, "data", "wordlists", "http_default_pass.txt") ]),
36
+          File.join(Msf::Config.data_directory, "wordlists", "http_default_pass.txt") ]),
37 37
       ], self.class)
38 38
   end
39 39
 

+ 3
- 3
modules/auxiliary/scanner/http/http_login.rb View File

@@ -37,11 +37,11 @@ class Metasploit3 < Msf::Auxiliary
37 37
     register_options(
38 38
       [
39 39
         OptPath.new('USERPASS_FILE',  [ false, "File containing users and passwords separated by space, one pair per line",
40
-          File.join(Msf::Config.install_root, "data", "wordlists", "http_default_userpass.txt") ]),
40
+          File.join(Msf::Config.data_directory, "wordlists", "http_default_userpass.txt") ]),
41 41
         OptPath.new('USER_FILE',  [ false, "File containing users, one per line",
42
-          File.join(Msf::Config.install_root, "data", "wordlists", "http_default_users.txt") ]),
42
+          File.join(Msf::Config.data_directory, "wordlists", "http_default_users.txt") ]),
43 43
         OptPath.new('PASS_FILE',  [ false, "File containing passwords, one per line",
44
-          File.join(Msf::Config.install_root, "data", "wordlists", "http_default_pass.txt") ]),
44
+          File.join(Msf::Config.data_directory, "wordlists", "http_default_pass.txt") ]),
45 45
         OptString.new('AUTH_URI', [ false, "The URI to authenticate against (default:auto)" ]),
46 46
         OptString.new('REQUESTTYPE', [ false, "Use HTTP-GET or HTTP-PUT for Digest-Auth, PROPFIND for WebDAV (default:GET)", "GET" ])
47 47
       ], self.class)

+ 1
- 1
modules/auxiliary/scanner/http/joomla_plugins.rb View File

@@ -27,7 +27,7 @@ class Metasploit3 < Msf::Auxiliary
27 27
     register_options(
28 28
       [
29 29
         OptString.new('TARGETURI', [ true,  "The path to the Joomla install", '/']),
30
-        OptPath.new('PLUGINS',   [ true, "Path to list of plugins to enumerate", File.join(Msf::Config.install_root, "data", "wordlists", "joomla.txt")])
30
+        OptPath.new('PLUGINS',   [ true, "Path to list of plugins to enumerate", File.join(Msf::Config.data_directory, "wordlists", "joomla.txt")])
31 31
       ], self.class)
32 32
   end
33 33
 

+ 1
- 1
modules/auxiliary/scanner/http/linksys_e1500_traversal.rb View File

@@ -34,7 +34,7 @@ class Metasploit3 < Msf::Auxiliary
34 34
     register_options(
35 35
       [
36 36
         OptPath.new('SENSITIVE_FILES',  [ true, "File containing senstive files, one per line",
37
-          File.join(Msf::Config.install_root, "data", "wordlists", "sensitive_files.txt") ]),
37
+          File.join(Msf::Config.data_directory, "wordlists", "sensitive_files.txt") ]),
38 38
         OptString.new('USERNAME',[ true, 'User to login with', 'admin']),
39 39
         OptString.new('PASSWORD',[ true, 'Password to login with', 'password']),
40 40
 

+ 1
- 1
modules/auxiliary/scanner/http/mod_negotiation_brute.rb View File

@@ -32,7 +32,7 @@ class Metasploit3 < Msf::Auxiliary
32 32
       [
33 33
         OptString.new('PATH', [ true,  "The path to detect mod_negotiation", '/']),
34 34
         OptPath.new('FILEPATH',[true, "path to file with file names",
35
-          File.join(Msf::Config.install_root, "data", "wmap", "wmap_files.txt")])
35
+          File.join(Msf::Config.data_directory, "wmap", "wmap_files.txt")])
36 36
       ], self.class)
37 37
   end
38 38
 

+ 1
- 1
modules/auxiliary/scanner/http/netgear_sph200d_traversal.rb View File

@@ -32,7 +32,7 @@ class Metasploit3 < Msf::Auxiliary
32 32
     register_options(
33 33
       [
34 34
         OptPath.new('FILELIST',  [ true, "File containing sensitive files, one per line",
35
-          File.join(Msf::Config.install_root, "data", "wordlists", "sensitive_files.txt") ]),
35
+          File.join(Msf::Config.data_directory, "wordlists", "sensitive_files.txt") ]),
36 36
         OptString.new('USERNAME',[ true, 'User to login with', 'admin']),
37 37
         OptString.new('PASSWORD',[ true, 'Password to login with', 'password'])
38 38
       ], self.class)

+ 1
- 1
modules/auxiliary/scanner/http/ntlm_info_enumeration.rb View File

@@ -28,7 +28,7 @@ class Metasploit3 < Msf::Auxiliary
28 28
     )
29 29
     register_options(
30 30
       [
31
-        OptPath.new('TARGETURIS', [ true, "Path to list of URIs to request", File.join(Msf::Config.install_root, "data", "wordlists", "http_owa_common.txt")])
31
+        OptPath.new('TARGETURIS', [ true, "Path to list of URIs to request", File.join(Msf::Config.data_directory, "wordlists", "http_owa_common.txt")])
32 32
       ], self.class)
33 33
   end
34 34
 

+ 1
- 1
modules/auxiliary/scanner/http/replace_ext.rb View File

@@ -38,7 +38,7 @@ class Metasploit3 < Msf::Auxiliary
38 38
       [
39 39
         OptInt.new('ErrorCode', [ true,  "The expected http code for non existant files", 404]),
40 40
         OptPath.new('HTTP404Sigs',   [ false, "Path of 404 signatures to use",
41
-            File.join(Msf::Config.install_root, "data", "wmap", "wmap_404s.txt")
41
+            File.join(Msf::Config.data_directory, "wmap", "wmap_404s.txt")
42 42
           ]
43 43
         ),
44 44
         OptBool.new('NoDetailMessages', [ false, "Do not display detailed test messages", true ])

+ 3
- 3
modules/auxiliary/scanner/http/splunk_web_login.rb View File

@@ -38,11 +38,11 @@ class Metasploit3 < Msf::Auxiliary
38 38
         Opt::RPORT(8000),
39 39
         OptString.new('URI', [true, "URI for Splunk Web login. Default is /en-US/account/login", "/en-US/account/login"]),
40 40
         OptPath.new('USERPASS_FILE',  [ false, "File containing users and passwords separated by space, one pair per line",
41
-          File.join(Msf::Config.install_root, "data", "wordlists", "http_default_userpass.txt") ]),
41
+          File.join(Msf::Config.data_directory, "wordlists", "http_default_userpass.txt") ]),
42 42
         OptPath.new('USER_FILE',  [ false, "File containing users, one per line",
43
-          File.join(Msf::Config.install_root, "data", "wordlists", "http_default_users.txt") ]),
43
+          File.join(Msf::Config.data_directory, "wordlists", "http_default_users.txt") ]),
44 44
         OptPath.new('PASS_FILE',  [ false, "File containing passwords, one per line",
45
-          File.join(Msf::Config.install_root, "data", "wordlists", "http_default_pass.txt") ])
45
+          File.join(Msf::Config.data_directory, "wordlists", "http_default_pass.txt") ])
46 46
       ], self.class)
47 47
   end
48 48
 

+ 1
- 1
modules/auxiliary/scanner/http/svn_scanner.rb View File

@@ -36,7 +36,7 @@ class Metasploit3 < Msf::Auxiliary
36 36
       [
37 37
         OptInt.new('ErrorCode', [ true, "Error code for non existent directory", 404]),
38 38
         OptPath.new('HTTP404Sigs',   [ false, "Path of 404 signatures to use",
39
-            File.join(Msf::Config.install_root, "data", "wmap", "wmap_404s.txt")
39
+            File.join(Msf::Config.data_directory, "wmap", "wmap_404s.txt")
40 40
           ]
41 41
         ),
42 42
         OptBool.new('NoDetailMessages', [ false, "Do not display detailed test messages", true ])

+ 1
- 1
modules/auxiliary/scanner/http/tomcat_enum.rb View File

@@ -46,7 +46,7 @@ class Metasploit3 < Msf::Auxiliary
46 46
         Opt::RPORT(8080),
47 47
         OptString.new('URI', [true, 'The path of the Apache Tomcat Administration page', '/admin/j_security_check']),
48 48
         OptPath.new('USER_FILE',  [ true, "File containing users, one per line",
49
-          File.join(Msf::Config.install_root, "data", "wordlists", "tomcat_mgr_default_users.txt") ]),
49
+          File.join(Msf::Config.data_directory, "wordlists", "tomcat_mgr_default_users.txt") ]),
50 50
       ], self.class)
51 51
 
52 52
     deregister_options('PASSWORD','PASS_FILE','USERPASS_FILE','USER_AS_PASS','STOP_ON_SUCCESS','BLANK_PASSWORDS','USERNAME')

+ 3
- 3
modules/auxiliary/scanner/http/tomcat_mgr_login.rb View File

@@ -60,11 +60,11 @@ class Metasploit3 < Msf::Auxiliary
60 60
         Opt::RPORT(8080),
61 61
         OptString.new('URI', [true, "URI for Manager login. Default is /manager/html", "/manager/html"]),
62 62
         OptPath.new('USERPASS_FILE',  [ false, "File containing users and passwords separated by space, one pair per line",
63
-          File.join(Msf::Config.install_root, "data", "wordlists", "tomcat_mgr_default_userpass.txt") ]),
63
+          File.join(Msf::Config.data_directory, "wordlists", "tomcat_mgr_default_userpass.txt") ]),
64 64
         OptPath.new('USER_FILE',  [ false, "File containing users, one per line",
65
-          File.join(Msf::Config.install_root, "data", "wordlists", "tomcat_mgr_default_users.txt") ]),
65
+          File.join(Msf::Config.data_directory, "wordlists", "tomcat_mgr_default_users.txt") ]),
66 66
         OptPath.new('PASS_FILE',  [ false, "File containing passwords, one per line",
67
-          File.join(Msf::Config.install_root, "data", "wordlists", "tomcat_mgr_default_pass.txt") ]),
67
+          File.join(Msf::Config.data_directory, "wordlists", "tomcat_mgr_default_pass.txt") ]),
68 68
       ], self.class)
69 69
 
70 70
     register_autofilter_ports([ 80, 443, 8080, 8081, 8000, 8008, 8443, 8444, 8880, 8888, 9080, 19300 ])

+ 1
- 1
modules/auxiliary/scanner/http/tplink_traversal_noauth.rb View File

@@ -35,7 +35,7 @@ class Metasploit3 < Msf::Auxiliary
35 35
     register_options(
36 36
       [
37 37
         OptPath.new('SENSITIVE_FILES',  [ true, "File containing senstive files, one per line",
38
-          File.join(Msf::Config.install_root, "data", "wordlists", "sensitive_files.txt") ]),
38
+          File.join(Msf::Config.data_directory, "wordlists", "sensitive_files.txt") ]),
39 39
       ], self.class)
40 40
   end
41 41
 

+ 3
- 3
modules/auxiliary/scanner/http/vcms_login.rb View File

@@ -28,11 +28,11 @@ class Metasploit3 < Msf::Auxiliary
28 28
     register_options(
29 29
       [
30 30
         OptPath.new('USERPASS_FILE',  [ false, "File containing users and passwords separated by space, one pair per line",
31
-          File.join(Msf::Config.install_root, "data", "wordlists", "http_default_userpass.txt") ]),
31
+          File.join(Msf::Config.data_directory, "wordlists", "http_default_userpass.txt") ]),
32 32
         OptPath.new('USER_FILE',  [ false, "File containing users, one per line",
33
-          File.join(Msf::Config.install_root, "data", "wordlists", "http_default_users.txt") ]),
33
+          File.join(Msf::Config.data_directory, "wordlists", "http_default_users.txt") ]),
34 34
         OptPath.new('PASS_FILE',  [ false, "File containing passwords, one per line",
35
-          File.join(Msf::Config.install_root, "data", "wordlists", "http_default_pass.txt") ]),
35
+          File.join(Msf::Config.data_directory, "wordlists", "http_default_pass.txt") ]),
36 36
         OptString.new('TARGETURI', [true, 'The URI path to dolibarr', '/vcms2/'])
37 37
       ], self.class)
38 38
   end

+ 1
- 1
modules/auxiliary/scanner/http/web_vulndb.rb View File

@@ -34,7 +34,7 @@ class Metasploit3 < Msf::Auxiliary
34 34
       [
35 35
         OptInt.new('ErrorCode', [ true,  "The expected http code for non existant files", 404]),
36 36
         OptPath.new('HTTP404Sigs',   [ false, "Path of 404 signatures to use",
37
-            File.join(Msf::Config.install_root, "data", "wmap", "wmap_404s.txt")
37
+            File.join(Msf::Config.data_directory, "wmap", "wmap_404s.txt")
38 38
           ]
39 39
         ),
40 40
         OptBool.new('NoDetailMessages', [ false, "Do not display detailed test messages", true ]),

+ 2
- 2
modules/auxiliary/scanner/misc/cctv_dvr_login.rb View File

@@ -46,14 +46,14 @@ class Metasploit3 < Msf::Auxiliary
46 46
         [
47 47
           false,
48 48
           "File containing usernames, one per line",
49
-          File.join(Msf::Config.install_root, "data", "wordlists", "multi_vendor_cctv_dvr_users.txt")
49
+          File.join(Msf::Config.data_directory, "wordlists", "multi_vendor_cctv_dvr_users.txt")
50 50
         ]),
51 51
       OptPath.new(
52 52
         'PASS_FILE',
53 53
         [
54 54
           false,
55 55
           "File containing passwords, one per line",
56
-          File.join(Msf::Config.install_root, "data", "wordlists", "multi_vendor_cctv_dvr_pass.txt")
56
+          File.join(Msf::Config.data_directory, "wordlists", "multi_vendor_cctv_dvr_pass.txt")
57 57
         ]),
58 58
       OptBool.new('STOP_ON_SUCCESS', [false, "Stop guessing when a credential works for a host", true]),
59 59
       OptPort.new('HTTP_PORT', [true, "The HTTP port for the IE ActiveX web client interface", 80]),

+ 1
- 1
modules/auxiliary/scanner/oracle/isqlplus_login.rb View File

@@ -42,7 +42,7 @@ class Metasploit3 < Msf::Auxiliary
42 42
         OptString.new('SID', [ false, 'Oracle SID' ]),
43 43
         OptInt.new('TIMEOUT', [false, 'Time to wait for HTTP responses', 60]),
44 44
         OptPath.new('USERPASS_FILE',  [ false, "File containing users and passwords separated by space, one pair per line",
45
-          File.join(Msf::Config.install_root, "data", "wordlists", "oracle_default_userpass.txt") ]),
45
+          File.join(Msf::Config.data_directory, "wordlists", "oracle_default_userpass.txt") ]),
46 46
         OptBool.new('USER_AS_PASS', [ false, "Try the username as the password for all users", false]),
47 47
       ], self.class)
48 48
 

+ 1
- 1
modules/auxiliary/scanner/oracle/oracle_login.rb View File

@@ -39,7 +39,7 @@ class Metasploit3 < Msf::Auxiliary
39 39
     register_options(
40 40
       [
41 41
         OptPath.new('USERPASS_FILE',  [ false, "File containing (space-seperated) users and passwords, one pair per line",
42
-          File.join(Msf::Config.install_root, "data", "wordlists", "oracle_default_userpass.txt") ]),
42
+          File.join(Msf::Config.data_directory, "wordlists", "oracle_default_userpass.txt") ]),
43 43
         OptString.new('SID', [ true, 'The instance (SID) to authenticate against', 'XE'])
44 44
       ], self.class)
45 45
 

+ 1
- 1
modules/auxiliary/scanner/oracle/sid_brute.rb View File

@@ -30,7 +30,7 @@ class Metasploit3 < Msf::Auxiliary
30 30
 
31 31
     register_options(
32 32
       [
33
-        OptPath.new('SID_FILE', [ false, "File containing instance names, one per line", File.join(Msf::Config.install_root, "data", "wordlists", "sid.txt") ]),
33
+        OptPath.new('SID_FILE', [ false, "File containing instance names, one per line", File.join(Msf::Config.data_directory, "wordlists", "sid.txt") ]),
34 34
         OptString.new('SID', [ false, 'A specific SID to attempt.' ]),
35 35
         Opt::RPORT(1521)
36 36
       ], self.class)

+ 3
- 3
modules/auxiliary/scanner/postgres/postgres_login.rb View File

@@ -36,11 +36,11 @@ class Metasploit3 < Msf::Auxiliary
36 36
     register_options(
37 37
       [
38 38
         OptPath.new('USERPASS_FILE',  [ false, "File containing (space-seperated) users and passwords, one pair per line",
39
-          File.join(Msf::Config.install_root, "data", "wordlists", "postgres_default_userpass.txt") ]),
39
+          File.join(Msf::Config.data_directory, "wordlists", "postgres_default_userpass.txt") ]),
40 40
         OptPath.new('USER_FILE',      [ false, "File containing users, one per line",
41
-          File.join(Msf::Config.install_root, "data", "wordlists", "postgres_default_user.txt") ]),
41
+          File.join(Msf::Config.data_directory, "wordlists", "postgres_default_user.txt") ]),
42 42
         OptPath.new('PASS_FILE',      [ false, "File containing passwords, one per line",
43
-          File.join(Msf::Config.install_root, "data", "wordlists", "postgres_default_pass.txt") ]),
43
+          File.join(Msf::Config.data_directory, "wordlists", "postgres_default_pass.txt") ]),
44 44
       ], self.class)
45 45
 
46 46
     deregister_options('SQL')

+ 1
- 1
modules/auxiliary/scanner/snmp/snmp_login.rb View File

@@ -35,7 +35,7 @@ class Metasploit3 < Msf::Auxiliary
35 35
       OptInt.new('BATCHSIZE', [true, 'The number of hosts to probe in each set', 256]),
36 36
       OptString.new('PASSWORD', [ false, 'The password to test' ]),
37 37
       OptPath.new('PASS_FILE',  [ false, "File containing communities, one per line",
38
-        File.join(Msf::Config.install_root, "data", "wordlists", "snmp_default_pass.txt")
38
+        File.join(Msf::Config.data_directory, "wordlists", "snmp_default_pass.txt")
39 39
       ])
40 40
     ], self.class)
41 41
 

+ 1
- 1
modules/auxiliary/scanner/tftp/tftpbrute.rb View File

@@ -26,7 +26,7 @@ class Metasploit3 < Msf::Auxiliary
26 26
         Opt::RPORT(69),
27 27
         Opt::CHOST,
28 28
         OptPath.new('DICTIONARY', [ true, 'The list of filenames',
29
-          File.join(Msf::Config.install_root, "data", "wordlists", "tftp.txt") ])
29
+          File.join(Msf::Config.data_directory, "wordlists", "tftp.txt") ])
30 30
       ], self.class)
31 31
   end
32 32
 

+ 3
- 3
modules/auxiliary/server/capture/http.rb View File

@@ -39,15 +39,15 @@ class Metasploit3 < Msf::Auxiliary
39 39
       [
40 40
         OptPort.new('SRVPORT',    [ true, "The local port to listen on.", 80 ]),
41 41
         OptPath.new('TEMPLATE',   [ false, "The HTML template to serve in responses",
42
-            File.join(Msf::Config.install_root, "data", "exploits", "capture", "http", "index.html")
42
+            File.join(Msf::Config.data_directory, "exploits", "capture", "http", "index.html")
43 43
           ]
44 44
         ),
45 45
         OptPath.new('SITELIST',   [ false, "The list of URLs that should be used for cookie capture",
46
-            File.join(Msf::Config.install_root, "data", "exploits", "capture", "http", "sites.txt")
46
+            File.join(Msf::Config.data_directory, "exploits", "capture", "http", "sites.txt")
47 47
           ]
48 48
         ),
49 49
         OptPath.new('FORMSDIR',   [ false, "The directory containing form snippets (example.com.txt)",
50
-            File.join(Msf::Config.install_root, "data", "exploits", "capture", "http", "forms")
50
+            File.join(Msf::Config.data_directory, "exploits", "capture", "http", "forms")
51 51
           ]
52 52
         ),
53 53
         OptAddress.new('AUTOPWN_HOST',[ false, "The IP address of the browser_autopwn service ", nil ]),

+ 1
- 1
modules/auxiliary/sniffer/psnuffle.rb View File

@@ -47,7 +47,7 @@ class Metasploit3 < Msf::Auxiliary
47 47
 
48 48
     register_advanced_options([
49 49
       OptPath.new('ProtocolBase', [true,	'The base directory containing the protocol decoders',
50
-        File.join(Msf::Config.install_root, "data", "exploits", "psnuffle")
50
+        File.join(Msf::Config.data_directory, "exploits", "psnuffle")
51 51
       ]),
52 52
     ], self.class)
53 53
     deregister_options('RHOST')

+ 1
- 1
modules/auxiliary/spoof/wifi/airpwn.rb View File

@@ -45,7 +45,7 @@ class Metasploit3 < Msf::Auxiliary
45 45
     register_options(
46 46
       [
47 47
         OptPath.new('SITELIST',	  [ false, "YAML file of URL/Replacement pairs for GET replacement",
48
-            File.join(Msf::Config.install_root, "data", "exploits", "wifi", "airpwn", "sitelist.yml")
48
+            File.join(Msf::Config.data_directory, "exploits", "wifi", "airpwn", "sitelist.yml")
49 49
           ]),
50 50
         OptBool.new('USESITEFILE', [ true, "Use site list file for match/response", "false"]),
51 51
         OptString.new('FILTER',	  [ true, "Default BPF filter", "port 80"]),

+ 1
- 1
modules/auxiliary/spoof/wifi/dnspwn.rb View File

@@ -28,7 +28,7 @@ class Metasploit3 < Msf::Auxiliary
28 28
     register_options(
29 29
       [
30 30
         OptPath.new('DNSLIST',	  [ false, "YAML file of DNS entries for replacement",
31
-            File.join(Msf::Config.install_root, "data", "exploits", "wifi", "dnspwn", "dnslist.yml")
31
+            File.join(Msf::Config.data_directory, "exploits", "wifi", "dnspwn", "dnslist.yml")
32 32
           ]),
33 33
         OptBool.new('USEDNSFILE', [ true, "Use dns list file for response", "false"]),
34 34
         OptString.new('FILTER',	  [ true, "Default BPF filter", "port 53"]),

+ 1
- 1
modules/exploits/freebsd/local/mmap.rb View File

@@ -82,7 +82,7 @@ class Metasploit4 < Msf::Exploit::Local
82 82
     #
83 83
     # Metasm does not support FreeBSD executable generation.
84 84
     #
85
-    path = File.join(Msf::Config.install_root, "data", "exploits", "CVE-2013-2171.bin")
85
+    path = File.join(Msf::Config.data_directory, "exploits", "CVE-2013-2171.bin")
86 86
     x = File.open(path, 'rb') { |f| f.read(f.stat.size) }
87 87
     x.gsub(/MSFABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890/, payload_fname.ljust(40, "\x00"))
88 88
   end

+ 1
- 1
modules/exploits/linux/browser/adobe_flashplayer_aslaunch.rb View File

@@ -54,7 +54,7 @@ class Metasploit3 < Msf::Exploit::Remote
54 54
   end
55 55
 
56 56
   def exploit
57
-    path = File.join( Msf::Config.install_root, "data", "exploits", "CVE-2008-5499.swf" )
57
+    path = File.join( Msf::Config.data_directory, "exploits", "CVE-2008-5499.swf" )
58 58
     fd = File.open( path, "rb" )
59 59
     @swf = fd.read(fd.stat.size)
60 60
     fd.close

+ 1
- 1
modules/exploits/multi/browser/firefox_svg_plugin.rb View File

@@ -159,7 +159,7 @@ class Metasploit3 < Msf::Exploit::Remote
159 159
 
160 160
   # @return [String] the contents of the .swf file used to trigger the exploit
161 161
   def flash_trigger
162
-    swf_path = File.join(Msf::Config.install_root, "data", "exploits", "cve-2013-0758.swf")
162
+    swf_path = File.join(Msf::Config.data_directory, "exploits", "cve-2013-0758.swf")
163 163
     @flash_trigger ||= File.read(swf_path)
164 164
   end
165 165
 

+ 1
- 1
modules/exploits/multi/browser/java_atomicreferencearray.rb View File

@@ -89,7 +89,7 @@ class Metasploit3 < Msf::Exploit::Remote
89 89
 
90 90
   def exploit
91 91
     # load the static jar file
92
-    path = File.join( Msf::Config.install_root, "data", "exploits", "CVE-2012-0507.jar" )
92
+    path = File.join( Msf::Config.data_directory, "exploits", "CVE-2012-0507.jar" )
93 93
     fd = File.open( path, "rb" )
94 94
     @jar_data = fd.read(fd.stat.size)
95 95
     fd.close

+ 1
- 1
modules/exploits/multi/browser/java_calendar_deserialize.rb View File

@@ -85,7 +85,7 @@ class Metasploit3 < Msf::Exploit::Remote
85 85
 
86 86
   def exploit
87 87
     # load the static jar file
88
-    path = File.join( Msf::Config.install_root, "data", "exploits", "CVE-2008-5353.jar" )
88
+    path = File.join( Msf::Config.data_directory, "exploits", "CVE-2008-5353.jar" )
89 89
     fd = File.open( path, "rb" )
90 90
     @jar_data = fd.read(fd.stat.size)
91 91
     fd.close

+ 1
- 1
modules/exploits/multi/browser/java_getsoundbank_bof.rb View File

@@ -92,7 +92,7 @@ No automatic targetting for now ...
92 92
 
93 93
   def exploit
94 94
     # load the static jar
95
-    path = File.join(Msf::Config.install_root, "data", "exploits", "CVE-2009-3867.jar")
95
+    path = File.join(Msf::Config.data_directory, "exploits", "CVE-2009-3867.jar")
96 96
     fd = File.open(path, "rb")
97 97
     @jar_data = fd.read(fd.stat.size)
98 98
     fd.close

+ 5
- 5
modules/exploits/multi/browser/java_jre17_driver_manager.rb View File

@@ -80,15 +80,15 @@ class Metasploit3 < Msf::Exploit::Remote
80 80
 
81 81
 
82 82
   def setup
83
-    path = File.join(Msf::Config.install_root, "data", "exploits", "cve-2013-1488", "Exploit.class")
83
+    path = File.join(Msf::Config.data_directory, "exploits", "cve-2013-1488", "Exploit.class")
84 84
     @exploit_class = File.open(path, "rb") {|fd| fd.read(fd.stat.size) }
85
-    path = File.join(Msf::Config.install_root, "data", "exploits", "cve-2013-1488", "FakeDriver.class")
85
+    path = File.join(Msf::Config.data_directory, "exploits", "cve-2013-1488", "FakeDriver.class")
86 86
     @driver_class = File.open(path, "rb") {|fd| fd.read(fd.stat.size) }
87
-    path = File.join(Msf::Config.install_root, "data", "exploits", "cve-2013-1488", "FakeDriver2.class")
87
+    path = File.join(Msf::Config.data_directory, "exploits", "cve-2013-1488", "FakeDriver2.class")
88 88
     @driver2_class = File.open(path, "rb") {|fd| fd.read(fd.stat.size) }
89
-    path = File.join(Msf::Config.install_root, "data", "exploits", "cve-2013-1488", "META-INF", "services", "java.lang.Object")
89
+    path = File.join(Msf::Config.data_directory, "exploits", "cve-2013-1488", "META-INF", "services", "java.lang.Object")
90 90
     @object_services = File.open(path, "rb") {|fd| fd.read(fd.stat.size) }
91
-    path = File.join(Msf::Config.install_root, "data", "exploits", "cve-2013-1488", "META-INF", "services", "java.sql.Driver")
91
+    path = File.join(Msf::Config.data_directory, "exploits", "cve-2013-1488", "META-INF", "services", "java.sql.Driver")
92 92
     @driver_services = File.open(path, "rb") {|fd| fd.read(fd.stat.size) }
93 93
 
94 94
     @exploit_class_name = rand_text_alpha("Exploit".length)

+ 1
- 1
modules/exploits/multi/browser/java_jre17_exec.rb View File

@@ -112,7 +112,7 @@ class Metasploit3 < Msf::Exploit::Remote
112 112
           jar.add_file(full, '')
113 113
         end
114 114
       end
115
-      fd = File.open(File.join( Msf::Config.install_root, "data", "exploits", "CVE-2012-4681", path ), "rb")
115
+      fd = File.open(File.join( Msf::Config.data_directory, "exploits", "CVE-2012-4681", path ), "rb")
116 116
       data = fd.read(fd.stat.size)
117 117
       jar.add_file(path.join("/"), data)
118 118
       fd.close

+ 2
- 2
modules/exploits/multi/browser/java_jre17_glassfish_averagerangestatisticimpl.rb View File

@@ -78,9 +78,9 @@ class Metasploit3 < Msf::Exploit::Remote
78 78
 
79 79
 
80 80
   def setup
81
-    path = File.join(Msf::Config.install_root, "data", "exploits", "cve-2012-5076_2", "Exploit.class")
81
+    path = File.join(Msf::Config.data_directory, "exploits", "cve-2012-5076_2", "Exploit.class")
82 82
     @exploit_class = File.open(path, "rb") {|fd| fd.read(fd.stat.size) }
83
-    path = File.join(Msf::Config.install_root, "data", "exploits", "cve-2012-5076_2", "B.class")
83
+    path = File.join(Msf::Config.data_directory, "exploits", "cve-2012-5076_2", "B.class")
84 84
     @loader_class = File.open(path, "rb") {|fd| fd.read(fd.stat.size) }
85 85
 
86 86
     @exploit_class_name = rand_text_alpha("Exploit".length)

+ 1
- 1
modules/exploits/multi/browser/java_jre17_jaxws.rb View File

@@ -96,7 +96,7 @@ class Metasploit3 < Msf::Exploit::Remote
96 96
           jar.add_file(full, '')
97 97
         end
98 98
       end
99
-      fd = File.open(File.join( Msf::Config.install_root, "data", "exploits", "cve-2012-5076", path ), "rb")
99
+      fd = File.open(File.join( Msf::Config.data_directory, "exploits", "cve-2012-5076", path ), "rb")
100 100
       data = fd.read(fd.stat.size)
101 101
       jar.add_file(path.join("/"), data)
102 102
       fd.close

+ 2
- 2
modules/exploits/multi/browser/java_jre17_jmxbean.rb View File

@@ -79,9 +79,9 @@ class Metasploit3 < Msf::Exploit::Remote
79 79
 
80 80
 
81 81
   def setup
82
-    path = File.join(Msf::Config.install_root, "data", "exploits", "cve-2013-0422", "Exploit.class")
82
+    path = File.join(Msf::Config.data_directory, "exploits", "cve-2013-0422", "Exploit.class")
83 83
     @exploit_class = File.open(path, "rb") {|fd| fd.read(fd.stat.size) }
84
-    path = File.join(Msf::Config.install_root, "data", "exploits", "cve-2013-0422", "B.class")
84
+    path = File.join(Msf::Config.data_directory, "exploits", "cve-2013-0422", "B.class")
85 85
     @loader_class = File.open(path, "rb") {|fd| fd.read(fd.stat.size) }
86 86
 
87 87
     @exploit_class_name = rand_text_alpha("Exploit".length)

+ 1
- 1
modules/exploits/multi/browser/java_jre17_jmxbean_2.rb View File

@@ -113,7 +113,7 @@ class Metasploit3 < Msf::Exploit::Remote
113 113
           jar.add_file(full, '')
114 114
         end
115 115
       end
116
-      fd = File.open(File.join( Msf::Config.install_root, "data", "exploits", "cve-2013-0431", path ), "rb")
116
+      fd = File.open(File.join( Msf::Config.data_directory, "exploits", "cve-2013-0431", path ), "rb")
117 117
       data = fd.read(fd.stat.size)
118 118
       jar.add_file(path.join("/"), data)
119 119
       fd.close

+ 2
- 2
modules/exploits/multi/browser/java_jre17_method_handle.rb View File

@@ -76,9 +76,9 @@ class Metasploit3 < Msf::Exploit::Remote
76 76
 
77 77
 
78 78
   def setup
79
-    path = File.join(Msf::Config.install_root, "data", "exploits", "cve-2012-5088", "Exploit.class")
79
+    path = File.join(Msf::Config.data_directory, "exploits", "cve-2012-5088", "Exploit.class")
80 80
     @exploit_class = File.open(path, "rb") {|fd| fd.read(fd.stat.size) }
81
-    path = File.join(Msf::Config.install_root, "data", "exploits", "cve-2012-5088", "B.class")
81
+    path = File.join(Msf::Config.data_directory, "exploits", "cve-2012-5088", "B.class")
82 82
     @loader_class = File.open(path, "rb") {|fd| fd.read(fd.stat.size) }
83 83
 
84 84
     @exploit_class_name = rand_text_alpha("Exploit".length)

+ 3
- 3
modules/exploits/multi/browser/java_jre17_provider_skeleton.rb View File

@@ -87,11 +87,11 @@ class Metasploit3 < Msf::Exploit::Remote
87 87
 
88 88
 
89 89
   def setup
90
-    path = File.join(Msf::Config.install_root, "data", "exploits", "cve-2013-2460", "Exploit.class")
90
+    path = File.join(Msf::Config.data_directory, "exploits", "cve-2013-2460", "Exploit.class")
91 91
     @exploit_class = File.open(path, "rb") {|fd| fd.read(fd.stat.size) }
92
-    path = File.join(Msf::Config.install_root, "data", "exploits", "cve-2013-2460", "ExpProvider.class")
92
+    path = File.join(Msf::Config.data_directory, "exploits", "cve-2013-2460", "ExpProvider.class")
93 93
     @provider_class = File.open(path, "rb") {|fd| fd.read(fd.stat.size) }
94
-    path = File.join(Msf::Config.install_root, "data", "exploits", "cve-2013-2460", "DisableSecurityManagerAction.class")
94
+    path = File.join(Msf::Config.data_directory, "exploits", "cve-2013-2460", "DisableSecurityManagerAction.class")
95 95
     @action_class = File.open(path, "rb") {|fd| fd.read(fd.stat.size) }
96 96
 
97 97
     @exploit_class_name = rand_text_alpha(EXPLOIT_STRING.length)

+ 4
- 4
modules/exploits/multi/browser/java_jre17_reflection_types.rb View File

@@ -81,13 +81,13 @@ class Metasploit3 < Msf::Exploit::Remote
81 81
 
82 82
 
83 83
   def setup
84
-    path = File.join(Msf::Config.install_root, "data", "exploits", "jre7u17", "Exploit.class")
84
+    path = File.join(Msf::Config.data_directory, "exploits", "jre7u17", "Exploit.class")
85 85
     @exploit_class = File.open(path, "rb") {|fd| fd.read(fd.stat.size) }
86
-    path = File.join(Msf::Config.install_root, "data", "exploits", "jre7u17", "Union1.class")
86
+    path = File.join(Msf::Config.data_directory, "exploits", "jre7u17", "Union1.class")
87 87
     @union1_class = File.open(path, "rb") {|fd| fd.read(fd.stat.size) }
88
-    path = File.join(Msf::Config.install_root, "data", "exploits", "jre7u17", "Union2.class")
88
+    path = File.join(Msf::Config.data_directory, "exploits", "jre7u17", "Union2.class")
89 89
     @union2_class = File.open(path, "rb") {|fd| fd.read(fd.stat.size) }
90
-    path = File.join(Msf::Config.install_root, "data", "exploits", "jre7u17", "SystemClass.class")
90
+    path = File.join(Msf::Config.data_directory, "exploits", "jre7u17", "SystemClass.class")
91 91
     @system_class = File.open(path, "rb") {|fd| fd.read(fd.stat.size) }
92 92
 
93 93
     @exploit_class_name = rand_text_alpha("Exploit".length)

+ 1
- 1
modules/exploits/multi/browser/java_rhino.rb View File

@@ -102,7 +102,7 @@ class Metasploit3 < Msf::Exploit::Remote
102 102
           jar.add_file(full, '')
103 103
         end
104 104
       end
105
-      fd = File.open(File.join( Msf::Config.install_root, "data", "exploits", "cve-2011-3544", path ), "rb")
105
+      fd = File.open(File.join( Msf::Config.data_directory, "exploits", "cve-2011-3544", path ), "rb")
106 106
       data = fd.read(fd.stat.size)
107 107
       jar.add_file(path.join("/"), data)
108 108
       fd.close

+ 1
- 1
modules/exploits/multi/browser/java_rmi_connection_impl.rb View File

@@ -89,7 +89,7 @@ class Metasploit3 < Msf::Exploit::Remote
89 89
           jar.add_file(full, '')
90 90
         end
91 91
       end
92
-      fd = File.open(File.join( Msf::Config.install_root, "data", "exploits", "cve-2010-0094", path ), "rb")
92
+      fd = File.open(File.join( Msf::Config.data_directory, "exploits", "cve-2010-0094", path ), "rb")
93 93
       data = fd.read(fd.stat.size)
94 94
       jar.add_file(path.join("/"), data)
95 95
       fd.close

+ 1
- 1
modules/exploits/multi/browser/java_setdifficm_bof.rb View File

@@ -200,7 +200,7 @@ EOF
200 200
 
201 201
 
202 202
   def exploit
203
-    path = File.join(Msf::Config.install_root, "data", "exploits", "CVE-2009-3869.jar")
203
+    path = File.join(Msf::Config.data_directory, "exploits", "CVE-2009-3869.jar")
204 204
     fd = File.open(path, "rb")
205 205
     @jar_data = fd.read(fd.stat.size)
206 206
     fd.close

+ 3
- 3
modules/exploits/multi/browser/java_storeimagearray.rb View File

@@ -71,11 +71,11 @@ class Metasploit3 < Msf::Exploit::Remote
71 71
   end
72 72
 
73 73
   def setup
74
-    path = File.join(Msf::Config.install_root, "data", "exploits", "CVE-2013-2465", "Exploit.class")
74
+    path = File.join(Msf::Config.data_directory, "exploits", "CVE-2013-2465", "Exploit.class")
75 75
     @exploit_class = File.open(path, "rb") {|fd| fd.read(fd.stat.size) }
76
-    path = File.join(Msf::Config.install_root, "data", "exploits", "CVE-2013-2465", "Exploit$MyColorModel.class")
76
+    path = File.join(Msf::Config.data_directory, "exploits", "CVE-2013-2465", "Exploit$MyColorModel.class")
77 77
     @color_model_class = File.open(path, "rb") {|fd| fd.read(fd.stat.size) }
78
-    path = File.join(Msf::Config.install_root, "data", "exploits", "CVE-2013-2465", "Exploit$MyColorSpace.class")
78
+    path = File.join(Msf::Config.data_directory, "exploits", "CVE-2013-2465", "Exploit$MyColorSpace.class")
79 79
     @color_space_class = File.open(path, "rb") {|fd| fd.read(fd.stat.size) }
80 80
 
81 81
     @exploit_class_name = rand_text_alpha("Exploit".length)

+ 1
- 1
modules/exploits/multi/browser/java_trusted_chain.rb View File

@@ -96,7 +96,7 @@ class Metasploit3 < Msf::Exploit::Remote
96 96
           jar.add_file(full, '')
97 97
         end
98 98
       end
99
-      fd = File.open(File.join( Msf::Config.install_root, "data", "exploits", "cve-2010-0840", path ), "rb")
99
+      fd = File.open(File.join( Msf::Config.data_directory, "exploits", "cve-2010-0840", path ), "rb")
100 100
       data = fd.read(fd.stat.size)
101 101
       jar.add_file(path.join("/"), data)
102 102
       fd.close

+ 1
- 1
modules/exploits/multi/browser/java_verifier_field_access.rb View File

@@ -88,7 +88,7 @@ class Metasploit3 < Msf::Exploit::Remote
88 88
 
89 89
   def exploit
90 90
     # load the static jar file
91
-    path = File.join( Msf::Config.install_root, "data", "exploits", "CVE-2012-1723.jar" )
91
+    path = File.join( Msf::Config.data_directory, "exploits", "CVE-2012-1723.jar" )
92 92
     fd = File.open( path, "rb" )
93 93
     @jar_data = fd.read(fd.stat.size)
94 94
     fd.close

+ 1
- 1
modules/exploits/multi/browser/qtjava_pointer.rb View File

@@ -82,7 +82,7 @@ class Metasploit3 < Msf::Exploit::Remote
82 82
 
83 83
   def exploit
84 84
     # load the class data
85
-    path = File.join(Msf::Config.install_root, "data", "exploits", "QTJavaExploit.class")
85
+    path = File.join(Msf::Config.data_directory, "exploits", "QTJavaExploit.class")
86 86
     fd = File.open(path, "rb")
87 87
     @class_data = fd.read(fd.stat.size)
88 88
     fd.close

+ 1
- 1
modules/exploits/multi/http/axis2_deployer.rb View File

@@ -100,7 +100,7 @@ class Metasploit3 < Msf::Exploit::Remote
100 100
 
101 101
       # We need this class as a wrapper to run in a thread.  For some reason
102 102
       # the Payload class is giving illegal access exceptions without it.
103
-      path = File.join(Msf::Config.install_root, "data", "java", "metasploit", "PayloadServlet.class")
103
+      path = File.join(Msf::Config.data_directory, "java", "metasploit", "PayloadServlet.class")
104 104
       fd = File.open(path, "rb")
105 105
       servlet = fd.read(fd.stat.size)
106 106
       fd.close

+ 1
- 1
modules/exploits/multi/http/jboss_invoke_deploy.rb View File

@@ -233,7 +233,7 @@ EOT
233 233
 
234 234
 
235 235
   def send_serialized_request(file_name , replace_params = {})
236
-    path = File.join( Msf::Config.install_root, "data", "exploits", "jboss_jmxinvoker", "DeploymentFileRepository", file_name)
236
+    path = File.join( Msf::Config.data_directory, "exploits", "jboss_jmxinvoker", "DeploymentFileRepository", file_name)
237 237
     data = File.open( path, "rb" ) { |fd| data = fd.read(fd.stat.size) }
238 238
 
239 239
     replace_params.each { |key, value| data.gsub!(key, value) }

+ 2
- 2
modules/exploits/multi/http/openfire_auth_bypass.rb View File

@@ -140,12 +140,12 @@ class Metasploit3 < Msf::Exploit::Remote
140 140
     ]
141 141
 
142 142
     jar = Rex::Zip::Jar.new
143
-    jar.add_files(files, File.join(Msf::Config.install_root, "data", "exploits", "CVE-2008-6508"))
143
+    jar.add_files(files, File.join(Msf::Config.data_directory, "exploits", "CVE-2008-6508"))
144 144
 
145 145
     plugin_author = datastore['PLUGINAUTHOR'] || rand_text_alphanumeric(8+rand(8))
146 146
     plugin_desc   = datastore['PLUGINDESC']   || rand_text_alphanumeric(8+rand(8))
147 147
 
148
-    plugin_xml = File.open(File.join(Msf::Config.install_root, "data", "exploits", "CVE-2008-6508", "plugin.xml"), "rb") {|fd| fd.read() }
148
+    plugin_xml = File.open(File.join(Msf::Config.data_directory, "exploits", "CVE-2008-6508", "plugin.xml"), "rb") {|fd| fd.read() }
149 149
     plugin_xml.gsub!(/PLUGINNAME/, plugin_name)
150 150
     plugin_xml.gsub!(/PLUGINDESCRIPTION/, plugin_desc)
151 151
     plugin_xml.gsub!(/PLUGINAUTHOR/, plugin_author)

+ 1
- 1
modules/exploits/multi/misc/batik_svg_java.rb View File

@@ -101,7 +101,7 @@ class Metasploit3 < Msf::Exploit::Remote
101 101
           end
102 102
         end
103 103
 
104
-        fd = File.open(File.join( Msf::Config.install_root, "data", "exploits", "batik_svg", path ), "rb")
104
+        fd = File.open(File.join( Msf::Config.data_directory, "exploits", "batik_svg", path ), "rb")
105 105
         data = fd.read(fd.stat.size)
106 106
         jar.add_file(path.join("/"), data)
107 107
         fd.close

+ 1
- 1
modules/exploits/unix/webapp/google_proxystylesheet_exec.rb View File

@@ -91,7 +91,7 @@ class Metasploit3 < Msf::Exploit::Remote
91 91
   def exploit
92 92
 
93 93
     # load the xml data
94
-    path = File.join(Msf::Config.install_root, "data", "exploits", "google_proxystylesheet.xml")
94
+    path = File.join(Msf::Config.data_directory, "exploits", "google_proxystylesheet.xml")
95 95
     fd = File.open(path, "rb")
96 96
     @xml_data = fd.read(fd.stat.size)
97 97
     fd.close

+ 1
- 1
modules/exploits/unix/webapp/php_include.rb View File

@@ -54,7 +54,7 @@ class Metasploit3 < Msf::Exploit::Remote
54 54
       OptString.new('POSTDATA', [false, "The POST data to send, with the include parameter changed to XXpathXX"]),
55 55
       OptString.new('HEADERS', [false, "Any additional HTTP headers to send, cookies for example. Format: \"header:value,header2:value2\""]),
56 56
       OptPath.new('PHPRFIDB', [false, "A local file containing a list of URLs to try, with XXpathXX replacing the URL",
57
-        File.join(Msf::Config.install_root, "data", "exploits", "php", "rfi-locations.dat")
57
+        File.join(Msf::Config.data_directory, "exploits", "php", "rfi-locations.dat")
58 58
         ])
59 59
       ], self.class)
60 60
   end

+ 1
- 1
modules/exploits/windows/browser/adobe_cooltype_sing.rb View File

@@ -62,7 +62,7 @@ class Metasploit3 < Msf::Exploit::Remote
62 62
 
63 63
   def exploit
64 64
     # NOTE: The 0day used Vera.ttf (785d2fd45984c6548763ae6702d83e20)
65
-    path = File.join( Msf::Config.install_root, "data", "exploits", "cve-2010-2883.ttf" )
65
+    path = File.join( Msf::Config.data_directory, "exploits", "cve-2010-2883.ttf" )
66 66
     fd = File.open( path, "rb" )
67 67
     @ttf_data = fd.read(fd.stat.size)
68 68
     fd.close

+ 1
- 1
modules/exploits/windows/browser/adobe_flash_mp4_cprt.rb View File

@@ -272,7 +272,7 @@ pluginspage="http://www.macromedia.com/go/getflashplayer">
272 272
   end
273 273
 
274 274
   def create_swf
275
-    path = ::File.join( Msf::Config.install_root, "data", "exploits", "CVE-2012-0754.swf" )
275
+    path = ::File.join( Msf::Config.data_directory, "exploits", "CVE-2012-0754.swf" )
276 276
     fd = ::File.open( path, "rb" )
277 277
     swf = fd.read(fd.stat.size)
278 278
     fd.close

+ 1
- 1
modules/exploits/windows/browser/adobe_flash_otf_font.rb View File

@@ -227,7 +227,7 @@ class Metasploit3 < Msf::Exploit::Remote
227 227
   end
228 228
 
229 229
   def create_swf
230
-    path = ::File.join( Msf::Config.install_root, "data", "exploits", "CVE-2012-1535", "Main.swf" )
230
+    path = ::File.join( Msf::Config.data_directory, "exploits", "CVE-2012-1535", "Main.swf" )
231 231
     fd = ::File.open( path, "rb" )
232 232
     swf = fd.read(fd.stat.size)
233 233
     fd.close

+ 1
- 1
modules/exploits/windows/browser/adobe_flash_rtmp.rb View File

@@ -424,7 +424,7 @@ class Metasploit3 < Msf::Exploit::Remote
424 424
   end
425 425
 
426 426
   def create_swf
427
-    path = ::File.join( Msf::Config.install_root, "data", "exploits", "CVE-2012-0779.swf" )
427
+    path = ::File.join( Msf::Config.data_directory, "exploits", "CVE-2012-0779.swf" )
428 428
     fd = ::File.open( path, "rb" )
429 429
     swf = fd.read(fd.stat.size)
430 430
     fd.close

+ 1
- 1
modules/exploits/windows/browser/adobe_flash_sps.rb View File

@@ -178,7 +178,7 @@ class Metasploit3 < Msf::Exploit::Remote
178 178
   end
179 179
 
180 180
   def create_swf
181
-    path = ::File.join( Msf::Config.install_root, "data", "exploits", "mp4player.swf" )
181
+    path = ::File.join( Msf::Config.data_directory, "exploits", "mp4player.swf" )
182 182
     fd = ::File.open( path, "rb" )
183 183
     swf = fd.read(fd.stat.size)
184 184
     fd.close

+ 1
- 1
modules/exploits/windows/browser/adobe_flashplayer_arrayindexing.rb View File

@@ -70,7 +70,7 @@ class Metasploit3 < Msf::Exploit::Remote
70 70
   def exploit
71 71
     # src for the flash file: external/source/exploits/CVE-2011-2110/CVE-2011-2110.as
72 72
     # full aslr/dep bypass using the info leak as per malware
73
-    path = File.join( Msf::Config.install_root, "data", "exploits", "CVE-2011-2110.swf" )
73
+    path = File.join( Msf::Config.data_directory, "exploits", "CVE-2011-2110.swf" )
74 74
     fd = File.open( path, "rb" )
75 75
     @swf = fd.read(fd.stat.size)
76 76
     fd.close

+ 1
- 1
modules/exploits/windows/browser/adobe_flashplayer_avm.rb View File

@@ -67,7 +67,7 @@ class Metasploit3 < Msf::Exploit::Remote
67 67
   end
68 68
 
69 69
   def exploit
70
-    path = File.join( Msf::Config.install_root, "data", "exploits", "CVE-2011-0609.swf" )
70
+    path = File.join( Msf::Config.data_directory, "exploits", "CVE-2011-0609.swf" )
71 71
     fd = File.open( path, "rb" )
72 72
     @swf = fd.read(fd.stat.size)
73 73
     fd.close

+ 1
- 1
modules/exploits/windows/browser/adobe_flashplayer_flash10o.rb View File

@@ -123,7 +123,7 @@ class Metasploit3 < Msf::Exploit::Remote
123 123
   end
124 124
 
125 125
   def exploit
126
-    path = File.join(Msf::Config.install_root, "data", "exploits", "CVE-2011-0611.swf")
126
+    path = File.join(Msf::Config.data_directory, "exploits", "CVE-2011-0611.swf")
127 127
     f = File.open(path, "rb")
128 128
     @trigger = f.read(f.stat.size)
129 129
     f.close

+ 1
- 1
modules/exploits/windows/browser/adobe_flashplayer_newfunction.rb View File

@@ -71,7 +71,7 @@ class Metasploit3 < Msf::Exploit::Remote
71 71
 
72 72
   def exploit
73 73
     # load the static swf file
74
-    path = File.join( Msf::Config.install_root, "data", "exploits", "CVE-2010-1297.swf" )
74
+    path = File.join( Msf::Config.data_directory, "exploits", "CVE-2010-1297.swf" )
75 75
     fd = File.open( path, "rb" )
76 76
     @swf_data = fd.read(fd.stat.size)
77 77
     fd.close

+ 0
- 0
modules/exploits/windows/browser/adobe_shockwave_rcsl_corruption.rb View File


Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save