From 7f1a913bdcda872b372b2d5ad0ad10f3df16aca5 Mon Sep 17 00:00:00 2001 From: Matt Andreko Date: Tue, 18 Jun 2013 12:13:19 -0400 Subject: [PATCH] Code Review Feedback from wchen Fixed the disclosure date format Removed the rport option Added a call to report_note to store the data --- modules/auxiliary/scanner/http/canon_wireless.rb | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/modules/auxiliary/scanner/http/canon_wireless.rb b/modules/auxiliary/scanner/http/canon_wireless.rb index efcb28b062..4ce1f611a1 100644 --- a/modules/auxiliary/scanner/http/canon_wireless.rb +++ b/modules/auxiliary/scanner/http/canon_wireless.rb @@ -23,11 +23,7 @@ class Metasploit3 < Msf::Auxiliary [ 'CVE', '2013-4614' ], [ 'URL', 'http://www.mattandreko.com/2013/06/canon-y-u-no-security.html'] ], - 'DisclosureDate' => 'June 18 2013')) - register_options( - [ - Opt::RPORT(80), - ], self.class) + 'DisclosureDate' => 'Jun 18 2013')) end def get_network_settings @@ -132,6 +128,13 @@ class Metasploit3 < Msf::Auxiliary good_string += "\tSSID: #{ns[1]}\tEncryption Type: #{wireless_key[0]}\tKey: #{wireless_key[1]}" end + report_note({ + :data => good_string, + :type => 'canon.wireless', + :host => ip, + :port => rport + }) + print_good good_string end