MSFTidy fixes.
This commit is contained in:
parent
d6e8f0b54d
commit
ad6f8257e1
|
@ -83,17 +83,17 @@ class Metasploit3 < Msf::Auxiliary
|
||||||
unless tmp_tblnames.nil?
|
unless tmp_tblnames.nil?
|
||||||
tmp_db['DBName']= dbname[0]
|
tmp_db['DBName']= dbname[0]
|
||||||
tmp_db['Tables'] = []
|
tmp_db['Tables'] = []
|
||||||
tmp_tblnames.each do |tblname|
|
tmp_tblnames.each do |tblname|
|
||||||
next if tblname[0].nil?
|
next if tblname[0].nil?
|
||||||
tmp_tbl = {}
|
tmp_tbl = {}
|
||||||
tmp_tbl['TableName'] = tblname[0]
|
tmp_tbl['TableName'] = tblname[0]
|
||||||
tmp_tbl['Columns'] = []
|
tmp_tbl['Columns'] = []
|
||||||
tmp_columns = get_columns(dbname[0], tblname[1])
|
tmp_columns = get_columns(dbname[0], tblname[1])
|
||||||
unless tmp_columns.nil?
|
unless tmp_columns.nil?
|
||||||
tmp_columns.each do |column|
|
tmp_columns.each do |column|
|
||||||
next if column[0].nil?
|
next if column[0].nil?
|
||||||
tmp_column = {}
|
tmp_column = {}
|
||||||
tmp_column['ColumnName'] = column[0]
|
tmp_column['ColumnName'] = column[0]
|
||||||
tmp_column['ColumnType'] = column[1]
|
tmp_column['ColumnType'] = column[1]
|
||||||
tmp_column['ColumnLength'] = column[2]
|
tmp_column['ColumnLength'] = column[2]
|
||||||
tmp_tbl['Columns'] << tmp_column
|
tmp_tbl['Columns'] << tmp_column
|
||||||
|
@ -121,6 +121,7 @@ class Metasploit3 < Msf::Auxiliary
|
||||||
return results
|
return results
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# TODO: This should be split up, I fear nil problems in these query/response parsings
|
||||||
def get_columns(db_name, table_id)
|
def get_columns(db_name, table_id)
|
||||||
results = mssql_query("Select syscolumns.name,systypes.name,syscolumns.length from #{db_name}..syscolumns JOIN #{db_name}..systypes ON syscolumns.xtype=systypes.xtype WHERE syscolumns.id=#{table_id}")[:rows]
|
results = mssql_query("Select syscolumns.name,systypes.name,syscolumns.length from #{db_name}..syscolumns JOIN #{db_name}..systypes ON syscolumns.xtype=systypes.xtype WHERE syscolumns.id=#{table_id}")[:rows]
|
||||||
return results
|
return results
|
||||||
|
|
|
@ -24,7 +24,7 @@ class Metasploit3 < Msf::Auxiliary
|
||||||
'Name' => 'MYSQL Schema Dump',
|
'Name' => 'MYSQL Schema Dump',
|
||||||
'Version' => '$Revision$',
|
'Version' => '$Revision$',
|
||||||
'Description' => %Q{
|
'Description' => %Q{
|
||||||
This module extracts the schema information from a
|
This module extracts the schema information from a
|
||||||
MySQL DB server.
|
MySQL DB server.
|
||||||
},
|
},
|
||||||
'Author' => ['TheLightCosine <thelightcosine[at]gmail.com>'],
|
'Author' => ['TheLightCosine <thelightcosine[at]gmail.com>'],
|
||||||
|
@ -86,7 +86,7 @@ class Metasploit3 < Msf::Auxiliary
|
||||||
unless tmp_clmnames.nil? or tmp_clmnames.empty?
|
unless tmp_clmnames.nil? or tmp_clmnames.empty?
|
||||||
tmp_clmnames.each do |column|
|
tmp_clmnames.each do |column|
|
||||||
tmp_column = {}
|
tmp_column = {}
|
||||||
tmp_column['ColumnName'] = column[0]
|
tmp_column['ColumnName'] = column[0]
|
||||||
tmp_column['ColumnType'] = column[1]
|
tmp_column['ColumnType'] = column[1]
|
||||||
tmp_tbl['Columns'] << tmp_column
|
tmp_tbl['Columns'] << tmp_column
|
||||||
end
|
end
|
||||||
|
|
|
@ -24,7 +24,7 @@ class Metasploit3 < Msf::Auxiliary
|
||||||
'Name' => 'Postgres Schema Dump',
|
'Name' => 'Postgres Schema Dump',
|
||||||
'Version' => '$Revision$',
|
'Version' => '$Revision$',
|
||||||
'Description' => %Q{
|
'Description' => %Q{
|
||||||
This module extracts the schema information from a
|
This module extracts the schema information from a
|
||||||
Postgres server.
|
Postgres server.
|
||||||
},
|
},
|
||||||
'Author' => ['TheLightCosine <thelightcosine[at]gmail.com>'],
|
'Author' => ['TheLightCosine <thelightcosine[at]gmail.com>'],
|
||||||
|
@ -117,7 +117,6 @@ class Metasploit3 < Msf::Auxiliary
|
||||||
when :complete
|
when :complete
|
||||||
return res[:complete].rows
|
return res[:complete].rows
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -26,7 +26,7 @@ class Metasploit3 < Msf::Exploit::Remote
|
||||||
super(update_info(info,
|
super(update_info(info,
|
||||||
'Name' => 'Mozilla Firefox 3.6.16 mChannel use after free vulnerability',
|
'Name' => 'Mozilla Firefox 3.6.16 mChannel use after free vulnerability',
|
||||||
'Description' => %q{
|
'Description' => %q{
|
||||||
This module exploits an use after free vulnerability in Mozilla
|
This module exploits a use-after-free vulnerability in Mozilla
|
||||||
Firefox 3.6.16. An OBJECT Element mChannel can be freed via the
|
Firefox 3.6.16. An OBJECT Element mChannel can be freed via the
|
||||||
OnChannelRedirect method of the nsIChannelEventSink Interface. mChannel
|
OnChannelRedirect method of the nsIChannelEventSink Interface. mChannel
|
||||||
becomes a dangling pointer and can be reused when setting the OBJECTs
|
becomes a dangling pointer and can be reused when setting the OBJECTs
|
||||||
|
|
|
@ -15,12 +15,12 @@ class Metasploit3 < Msf::Post
|
||||||
include Msf::Auxiliary::Report
|
include Msf::Auxiliary::Report
|
||||||
include Msf::Post::File
|
include Msf::Post::File
|
||||||
include Msf::Post::Windows::Registry
|
include Msf::Post::Windows::Registry
|
||||||
|
|
||||||
def initialize(info={})
|
def initialize(info={})
|
||||||
super( update_info( info,
|
super( update_info( info,
|
||||||
'Name' => 'Windows File and Registry Artifacts Enumeration',
|
'Name' => 'Windows File and Registry Artifacts Enumeration',
|
||||||
'Description' => %q{
|
'Description' => %q{
|
||||||
This module will check the file system and registry for particular artifacts. The
|
This module will check the file system and registry for particular artifacts. The
|
||||||
list of artifacts is read from data/post/artifacts or a user specified file. Any
|
list of artifacts is read from data/post/artifacts or a user specified file. Any
|
||||||
matches are written to the loot. },
|
matches are written to the loot. },
|
||||||
'License' => MSF_LICENSE,
|
'License' => MSF_LICENSE,
|
||||||
|
@ -54,7 +54,7 @@ class Metasploit3 < Msf::Post
|
||||||
|
|
||||||
# Start enumerating
|
# Start enumerating
|
||||||
print_status("Processing artifacts file...")
|
print_status("Processing artifacts file...")
|
||||||
file = ::File.open(filename, "r")
|
file = ::File.open(filename, "rb")
|
||||||
file.each_line do |line|
|
file.each_line do |line|
|
||||||
line.strip!
|
line.strip!
|
||||||
next if line.length < 1
|
next if line.length < 1
|
||||||
|
@ -103,4 +103,4 @@ end
|
||||||
|
|
||||||
=begin
|
=begin
|
||||||
To-do: Use CSV or yaml format to store enum_artifacts_list.txt
|
To-do: Use CSV or yaml format to store enum_artifacts_list.txt
|
||||||
=end
|
=end
|
||||||
|
|
Loading…
Reference in New Issue