Skip to content

Fix call log and message relationship fields in the LEAPP processor #8037

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

Fix call log and message relationship fields in the LEAPP processor #8037

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
13 changes: 9 additions & 4 deletions Core/src/org/sleuthkit/autopsy/modules/leappanalyzers/LeappFileProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,7 +580,6 @@ private void createMessageRelationship(Collection<BlackboardAttribute> bbattribu
String alternateId = null;
CommunicationDirection communicationDirection = CommunicationDirection.UNKNOWN;
String senderId = null;
String receipentId = null;
String[] receipentIdList = null;
Long dateTime = Long.valueOf(0);
MessageReadStatus messageStatus = MessageReadStatus.UNKNOWN;
Expand Down Expand Up @@ -661,8 +660,10 @@ private void createMessageRelationship(Collection<BlackboardAttribute> bbattribu
accountHelper = new CommunicationArtifactsHelper(Case.getCurrentCaseThrows().getSleuthkitCase(),
moduleName, absFile, accountType, accountType, alternateId, context.getJobId());
}
List<String> recipientIds = receipentIdList == null ? new ArrayList<>()
: Arrays.stream(receipentIdList).map(String::trim).filter(id -> !id.isEmpty()).collect(Collectors.toList());
BlackboardArtifact messageArtifact = accountHelper.addMessage(messageType, communicationDirection, senderId,
receipentId, dateTime, messageStatus, subject,
recipientIds, dateTime, messageStatus, subject,
messageText, threadId, otherAttributes);
if (!fileAttachments.isEmpty()) {
messageAttachments = new MessageAttachments(fileAttachments, new ArrayList<>());
Expand Down Expand Up @@ -769,7 +770,7 @@ private void createCalllogRelationship(Collection<BlackboardAttribute> bbattribu
startDateTime = bba.getValueLong();
break;
case "TSK_DATETIME_END":
startDateTime = bba.getValueLong();
endDateTime = bba.getValueLong();
break;
case "TSK_DIRECTION":
if (bba.getValueString().toLowerCase().equals("outgoing")) {
Expand Down Expand Up @@ -817,7 +818,11 @@ private void createCalllogRelationship(Collection<BlackboardAttribute> bbattribu
accountHelper = new CommunicationArtifactsHelper(Case.getCurrentCaseThrows().getSleuthkitCase(),
moduleName, absFile, accountType, accountType, alternateId, context.getJobId());
}
accountHelper.addCalllog(communicationDirection, callerId, calleeId, startDateTime, endDateTime, mediaType, otherAttributes);
try {
accountHelper.addCalllog(communicationDirection, callerId, calleeId, startDateTime, endDateTime, mediaType, otherAttributes);
} catch (IllegalArgumentException ex) {
logger.log(Level.WARNING, String.format("Skipping a call log row in %s: %s", fileName, ex.getMessage())); //NON-NLS
}
} catch (NoCurrentCaseException | TskCoreException | BlackboardException ex) {
throw new IngestModuleException(Bundle.LeappFileProcessor_cannot_create_calllog_relationship() + ex.getLocalizedMessage(), ex); //NON-NLS
}
Expand Down