Skip to content

Commit 26b17d5

Browse files
committed
Clean get_router_mac_filter_info
1 parent a63625a commit 26b17d5

File tree

1 file changed

+11
-74
lines changed

1 file changed

+11
-74
lines changed

modules/auxiliary/admin/huawei/huawei_wifi_info.rb

Lines changed: 11 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,6 @@ def get_router_ssid
266266
end
267267

268268
def get_router_mac_filter_info
269-
270269
res = send_request_raw(
271270
{
272271
'method' => 'GET',
@@ -277,83 +276,21 @@ def get_router_mac_filter_info
277276
return
278277
end
279278

280-
print_status('---===[ MAC Filter Information ]===---')
279+
print_status('MAC Filter Information')
281280

282-
# Grabbing the WifiMacFilterStatus
283-
if res.body.match(/<WifiMacFilterStatus>(.*)<\/WifiMacFilterStatus>/i)
284-
wifimacfilterstatus = $1
285-
print_status("Wifi MAC Filter Status: #{(wifimacfilterstatus == '1') ? 'ENABLED' : 'DISABLED'}" )
286-
end
281+
resp_body = res.body.to_s
287282

288-
# Grabbing the WifiMacFilterMac0
289-
if res.body.match(/<WifiMacFilterMac0>(.*)<\/WifiMacFilterMac0>/i)
290-
wifimacfiltermac = $1
291-
unless wifimacfiltermac == ''
292-
print_status("Mac: #{wifimacfiltermac}")
293-
end
283+
if resp_body.match(/<WifiMacFilterStatus>(.*)<\/WifiMacFilterStatus>/i)
284+
wifi_mac_filter_status = $1
285+
print_status("Wifi MAC Filter Status: #{(wifi_mac_filter_status == '1') ? 'ENABLED' : 'DISABLED'}" )
294286
end
295287

296-
# Grabbing the WifiMacFilterMac1
297-
if res.body.match(/<WifiMacFilterMac1>(.*)<\/WifiMacFilterMac1>/i)
298-
wifimacfiltermac = $1
299-
unless wifimacfiltermac == ''
300-
print_status("Mac: #{wifimacfiltermac}")
301-
end
302-
end
303-
# Grabbing the WifiMacFilterMac2
304-
if res.body.match(/<WifiMacFilterMac2>(.*)<\/WifiMacFilterMac2>/i)
305-
wifimacfiltermac = $1
306-
unless wifimacfiltermac == ''
307-
print_status("Mac: #{wifimacfiltermac}")
308-
end
309-
end
310-
# Grabbing the WifiMacFilterMac3
311-
if res.body.match(/<WifiMacFilterMac3>(.*)<\/WifiMacFilterMac3>/i)
312-
wifimacfiltermac = $1
313-
unless wifimacfiltermac == ''
314-
print_status("Mac: #{wifimacfiltermac}")
315-
end
316-
end
317-
# Grabbing the WifiMacFilterMac4
318-
if res.body.match(/<WifiMacFilterMac4>(.*)<\/WifiMacFilterMac4>/i)
319-
wifimacfiltermac = $1
320-
unless wifimacfiltermac == ''
321-
print_status("Mac: #{wifimacfiltermac}")
322-
end
323-
end
324-
# Grabbing the WifiMacFilterMac5
325-
if res.body.match(/<WifiMacFilterMac5>(.*)<\/WifiMacFilterMac5>/i)
326-
wifimacfiltermac = $1
327-
unless wifimacfiltermac == ''
328-
print_status("Mac: #{wifimacfiltermac}")
329-
end
330-
end
331-
# Grabbing the WifiMacFilterMac6
332-
if res.body.match(/<WifiMacFilterMac6>(.*)<\/WifiMacFilterMac6>/i)
333-
wifimacfiltermac = $1
334-
unless wifimacfiltermac == ''
335-
print_status("Mac: #{wifimacfiltermac}")
336-
end
337-
end
338-
# Grabbing the WifiMacFilterMac7
339-
if res.body.match(/<WifiMacFilterMac7>(.*)<\/WifiMacFilterMac7>/i)
340-
wifimacfiltermac = $1
341-
unless wifimacfiltermac == ''
342-
print_status("Mac: #{wifimacfiltermac}")
343-
end
344-
end
345-
# Grabbing the WifiMacFilterMac8
346-
if res.body.match(/<WifiMacFilterMac8>(.*)<\/WifiMacFilterMac8>/i)
347-
wifimacfiltermac = $1
348-
unless wifimacfiltermac == ''
349-
print_status("Mac: #{wifimacfiltermac}")
350-
end
351-
end
352-
# Grabbing the WifiMacFilterMac9
353-
if res.body.match(/<WifiMacFilterMac9>(.*)<\/WifiMacFilterMac9>/i)
354-
wifimacfiltermac = $1
355-
unless wifimacfiltermac == ''
356-
print_status("Mac: #{wifimacfiltermac}")
288+
(0..9).each do |i|
289+
if resp_body.match(/<WifiMacFilterMac#{i}>(.*)<\/WifiMacFilterMac#{i}>/i)
290+
wifi_mac_filter = $1
291+
unless wifi_mac_filter.empty?
292+
print_status("Mac: #{wifi_mac_filter}")
293+
end
357294
end
358295
end
359296
end

0 commit comments

Comments
 (0)