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

fixes

Browse Source
This commit is contained in:
Greg DiCristofaro 2022-05-19 14:18:51 -04:00
parent b48357d989
commit 0aada85787
3 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIngestConfigPanel.java
View File

@ -31,6 +31,7 @@ import org.openide.windows.WindowManager;
import org.sleuthkit.autopsy.coreutils.ModuleSettings; import org.sleuthkit.autopsy.coreutils.ModuleSettings;
import org.sleuthkit.autopsy.ingest.IngestJobSettings; import org.sleuthkit.autopsy.ingest.IngestJobSettings;
import org.sleuthkit.autopsy.ingest.IngestJobSettingsPanel; import org.sleuthkit.autopsy.ingest.IngestJobSettingsPanel;
import org.sleuthkit.autopsy.ingest.IngestProfiles;
import org.sleuthkit.autopsy.ingest.runIngestModuleWizard.IngestProfileSelectionWizardPanel; import org.sleuthkit.autopsy.ingest.runIngestModuleWizard.IngestProfileSelectionWizardPanel;
import org.sleuthkit.autopsy.ingest.runIngestModuleWizard.ShortcutWizardDescriptorPanel; import org.sleuthkit.autopsy.ingest.runIngestModuleWizard.ShortcutWizardDescriptorPanel;
@ -189,7 +190,8 @@ class AddImageWizardIngestConfigPanel extends ShortcutWizardDescriptorPanel {
} }
//Because this panel kicks off ingest during the wizard we need to //Because this panel kicks off ingest during the wizard we need to
//swap out the ingestJobSettings for the ones of the chosen profile before //swap out the ingestJobSettings for the ones of the chosen profile before
IngestJobSettings ingestJobSettings = new IngestJobSettings(lastProfileUsed); //use prefix to specify correct execution context for profiles.
IngestJobSettings ingestJobSettings = new IngestJobSettings(IngestProfiles.getIngestProfilePrefix() + lastProfileUsed);
progressPanel.setIngestJobSettings(ingestJobSettings); //prepare ingest for being started progressPanel.setIngestJobSettings(ingestJobSettings); //prepare ingest for being started
} }
} }

2
Core/src/org/sleuthkit/autopsy/texttranslation/translators/settings/TranslatorSettings.java
View File

