github/metasploit-framework
1
Fork 0
mirror of https://github.com/rapid7/metasploit-framework synced 2024-11-12 11:52:01 +01:00
Code Releases Activity

Fixes #3067. Raise DBImportErrors when the contents of a zip archive isn't a Metasploit ZIP report.

Browse Source 
git-svn-id: file:///home/svn/framework3/trunk@10842 4d416f70-5f16-0410-b530-b9f4589650da
This commit is contained in:
Tod Beardsley 2010-10-28 15:59:40 +00:00
parent a0ee41188f
commit dc4b7b6641
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/msf/core/db.rb
View File

@ -1919,6 +1919,7 @@ class DBManager
# If there is no match, an error is raised instead.
def import_filetype_detect(data)
if data.kind_of? Zip::ZipFile
raise DBImportError.new("The zip file provided is empty.") if data.entries.empty?
@import_filedata ||= {}
@import_filedata[:zip_filename] = File.split(data.to_s).last
@import_filedata[:zip_basename] = @import_filedata[:zip_filename].gsub(/\.zip$/,"")
@ -1926,7 +1927,11 @@ class DBManager
@import_filedata[:zip_xml] = @import_filedata[:zip_entry_names].grep(/^(.*)_[0-9]+\.xml$/).first
@import_filedata[:zip_wspace] = $1
@import_filedata[:type] = "Metasploit ZIP Report"
return :msf_zip if @import_filedata[:zip_xml]
if @import_filedata[:zip_xml]
return :msf_zip
else
raise DBImportError.new("The zip file provided is not a Metasploit ZIP report")
end
end
di = data.index("\n")
firstline = data[0, di]