@@ -187,8 +187,8 @@ def grab_channels
187
187
disconnect
188
188
channels_table = Rex ::Ui ::Text ::Table . new (
189
189
'Header' => 'Dahua Camera Channels' ,
190
- 'Indent' => '1' ,
191
- 'Columns' => [ 'Number ' , 'Channels' ]
190
+ 'Indent' => 1 ,
191
+ 'Columns' => [ 'ID ' , 'Channels' ]
192
192
)
193
193
return unless data . length > 1
194
194
print_good ( "#{ peer } -- camera channels:" )
@@ -208,20 +208,13 @@ def grab_users
208
208
usercount = 0
209
209
users_table = Rex ::Ui ::Text ::Table . new (
210
210
'Header' => 'Dahua Users Hashes and Rights' ,
211
- 'Indent' => '1' ,
211
+ 'Indent' => 1 ,
212
212
'Columns' => [ 'Username' , 'Password Hash' , 'Permissions' , 'Description' ]
213
213
)
214
- print_status ( "Users\\ Hashed Passwords\\ Rights\\ Description: @ #{ rhost } :#{ rport } !" )
215
214
data . each do |val |
216
215
usercount += 1
217
216
user , md5hash , rights , name = val . match ( /^.*:(.*):(.*):.*:(.*):(.*):.*$/ ) . captures
218
217
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:]]+))/ ] } " )
225
218
# Write the dahua hash to the database
226
219
hash = "#{ rhost } #{ user } :$dahua$#{ md5hash } "
227
220
report_hash ( rhost , rport , user , hash )
@@ -236,6 +229,7 @@ def grab_users
236
229
refs : references
237
230
)
238
231
end
232
+ users_table . print
239
233
end
240
234
241
235
def grab_groups
@@ -245,18 +239,16 @@ def grab_groups
245
239
data = response . split ( '&&' )
246
240
groups_table = Rex ::Ui ::Text ::Table . new (
247
241
'Header' => 'Dahua groups' ,
248
- 'Indent' => '1' ,
249
- 'Columns' => [ 'Number ' , 'Group' ]
242
+ 'Indent' => 1 ,
243
+ 'Columns' => [ 'ID ' , 'Group' ]
250
244
)
251
245
print_good ( "#{ peer } -- groups:" )
252
246
data . each do |val |
253
247
number = "#{ val [ /(([\d ]+))/ ] } "
254
248
groups = "#{ val [ /(([a-z]+))/ ] } "
255
- # puts number.class
256
- # puts groups.class
257
249
groups_table << [ number , groups ]
258
- groups_table . print
259
250
end
251
+ groups_table . print
260
252
end
261
253
262
254
def reset_user
0 commit comments