mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-06 21:00:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5773 from raman-bt/6219-validation-exceptions

Browse Source 
6219: TskCoreException thrown from normalizePhoneNum
This commit is contained in:
Richard Cordovano 2020-04-07 12:53:38 -04:00 committed by GitHub
commit e9fa9d2a47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
InternalPythonModules/android/calllog.py
View File

@ -103,10 +103,7 @@ class CallLogAnalyzer(general.AndroidComponentAnalyzer):
calleeId = None calleeId = None
timeStamp = resultSet.getLong("date") / 1000 timeStamp = resultSet.getLong("date") / 1000
number = resultSet.getString("number") number = resultSet.getString("number")
if not general.isValidPhoneNumer(number):
number = None
duration = resultSet.getLong("duration") # duration of call is in seconds duration = resultSet.getLong("duration") # duration of call is in seconds
name = resultSet.getString("name") # name of person dialed or called. None if unregistered name = resultSet.getString("name") # name of person dialed or called. None if unregistered

14
InternalPythonModules/android/general.py
View File

@ -45,19 +45,15 @@ def appendAttachmentList(msgBody, attachmentsList):
""" """
Checks if the given string might be a phone number. Checks if the given string might be a phone number.
""" """
def isValidPhoneNumer(data): def isValidPhoneNumber(data):
try: return CommunicationsUtils.isValidPhoneNumber(data)
return CommunicationsUtils.normalizePhoneNum(data) is not None
except TskCoreException as ex:
return False
""" """
Checks if the given string is a valid email address. Checks if the given string is a valid email address.
""" """
def isValidEmailAddress(data): def isValidEmailAddress(data):
try: return CommunicationsUtils.isValidEmailAddress(data)
return CommunicationsUtils.normalizeEmailAddress(data) is not None
except TskCoreException as ex:
return False

2
InternalPythonModules/android/textnow.py
View File

@ -286,7 +286,7 @@ class TextNowContactsParser(TskContactsParser):
def get_phone(self): def get_phone(self):
number = self.result_set.getString("number") number = self.result_set.getString("number")
return (number if general.isValidPhoneNumer(number) else None) return (number if general.isValidPhoneNumber(number) else None)
def get_email(self): def get_email(self):
# occasionally the 'number' column may have an email address instead # occasionally the 'number' column may have an email address instead

2
InternalPythonModules/android/whatsapp.py
View File

@ -435,7 +435,7 @@ class WhatsAppContactsParser(TskContactsParser):
def get_phone(self): def get_phone(self):
number = self.result_set.getString("number") number = self.result_set.getString("number")
return (number if general.isValidPhoneNumer(number) else None) return (number if general.isValidPhoneNumber(number) else None)
def get_email(self): def get_email(self):
# occasionally the 'number' column may have an email address instead # occasionally the 'number' column may have an email address instead