Land rapid7#4371

Author: jhart-r7

tools/msftidy.rb

@@ -536,8 +536,8 @@ def check_lines
       # RM#8498 for discussion, starting at comment #16:
       #
       # https://dev.metasploit.com/redmine/issues/8498#note-16
-      if ln =~ /(?<!\.)datastore\[["'][^"']+["']\]\s*=(?![=~>])/
-        info("datastore is modified in code: #{ln}", idx)
+      if ln =~ /(?<!\.)datastore\[["'][^"']+["']\]\s*(=|<<)(?![=~>])/
+        info("datastore is modified in code with '#{Regexp.last_match(1)}': #{ln}", idx)
       end
 
       # do not read Set-Cookie header (ignore commented lines)
@@ -549,6 +549,10 @@ def check_lines
       if ln =~ /^\s*Rank\s*=\s*/ and @source =~ /<\sMsf::Auxiliary/
         warn("Auxiliary modules have no 'Rank': #{ln}", idx)
       end
+
+      if ln =~ /^\s*def\s+(?:[^\(\)]*[A-Z]+[^\(\)]*)(?:\(.*\))?$/
+        warn("Please use snake case on method names: #{ln}", idx)
+      end
     end
   end
 
@@ -586,6 +590,19 @@ def check_udp_sock_get
     end
   end
 
+  # At one point in time, somebody committed a module with a bad metasploit.com URL
+  # in the header -- http//metasploit.com/download rather than http://metasploit.com/download.
+  # This module then got copied and committed 20+ times and is used in numerous other places.
+  # This ensures that this stops.
+  def check_invalid_url_scheme
+    test = @source.scan(/^#.+http\/\/metasploit.com/)
+    unless test.empty?
+      test.each { |item|
+        info("Invalid URL: #{item}")
+      }
+    end
+  end
+
   private
 
   def load_file(file)
@@ -634,6 +651,7 @@ def run_checks(full_filepath)
   tidy.check_newline_eof
   tidy.check_sock_get
   tidy.check_udp_sock_get
+  tidy.check_invalid_url_scheme
   return tidy
 end