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

Land #4771, userPrincipalName fix 

Lands Meatballs1's PR to add userPrincipalName as a column
enumerated by the enum_ad_user* post modules.
bug/bundler_fix
David Maloney 2015-02-17 11:31:15 -06:00
parent 6eaa3c264c ecefad946e
commit 8e50baaded
No known key found for this signature in database
GPG Key ID: DEDBA9DC3A913DB2
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/post/windows/gather/enum_ad_user_comments.rb
View File

@ -31,7 +31,7 @@ class Metasploit3 < Msf::Post
register_options([ register_options([
OptBool.new('STORE_LOOT', [true, 'Store file in loot.', false]), OptBool.new('STORE_LOOT', [true, 'Store file in loot.', false]),
OptString.new('FIELDS', [true, 'Fields to retrieve.','sAMAccountName,userAccountControl,comment,description']), OptString.new('FIELDS', [true, 'Fields to retrieve.','userPrincipalName,sAMAccountName,userAccountControl,comment,description']),
OptString.new('FILTER', [true, 'Search filter.','(&(&(objectCategory=person)(objectClass=user))(|(description=*pass*)(comment=*pass*)))']), OptString.new('FILTER', [true, 'Search filter.','(&(&(objectCategory=person)(objectClass=user))(|(description=*pass*)(comment=*pass*)))']),
], self.class) ], self.class)
end end
@ -63,7 +63,6 @@ class Metasploit3 < Msf::Post
q[:results].each do |result| q[:results].each do |result|
row = [] row = []
report = {}
result.each do |field| result.each do |field|
if field[:value].nil? if field[:value].nil?
row << "" row << ""

26
modules/post/windows/gather/enum_ad_users.rb
View File

@ -12,7 +12,13 @@ class Metasploit3 < Msf::Post
include Msf::Post::Windows::Accounts include Msf::Post::Windows::Accounts
UAC_DISABLED = 0x02 UAC_DISABLED = 0x02
USER_FIELDS = ['sAMAccountName', 'userAccountControl', 'lockoutTime', 'mail', 'primarygroupid', 'description'].freeze USER_FIELDS = ['sAMAccountName',
'userPrincipalName',
'userAccountControl',
'lockoutTime',
'mail',
'primarygroupid',
'description'].freeze
def initialize(info = {}) def initialize(info = {})
super(update_info( super(update_info(
@ -35,6 +41,7 @@ class Metasploit3 < Msf::Post
OptBool.new('STORE_LOOT', [true, 'Store file in loot.', false]), OptBool.new('STORE_LOOT', [true, 'Store file in loot.', false]),
OptBool.new('EXCLUDE_LOCKED', [true, 'Exclude in search locked accounts..', false]), OptBool.new('EXCLUDE_LOCKED', [true, 'Exclude in search locked accounts..', false]),
OptBool.new('EXCLUDE_DISABLED', [true, 'Exclude from search disabled accounts.', false]), OptBool.new('EXCLUDE_DISABLED', [true, 'Exclude from search disabled accounts.', false]),
OptString.new('ADDITIONAL_FIELDS', [false, 'Additional fields to retrieve, comma separated', nil]),
OptEnum.new('UAC', [true, 'Filter on User Account Control Setting.', 'ANY', OptEnum.new('UAC', [true, 'Filter on User Account Control Setting.', 'ANY',
[ [
'ANY', 'ANY',
@ -48,10 +55,17 @@ class Metasploit3 < Msf::Post
end end
def run def run
@user_fields = USER_FIELDS.dup
if datastore['ADDITIONAL_FIELDS']
additional_fields = datastore['ADDITIONAL_FIELDS'].gsub(/\s+/,"").split(',')
@user_fields.push(*additional_fields)
end
max_search = datastore['MAX_SEARCH'] max_search = datastore['MAX_SEARCH']
begin begin
q = query(query_filter, max_search, USER_FIELDS) q = query(query_filter, max_search, @user_fields)
rescue ::RuntimeError, ::Rex::Post::Meterpreter::RequestError => e rescue ::RuntimeError, ::Rex::Post::Meterpreter::RequestError => e
# Can't bind or in a network w/ limited accounts # Can't bind or in a network w/ limited accounts
print_error(e.message) print_error(e.message)
@ -93,7 +107,7 @@ class Metasploit3 < Msf::Post
'Header' => "Domain Users", 'Header' => "Domain Users",
'Indent' => 1, 'Indent' => 1,
'SortIndex' => -1, 'SortIndex' => -1,
'Columns' => USER_FIELDS 'Columns' => @user_fields
) )
results.each do |result| results.each do |result|
@ -107,9 +121,9 @@ class Metasploit3 < Msf::Post
end end
end end
username = result.first[:value] username = result[@user_fields.index('sAMAccountName')][:value]
uac = result[1][:value] uac = result[@user_fields.index('userAccountControl')][:value]
lockout_time = result[2][:value] lockout_time = result[@user_fields.index('lockoutTime')][:value]
store_username(username, uac, lockout_time, domain, domain_ip) store_username(username, uac, lockout_time, domain, domain_ip)
results_table << row results_table << row