Skip to content

fix(ConnectedDeviceInformation): add database query error handling #1398

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Tokenzrey wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(ConnectedDeviceInformation): add database query error handling #1398

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions scripts/artifacts/ConnectedDeviceInformation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,12 @@ def connected_device_info_device_history(context):
'Origin Product Type', 'Device Model', 'Source ID', 'Origin Build',
'OS Version')

db_records = get_sqlite_db_records(source_path, query)
try:
db_records = get_sqlite_db_records(source_path, query)
except Exception as e:
from scripts.ilapfuncs import logfunc
logfunc(f"Error querying Connected Device History database: {str(e)}")
db_records = []

for record in db_records:
start_timestamp = convert_cocoa_core_data_ts_to_utc(record[0])
Expand Down Expand Up @@ -135,7 +140,12 @@ def connected_device_info_consolidated_connected_device_history(context):
('Start Time', 'datetime'), ('End Time', 'datetime'),
'Origin Product Type', 'Device Model')

db_records = get_sqlite_db_records(source_path, query)
try:
db_records = get_sqlite_db_records(source_path, query)
except Exception as e:
from scripts.ilapfuncs import logfunc
logfunc(f"Error querying Consolidated Connected Device History database: {str(e)}")
db_records = []

for record in db_records:
start_timestamp = convert_cocoa_core_data_ts_to_utc(record[0])
Expand Down Expand Up @@ -171,7 +181,13 @@ def connected_device_information_current_device_info(context):
'OS Version')

if does_table_exist_in_db(source_path, 'device_context'):
db_records = get_sqlite_db_records(source_path, query)
try:
db_records = get_sqlite_db_records(source_path, query)
except Exception as e:
from scripts.ilapfuncs import logfunc
logfunc(f"Error querying Current Device Information database: {str(e)}")
db_records = []

for record in db_records:
mod_timestamp = convert_cocoa_core_data_ts_to_utc(record[0])
device_model = context.get_device_model(record[1])
Expand Down
Loading