style fixups

Author: medievia96

lib/rex/proto/http/client.rb

@@ -275,26 +275,26 @@ def send_auth(res, opts, t, persist)
     # if several providers are available, the client may want one in particular
     preferred_auth = opts['preferred_auth']
 
-    if supported_auths.include? 'Basic' and (preferred_auth.nil? or preferred_auth == 'Basic')
+    if supported_auths.include?('Basic') && (preferred_auth.nil? || preferred_auth == 'Basic')
       opts['headers'] ||= {}
       opts['headers']['Authorization'] = basic_auth_header(opts['username'],opts['password'] )
       req = request_cgi(opts)
       res = _send_recv(req,t,persist)
       return res
-    elsif supported_auths.include? "Digest" and (preferred_auth.nil? or preferred_auth == 'Digest')
+    elsif supported_auths.include?('Digest') && (preferred_auth.nil? || preferred_auth == 'Digest')
       temp_response = digest_auth(opts)
       if temp_response.kind_of? Rex::Proto::Http::Response
         res = temp_response
       end
       return res
-    elsif supported_auths.include? "NTLM" and (preferred_auth.nil? or preferred_auth == 'NTLM')
+    elsif supported_auths.include?('NTLM') && (preferred_auth.nil? || preferred_auth == 'NTLM')
       opts['provider'] = 'NTLM'
       temp_response = negotiate_auth(opts)
       if temp_response.kind_of? Rex::Proto::Http::Response
         res = temp_response
       end
       return res
-    elsif supported_auths.include? "Negotiate" and (preferred_auth.nil? or preferred_auth == 'Negotiate')
+    elsif supported_auths.include?('Negotiate') && (preferred_auth.nil? || preferred_auth == 'Negotiate')
       opts['provider'] = 'Negotiate'
       temp_response = negotiate_auth(opts)
       if temp_response.kind_of? Rex::Proto::Http::Response

modules/auxiliary/scanner/http/owa_ews_login.rb

@@ -31,8 +31,8 @@ def initialize
       [
         OptBool.new('AUTODISCOVER', [ false, "Automatically discover domain URI", true ]),
         OptString.new('AD_DOMAIN', [ false, "The Active Directory domain name", nil ]),
-        OptString.new('TARGET_URI', [ false, "The location of the NTLM service", nil ]),
-        OptInt.new('RPORT', [ true, "The target port", 443 ]),
+        OptString.new('TARGETURI', [ false, "The location of the NTLM service", nil ]),
+        OptInt.new('RPORT', [ true, "The target port", 443 ])
       ], self.class)
   end
 
@@ -46,18 +46,18 @@ def run_host(ip)
 
     if datastore['AUTODISCOVER']
       domain, uri = autodiscover(cli)
-      if domain and uri
+      if domain && uri
         print_good("Found NTLM service at #{uri} for domain #{domain}.")
       else
         print_error("Failed to autodiscover - try manually")
         return
       end
-    elsif datastore['AD_DOMAIN'] and datastore['TARGET_URI']
+    elsif datastore['AD_DOMAIN'] && datastore['TARGETURI']
       domain = datastore['AD_DOMAIN']
-      uri = datastore['TARGET_URI']
+      uri = datastore['TARGETURI']
       uri << "/" unless uri.chars.last == "/"
     else
-      print_error("You must set AD_DOMAIN and TARGET_URI if not using autodiscover.")
+      print_error("You must set AD_DOMAIN and TARGETURI if not using autodiscover.")
       return
     end
 
@@ -107,11 +107,11 @@ def run_host(ip)
 
   def autodiscover(cli)
     uris = %w[ /ews/ /rpc/ /public/ ]
-    uris.each do |u|
+    uris.each do |uri|
       begin
         req = cli.request_raw({
           'encode'   => true,
-          'uri'      => u,
+          'uri'      => uri,
           'method'   => 'GET',
           'headers'  =>  {'Authorization' => 'NTLM TlRMTVNTUAABAAAAB4IIogAAAAAAAAAAAAAAAAAAAAAGAbEdAAAADw=='}
         })
@@ -122,15 +122,15 @@ def autodiscover(cli)
         next
       end
 
-      if not res
+      unless res
         print_error("HTTP Connection Timeout")
         next
       end
 
       if res && res.code == 401 && res.headers.has_key?('WWW-Authenticate') && res.headers['WWW-Authenticate'].match(/^NTLM/i)
         hash = res['WWW-Authenticate'].split('NTLM ')[1]
         domain = Rex::Proto::NTLM::Message.parse(Rex::Text.decode_base64(hash))[:target_name].value().gsub(/\0/,'')
-        return domain, u
+        return domain, uri
       end
     end