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

Merge pull request #2854 from narfindustries/issue172

Browse Source 
Issue172 - make listeners do NOP if module not enabled.
This commit is contained in:
Richard Cordovano 2017-06-16 08:15:02 -04:00 committed by GitHub
commit d7b0a94445
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/eventlisteners/CaseEventListener.java
View File

@ -61,6 +61,10 @@ public class CaseEventListener implements PropertyChangeListener {
EamDb dbManager = EamDb.getInstance(); EamDb dbManager = EamDb.getInstance();
switch (Case.Events.valueOf(evt.getPropertyName())) { switch (Case.Events.valueOf(evt.getPropertyName())) {
case CONTENT_TAG_ADDED: { case CONTENT_TAG_ADDED: {
if (!dbManager.isEnabled()) {
return;
}
final ContentTagAddedEvent tagAddedEvent = (ContentTagAddedEvent) evt; final ContentTagAddedEvent tagAddedEvent = (ContentTagAddedEvent) evt;
final ContentTag tagAdded = tagAddedEvent.getAddedTag(); final ContentTag tagAdded = tagAddedEvent.getAddedTag();
// TODO: detect failed cast and break if so. // TODO: detect failed cast and break if so.
@ -121,6 +125,10 @@ public class CaseEventListener implements PropertyChangeListener {
break; break;
case BLACKBOARD_ARTIFACT_TAG_ADDED: { case BLACKBOARD_ARTIFACT_TAG_ADDED: {
if (!dbManager.isEnabled()) {
return;
}
final BlackBoardArtifactTagAddedEvent bbTagAddedEvent = (BlackBoardArtifactTagAddedEvent) evt; final BlackBoardArtifactTagAddedEvent bbTagAddedEvent = (BlackBoardArtifactTagAddedEvent) evt;
final BlackboardArtifactTag bbTagAdded = bbTagAddedEvent.getAddedTag(); final BlackboardArtifactTag bbTagAdded = bbTagAddedEvent.getAddedTag();
final AbstractFile af = (AbstractFile) bbTagAdded.getContent(); final AbstractFile af = (AbstractFile) bbTagAdded.getContent();
@ -149,12 +157,13 @@ public class CaseEventListener implements PropertyChangeListener {
break; break;
case DATA_SOURCE_ADDED: { case DATA_SOURCE_ADDED: {
final DataSourceAddedEvent dataSourceAddedEvent = (DataSourceAddedEvent) evt;
Content newDataSource = dataSourceAddedEvent.getDataSource();
if (!dbManager.isEnabled()) { if (!dbManager.isEnabled()) {
break; break;
} }
final DataSourceAddedEvent dataSourceAddedEvent = (DataSourceAddedEvent) evt;
Content newDataSource = dataSourceAddedEvent.getDataSource();
try { try {
String deviceId = Case.getCurrentCase().getSleuthkitCase().getDataSource(newDataSource.getId()).getDeviceId(); String deviceId = Case.getCurrentCase().getSleuthkitCase().getDataSource(newDataSource.getId()).getDeviceId();

1
Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/eventlisteners/IngestEventsListener.java
View File

@ -79,7 +79,6 @@ public class IngestEventsListener {
switch (IngestManager.IngestModuleEvent.valueOf(evt.getPropertyName())) { switch (IngestManager.IngestModuleEvent.valueOf(evt.getPropertyName())) {
case DATA_ADDED: { case DATA_ADDED: {
if (!dbManager.isEnabled()) { if (!dbManager.isEnabled()) {
LOGGER.log(Level.WARNING, "Error connecting to database, enteprise artifact manager artifacts not created");
return; return;
} }