Merge pull request #5379 from rcordovano/rc-data-src-deletion-integration

5511 Delete data sources from Image Gallery database tables

Core/src/org/sleuthkit/autopsy/casemodule/events/DataSourceDeletedEvent.java

@@ -37,7 +37,7 @@ public class DataSourceDeletedEvent extends AutopsyEvent implements Serializable
      * @param dataSourceId The object ID of the data source that was deleted.
      */
     public DataSourceDeletedEvent(Long dataSourceId) {
-        super(Case.Events.DATA_SOURCE_DELETED.toString(), null, dataSourceId);
+        super(Case.Events.DATA_SOURCE_DELETED.toString(), dataSourceId, null);
         this.dataSourceID = dataSourceId;
     }
 

ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryController.java

@@ -23,6 +23,7 @@ import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
+import java.sql.SQLException;
 import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -55,6 +56,7 @@ import org.sleuthkit.autopsy.casemodule.Case.CaseType;
 import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
 import org.sleuthkit.autopsy.casemodule.events.ContentTagAddedEvent;
 import org.sleuthkit.autopsy.casemodule.events.ContentTagDeletedEvent;
+import org.sleuthkit.autopsy.casemodule.events.DataSourceDeletedEvent;
 import org.sleuthkit.autopsy.coreutils.History;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.coreutils.ThreadConfined;
