Permalink
Browse files

Merge branch 'wmap_update'

Fixed up a few merge conflicts, tested against metasploitable, looks
functional. Thanks Efraim!

[Closes #154]
  • Loading branch information...
2 parents 8f30e55 + 7447052 commit faad9db393a18fb2413cb57ed88c02dbed3b37a1 @todb todb committed Mar 2, 2012
Showing with 2,762 additions and 1,341 deletions.
  1. +5 −0 data/wmap/wmap_dirs.txt
  2. +531 −114 documentation/wmap.txt
  3. +49 −26 lib/msf/core/auxiliary/wmapmodule.rb
  4. +0 −1 modules/auxiliary/admin/http/contentkeeper_fileaccess.rb
  5. +1 −1 modules/auxiliary/admin/http/tomcat_administration.rb
  6. +2 −2 modules/auxiliary/admin/http/tomcat_utf8_traversal.rb
  7. +1 −2 modules/auxiliary/admin/http/trendmicro_dlp_traversal.rb
  8. +1 −1 modules/auxiliary/scanner/http/apache_userdir_enum.rb
  9. +1 −1 modules/auxiliary/scanner/http/axis_local_file_include.rb
  10. +1 −1 modules/auxiliary/scanner/http/axis_login.rb
  11. +16 −8 modules/auxiliary/scanner/http/backup_file.rb
  12. +358 −208 modules/auxiliary/scanner/http/blind_sql_query.rb
  13. +16 −9 modules/auxiliary/scanner/http/brute_dirs.rb
  14. +1 −1 modules/auxiliary/scanner/http/cert.rb
  15. +0 −1 modules/auxiliary/scanner/http/cisco_nac_manager_traversal.rb
  16. +13 −6 modules/auxiliary/scanner/http/copy_of_file.rb
  17. +25 −11 modules/auxiliary/scanner/http/dir_listing.rb
  18. +15 −7 modules/auxiliary/scanner/http/dir_scanner.rb
  19. +8 −4 modules/auxiliary/scanner/http/dir_webdav_unicode_bypass.rb
  20. +8 −7 modules/auxiliary/scanner/http/drupal_views_user_enum.rb
  21. +1 −1 modules/auxiliary/scanner/http/ektron_cms400net.rb
  22. +26 −12 modules/auxiliary/scanner/http/error_sql_injection.rb
  23. +13 −6 modules/auxiliary/scanner/http/file_same_name_dir.rb
  24. +14 −7 modules/auxiliary/scanner/http/files_dir.rb
  25. +3 −3 modules/auxiliary/scanner/http/frontpage_login.rb
  26. +2 −2 modules/auxiliary/scanner/http/glassfish_login.rb
  27. +1 −1 modules/auxiliary/scanner/http/http_login.rb
  28. +12 −4 modules/auxiliary/scanner/http/http_put.rb
  29. +1 −1 modules/auxiliary/scanner/http/http_traversal.rb
  30. +6 −2 modules/auxiliary/scanner/http/http_version.rb
  31. +0 −5 modules/auxiliary/scanner/http/lucky_punch.rb
  32. +1 −1 modules/auxiliary/scanner/http/ms09_020_webdav_unicode_bypass.rb
  33. +16 −3 modules/auxiliary/scanner/http/open_proxy.rb
  34. +3 −3 modules/auxiliary/scanner/http/options.rb
  35. +13 −6 modules/auxiliary/scanner/http/prev_dir_same_name_file.rb
  36. +17 −7 modules/auxiliary/scanner/http/replace_ext.rb
  37. +1 −1 modules/auxiliary/scanner/http/robots_txt.rb
  38. +15 −6 modules/auxiliary/scanner/http/scraper.rb
  39. +0 −1 modules/auxiliary/scanner/http/soap_xml.rb
  40. +1 −1 modules/auxiliary/scanner/http/sqlmap.rb
  41. +2 −2 modules/auxiliary/scanner/http/squiz_matrix_user_enum.rb
  42. +1 −1 modules/auxiliary/scanner/http/ssl.rb
  43. +25 −14 modules/auxiliary/scanner/http/svn_scanner.rb
  44. +1 −1 modules/auxiliary/scanner/http/tomcat_mgr_login.rb
  45. +2 −1 modules/auxiliary/scanner/http/trace.rb
  46. +4 −3 modules/auxiliary/scanner/http/trace_axd.rb
  47. +13 −7 modules/auxiliary/scanner/http/verb_auth_bypass.rb
  48. +4 −3 modules/auxiliary/scanner/http/vhost_scanner.rb
  49. +8 −3 modules/auxiliary/scanner/http/web_vulndb.rb
  50. +2 −2 modules/auxiliary/scanner/http/webdav_internal_ip.rb
  51. +2 −2 modules/auxiliary/scanner/http/webdav_scanner.rb
  52. +2 −2 modules/auxiliary/scanner/http/webdav_website_content.rb
  53. +2 −2 modules/auxiliary/scanner/http/wordpress_login_enum.rb
  54. +1 −1 modules/auxiliary/scanner/http/xpath.rb
  55. +1,495 −813 plugins/wmap.rb
@@ -459,6 +459,7 @@ api
aponline
app
appeals
+appl
apple
applet
applets
@@ -525,6 +526,8 @@ aw
awStats
awardsearch
awstatsoutput
+axis
+axis2
axis-cgi
ayuda
b
@@ -855,6 +858,7 @@ connect
connected
conquer
console
+consola
consumer
contact
contact-us
@@ -1801,6 +1805,7 @@ marketing
mary
master
mastergate
+mastercraft
math
math-ph
matrix
Oops, something went wrong.

1 comment on commit faad9db

@todb-r7
Contributor
todb-r7 commented on faad9db Mar 2, 2012

Efrain, not Efraim. Sheesh.

Please sign in to comment.