From a66556b4363c69df0eb13af9dd00d0ee3f4f9e3c Mon Sep 17 00:00:00 2001
From: Christian Mehlmauer <firefart@gmail.com>
Date: Tue, 28 Aug 2018 13:12:43 +0200
Subject: [PATCH] fix msftidy errors

---
 modules/auxiliary/dos/scada/siemens_siprotec4.rb                | 2 +-
 modules/exploits/linux/http/netgear_r7000_cgibin_exec.rb        | 2 +-
 .../exploits/windows/misc/hp_imc_dbman_restartdb_unauth_rce.rb  | 2 +-
 .../windows/misc/hp_imc_dbman_restoredbase_unauth_rce.rb        | 2 +-
 tools/dev/msftidy.rb                                            | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/auxiliary/dos/scada/siemens_siprotec4.rb b/modules/auxiliary/dos/scada/siemens_siprotec4.rb
index ac6dc5e95c..dc5e9d3680 100644
--- a/modules/auxiliary/dos/scada/siemens_siprotec4.rb
+++ b/modules/auxiliary/dos/scada/siemens_siprotec4.rb
@@ -21,7 +21,7 @@ class MetasploitModule < Msf::Auxiliary
           'References'     =>
             [
               [ 'CVE' '2015-5374' ],
-              [ 'URL', 'https://www.exploit-db.com/exploits/44103/' ],
+              [ 'EDB', '44103' ],
               [ 'URL', 'https://ics-cert.us-cert.gov/advisories/ICSA-15-202-01' ]
             ])
         register_options([Opt::RPORT(50000),])
diff --git a/modules/exploits/linux/http/netgear_r7000_cgibin_exec.rb b/modules/exploits/linux/http/netgear_r7000_cgibin_exec.rb
index d227b3c867..42c8d89dd4 100644
--- a/modules/exploits/linux/http/netgear_r7000_cgibin_exec.rb
+++ b/modules/exploits/linux/http/netgear_r7000_cgibin_exec.rb
@@ -29,7 +29,7 @@ class MetasploitModule < Msf::Exploit::Remote
         [
           [ 'EDB', '40889'],
           [ 'URL', 'http://labs.idefense.com/intelligence/vulnerabilities/display.php?id=305'],
-          [ 'URL', 'https://www.kb.cert.org/vuls/id/582384'],
+          [ 'US-CERT-VU', '582384'],
           [ 'URL', 'http://kb.netgear.com/000036386/CVE-2016-582384'],
           [ 'CVE', '2016-6277']
         ],
diff --git a/modules/exploits/windows/misc/hp_imc_dbman_restartdb_unauth_rce.rb b/modules/exploits/windows/misc/hp_imc_dbman_restartdb_unauth_rce.rb
index 25d49d6ef0..3b8a79e441 100644
--- a/modules/exploits/windows/misc/hp_imc_dbman_restartdb_unauth_rce.rb
+++ b/modules/exploits/windows/misc/hp_imc_dbman_restartdb_unauth_rce.rb
@@ -38,7 +38,7 @@ class MetasploitModule < Msf::Exploit::Remote
           ['CVE', '2017-5816'],
           ['EDB', '43198'],
           ['ZDI', '17-340'],
-          ['URL', 'https://www.securityfocus.com/bid/98469/info'],
+          ['BID', '98469'],
           ['URL', 'https://h20564.www2.hpe.com/hpsc/doc/public/display?docId=emr_na-hpesbhf03745en_us']
         ],
       'Platform'       => 'win',
diff --git a/modules/exploits/windows/misc/hp_imc_dbman_restoredbase_unauth_rce.rb b/modules/exploits/windows/misc/hp_imc_dbman_restoredbase_unauth_rce.rb
index 98f6c1b1c4..07fd2e1ae4 100644
--- a/modules/exploits/windows/misc/hp_imc_dbman_restoredbase_unauth_rce.rb
+++ b/modules/exploits/windows/misc/hp_imc_dbman_restoredbase_unauth_rce.rb
@@ -38,7 +38,7 @@ class MetasploitModule < Msf::Exploit::Remote
           ['CVE', '2017-5817'],
           ['EDB', '43195'],
           ['ZDI', '17-341'],
-          ['URL', 'https://www.securityfocus.com/bid/98469/info'],
+          ['BID', '98469'],
           ['URL', 'https://h20564.www2.hpe.com/hpsc/doc/public/display?docId=emr_na-hpesbhf03745en_us']
         ],
       'Platform'       => 'win',
diff --git a/tools/dev/msftidy.rb b/tools/dev/msftidy.rb
index f9bf52deba..efa1a71b3b 100755
--- a/tools/dev/msftidy.rb
+++ b/tools/dev/msftidy.rb
@@ -745,7 +745,7 @@ if __FILE__ == $PROGRAM_NAME
       Find.find(dir) do |full_filepath|
         next if full_filepath =~ /\.git[\x5c\x2f]/
         next unless File.file? full_filepath
-        next unless full_filepath =~ /\.rb$/
+        next unless File.extname(full_filepath) == '.rb'
         # Executable files are now assumed to be external modules
         next if File.executable?(full_filepath)
         msftidy = Msftidy.new(full_filepath)