Skip to content

Commit bda6c94

Browse files
committed
fixed issues with printing of tables and cleaned up output a bit removed unecessary prints
1 parent c000e59 commit bda6c94

File tree

1 file changed

+7
-15
lines changed

1 file changed

+7
-15
lines changed

modules/auxiliary/scanner/misc/dahua_dvr_auth_bypass.rb

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -187,8 +187,8 @@ def grab_channels
187187
disconnect
188188
channels_table = Rex::Ui::Text::Table.new(
189189
'Header' => 'Dahua Camera Channels',
190-
'Indent' => '1',
191-
'Columns' => ['Number', 'Channels']
190+
'Indent' => 1,
191+
'Columns' => ['ID', 'Channels']
192192
)
193193
return unless data.length > 1
194194
print_good("#{peer} -- camera channels:")
@@ -208,20 +208,13 @@ def grab_users
208208
usercount = 0
209209
users_table = Rex::Ui::Text::Table.new(
210210
'Header' => 'Dahua Users Hashes and Rights',
211-
'Indent' => '1',
211+
'Indent' => 1,
212212
'Columns' => ['Username', 'Password Hash', 'Permissions', 'Description']
213213
)
214-
print_status("Users\\Hashed Passwords\\Rights\\Description: @ #{rhost}:#{rport}!")
215214
data.each do |val|
216215
usercount += 1
217216
user, md5hash, rights, name = val.match(/^.*:(.*):(.*):.*:(.*):(.*):.*$/).captures
218217
users_table << [user, md5hash, rights, name]
219-
# puts user.class
220-
# puts md5hash.class
221-
# puts rights.class
222-
# puts name.class
223-
# users_table.print
224-
print_status(" #{val[/(([\d]+)[:]([[:print:]]+))/]}")
225218
# Write the dahua hash to the database
226219
hash = "#{rhost} #{user}:$dahua$#{md5hash}"
227220
report_hash(rhost, rport, user, hash)
@@ -236,6 +229,7 @@ def grab_users
236229
refs: references
237230
)
238231
end
232+
users_table.print
239233
end
240234

241235
def grab_groups
@@ -245,18 +239,16 @@ def grab_groups
245239
data = response.split('&&')
246240
groups_table = Rex::Ui::Text::Table.new(
247241
'Header' => 'Dahua groups',
248-
'Indent' => '1',
249-
'Columns' => ['Number', 'Group']
242+
'Indent' => 1,
243+
'Columns' => ['ID', 'Group']
250244
)
251245
print_good("#{peer} -- groups:")
252246
data.each do |val|
253247
number = "#{val[/(([\d]+))/]}"
254248
groups = "#{val[/(([a-z]+))/]}"
255-
# puts number.class
256-
# puts groups.class
257249
groups_table << [ number, groups ]
258-
groups_table.print
259250
end
251+
groups_table.print
260252
end
261253

262254
def reset_user

0 commit comments

Comments
 (0)