Skip to content

Handle Errors in wifiConfigstore2 and gboard #630

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
AspHyxia28 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Handle Errors in wifiConfigstore2 and gboard #630

Show file tree
Hide file tree
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
36 changes: 21 additions & 15 deletions scripts/artifacts/gboard.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import os
import shutil
import sqlite3
from google.protobuf.message import DecodeError

from scripts.artifact_report import ArtifactHtmlReport
from scripts.ilapfuncs import logfunc, tsv, timeline, is_platform_windows, open_sqlite_db_readonly, does_table_exist_in_db, media_to_html
Expand Down Expand Up @@ -124,22 +125,27 @@ def read_trainingcache2(file_found, report_folder, seeker):
all_rows = cursor.fetchall()
for row in all_rows:
pb = row['_payload']
data, actual_types = blackboxprotobuf.decode_message(pb, pb_types)
texts = data.get('7', {}).get('2', [])
text_typed = ''
if texts:
if isinstance(texts, list):
for t in texts:
text_typed += t.get('1', b'').decode('utf8', 'ignore')
else:
text_typed = texts.get('1', b'').decode('utf8', 'ignore')
try:
data, actual_types = blackboxprotobuf.decode_message(pb, pb_types)
texts = data.get('7', {}).get('2', [])
text_typed = ''
if texts:
if isinstance(texts, list):
for t in texts:
text_typed += t.get('1', b'').decode('utf8', 'ignore')
else:
text_typed = texts.get('1', b'').decode('utf8', 'ignore')

# Not filtering out blanks for now
textbox_name = row['textbox_name']
textbox_id = row['textbox_id']
if len(textbox_id) > len(textbox_name):
textbox_id = textbox_id[len(textbox_name) + 4:]
keyboard_events.append(keyboard_event(row['_id'], row['app'], text_typed, row['textbox_name'], row['textbox_id'], row['ts']))
# Not filtering out blanks for now
textbox_name = row['textbox_name']
textbox_id = row['textbox_id']
if len(textbox_id) > len(textbox_name):
textbox_id = textbox_id[len(textbox_name) + 4:]
keyboard_events.append(keyboard_event(row['_id'], row['app'], text_typed, row['textbox_name'], row['textbox_id'], row['ts']))
except (DecodeError, ValueError, AttributeError, TypeError) as inner_ex:
# Skip rows with malformed protobuf data
logfunc(f'Skipping row with malformed protobuf data: {inner_ex}')
continue
except (sqlite3.Error, TypeError, ValueError) as ex:
logfunc(f'read_trainingcache2 had an error reading {file_found} ' + str(ex))

Expand Down
18 changes: 17 additions & 1 deletion scripts/artifacts/wifiConfigstore2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,22 @@ def get_wifiConfigstore(files_found, report_folder, seeker, wrap_text):
#print(b.tag)
tagg = b.tag

# Initialize all variables before processing fields
configcombined = ''
ssidcombined = ''
bssidcombined = ''
PreSharedKeycombined = ''
WEPKeyscombined = ''
HiddenSSIDcombined = ''
RandomizedMacAddresscombined = ''
CreatorNamecombined = ''
CreationTimecombined = ''
ConnectChoicecombined = ''
ConnectChoiceTimeStampcombined = ''
HasEverConnectedcombined = ''
IpAssignmentcombined = ''
ProxySettingscombined = ''

for c in b:
combined = (c.attrib, c.text)
datafieldname = (c.attrib['name']) #field
Expand Down Expand Up @@ -109,7 +125,7 @@ def get_wifiConfigstore(files_found, report_folder, seeker, wrap_text):
ProxySettingsvalue = f'{datafieldvalue}'
ProxySettingscombined = f'{ProxySettings} - {ProxySettingsvalue}'

data_list.append((configcombined,ssidcombined,bssidcombined,PreSharedKeycombined, WEPKeyscombined,HiddenSSIDcombined,RandomizedMacAddresscombined,CreatorNamecombined,CreationTimecombined,ConnectChoicecombined,ConnectChoiceTimeStampcombined,HasEverConnectedcombined,IpAssignmentcombined,ProxySettingscombined))
data_list.append((configcombined,ssidcombined,bssidcombined,PreSharedKeycombined, WEPKeyscombined,HiddenSSIDcombined,RandomizedMacAddresscombined,CreatorNamecombined,CreationTimecombined,ConnectChoicecombined,ConnectChoiceTimeStampcombined,HasEverConnectedcombined,IpAssignmentcombined,ProxySettingscombined))

if data_list:
report = ArtifactHtmlReport(f'Wifi Configuration Store Details.xml - {count}')
Expand Down