@ -20,10 +20,12 @@ package org.sleuthkit.autopsy.texttranslation.translators.settings;
import java.nio.file.Paths; import java.nio.file.Paths;
import org.sleuthkit.autopsy.coreutils.PlatformUtil; import org.sleuthkit.autopsy.coreutils.PlatformUtil;
import com.google.common.annotations.Beta;
/** /**
* ModuleSettings keys and paths for translator settings. * ModuleSettings keys and paths for translator settings.
*/ */
@Beta
public class TranslatorSettings { public class TranslatorSettings {
private static final String TRANSLATION_FOLDER = "Translation"; private static final String TRANSLATION_FOLDER = "Translation";

34
Experimental/src/org/sleuthkit/autopsy/experimental/configuration/SharedConfiguration.java
View File

@ -89,6 +89,8 @@ public class SharedConfiguration {
public static final String FILE_EXPORTER_FOLDER = "Automated File Exporter"; //NON-NLS public static final String FILE_EXPORTER_FOLDER = "Automated File Exporter"; //NON-NLS
private static final String UPLOAD_IN_PROGRESS_FILE = "uploadInProgress"; // NON-NLS private static final String UPLOAD_IN_PROGRESS_FILE = "uploadInProgress"; // NON-NLS
private static final String moduleDirPath = PlatformUtil.getUserConfigDirectory(); private static final String moduleDirPath = PlatformUtil.getUserConfigDirectory();
private static final String INGEST_MODULES_PATH = IngestJobSettings.getBaseSettingsPath();
private static final String INGEST_MODULES_REL_PATH = new File(moduleDirPath).toURI().relativize(new File(INGEST_MODULES_PATH).toURI()).getPath();
private static final Logger logger = Logger.getLogger(SharedConfiguration.class.getName()); private static final Logger logger = Logger.getLogger(SharedConfiguration.class.getName());
private final UpdateConfigSwingWorker swingWorker; private final UpdateConfigSwingWorker swingWorker;
@ -425,7 +427,7 @@ public class SharedConfiguration {
// Check that the context directory exists and is not empty // Check that the context directory exists and is not empty
File contextDir; File contextDir;
if (isSharedFolder) { if (isSharedFolder) {
contextDir = new File(folder, AUTO_MODE_FOLDER); contextDir = Paths.get(folder.getAbsolutePath(), INGEST_MODULES_REL_PATH, AUTO_MODE_FOLDER).toFile();
} else { } else {
IngestJobSettings ingestJobSettings = new IngestJobSettings(AutoIngestUserPreferences.getAutoModeIngestModuleContextString()); IngestJobSettings ingestJobSettings = new IngestJobSettings(AutoIngestUserPreferences.getAutoModeIngestModuleContextString());
contextDir = ingestJobSettings.getSavedModuleSettingsFolder().toFile(); contextDir = ingestJobSettings.getSavedModuleSettingsFolder().toFile();
@ -439,7 +441,7 @@ public class SharedConfiguration {
} }
// Check that the automode context properties file exists // Check that the automode context properties file exists
File contextProperties = new File(folder, AUTO_MODE_CONTEXT_FILE); File contextProperties = Paths.get(folder.getAbsolutePath(), INGEST_MODULES_REL_PATH, AUTO_MODE_CONTEXT_FILE).toFile();
return contextProperties.exists(); return contextProperties.exists();
} }
@ -640,7 +642,7 @@ public class SharedConfiguration {
publishTask("Uploading AutoModeContext configuration files"); publishTask("Uploading AutoModeContext configuration files");
// Make a subfolder // Make a subfolder
File remoteAutoConfFolder = new File(remoteFolder, AUTO_MODE_FOLDER); File remoteAutoConfFolder = Paths.get(remoteFolder.getAbsolutePath(), INGEST_MODULES_REL_PATH, AUTO_MODE_FOLDER).toFile();
try { try {
if (remoteAutoConfFolder.exists()) { if (remoteAutoConfFolder.exists()) {
FileUtils.deleteDirectory(remoteAutoConfFolder); FileUtils.deleteDirectory(remoteAutoConfFolder);
@ -678,7 +680,7 @@ public class SharedConfiguration {
publishTask("Downloading AutoModeContext configuration files"); publishTask("Downloading AutoModeContext configuration files");
// Check that the remote subfolder exists // Check that the remote subfolder exists
File remoteAutoConfFolder = new File(remoteFolder, AUTO_MODE_FOLDER); File remoteAutoConfFolder = Paths.get(remoteFolder.getAbsolutePath(), INGEST_MODULES_REL_PATH, AUTO_MODE_FOLDER).toFile();
if (!remoteAutoConfFolder.exists()) { if (!remoteAutoConfFolder.exists()) {
logger.log(Level.SEVERE, "Shared configuration folder {0} does not exist", remoteAutoConfFolder.getAbsolutePath()); logger.log(Level.SEVERE, "Shared configuration folder {0} does not exist", remoteAutoConfFolder.getAbsolutePath());
throw new SharedConfigurationException("Shared configuration folder " + remoteAutoConfFolder.getAbsolutePath() + " does not exist"); throw new SharedConfigurationException("Shared configuration folder " + remoteAutoConfFolder.getAbsolutePath() + " does not exist");
@ -714,7 +716,7 @@ public class SharedConfiguration {
*/ */
private void uploadEnabledModulesSettings(File remoteFolder) throws SharedConfigurationException { private void uploadEnabledModulesSettings(File remoteFolder) throws SharedConfigurationException {
publishTask("Uploading enabled module configuration"); publishTask("Uploading enabled module configuration");
copyToRemoteFolder(AUTO_MODE_CONTEXT_FILE, moduleDirPath, remoteFolder, false); copyToRemoteFolder(AUTO_MODE_CONTEXT_FILE, INGEST_MODULES_PATH, Paths.get(remoteFolder.getAbsolutePath(), INGEST_MODULES_REL_PATH).toFile(), false);
} }
/** /**
@ -726,7 +728,7 @@ public class SharedConfiguration {
*/ */
private void downloadEnabledModuleSettings(File remoteFolder) throws SharedConfigurationException { private void downloadEnabledModuleSettings(File remoteFolder) throws SharedConfigurationException {
publishTask("Downloading enabled module configuration"); publishTask("Downloading enabled module configuration");
copyToLocalFolder(AUTO_MODE_CONTEXT_FILE, moduleDirPath, remoteFolder, false); copyToLocalFolder(AUTO_MODE_CONTEXT_FILE, INGEST_MODULES_PATH, Paths.get(remoteFolder.getAbsolutePath(), INGEST_MODULES_REL_PATH).toFile(), false);
} }
/** /**
@ -902,7 +904,14 @@ public class SharedConfiguration {
private void uploadCentralRepositorySettings(File remoteFolder) throws SharedConfigurationException { private void uploadCentralRepositorySettings(File remoteFolder) throws SharedConfigurationException {
publishTask("Uploading central repository configuration"); publishTask("Uploading central repository configuration");
copyToRemoteFolder(CentralRepoSettings.getInstance().getModuleSettingsFile(), remoteFolder, true); // get relative cr path to config path.
String centralRepoRelPath = new File(moduleDirPath).toURI().relativize(
new File(CentralRepoSettings.getInstance().getModuleSettingsFile()).getParentFile().toURI()).getPath();
copyToRemoteFolder(
CentralRepoSettings.getInstance().getModuleSettingsFile(),
Paths.get(remoteFolder.getAbsolutePath(), centralRepoRelPath).toFile(),
true);
} }
/** /**
@ -914,7 +923,12 @@ public class SharedConfiguration {
*/ */
private void downloadCentralRepositorySettings(File remoteFolder) throws SharedConfigurationException { private void downloadCentralRepositorySettings(File remoteFolder) throws SharedConfigurationException {
publishTask("Downloading central repository configuration"); publishTask("Downloading central repository configuration");
copyToLocalFolder(CentralRepoSettings.getInstance().getModuleSettingsFile(), moduleDirPath, remoteFolder, true);
// get relative cr path to config path.
String centralRepoRelPath = new File(moduleDirPath).toURI().relativize(
new File(CentralRepoSettings.getInstance().getModuleSettingsFile()).getParentFile().toURI()).getPath();
copyToLocalFolder(CentralRepoSettings.getInstance().getModuleSettingsFile(), Paths.get(remoteFolder.getAbsolutePath(), centralRepoRelPath).toFile(), true);
} }
/** /**
@ -1027,7 +1041,7 @@ public class SharedConfiguration {
Map<String, String> sharedVersions = readVersionsFromFile(sharedVersionFile); Map<String, String> sharedVersions = readVersionsFromFile(sharedVersionFile);
// Copy the settings file // Copy the settings file
copyToRemoteFolder(HashLookupSettings.getSettingsPath(), moduleDirPath, remoteFolder, true); copyToRemoteFolder(HashLookupSettings.getSettingsPath(), remoteFolder, true);
copyToRemoteFolder(HASHDB_CONFIG_FILE_NAME_LEGACY, moduleDirPath, remoteFolder, true); copyToRemoteFolder(HASHDB_CONFIG_FILE_NAME_LEGACY, moduleDirPath, remoteFolder, true);
// Get the list of databases from the file // Get the list of databases from the file
@ -1276,7 +1290,7 @@ public class SharedConfiguration {
} }
// Copy the settings filey // Copy the settings filey
copyToLocalFolder(HashLookupSettings.getSettingsPath(), moduleDirPath, remoteFolder, true); copyToLocalFolder(HashLookupSettings.getSettingsPath(), remoteFolder, true);
copyToLocalFolder(HASHDB_CONFIG_FILE_NAME_LEGACY, moduleDirPath, remoteFolder, true); copyToLocalFolder(HASHDB_CONFIG_FILE_NAME_LEGACY, moduleDirPath, remoteFolder, true);
copyToLocalFolder(SHARED_CONFIG_VERSIONS, moduleDirPath, remoteFolder, true); copyToLocalFolder(SHARED_CONFIG_VERSIONS, moduleDirPath, remoteFolder, true);