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

updates from debugging

Browse Source
This commit is contained in:
Greg DiCristofaro 2020-02-28 09:28:19 -05:00
parent 13719c3e70
commit 00a94d649b
3 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/CentralRepoDbManager.java
View File

@ -194,14 +194,21 @@ public class CentralRepoDbManager {
private CentralRepoDbChoice selectedDbChoice; private CentralRepoDbChoice selectedDbChoice;
private final PostgresCentralRepoSettings dbSettingsPostgres; private final PostgresCentralRepoSettings dbSettingsPostgres;
private final PostgresCentralRepoSettings dbSettingsMultiUser;
private final SqliteCentralRepoSettings dbSettingsSqlite; private final SqliteCentralRepoSettings dbSettingsSqlite;
private boolean configurationChanged = false; private boolean configurationChanged = false;
public CentralRepoDbManager() { public CentralRepoDbManager() {
dbSettingsPostgres = new PostgresCentralRepoSettings();
dbSettingsSqlite = new SqliteCentralRepoSettings();
selectedDbChoice = getSavedDbChoice(); selectedDbChoice = getSavedDbChoice();
dbSettingsPostgres = new PostgresCentralRepoSettings(PostgresSettingsLoader.CUSTOM_LOADER);
dbSettingsMultiUser = new PostgresCentralRepoSettings(PostgresSettingsLoader.MULTIUSER_LOADER);
dbSettingsSqlite = new SqliteCentralRepoSettings();
}
public PostgresCentralRepoSettings getDbSettingsMultiUser() {
return dbSettingsMultiUser;
} }
public PostgresCentralRepoSettings getDbSettingsPostgres() { public PostgresCentralRepoSettings getDbSettingsPostgres() {
@ -250,6 +257,8 @@ public class CentralRepoDbManager {
} }
private CentralRepoDbConnectivityManager getSelectedSettings() throws CentralRepoException { private CentralRepoDbConnectivityManager getSelectedSettings() throws CentralRepoException {
if (selectedDbChoice == CentralRepoDbChoice.POSTGRESQL_MULTIUSER)
return dbSettingsMultiUser;
if (selectedDbChoice == CentralRepoDbChoice.POSTGRESQL_CUSTOM) if (selectedDbChoice == CentralRepoDbChoice.POSTGRESQL_CUSTOM)
return dbSettingsPostgres; return dbSettingsPostgres;
if (selectedDbChoice == CentralRepoDbChoice.SQLITE) if (selectedDbChoice == CentralRepoDbChoice.SQLITE)
@ -257,10 +266,12 @@ public class CentralRepoDbManager {
if (selectedDbChoice == CentralRepoDbChoice.DISABLED) if (selectedDbChoice == CentralRepoDbChoice.DISABLED)
return null; return null;
throw new CentralRepoException("Unknown database type: " + selectedDbChoice); throw new CentralRepoException("Unknown database type: " + selectedDbChoice);
} }
private RdbmsCentralRepoFactory getDbFactory() throws CentralRepoException { private RdbmsCentralRepoFactory getDbFactory() throws CentralRepoException {
if (selectedDbChoice == CentralRepoDbChoice.POSTGRESQL_MULTIUSER)
return new RdbmsCentralRepoFactory(CentralRepoPlatforms.POSTGRESQL, dbSettingsMultiUser);
if (selectedDbChoice == CentralRepoDbChoice.POSTGRESQL_CUSTOM) if (selectedDbChoice == CentralRepoDbChoice.POSTGRESQL_CUSTOM)
return new RdbmsCentralRepoFactory(CentralRepoPlatforms.POSTGRESQL, dbSettingsPostgres); return new RdbmsCentralRepoFactory(CentralRepoPlatforms.POSTGRESQL, dbSettingsPostgres);
if (selectedDbChoice == CentralRepoDbChoice.SQLITE) if (selectedDbChoice == CentralRepoDbChoice.SQLITE)
@ -271,12 +282,19 @@ public class CentralRepoDbManager {
throw new CentralRepoException("Unknown database type: " + selectedDbChoice); throw new CentralRepoException("Unknown database type: " + selectedDbChoice);
} }
/**
* create central repo database if it does not already exist
* @return true if successful; false if unsuccessful
* @throws CentralRepoException if
*/
public boolean createDb() throws CentralRepoException { public boolean createDb() throws CentralRepoException {
boolean result = false; boolean result = false;
boolean dbCreated = true; boolean dbCreated = true;
CentralRepoDbConnectivityManager selectedDbSettings = getSelectedSettings(); CentralRepoDbConnectivityManager selectedDbSettings = getSelectedSettings();
if (selectedDbSettings == null)
throw new CentralRepoException("Unable to derive connectivity manager from settings: " + selectedDbChoice);
if (!selectedDbSettings.verifyDatabaseExists()) { if (!selectedDbSettings.verifyDatabaseExists()) {
dbCreated = selectedDbSettings.createDatabase(); dbCreated = selectedDbSettings.createDatabase();
} }
@ -294,7 +312,6 @@ public class CentralRepoDbManager {
if (!result) { if (!result) {
// Remove the incomplete database // Remove the incomplete database
if (dbCreated) { if (dbCreated) {
// RAMAN TBD: migrate deleteDatabase() to RdbmsCentralRepoFactory
selectedDbSettings.deleteDatabase(); selectedDbSettings.deleteDatabase();
} }
@ -344,7 +361,7 @@ public class CentralRepoDbManager {
// in case we are still using the same instance. // in case we are still using the same instance.
if (selectedDbChoice != null && selectedDbSettings != CentralRepoDbChoice.DISABLED) { if (selectedDbChoice != null && selectedDbSettings != CentralRepoDbChoice.DISABLED) {
try { try {
logger.info("Creating central repo db with settings: " + selectedDbSettings); logger.info("Saving central repo settings for db: " + selectedDbSettings);
CentralRepository.getInstance().updateSettings(); CentralRepository.getInstance().updateSettings();
configurationChanged = true; configurationChanged = true;
} catch (CentralRepoException ex) { } catch (CentralRepoException ex) {
@ -399,7 +416,7 @@ public class CentralRepoDbManager {
} }
public DatabaseTestResult testStatus() { public DatabaseTestResult testStatus() {
if (selectedDbChoice == CentralRepoDbChoice.POSTGRESQL_CUSTOM) { if (selectedDbChoice.getDbPlatform() == CentralRepoPlatforms.POSTGRESQL) {
if (dbSettingsPostgres.verifyConnection()) { if (dbSettingsPostgres.verifyConnection()) {
if (dbSettingsPostgres.verifyDatabaseExists()) { if (dbSettingsPostgres.verifyDatabaseExists()) {
if (dbSettingsPostgres.verifyDatabaseSchema()) { if (dbSettingsPostgres.verifyDatabaseSchema()) {
@ -413,7 +430,7 @@ public class CentralRepoDbManager {
} else { } else {
testingStatus = DatabaseTestResult.CONNECTION_FAILED; testingStatus = DatabaseTestResult.CONNECTION_FAILED;
} }
} else if (selectedDbChoice == CentralRepoDbChoice.SQLITE) { } else if (selectedDbChoice.getDbPlatform() == CentralRepoPlatforms.SQLITE) {
if (dbSettingsSqlite.dbFileExists()) { if (dbSettingsSqlite.dbFileExists()) {
if (dbSettingsSqlite.verifyConnection()) { if (dbSettingsSqlite.verifyConnection()) {
if (dbSettingsSqlite.verifyDatabaseSchema()) { if (dbSettingsSqlite.verifyDatabaseSchema()) {

4
Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/EamDbSettingsDialog.form
View File

@ -145,9 +145,9 @@
<Component id="bnDatabasePathFileOpen" min="-2" max="-2" attributes="0"/> <Component id="bnDatabasePathFileOpen" min="-2" max="-2" attributes="0"/>
</Group> </Group>
<Group type="102" alignment="0" attributes="0"> <Group type="102" alignment="0" attributes="0">
<Component id="cbDatabaseType" min="-2" max="-2" attributes="0"/> <Component id="cbDatabaseType" min="-2" pref="210" max="-2" attributes="0"/>
<EmptySpace type="unrelated" max="-2" attributes="0"/> <EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="lbSingleUserSqLite" min="-2" max="-2" attributes="0"/> <Component id="lbSingleUserSqLite" pref="0" max="32767" attributes="0"/>
</Group> </Group>
<Component id="jpDbPassword" alignment="0" min="-2" max="-2" attributes="0"/> <Component id="jpDbPassword" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="tbDbUsername" alignment="0" min="-2" max="-2" attributes="0"/> <Component id="tbDbUsername" alignment="0" min="-2" max="-2" attributes="0"/>

4
Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/EamDbSettingsDialog.java
View File

@ -377,9 +377,9 @@ public class EamDbSettingsDialog extends JDialog {
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(bnDatabasePathFileOpen)) .addComponent(bnDatabasePathFileOpen))
.addGroup(pnSQLiteSettingsLayout.createSequentialGroup() .addGroup(pnSQLiteSettingsLayout.createSequentialGroup()
.addComponent(cbDatabaseType, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(cbDatabaseType, javax.swing.GroupLayout.PREFERRED_SIZE, 210, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(lbSingleUserSqLite, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) .addComponent(lbSingleUserSqLite, javax.swing.GroupLayout.PREFERRED_SIZE, 1, Short.MAX_VALUE))
.addComponent(jpDbPassword, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(jpDbPassword, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(tbDbUsername, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(tbDbUsername, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(tbDbPort, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(tbDbPort, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)