Skip to content

Commit 3640e87

Browse files
committed
Land rapid7#7599, Don't complain when Proxies is an empty string
2 parents 6d85330 + b45a361 commit 3640e87

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

lib/msf/core/handler/reverse.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def bind_port
6161
# if it fails to start the listener.
6262
#
6363
def setup_handler
64-
if datastore['Proxies'] and not datastore['ReverseAllowProxy']
64+
if !datastore['Proxies'].blank? && !datastore['ReverseAllowProxy']
6565
raise RuntimeError, "TCP connect-back payloads cannot be used with Proxies. Use 'set ReverseAllowProxy true' to override this behaviour."
6666
end
6767

lib/msf/core/handler/reverse_tcp_double_ssl.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def human_name
6363
# if it fails to start the listener.
6464
#
6565
def setup_handler
66-
if datastore['Proxies'] and not datastore['ReverseAllowProxy']
66+
if !datastore['Proxies'].blank? && !datastore['ReverseAllowProxy']
6767
raise RuntimeError, 'TCP connect-back payloads cannot be used with Proxies. Can be overriden by setting ReverseAllowProxy to true'
6868
end
6969

lib/msf/core/handler/reverse_tcp_ssl.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def self.general_handler_type
4343
# if it fails to start the listener.
4444
#
4545
def setup_handler
46-
if datastore['Proxies'] and not datastore['ReverseAllowProxy']
46+
if !datastore['Proxies'].blank? && !datastore['ReverseAllowProxy']
4747
raise RuntimeError, "TCP connect-back payloads cannot be used with Proxies. Use 'set ReverseAllowProxy true' to override this behaviour."
4848
end
4949

0 commit comments

Comments
 (0)