From 1b485564566d0492a8d62e98992d3fb92b4907ef Mon Sep 17 00:00:00 2001 From: Jon Hart Date: Tue, 5 Jan 2016 08:33:21 -0800 Subject: [PATCH 1/3] Use cleaner hash syntax --- modules/auxiliary/scanner/redis/redis_server.rb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/modules/auxiliary/scanner/redis/redis_server.rb b/modules/auxiliary/scanner/redis/redis_server.rb index 6193ff75e9..20b3c7f4f4 100644 --- a/modules/auxiliary/scanner/redis/redis_server.rb +++ b/modules/auxiliary/scanner/redis/redis_server.rb @@ -32,10 +32,7 @@ class Metasploit3 < Msf::Auxiliary begin connect data = redis_command('PING') - report_service(:host => rhost, - :port => rport, - :name => "redis server", - :info => data) + report_service(host: rhost, port: rport, name: "redis server", info: data) rescue ::Exception => e print_error("Unable to connect: #{e}") ensure From 63324bd77d219be23d3d3db4391231d329b5203c Mon Sep 17 00:00:00 2001 From: Jon Hart Date: Tue, 5 Jan 2016 08:54:22 -0800 Subject: [PATCH 2/3] Rescue correct exceptions --- modules/auxiliary/scanner/redis/redis_server.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/auxiliary/scanner/redis/redis_server.rb b/modules/auxiliary/scanner/redis/redis_server.rb index 20b3c7f4f4..96561b0146 100644 --- a/modules/auxiliary/scanner/redis/redis_server.rb +++ b/modules/auxiliary/scanner/redis/redis_server.rb @@ -33,7 +33,8 @@ class Metasploit3 < Msf::Auxiliary connect data = redis_command('PING') report_service(host: rhost, port: rport, name: "redis server", info: data) - rescue ::Exception => e + rescue Rex::AddressInUse, Rex::HostUnreachable, Rex::ConnectionTimeout, + Rex::ConnectionRefused, ::Timeout::Error, ::EOFError, ::Errno::ETIMEDOUT => e print_error("Unable to connect: #{e}") ensure disconnect From eef154420b92c6862b6fdd6d480d2b36cf1c96b5 Mon Sep 17 00:00:00 2001 From: Jon Hart Date: Tue, 5 Jan 2016 08:54:53 -0800 Subject: [PATCH 3/3] This is a scanner, so vprint things that occur frequently --- modules/auxiliary/scanner/redis/redis_server.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/auxiliary/scanner/redis/redis_server.rb b/modules/auxiliary/scanner/redis/redis_server.rb index 96561b0146..f235ca618d 100644 --- a/modules/auxiliary/scanner/redis/redis_server.rb +++ b/modules/auxiliary/scanner/redis/redis_server.rb @@ -28,14 +28,15 @@ class Metasploit3 < Msf::Auxiliary end def run_host(_ip) - print_status("Scanning IP: #{peer}") + vprint_status("Scanning IP: #{peer}") begin connect data = redis_command('PING') report_service(host: rhost, port: rport, name: "redis server", info: data) + print_good("#{peer} -- found redis") rescue Rex::AddressInUse, Rex::HostUnreachable, Rex::ConnectionTimeout, Rex::ConnectionRefused, ::Timeout::Error, ::EOFError, ::Errno::ETIMEDOUT => e - print_error("Unable to connect: #{e}") + vprint_error("Unable to connect: #{e}") ensure disconnect end