infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix page size and max results

bug/bundler_fix
OJ 2013-12-11 00:03:05 +10:00
parent 8a1517fde8
commit 64b1e78e34
3 changed files with 56 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/rex/post/meterpreter/extensions/extapi/adsi/adsi.rb
View File

@ -19,39 +19,14 @@ class Adsi
@client = client
end
# Enumerate all the users in the given domain.
def user_enumerate(domain_name, page_size)
filter = "(objectClass=user)"
fields = [
"samaccountname",
"name",
"distinguishedname",
"description",
"comment"
]
return domain_query(domain_name, filter, page_size, fields)
end
# Enumerate all the computers in the given domain.
def computer_enumerate(domain_name, page_size)
filter = "(objectClass=computer)"
fields = [
"name",
"distinguishedname",
"description",
"comment"
]
return domain_query(domain_name, filter, page_size, fields)
end
#
# Perform a generic domain query against ADSI.
#
# @param domain_name [String] The FQDN of the target domain.
# @param filter [String] The filter to apply to the query in
# LDAP format.
# @param max_results [Integer] The maximum number of results
# to return.
# @param page_size [Integer] The size of the page of results
# to return.
# @param fields [Array] Array of string fields to return for
@ -59,11 +34,12 @@ class Adsi
#
# @returns [Hash] Array of field names with associated results.
#
def domain_query(domain_name, filter, page_size, fields)
def domain_query(domain_name, filter, max_results, page_size, fields)
request = Packet.create_request('extapi_adsi_domain_query')
request.add_tlv(TLV_TYPE_EXT_ADSI_DOMAIN, domain_name)
request.add_tlv(TLV_TYPE_EXT_ADSI_FILTER, filter)
request.add_tlv(TLV_TYPE_EXT_ADSI_MAXRESULTS, max_results)
request.add_tlv(TLV_TYPE_EXT_ADSI_PAGESIZE, page_size)
fields.each do |f|

3
lib/rex/post/meterpreter/extensions/extapi/tlv.rb
View File

