Fix #8041 so it works

lib/msf/core/handler/reverse.rb

@@ -23,6 +23,16 @@ module Msf
         )
       end
 
+      def is_loopback_address?(address)
+        begin
+           a = IPAddr.new(address.to_s)
+           return true if IPAddr.new('127.0.0.1/8') === a
+           return true if IPAddr.new('::1') === a
+        rescue
+        end
+        false
+      end
+
       # A list of addresses to attempt to bind, in preferred order.
       #
       # @return [Array<String>] a two-element array. The first element will be
@@ -32,11 +42,18 @@ module Msf
       def bind_addresses
         # Switch to IPv6 ANY address if the LHOST is also IPv6
         addr = Rex::Socket.resolv_nbo(datastore['LHOST'])
+
         # First attempt to bind LHOST. If that fails, the user probably has
         # something else listening on that interface. Try again with ANY_ADDR.
         any = (addr.length == 4) ? "0.0.0.0" : "::0"
+        addr = Rex::Socket.addr_ntoa(addr)
 
-        addrs = [ Rex::Socket.addr_ntoa(addr), any  ]
+        # Checking if LHOST is a loopback address
+        if is_loopback_address?(addr)
+          print_warning("You are binding to a loopback address by setting LHOST to #{addr}. Did you want ReverseListenerBindAddress?")
+        end
+
+        addrs = [ addr, any ]
 
         if not datastore['ReverseListenerBindAddress'].to_s.empty?
           # Only try to bind to this specific interface
@@ -55,17 +72,6 @@ module Msf
         (port > 0) ? port : datastore['LPORT'].to_i
       end
 
-      # Checking if LHOST is a loopback address
-      def is_loopback_address(address)
-        begin
-           a = IPAddr.new(address.to_s)
-           return true if IPAddr.new('127.0.0.1/8') === a
-           return true if IPAddr.new('::1') === a
-        rescue
-        end
-        return false
-      end
-
       #
       # Starts the listener but does not actually attempt
       # to accept a connection.  Throws socket exceptions
@@ -93,11 +99,6 @@ module Msf
                 'MsfPayload' => self,
                 'MsfExploit' => assoc_exploit
               })
-
-            if is_loopback_address(ip)
-              print_warning ("You are attempting to listen on a loopback address by setting LHOST to #{ip}, did you mean to set ReverseListenerBindAddress instead?")
-            end
-
           rescue
             ex = $!
             print_error("Handler failed to bind to #{ip}:#{local_port}:- #{comm} -")
@@ -105,7 +106,6 @@ module Msf
             ex = false
             via = via_string_for_ip(ip, comm)
             print_status("Started #{human_name} handler on #{ip}:#{local_port} #{via}")
-
             break
           end
         end

lib/msf/core/handler/reverse_http.rb

@@ -356,10 +356,6 @@ protected
 
           print_status("Staging #{uuid.arch} payload (#{blob.length} bytes) ...")
 
-          if is_loopback_address(uri.host)
-            print_warning ("You are attempting to listen on a loopback address by setting LHOST to #{uri.host}, did you mean to set ReverseListenerBindAddress instead?")
-          end
-
           resp.body = blob
 
           # Short-circuit the payload's handle_connection processing for create_session