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

some updates

Browse Source
This commit is contained in:
Greg DiCristofaro 2023-07-27 20:22:22 -04:00
parent dc9c212db5
commit ce1c57dc79
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Core/src/com/basistech/df/cybertriage/autopsy/malwarescan/MalwareScanIngestModule.java
View File

@ -558,16 +558,16 @@ public class MalwareScanIngestModule implements FileIngestModule {
} else if (ingestJobState.getIngestJobContext().fileIngestIsCancelled()) { } else if (ingestJobState.getIngestJobContext().fileIngestIsCancelled()) {
return Collections.emptyList(); return Collections.emptyList();
} }
// while we have a valid auth token, also check file uploads. // while we have a valid auth token, also check file uploads.
if (ingestJobState.isUploadUnknownFiles()) { if (ingestJobState.isUploadUnknownFiles()) {
long remainingUploads = remaining(authTokenResponse.getFileUploadLimit(), authTokenResponse.getHashLookupCount()); long remainingUploads = remaining(authTokenResponse.getFileUploadLimit(), authTokenResponse.getFileUploadCount());
if (remainingUploads <= 0) { if (remainingUploads <= 0) {
ingestJobState.disableUploadUnknownFiles(); ingestJobState.disableUploadUnknownFiles();
notifyWarning( notifyWarning(
Bundle.MalwareScanIngestModule_uploadFile_noRemainingFileUploads_title(), Bundle.MalwareScanIngestModule_uploadFile_noRemainingFileUploads_title(),
Bundle.MalwareScanIngestModule_uploadFile_noRemainingFileUploads_desc(), Bundle.MalwareScanIngestModule_uploadFile_noRemainingFileUploads_desc(),
null); null);
} }
} }
@ -683,7 +683,10 @@ public class MalwareScanIngestModule implements FileIngestModule {
"MalwareScanIngestModule_longPollForNotFound_timeout_title=File Upload Results Timeout", "MalwareScanIngestModule_longPollForNotFound_timeout_title=File Upload Results Timeout",
"MalwareScanIngestModule_longPollForNotFound_timeout_desc=There was a timeout while waiting for file uploads to be processed. Please try again later.",}) "MalwareScanIngestModule_longPollForNotFound_timeout_desc=There was a timeout while waiting for file uploads to be processed. Please try again later.",})
private void longPollForNotFound(IngestJobState ingestJobState) throws InterruptedException, CTCloudException, Blackboard.BlackboardException, TskCoreException { private void longPollForNotFound(IngestJobState ingestJobState) throws InterruptedException, CTCloudException, Blackboard.BlackboardException, TskCoreException {
if (!ingestJobState.isDoFileLookups() || !ingestJobState.isQueryForMissing() || MapUtils.isEmpty(ingestJobState.getUnidentifiedHashes())) { if (!ingestJobState.isDoFileLookups()
|| !ingestJobState.isQueryForMissing()
|| MapUtils.isEmpty(ingestJobState.getUnidentifiedHashes())
|| ingestJobState.getIngestJobContext().fileIngestIsCancelled()) {
return; return;
} }