From b5e3e6280e2ffedeb30c2f2bb436ea689e24f85e Mon Sep 17 00:00:00 2001 From: g0tmi1k Date: Mon, 14 May 2018 18:08:42 +0100 Subject: [PATCH] Trying to make code climate happier --- lib/wpscan/web_site/humans_txt.rb | 20 +------------------- lib/wpscan/web_site/security_txt.rb | 20 +------------------- lib/wpscan/wpscan_helper.rb | 19 +++++++++++++++++++ wpscan.rb | 10 +++++----- 4 files changed, 26 insertions(+), 43 deletions(-) diff --git a/lib/wpscan/web_site/humans_txt.rb b/lib/wpscan/web_site/humans_txt.rb index 18d9386b..e9eceaad 100644 --- a/lib/wpscan/web_site/humans_txt.rb +++ b/lib/wpscan/web_site/humans_txt.rb @@ -3,29 +3,11 @@ class WebSite module HumansTxt - # Gets a humans.txt URL + # Gets the humans.txt URL # @return [ String ] def humans_url @uri.clone.merge('humans.txt').to_s end - # Parse humans.txt - # @return [ Array ] URLs generated from humans.txt - def parse_humans_txt - return_object = [] - response = Browser.get(humans_url.to_s) - body = response.body - - # Get all non-comments - entries = body.split(/\n/) - - # Did we get something? - if entries - # Remove any rubbish - entries = clean_uri(entries) - end - return return_object - end - end end diff --git a/lib/wpscan/web_site/security_txt.rb b/lib/wpscan/web_site/security_txt.rb index 77a686ef..c8f8687e 100644 --- a/lib/wpscan/web_site/security_txt.rb +++ b/lib/wpscan/web_site/security_txt.rb @@ -3,29 +3,11 @@ class WebSite module SecurityTxt - # Gets a security.txt URL + # Gets the security.txt URL # @return [ String ] def security_url @uri.clone.merge('.well-known/security.txt').to_s end - # Parse security.txt - # @return [ Array ] URLs generated from security.txt - def parse_security_txt - return_object = [] - response = Browser.get(security_url.to_s) - body = response.body - - # Get all non-comments - entries = body.split(/\n/) - - # Did we get something? - if entries - # Remove any rubbish - entries = clean_uri(entries) - end - return return_object - end - end end diff --git a/lib/wpscan/wpscan_helper.rb b/lib/wpscan/wpscan_helper.rb index 02626441..f2fc5470 100644 --- a/lib/wpscan/wpscan_helper.rb +++ b/lib/wpscan/wpscan_helper.rb @@ -153,6 +153,25 @@ def full_uri(entries) return return_object end +# Parse humans.txt +# @return [ Array ] URLs generated from humans.txt +def parse_txt(url) + return_object = [] + response = Browser.get(url.to_s) + body = response.body + + # Get all non-comments + entries = body.split(/\n/) + + # Did we get something? + if entries + # Remove any rubbish + entries = clean_uri(entries) + end + return return_object +end + + # Hook to check if the target if down during the scan # And have the number of requests performed to display at the end of the scan # The target is considered down after 30 requests with status = 0 diff --git a/wpscan.rb b/wpscan.rb index 7e64c7bb..92e4513a 100755 --- a/wpscan.rb +++ b/wpscan.rb @@ -248,7 +248,7 @@ def main end if wp_target.has_sitemap? - code = get_http_status(wp_target.robots_url) + code = get_http_status(wp_target.sitemap_url) puts info("Sitemap found: #{wp_target.sitemap_url} [HTTP #{code}]") wp_target.parse_sitemap.each do |dir| @@ -262,8 +262,8 @@ def main if code == 200 puts info("humans.txt available under: #{wp_target.humans_url} [HTTP #{code}]") - wp_target.parse_humans_txt.each do |dir| - puts info("Interesting entry from humans.txt: #{dir}") + wp_target.parse_txt(humans_url).each do |dir| + puts info("Entry from humans.txt: #{dir}") end spacer() end @@ -272,8 +272,8 @@ def main if code == 200 puts info("security.txt available under: #{wp_target.security_url} [HTTP #{code}]") - wp_target.parse_security_txt.each do |dir| - puts info("Interesting entry from security.txt: #{dir}") + wp_target.parse_txt(security_url).each do |dir| + puts info("Entry from security.txt: #{dir}") end spacer() end