diff --git a/Core/src/com/basistech/df/cybertriage/autopsy/ctoptions/ctcloud/Bundle.properties-MERGED b/Core/src/com/basistech/df/cybertriage/autopsy/ctoptions/ctcloud/Bundle.properties-MERGED
index d3922b3c09ae3568c0545720cfeb05b0662320e6..0e888c7facf1375c12a0f927e486e3b38032b34b 100644
--- a/Core/src/com/basistech/df/cybertriage/autopsy/ctoptions/ctcloud/Bundle.properties-MERGED
+++ b/Core/src/com/basistech/df/cybertriage/autopsy/ctoptions/ctcloud/Bundle.properties-MERGED
@@ -60,8 +60,6 @@ CTOPtionsPanel_loadMalwareScansInfo_loading=Loading...
EULADialog.cancelButton.text=Cancel
EULADialog.acceptButton.text=Accept
EULADialog.title=Cyber Triage End User License Agreement
-CTMalwareScannerOptionsPanel.fileUploadCheckbox.text=Upload file if hash lookup produces no results
-CTMalwareScannerOptionsPanel.fileUploadPanel.border.title=File Upload
CTMalwareScannerOptionsPanel.licenseInfoMessageLabel.text=
CTMalwareScannerOptionsPanel.disclaimer.text=<html>The Cyber Triage Malware Scanner module uses 40+ malware scanning engines to identify if Windows executables are malicious. It requires a paid subscription to use.</html>
CTMalwareScannerOptionsPanel.purchaseFromLabel.text=For licensing information, visit
diff --git a/Core/src/com/basistech/df/cybertriage/autopsy/ctoptions/ctcloud/CTLicensePersistence.java b/Core/src/com/basistech/df/cybertriage/autopsy/ctoptions/ctcloud/CTLicensePersistence.java
index 717c4f4321348b6cb7a55c98dcb0245a7bddc95a..43e34a8d2a22238f90545e79db8081e788b9a7ea 100644
--- a/Core/src/com/basistech/df/cybertriage/autopsy/ctoptions/ctcloud/CTLicensePersistence.java
+++ b/Core/src/com/basistech/df/cybertriage/autopsy/ctoptions/ctcloud/CTLicensePersistence.java
@@ -91,39 +91,6 @@ public synchronized Optional<LicenseInfo> loadLicenseInfo() {
});
}
- public synchronized boolean saveMalwareSettings(MalwareIngestSettings malwareIngestSettings) {
- if (malwareIngestSettings != null) {
- File settingsFile = getMalwareIngestFile();
- try {
- settingsFile.getParentFile().mkdirs();
- objectMapper.writeValue(settingsFile, malwareIngestSettings);
- return true;
- } catch (IOException ex) {
- logger.log(Level.WARNING, "There was an error writing malware ingest settings to file: " + settingsFile.getAbsolutePath(), ex);
- }
- }
-
- return false;
- }
-
- public synchronized MalwareIngestSettings loadMalwareIngestSettings() {
- MalwareIngestSettings settings = null;
- File settingsFile = getMalwareIngestFile();
- if (settingsFile.exists() && settingsFile.isFile()) {
- try {
- settings = objectMapper.readValue(settingsFile, MalwareIngestSettings.class);
- } catch (IOException ex) {
- logger.log(Level.WARNING, "There was an error reading malware ingest settings from file: " + settingsFile.getAbsolutePath(), ex);
- }
- }
-
- if (settings == null) {
- settings = new MalwareIngestSettings();
- }
-
- return settings;
- }
-
private File getCTLicenseFile() {
return Paths.get(PlatformUtil.getModuleConfigDirectory(), CT_SETTINGS_DIR, CT_LICENSE_FILENAME).toFile();
}
diff --git a/Core/src/com/basistech/df/cybertriage/autopsy/ctoptions/ctcloud/CTMalwareScannerOptionsPanel.java b/Core/src/com/basistech/df/cybertriage/autopsy/ctoptions/ctcloud/CTMalwareScannerOptionsPanel.java
index 056b96915b6ce94fbb7bb065cdb2ce25eed85f70..f0e1a4e88fcee28c30a4cde326fb4edba5738c51 100644
--- a/Core/src/com/basistech/df/cybertriage/autopsy/ctoptions/ctcloud/CTMalwareScannerOptionsPanel.java
+++ b/Core/src/com/basistech/df/cybertriage/autopsy/ctoptions/ctcloud/CTMalwareScannerOptionsPanel.java
@@ -88,8 +88,6 @@ public class CTMalwareScannerOptionsPanel extends CTOptionsSubPanel {
public CTMalwareScannerOptionsPanel() {
initComponents();
- this.fileUploadPanel.setVisible(false);
-
this.addComponentListener(new ComponentAdapter() {
@Override
public void componentHidden(ComponentEvent e) {
@@ -121,7 +119,6 @@ public void componentShown(ComponentEvent e) {
@Override
public synchronized void saveSettings() {
ctPersistence.saveLicenseResponse(getLicenseInfo());
- ctPersistence.saveMalwareSettings(getIngestSettings());
}
@Override
@@ -138,9 +135,6 @@ public synchronized void loadSettings() {
if (licenseInfo != null) {
loadMalwareScansInfo(licenseInfo);
}
-
- MalwareIngestSettings ingestSettings = ctPersistence.loadMalwareIngestSettings();
- setIngestSettings(ingestSettings);
}
private static String getHtmlLink(String url) {
@@ -163,18 +157,6 @@ private synchronized LicenseResponse getLicenseInfo() {
return this.licenseInfo == null ? null : this.licenseInfo.getLicenseResponse();
}
- private MalwareIngestSettings getIngestSettings() {
- return new MalwareIngestSettings()
- .setUploadFiles(this.fileUploadCheckbox.isSelected());
- }
-
- private void setIngestSettings(MalwareIngestSettings ingestSettings) {
- if (ingestSettings == null) {
- ingestSettings = new MalwareIngestSettings();
- }
- this.fileUploadCheckbox.setSelected(ingestSettings.isUploadFiles());
- }
-
private synchronized void setLicenseDisplay(LicenseInfo licenseInfo, String licenseMessage) {
this.licenseInfo = licenseInfo;
this.licenseInfoMessage = licenseMessage;
@@ -695,15 +677,12 @@ public AuthTokenFetcher(DecryptedLicenseResponse decryptedLicense) {
}
@Override
- protected AuthTokenResponse doInBackground() throws Exception, CTCloudException {
+ protected AuthTokenResponse doInBackground() throws Exception {
if (this.isCancelled()) {
return null;
}
- try {
- return ctApiDAO.getAuthToken(decryptedLicense);
- } catch (CTCloudException ex) {
- return null;
- }
+
+ return ctApiDAO.getAuthToken(decryptedLicense);
}
@Override
diff --git a/Core/src/com/basistech/df/cybertriage/autopsy/ctoptions/ctcloud/MalwareIngestSettings.java b/Core/src/com/basistech/df/cybertriage/autopsy/ctoptions/ctcloud/MalwareIngestSettings.java
deleted file mode 100644
index 11e671d56106a92b37696b0caefc1f89770092d8..0000000000000000000000000000000000000000
--- a/Core/src/com/basistech/df/cybertriage/autopsy/ctoptions/ctcloud/MalwareIngestSettings.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Autopsy Forensic Browser
- *
- * Copyright 2023 Basis Technology Corp.
- * Contact: carrier <at> sleuthkit <dot> org
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.basistech.df.cybertriage.autopsy.ctoptions.ctcloud;
-
-/**
- * Settings for the malware ingest module.
- */
-public class MalwareIngestSettings {
-
- private boolean uploadFiles = true;
-
- public boolean isUploadFiles() {
- return uploadFiles;
- }
-
- public MalwareIngestSettings setUploadFiles(boolean uploadFiles) {
- this.uploadFiles = uploadFiles;
- return this;
- }
-
-}
diff --git a/Core/src/com/basistech/df/cybertriage/autopsy/malwarescan/MalwareScanIngestModule.java b/Core/src/com/basistech/df/cybertriage/autopsy/malwarescan/MalwareScanIngestModule.java
index 4698392478914b2c7858f6e840d41e96996e6b0d..d8119baab09325c5eb4d52b750a8a38d659d6f5d 100644
--- a/Core/src/com/basistech/df/cybertriage/autopsy/malwarescan/MalwareScanIngestModule.java
+++ b/Core/src/com/basistech/df/cybertriage/autopsy/malwarescan/MalwareScanIngestModule.java
@@ -207,7 +207,7 @@ private IngestJobState getNewJobState(IngestJobContext context) throws Exception
}
// determine lookups remaining
- boolean uploadFiles = ctSettingsPersistence.loadMalwareIngestSettings().isUploadFiles();
+ boolean uploadFiles = true;
if (uploadFiles) {
long uploadsRemaining = remaining(authTokenResponse.getFileUploadLimit(), authTokenResponse.getFileUploadCount());
if (uploadsRemaining <= 0) {