@@ -102,7 +104,8 @@ public final class ImageGalleryController {
             Case.Events.CURRENT_CASE,
             Case.Events.DATA_SOURCE_ADDED,
             Case.Events.CONTENT_TAG_ADDED,
-            Case.Events.CONTENT_TAG_DELETED
+            Case.Events.CONTENT_TAG_DELETED,
+            Case.Events.DATA_SOURCE_DELETED
     );
 
     /*
@@ -802,6 +805,17 @@ public final class ImageGalleryController {
                             }
                         }
                         break;
+                    case DATA_SOURCE_DELETED:
+                        if (((AutopsyEvent) event).getSourceType() == AutopsyEvent.SourceType.LOCAL) {
+                            final DataSourceDeletedEvent dataSourceDeletedEvent = (DataSourceDeletedEvent) event;
+                            long dataSourceObjId = dataSourceDeletedEvent.getDataSourceId();
+                            try {
+                                drawableDB.deleteDataSource(dataSourceObjId);
+                            } catch (SQLException | TskCoreException ex) {
+                                logger.log(Level.SEVERE, String.format("Failed to delete data source (obj_id = %d)", dataSourceObjId), ex); //NON-NLS
+                            }
+                        }
+                        break;
                     case CONTENT_TAG_ADDED:
                         final ContentTagAddedEvent tagAddedEvent = (ContentTagAddedEvent) event;
                         long objId = tagAddedEvent.getAddedTag().getContent().getId();

ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableDB.java

@@ -106,8 +106,8 @@ public final class DrawableDB {
     private static final String IG_CREATION_SCHEMA_MAJOR_VERSION_KEY = "IG_CREATION_SCHEMA_MAJOR_VERSION";
     private static final String IG_CREATION_SCHEMA_MINOR_VERSION_KEY = "IG_CREATION_SCHEMA_MINOR_VERSION";
 
-    private static final VersionNumber IG_STARTING_SCHEMA_VERSION = new VersionNumber(1, 0, 0);    // IG Schema Starting version
+    private static final VersionNumber IG_STARTING_SCHEMA_VERSION = new VersionNumber(1, 0, 0);    // IG Schema Starting version - DO NOT CHANGE
-    private static final VersionNumber IG_SCHEMA_VERSION = new VersionNumber(1, 1, 0);    // IG Schema Current version
+    private static final VersionNumber IG_SCHEMA_VERSION = new VersionNumber(1, 2, 0);    // IG Schema Current version
 
     private PreparedStatement insertHashSetStmt;
 
@@ -146,6 +146,8 @@ public final class DrawableDB {
 
     private PreparedStatement pathGroupFilterByDataSrcStmt;
 
+    private PreparedStatement deleteDataSourceStmt;
+
     /**
      * map from {@link DrawableAttribute} to the {@link PreparedStatement} that
      * is used to select groups for that attribute
@@ -263,6 +265,7 @@ public final class DrawableDB {
             selectHashSetStmt = prepareStatement("SELECT hash_set_id FROM hash_sets WHERE hash_set_name = ?"); //NON-NLS
             insertHashHitStmt = prepareStatement("INSERT OR IGNORE INTO hash_set_hits (hash_set_id, obj_id) VALUES (?,?)"); //NON-NLS
             removeHashHitStmt = prepareStatement("DELETE FROM hash_set_hits WHERE obj_id = ?"); //NON-NLS
+            deleteDataSourceStmt = prepareStatement("DELETE FROM datasources where ds_obj_id = ?"); //NON-NLS
             return true;
         } catch (TskCoreException | SQLException ex) {
             logger.log(Level.SEVERE, "Failed to prepare all statements", ex); //NON-NLS
@@ -406,6 +409,7 @@ public final class DrawableDB {
      * Checks if the specified table exists in Drawable DB
      *
      * @param tableName table to check
+     *
      * @return true if the table exists in the database
      *
      * @throws SQLException
@@ -421,8 +425,7 @@ public final class DrawableDB {
                     break;
                 }
             }
-        }
+        } finally {
-        finally {
             if (tableQueryResults != null) {
                 tableQueryResults.close();
             }
@@ -475,7 +478,7 @@ public final class DrawableDB {
                 //allow to query while in transaction - no need read locks
                 statement.execute("PRAGMA read_uncommitted = True;"); //NON-NLS
 
-                //TODO: do we need this?
+                //used for data source deletion
                 statement.execute("PRAGMA foreign_keys = ON"); //NON-NLS
 
                 //TODO: test this
@@ -578,7 +581,8 @@ public final class DrawableDB {
                             + " modified_time integer, " //NON-NLS
                             + " make TEXT DEFAULT NULL, " //NON-NLS
                             + " model TEXT DEFAULT NULL, " //NON-NLS
-                            + " analyzed integer DEFAULT 0)"; //NON-NLS
+                            + " analyzed integer DEFAULT 0, " //NON-NLS
+                            + " FOREIGN KEY (data_source_obj_id) REFERENCES datasources(ds_obj_id) ON DELETE CASCADE)"; //NON-NLS
                     stmt.execute(sql);
                 } catch (SQLException ex) {
                     logger.log(Level.SEVERE, "Failed to create drawable_files table", ex); //NON-NLS
@@ -598,8 +602,9 @@ public final class DrawableDB {
                 try {
                     String sql = "CREATE TABLE if not exists hash_set_hits " //NON-NLS
                             + "(hash_set_id INTEGER REFERENCES hash_sets(hash_set_id) not null, " //NON-NLS
-                            + " obj_id BIGINT REFERENCES drawable_files(obj_id) not null, " //NON-NLS
+                            + " obj_id BIGINT NOT NULL, " //NON-NLS
-                            + " PRIMARY KEY (hash_set_id, obj_id))"; //NON-NLS
+                            + " PRIMARY KEY (hash_set_id, obj_id), " //NON-NLS
+                            + " FOREIGN KEY (obj_id) REFERENCES drawable_files(obj_id) ON DELETE CASCADE)"; //NON-NLS
                     stmt.execute(sql);
                 } catch (SQLException ex) {
                     logger.log(Level.SEVERE, "Failed to create hash_set_hits table", ex); //NON-NLS
@@ -710,7 +715,7 @@ public final class DrawableDB {
                         + " examiner_id integer not null, " //NON-NLS
                         + " seen integer DEFAULT 0, " //NON-NLS
                         + " UNIQUE(group_id, examiner_id),"
-                        + " FOREIGN KEY(group_id) REFERENCES " + GROUPS_TABLENAME + "(group_id),"
+                        + " FOREIGN KEY(group_id) REFERENCES " + GROUPS_TABLENAME + "(group_id) ON DELETE CASCADE,"
                         + " FOREIGN KEY(examiner_id) REFERENCES  tsk_examiners(examiner_id)"
                         + " )"; //NON-NLS
 
@@ -731,6 +736,7 @@ public final class DrawableDB {
      * Gets the Schema version from DrawableDB
      *
      * @return image gallery schema version in DrawableDB
+     *
      * @throws SQLException
      * @throws TskCoreException
      */
@@ -769,8 +775,7 @@ public final class DrawableDB {
             }
 
             return new VersionNumber(majorVersion, minorVersion, 0);
-        } 
+        } finally {
-        finally {
             if (resultSet != null) {
                 resultSet.close();
             }
@@ -784,6 +789,7 @@ public final class DrawableDB {
      * Gets the ImageGallery schema version from CaseDB
      *
      * @return image gallery schema version in CaseDB
+     *
      * @throws SQLException
      * @throws TskCoreException
      */
@@ -811,8 +817,7 @@ public final class DrawableDB {
                     } else {
                         logger.log(Level.SEVERE, "Failed to get version");
                     }
-                }
+                } catch (SQLException ex) {
-                catch (SQLException ex) {
                     logger.log(Level.SEVERE, "Failed to get version", ex); //NON-NLS
                 }
             }
@@ -851,8 +856,7 @@ public final class DrawableDB {
             statement.execute(String.format("UPDATE %s  SET value = '%s' WHERE name = '%s'", IG_DB_INFO_TABLE, version.getMinor(), IG_SCHEMA_MINOR_VERSION_KEY));
 
             statement.close();
-        }
+        } finally {
-        finally {
             dbWriteUnlock();
         }
     }
