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

5848: Key error for non existent keys while accessing dictionary.

Browse Source
This commit is contained in:
Raman Arora 2019-12-05 16:18:32 -05:00
parent ee8b12fc15
commit a197ad32b8
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
InternalPythonModules/android/fbmessenger.py
View File

@ -316,19 +316,29 @@ class FBMessengerAnalyzer(general.AndroidComponentAnalyzer):
if (attachment is not None): if (attachment is not None):
attachmentDict = json.loads(attachment)[0] attachmentDict = json.loads(attachment)[0]
if (attachmentDict["mime_type"] == "image/jpeg"): if (attachmentDict["mime_type"] == "image/jpeg"):
urlAttachments = self.getJPGListFromJson(attachmentDict["urls"]) urls = attachmentDict.get("urls", None)
if (urls is not None):
urlAttachments = self.getJPGListFromJson(urls)
elif (attachmentDict["mime_type"] == "video/mp4"): elif (attachmentDict["mime_type"] == "video/mp4"):
# filename does not have an associated path with it so it will be ignored # filename does not have an associated path with it so it will be ignored
urlAttachments = self.getJPGListFromJson(attachmentDict["urls"])
urlAttachments.add(URLAttachment(attachmentDict["video_data_url"])) urls = attachmentDict.get("urls", None)
urlAttachments.add(URLAttachment(attachmentDict["video_data_thumbnail_url"])) if (urls is not None):
urlAttachments = self.getJPGListFromJson(urls)
video_data_url = attachmentDict.get("video_data_url", None)
if (video_data_url is not None):
urlAttachments.add(URLAttachment(video_data_url))
video_data_thumbnail_url = attachmentDict.get("video_data_thumbnail_url", None)
if (video_data_thumbnail_url is not None):
urlAttachments.add(URLAttachment(video_data_thumbnail_url))
elif (attachmentDict["mime_type"] == "audio/mpeg"): elif (attachmentDict["mime_type"] == "audio/mpeg"):
if (attachmentDict["audio_uri"] == ""): audioUri = attachmentDict.get("audio_uri", None)
if (audioUri is None or audioUri == ""):
continue continue
else: else:
audioUri = attachmentDict["audio_uri"]
fileAttachments.add(FileAttachment(currentCase.getSleuthkitCase(), threadsDb.getDBFile().getDataSource(), audioUri.replace("file://",""))) fileAttachments.add(FileAttachment(currentCase.getSleuthkitCase(), threadsDb.getDBFile().getDataSource(), audioUri.replace("file://","")))
else: else:
@ -336,8 +346,9 @@ class FBMessengerAnalyzer(general.AndroidComponentAnalyzer):
if (pendingAttachment is not None): if (pendingAttachment is not None):
pendingAttachmentDict = json.loads(pendingAttachment)[0] pendingAttachmentDict = json.loads(pendingAttachment)[0]
pendingAttachmentUri = pendingAttachmentDict["uri"] pendingAttachmentUri = pendingAttachmentDict.get("uri", None)
fileAttachments.add(FileAttachment(currentCase.getSleuthkitCase(), threadsDb.getDBFile().getDataSource(), pendingAttachmentUri.replace("file://",""))) if (pendingAttachmentUri is not None):
fileAttachments.add(FileAttachment(currentCase.getSleuthkitCase(), threadsDb.getDBFile().getDataSource(), pendingAttachmentUri.replace("file://","")))
messageAttachments = MessageAttachments(fileAttachments, urlAttachments) messageAttachments = MessageAttachments(fileAttachments, urlAttachments)