From 7e8d06ac0a3984d8afc3d0545209064698b1bac0 Mon Sep 17 00:00:00 2001 From: Erwan Date: Tue, 23 Oct 2012 18:44:41 +0200 Subject: [PATCH] Rspec for previous commit URI.escape is now only overriden for ruby >= 1.9.2 RDoc --- doc/Array.html | 4 +- doc/Browser.html | 2 + doc/BruteForce.html | 2 + doc/CREDITS.html | 2 + doc/CacheFileStore.html | 2 + doc/Exploit.html | 2 + doc/Generate_List.html | 2 + doc/GitUpdater.html | 2 + doc/Malwares.html | 4 +- doc/Object.html | 122 +-- doc/README.html | 8 +- doc/RpcClient.html | 2 + doc/SvnUpdater.html | 2 + doc/Svn_Parser.html | 2 + doc/URI.html | 254 ++++++ doc/Updater.html | 2 + doc/UpdaterFactory.html | 2 + doc/Vulnerable.html | 2 + doc/WebSite.html | 2 + doc/WpConfigBackup.html | 4 +- doc/WpDetector.html | 2 + doc/WpEnumerator.html | 8 +- doc/WpFullPathDisclosure.html | 2 + doc/WpItem.html | 2 + doc/WpLoginProtection.html | 774 ++++++++++++++++++ doc/WpOptions.html | 2 + doc/WpPlugin.html | 2 + doc/WpPlugins.html | 2 + doc/WpReadme.html | 2 + doc/WpTarget.html | 37 +- doc/WpTheme.html | 2 + doc/WpThemes.html | 316 +++++++ doc/WpTimthumbs.html | 2 + doc/WpUser.html | 433 ++++++++++ doc/WpUsernames.html | 2 + doc/WpVersion.html | 2 + doc/WpVulnerability.html | 2 + doc/WpscanOptions.html | 40 +- doc/created.rid | 86 +- doc/index.html | 60 +- doc/lib/browser_rb.html | 2 +- doc/lib/cache_file_store_rb.html | 2 +- doc/lib/common_helper_rb.html | 2 +- doc/lib/environment_rb.html | 2 +- doc/lib/updater/git_updater_rb.html | 2 +- doc/lib/updater/svn_updater_rb.html | 2 +- doc/lib/updater/updater_factory_rb.html | 2 +- doc/lib/updater/updater_rb.html | 2 +- doc/lib/wpscan/exploit_rb.html | 2 +- doc/lib/wpscan/modules/brute_force_rb.html | 2 +- doc/lib/wpscan/modules/malwares_rb.html | 2 +- doc/lib/wpscan/modules/web_site_rb.html | 2 +- .../wpscan/modules/wp_config_backup_rb.html | 2 +- .../modules/wp_full_path_disclosure_rb.html | 2 +- .../modules/wp_login_protection_rb.html | 52 ++ doc/lib/wpscan/modules/wp_plugins_rb.html | 2 +- doc/lib/wpscan/modules/wp_readme_rb.html | 2 +- doc/lib/wpscan/modules/wp_themes_rb.html | 52 ++ doc/lib/wpscan/modules/wp_timthumbs_rb.html | 2 +- doc/lib/wpscan/modules/wp_usernames_rb.html | 2 +- doc/lib/wpscan/msfrpc_client_rb.html | 2 +- doc/lib/wpscan/vulnerable_rb.html | 2 +- doc/lib/wpscan/wp_detector_rb.html | 2 +- doc/lib/wpscan/wp_enumerator_rb.html | 2 +- doc/lib/wpscan/wp_item_rb.html | 52 ++ doc/lib/wpscan/wp_options_rb.html | 2 +- doc/lib/wpscan/wp_plugin_rb.html | 2 +- doc/lib/wpscan/wp_target_rb.html | 2 +- doc/lib/wpscan/wp_theme_rb.html | 2 +- doc/lib/wpscan/wp_user_rb.html | 52 ++ doc/lib/wpscan/wp_version_rb.html | 2 +- doc/lib/wpscan/wp_vulnerability_rb.html | 2 +- doc/lib/wpscan/wpscan_helper_rb.html | 2 +- doc/lib/wpscan/wpscan_options_rb.html | 2 +- doc/lib/wpstools/generate_list_rb.html | 2 +- doc/lib/wpstools/parse_svn_rb.html | 2 +- doc/lib/wpstools/wpstools_helper_rb.html | 2 +- doc/wpscan_rb.html | 2 +- doc/wpstools_rb.html | 2 +- lib/common_helper.rb | 8 +- spec/lib/wpscan/wpscan_options_spec.rb | 6 +- 81 files changed, 2259 insertions(+), 235 deletions(-) create mode 100644 doc/URI.html create mode 100644 doc/WpLoginProtection.html create mode 100644 doc/WpThemes.html create mode 100644 doc/WpUser.html create mode 100644 doc/lib/wpscan/modules/wp_login_protection_rb.html create mode 100644 doc/lib/wpscan/modules/wp_themes_rb.html create mode 100644 doc/lib/wpscan/wp_item_rb.html create mode 100644 doc/lib/wpscan/wp_user_rb.html diff --git a/doc/Array.html b/doc/Array.html index 8bae154d..7beab4b6 100644 --- a/doc/Array.html +++ b/doc/Array.html @@ -132,6 +132,8 @@
  • Svn_Parser
    • +
  • URI
    • +
  • Updater
  • UpdaterFactory
    • @@ -230,7 +232,7 @@ 
    -# File lib/common_helper.rb, line 82