@ -45,7 +45,8 @@ TLV_TYPE_EXT_ADSI_FILTER = TLV_META_TYPE_STRING | (TLV_TYPE_E
TLV_TYPE_EXT_ADSI_FIELD = TLV_META_TYPE_STRING | (TLV_TYPE_EXTENSION_EXTAPI + TLV_EXTENSIONS + 57)
TLV_TYPE_EXT_ADSI_VALUE = TLV_META_TYPE_STRING | (TLV_TYPE_EXTENSION_EXTAPI + TLV_EXTENSIONS + 58)
TLV_TYPE_EXT_ADSI_RESULT = TLV_META_TYPE_GROUP | (TLV_TYPE_EXTENSION_EXTAPI + TLV_EXTENSIONS + 59)
TLV_TYPE_EXT_ADSI_PAGESIZE = TLV_META_TYPE_UINT | (TLV_TYPE_EXTENSION_EXTAPI + TLV_EXTENSIONS + 60)
TLV_TYPE_EXT_ADSI_MAXRESULTS = TLV_META_TYPE_UINT | (TLV_TYPE_EXTENSION_EXTAPI + TLV_EXTENSIONS + 60)
TLV_TYPE_EXT_ADSI_PAGESIZE = TLV_META_TYPE_UINT | (TLV_TYPE_EXTENSION_EXTAPI + TLV_EXTENSIONS + 61)
end
end

128
lib/rex/post/meterpreter/ui/console/command_dispatcher/extapi/adsi.rb
View File

@ -17,7 +17,9 @@ class Console::CommandDispatcher::Extapi::Adsi
include Console::CommandDispatcher
DEFAULT_PAGE_SIZE = 200
# Zero indicates "no limit"
DEFAULT_MAX_RESULTS = 0
DEFAULT_PAGE_SIZE = 0
#
# List of supported commands.
@ -42,12 +44,13 @@ class Console::CommandDispatcher::Extapi::Adsi
#
@@adsi_user_enum_opts = Rex::Parser::Arguments.new(
"-h" => [ false, "Help banner" ],
"-s" => [ true, "Result set page size." ]
"-m" => [ true, "Maximum results to return." ],
"-p" => [ true, "Result set page size." ]
)
def adsi_user_enum_usage
print(
"\nUsage: adsi_user_enum <domain> [-h] [-s pagesize]\n\n" +
"\nUsage: adsi_user_enum <domain> [-h] [-m maxresults] [-p pagesize]\n\n" +
"Enumerate the users on the target domain.\n\n" +
"Enumeration returns information such as the user name, SAM account name, locked\n" +
"status, desc, and comment.\n" +
@ -58,43 +61,23 @@ class Console::CommandDispatcher::Extapi::Adsi
# Enumerate domain users.
#
def cmd_adsi_user_enum(*args)
page_size = DEFAULT_PAGE_SIZE
args.unshift("-h") if args.length == 0
@@adsi_user_enum_opts.parse(args) { |opt, idx, val|
case opt
when "-h"
adsi_user_enum_usage
return true
when "-s"
page_size = (val || DEFAULT_PAGE_SIZE).to_i
end
}
domain = args.shift
users = client.extapi.adsi.user_enumerate(domain, page_size)
table = Rex::Ui::Text::Table.new(
'Header' => "#{domain} Users",
'Indent' => 0,
'SortIndex' => 0,
'Columns' => users[:fields]
)
users[:results].each do |u|
table << u
if args.include?("-h")
adsi_user_enum_usage
return true
end
print_line
print_line(table.to_s)
print_line("Total users: #{users[:results].length}")
print_line
return true
domain = args.shift
filter = "(objectClass=user)"
fields = [
"samaccountname",
"name",
"distinguishedname",
"description",
"comment"
]
args = [domain, filter] + fields + args
return cmd_adsi_domain_query(*args)
end
#
@ -102,12 +85,13 @@ class Console::CommandDispatcher::Extapi::Adsi
#
@@adsi_computer_enum_opts = Rex::Parser::Arguments.new(
"-h" => [ false, "Help banner" ],
"-s" => [ true, "Result set page size." ]
"-m" => [ true, "Maximum results to return." ],
"-p" => [ true, "Result set page size." ]
)
def adsi_computer_enum_usage
print(
"\nUsage: adsi_computer_enum <domain> [-h] [-s pagesize]\n\n" +
"\nUsage: adsi_computer_enum <domain> [-h] [-m maxresults] [-p pagesize]\n\n" +
"Enumerate the computers on the target domain.\n\n" +
"Enumeration returns information such as the computer name, desc, and comment.\n" +
@@adsi_computer_enum_opts.usage)
@ -117,43 +101,22 @@ class Console::CommandDispatcher::Extapi::Adsi
# Enumerate domain computers.
#
def cmd_adsi_computer_enum(*args)
page_size = DEFAULT_PAGE_SIZE
args.unshift("-h") if args.length == 0
@@adsi_computer_enum_opts.parse(args) { |opt, idx, val|
case opt
when "-h"
adsi_computer_enum_usage
return true
when "-s"
page_size = (val || DEFAULT_PAGE_SIZE).to_i
end
}
domain = args.shift
computers = client.extapi.adsi.computer_enumerate(domain, page_size)
table = Rex::Ui::Text::Table.new(
'Header' => "#{domain} Computers",
'Indent' => 0,
'SortIndex' => 0,
'Columns' => computers[:fields]
)
computers[:results].each do |c|
table << c
if args.include?("-h")
adsi_computer_enum_usage
return true
end
print_line
print_line(table.to_s)
print_line("Total computers: #{computers[:results].length}")
print_line
return true
domain = args.shift
filter = "(objectClass=computer)"
fields = [
"name",
"distinguishedname",
"description",
"comment"
]
args = [domain, filter] + fields + args
return cmd_adsi_domain_query(*args)
end
#
@ -161,12 +124,13 @@ class Console::CommandDispatcher::Extapi::Adsi
#
@@adsi_domain_query_opts = Rex::Parser::Arguments.new(
"-h" => [ false, "Help banner" ],
"-s" => [ true, "Result set page size." ]
"-m" => [ true, "Maximum results to return." ],
"-p" => [ true, "Result set page size." ]
)
def adsi_domain_query_usage
print(
"\nUsage: adsi_computer_enum <domain> <filter> <field 1> [field 2 [field ..]] [-h] [-s size]\n\n" +
"\nUsage: adsi_domain_query <domain> <filter> <field 1> [field 2 [field ..]] [-h] [-m maxresults] [-p pagesize]\n\n" +
"Enumerate the objects on the target domain.\n\n" +
"Enumeration returns the set of fields that are specified.\n" +
@@adsi_domain_query_opts.usage)
@ -177,24 +141,32 @@ class Console::CommandDispatcher::Extapi::Adsi
#
def cmd_adsi_domain_query(*args)
page_size = DEFAULT_PAGE_SIZE
max_results = DEFAULT_MAX_RESULTS
args.unshift("-h") if args.length < 3
@@adsi_domain_query_opts.parse(args) { |opt, idx, val|
case opt
when "-s"
page_size = (val || DEFAULT_PAGE_SIZE).to_i
page_size = val.to_i
when "-m"
max_results = val.to_i
when "-h"
adsi_domain_query_usage
return true
end
}
# Assume that the flags are passed in at the end. Safe?
switch_index = args.index { |a| a.start_with?("-") }
if switch_index
args = args.first(switch_index)
end
domain = args.shift
filter = args.shift
args = args.first(args.length - 2) if args.include? "-s"
objects = client.extapi.adsi.domain_query(domain, filter, page_size, args)
objects = client.extapi.adsi.domain_query(domain, filter, max_results, page_size, args)
table = Rex::Ui::Text::Table.new(
'Header' => "#{domain} Objects",