@@ -872,7 +876,6 @@ public final class DrawableDB {
         tskCase.getCaseDbAccessManager().update(IG_DB_INFO_TABLE, String.format(updateSQLTemplate, version.getMinor(), IG_SCHEMA_MINOR_VERSION_KEY), caseDbTransaction);
     }
 
-    
     /**
      * Upgrades the DB schema.
      *
@@ -903,8 +906,7 @@ public final class DrawableDB {
             caseDbTransaction = null;
             commitTransaction(transaction, false);
             transaction = null;
-        }
+        } catch (TskCoreException | SQLException ex) {
-        catch (TskCoreException | SQLException ex) {
             if (null != caseDbTransaction) {
                 try {
                     caseDbTransaction.rollback();
@@ -925,21 +927,22 @@ public final class DrawableDB {
     }
 
     /**
-     * Upgrades IG tables in CaseDB from 1.0 to 1.1
+     * Upgrades IG tables in CaseDB from 1.0 to 1.1 Does nothing if the incoming
-     * Does nothing if the incoming version is not 1.0 
+     * version is not 1.0
      *
      * @param currVersion       version to upgrade from
      * @param caseDbTransaction transaction to use for all updates
      *
      * @return new version number
+     *
      * @throws TskCoreException
      */
     private VersionNumber upgradeCaseDbIgSchema1dot0TO1dot1(VersionNumber currVersion, CaseDbTransaction caseDbTransaction) throws TskCoreException {
 
         // Upgrade if current version is 1.0
         // or 1.1 - a bug in versioning alllowed some databases to be versioned as 1.1 without the actual corresponding upgrade.  This allows such databases to be fixed, if needed.
-        if (!(currVersion.getMajor() == 1 && 
+        if (!(currVersion.getMajor() == 1
-             (currVersion.getMinor() == 0 || currVersion.getMinor() == 1))) {
+                && (currVersion.getMinor() == 0 || currVersion.getMinor() == 1))) {
             return currVersion;
         }
 
@@ -952,19 +955,20 @@ public final class DrawableDB {
     }
 
     /**
-     * Upgrades IG tables in DrawableDB from 1.0 to 1.1
+     * Upgrades IG tables in DrawableDB from 1.0 to 1.1 Does nothing if the
-     * Does nothing if the incoming version is not 1.0 
+     * incoming version is not 1.0
      *
      * @param currVersion version to upgrade from
      * @param transaction transaction to use for all updates
      *
      * @return new version number
+     *
      * @throws TskCoreException
      */
     private VersionNumber upgradeDrawableDbIgSchema1dot0TO1dot1(VersionNumber currVersion, DrawableTransaction transaction) throws TskCoreException {
 
-        if (currVersion.getMajor() != 1 || 
+        if (currVersion.getMajor() != 1
-            currVersion.getMinor() != 0) {  
+                || currVersion.getMinor() != 0) {
             return currVersion;
         }
 
@@ -1143,8 +1147,8 @@ public final class DrawableDB {
     }
 
     /**
-     * Record in the DB that the group with the given key is seen
+     * Record in the DB that the group with the given key is seen by given
-     * by given examiner id.
+     * examiner id.
      *
      * @param groupKey   key identifying the group.
      * @param examinerID examiner id.
@@ -1154,8 +1158,8 @@ public final class DrawableDB {
     public void markGroupSeen(GroupKey<?> groupKey, long examinerID) throws TskCoreException {
 
         /*
-         * Check the groupSeenCache to see if the seen status for this group was set recently.
+         * Check the groupSeenCache to see if the seen status for this group was
-         * If recently set to seen, there's no need to update it
+         * set recently. If recently set to seen, there's no need to update it
          */
         Boolean cachedValue = groupSeenCache.getIfPresent(groupKey);
         if (cachedValue != null && cachedValue == true) {
@@ -1180,8 +1184,8 @@ public final class DrawableDB {
     }
 
     /**
-     * Record in the DB that given group is unseen.
+     * Record in the DB that given group is unseen. The group is marked unseen
-     * The group is marked unseen for ALL examiners that have seen the group.
+     * for ALL examiners that have seen the group.
      *
      * @param groupKey key identifying the group.
      *
@@ -1190,8 +1194,8 @@ public final class DrawableDB {
     public void markGroupUnseen(GroupKey<?> groupKey) throws TskCoreException {
 
         /*
-         * Check the groupSeenCache to see if the seen status for this group was set recently.
+         * Check the groupSeenCache to see if the seen status for this group was
-         * If recently set to unseen, there's no need to update it
+         * set recently. If recently set to unseen, there's no need to update it
          */
         Boolean cachedValue = groupSeenCache.getIfPresent(groupKey);
         if (cachedValue != null && cachedValue == false) {
@@ -1213,7 +1217,6 @@ public final class DrawableDB {
      */
     public void markGroupAnalyzed(GroupKey<?> groupKey) throws TskCoreException {
 
-        
         String updateSQL = String.format(" SET is_analyzed = %d "
                 + " WHERE attribute = \'%s\' AND value = \'%s\' and data_source_obj_id = %d ",
                 1,
@@ -1288,7 +1291,6 @@ public final class DrawableDB {
         }
     }
 
-   
     /**
      * Update an existing entry (or make a new one) into the DB that includes
      * group information. Called when a file has been analyzed or during a bulk
@@ -1603,8 +1605,8 @@ public final class DrawableDB {
     }
 
     /**
-     * Get the build status for the given data source.
+     * Get the build status for the given data source. Will return UNKNOWN if
-     * Will return UNKNOWN if the data source is not yet in the database.
+     * the data source is not yet in the database.
      *
      * @param dataSourceId
      *
@@ -1687,10 +1689,13 @@ public final class DrawableDB {
     }
 
     /**
-     * Returns whether or not the given group is analyzed and ready to be viewed.
+     * Returns whether or not the given group is analyzed and ready to be
+     * viewed.
      *
      * @param groupKey group key.
+     *
      * @return true if the group is analyzed.
+     *
      * @throws SQLException
      * @throws TskCoreException
      */
@@ -1995,7 +2000,6 @@ public final class DrawableDB {
         return countFilesWhere(" 1 ");
     }
 
-
     /**
      * delete the row with obj_id = id.
      *
@@ -2027,6 +2031,37 @@ public final class DrawableDB {
         }
     }
 
+    /**
+     * Deletes a cascading delete of a data source, starting from the
+     * datasources table.
+     *
+     * @param dataSourceID The object ID of the data source to delete.
+     *
+     * @throws SQLException 
+     * @throws TskCoreException
+     */
+    public void deleteDataSource(long dataSourceID) throws SQLException, TskCoreException {
+        dbWriteLock();
+        DrawableTransaction trans = null;
+        try {
+            trans = beginTransaction();
+            deleteDataSourceStmt.setLong(1, dataSourceID);
+            deleteDataSourceStmt.executeUpdate();
+            commitTransaction(trans, true);
+        } catch (SQLException | TskCoreException ex) {
+            if (null != trans) {
+                try {
+                    rollbackTransaction(trans);
+                } catch (SQLException ex2) {
+                    logger.log(Level.SEVERE, String.format("Failed to roll back drawables db transaction after error: %s", ex.getMessage()), ex2); //NON-NLS
+                }
+            }
+            throw ex;
+        } finally {
+            dbWriteUnlock();
+        }
+    }
+
     public class MultipleTransactionException extends IllegalStateException {
 
         public MultipleTransactionException() {

KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties-MERGED

@@ -348,7 +348,6 @@ SolrSearch.openCore.msg=Opening text index
 SolrSearch.openGiantCore.msg=Opening text index. Text index for this case is very large and may take long time to load.
 SolrSearch.openLargeCore.msg=Opening text index. This may take several minutes.
 SolrSearch.readingIndexes.msg=Reading text index metadata file
-SolrSearchService.deleteDataSource.exceptionMessage.noCurrentSolrCore=DeleteDataSource did not contain a current Solr core so could not delete the Data Source
 # {0} - index folder path
 SolrSearchService.exceptionMessage.failedToDeleteIndexFiles=Failed to delete text index files at {0}
 SolrSearchService.exceptionMessage.noCurrentSolrCore=IndexMetadata did not contain a current Solr core so could not delete the case

branding/core/core.jar/org/netbeans/core/startup/Bundle.properties

@@ -1,5 +1,5 @@
 #Updated by build script
-#Fri, 04 Oct 2019 14:30:10 -0400
+#Mon, 28 Oct 2019 16:22:16 -0400
 LBL_splash_window_title=Starting Autopsy
 SPLASH_HEIGHT=314
 SPLASH_WIDTH=538

branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties

@@ -1,4 +1,4 @@
 #Updated by build script
-#Fri, 04 Oct 2019 14:30:10 -0400
+#Mon, 28 Oct 2019 16:22:16 -0400
 CTL_MainWindow_Title=Autopsy 4.13.0
 CTL_MainWindow_Title_No_Project=Autopsy 4.13.0