+# File lib/common_helper.rb, line 88
 def _grep_(regexp)
   matches = []
   self.each do |value|
diff --git a/doc/Browser.html b/doc/Browser.html
index 6487c717..ac5d341c 100644
--- a/doc/Browser.html
+++ b/doc/Browser.html
@@ -148,6 +148,8 @@
         
           
  • Svn_Parser
    • 
         
+          
  • URI
    • 
+        
           
  • Updater
    • 
         
           
  • UpdaterFactory
    • 
diff --git a/doc/BruteForce.html b/doc/BruteForce.html
index 4cd89924..a6484f93 100644
--- a/doc/BruteForce.html
+++ b/doc/BruteForce.html
@@ -124,6 +124,8 @@
         
           
  • Svn_Parser
    • 
         
+          
  • URI
    • 
+        
           
  • Updater
    • 
         
           
  • UpdaterFactory
    • 
diff --git a/doc/CREDITS.html b/doc/CREDITS.html
index de771b21..f58faa9e 100644
--- a/doc/CREDITS.html
+++ b/doc/CREDITS.html
@@ -88,6 +88,8 @@
         
           
  • Svn_Parser
    • 
         
+          
  • URI
    • 
+        
           
  • Updater
    • 
         
           
  • UpdaterFactory
    • 
diff --git a/doc/CacheFileStore.html b/doc/CacheFileStore.html
index 8d0b8139..4c6fb242 100644
--- a/doc/CacheFileStore.html
+++ b/doc/CacheFileStore.html
@@ -138,6 +138,8 @@
         
           
  • Svn_Parser
    • 
         
+          
  • URI
    • 
+        
           
  • Updater
    • 
         
           
  • UpdaterFactory
    • 
diff --git a/doc/Exploit.html b/doc/Exploit.html
index d1f36c7f..8d35308e 100644
--- a/doc/Exploit.html
+++ b/doc/Exploit.html
@@ -156,6 +156,8 @@
         
           
  • Svn_Parser
    • 
         
+          
  • URI
    • 
+        
           
  • Updater
    • 
         
           
  • UpdaterFactory
    • 
diff --git a/doc/Generate_List.html b/doc/Generate_List.html
index e27b93d9..f8c6c078 100644
--- a/doc/Generate_List.html
+++ b/doc/Generate_List.html
@@ -138,6 +138,8 @@
         
           
  • Svn_Parser
    • 
         
+          
  • URI
    • 
+        
           
  • Updater
    • 
         
           
  • UpdaterFactory
    • 
diff --git a/doc/GitUpdater.html b/doc/GitUpdater.html
index 878ac76c..c8366a27 100644
--- a/doc/GitUpdater.html
+++ b/doc/GitUpdater.html
@@ -136,6 +136,8 @@
         
           
  • Svn_Parser
    • 
         
+          
  • URI
    • 
+        
           
  • Updater
    • 
         
           
  • UpdaterFactory
    • 
diff --git a/doc/Malwares.html b/doc/Malwares.html
index f679e02a..3fab9ede 100644
--- a/doc/Malwares.html
+++ b/doc/Malwares.html
@@ -128,6 +128,8 @@
         
           
  • Svn_Parser
    • 
         
+          
  • URI
    • 
+        
           
  • Updater
    • 
         
           
  • UpdaterFactory
    • 
@@ -334,7 +336,7 @@
 
     # File lib/wpscan/modules/malwares.rb, line 28
 def malwares(malwares_file_path = nil)
-  if @malwares.nil?
+  unless @malwares
     malwares_found = []
     malwares_file = Malwares.malwares_file(malwares_file_path)
     index_page_body = Browser.instance.get(@uri.to_s).body
diff --git a/doc/Object.html b/doc/Object.html
index 7252d523..54146448 100644
--- a/doc/Object.html
+++ b/doc/Object.html
@@ -34,14 +34,14 @@
         
    
           
         
    
@@ -154,6 +154,8 @@
         
           
  • Svn_Parser
    • 
         
+          
  • URI
    • 
+        
           
  • Updater
    • 
         
           
  • UpdaterFactory
    • 
@@ -312,10 +314,7 @@
 
     # File lib/common_helper.rb, line 42
 def add_http_protocol(url)
-  if url !~ /^https?:/
-    url = "http://#{url}"
-  end
-  url
+  url =~ /^https?:/ ? url : "http://#{url}"
 end
    @@ -346,10 +345,9 @@ 
    -# File lib/common_helper.rb, line 49
+# File lib/common_helper.rb, line 46
 def add_trailing_slash(url)
-  url = "#{url}/" if url !~ /\/$/
-  url
+  url =~ /\/$/ ? url : "#{url}/"
 end
    @@ -380,7 +378,7 @@