Skip to content

Commit d3b2537

Browse files
committed
Prevent generation of empty artifacts on the report
icloudWifi wifi
1 parent a420079 commit d3b2537

File tree

2 files changed

+24
-19
lines changed

2 files changed

+24
-19
lines changed

scripts/artifacts/iCloudWifi.py

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,15 @@ def get_iCloudWifi(files_found, report_folder, seeker):
5151
added_at = 'Not Available'
5252
data_list.append((bssid, ssid, added_by, enabled, added_at))
5353

54-
report = ArtifactHtmlReport('iCloud Wifi Networks')
55-
report.start_artifact_report(report_folder, 'iCloud Wifi Networks')
56-
report.add_script()
57-
data_headers = ('BSSID','SSID', 'Added By', 'Enabled', 'Added At')
58-
report.write_artifact_data_table(data_headers, data_list, file_found)
59-
report.end_artifact_report()
60-
61-
tsvname = 'iCloud Wifi Networks'
62-
tsv(report_folder, data_headers, data_list, tsvname)
54+
if len(data_list) > 0:
55+
report = ArtifactHtmlReport('iCloud Wifi Networks')
56+
report.start_artifact_report(report_folder, 'iCloud Wifi Networks')
57+
report.add_script()
58+
data_headers = ('BSSID','SSID', 'Added By', 'Enabled', 'Added At')
59+
report.write_artifact_data_table(data_headers, data_list, file_found)
60+
report.end_artifact_report()
61+
62+
tsvname = 'iCloud Wifi Networks'
63+
tsv(report_folder, data_headers, data_list, tsvname)
64+
else:
65+
logfunc('No data on iCloud WiFi networks')

scripts/artifacts/wifi.py

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,17 @@ def get_wifi(files_found, report_folder, seeker):
5656

5757
data_list.append((ssid, bssid, netusage, countrycode, devname, mfr, serialnum, modelname, lastjoined, lastautojoined, enabled))
5858

59-
60-
report = ArtifactHtmlReport('Wifi')
61-
report.start_artifact_report(report_folder, 'Wifi')
62-
report.add_script()
63-
data_headers = ('SSID','BSSID', 'Network usage', 'Country code', 'Device name', 'Manufacturer', 'Serial number', 'Model name', 'Last joined', 'Last autojoined', 'Enabled')
64-
report.write_artifact_data_table(data_headers, data_list, file_found)
65-
report.end_artifact_report()
66-
67-
tsvname = 'Wifi'
68-
tsv(report_folder, data_headers, data_list, tsvname)
59+
if len(data_list) > 0:
60+
report = ArtifactHtmlReport('Wifi')
61+
report.start_artifact_report(report_folder, 'Wifi')
62+
report.add_script()
63+
data_headers = ('SSID','BSSID', 'Network usage', 'Country code', 'Device name', 'Manufacturer', 'Serial number', 'Model name', 'Last joined', 'Last autojoined', 'Enabled')
64+
report.write_artifact_data_table(data_headers, data_list, file_found)
65+
report.end_artifact_report()
66+
67+
tsvname = 'Wifi'
68+
tsv(report_folder, data_headers, data_list, tsvname)
69+
else:
70+
logfunc('No Networks data')
6971

7072

0 commit comments

Comments
 (0)