From a11d16ea30fcbc3fbcb5cd9991593432933ec66d Mon Sep 17 00:00:00 2001 From: sinn3r Date: Sun, 14 Oct 2012 19:06:36 -0500 Subject: [PATCH] More strict on check_disclosure_date --- tools/msftidy.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/msftidy.rb b/tools/msftidy.rb index 880690e410..cdcf95aea8 100755 --- a/tools/msftidy.rb +++ b/tools/msftidy.rb @@ -96,13 +96,13 @@ class Msftidy end def check_disclosure_date - return if @source =~ /Generic Payload Handler/ + return if @source =~ /Generic Payload Handler/ or @source !~ / \< Msf::Exploit/ # Check disclosure date format - if @source =~ /'DisclosureDate' => ['|\"](.+)['|\"]/ + if @source =~ /'DisclosureDate'.*\=\>[\x0d|\x20]*['|\"](.+)['|\"]/ d = $1 #Captured date # Flag if overall format is wrong - if d =~ /^... \d{1,2} \d{4}/ + if d =~ /^... \d{1,2}\,* \d{4}/ # Flag if month format is wrong m = d.split[0] months = [ @@ -114,6 +114,8 @@ class Msftidy else error('Incorrect disclosure date format') end + else + error('Exploit is missing a disclosure date') end end