From bc842593c65af5181e2e832200157908b100b011 Mon Sep 17 00:00:00 2001
From: apriestman <apriestman@basistech.com>
Date: Wed, 15 Apr 2020 09:47:14 -0400
Subject: [PATCH] Fixed spacing
---
bindings/java/jni/auto_db_java.h | 2 +
.../org/sleuthkit/datamodel/JniDbHelper.java | 706 +++++++++---------
.../sleuthkit/datamodel/TimelineManager.java | 18 +-
3 files changed, 361 insertions(+), 365 deletions(-)
diff --git a/bindings/java/jni/auto_db_java.h b/bindings/java/jni/auto_db_java.h
index 46db10aae..85a9dc69e 100644
--- a/bindings/java/jni/auto_db_java.h
+++ b/bindings/java/jni/auto_db_java.h
@@ -169,10 +169,12 @@ class TskAutoDbJava :public TskAuto {
jmethodID m_addLayoutFileMethodID = NULL;
jmethodID m_addLayoutFileRangeMethodID = NULL;
+ // Cached objects
vector<TSK_DB_FS_INFO> m_savedFsInfo;
vector<TSK_DB_VS_INFO> m_savedVsInfo;
vector<TSK_DB_VS_PART_INFO> m_savedVsPartInfo;
vector<TSK_DB_OBJECT> m_savedObjects;
+
void saveObjectInfo(uint64_t objId, uint64_t parObjId, TSK_DB_OBJECT_TYPE_ENUM type);
TSK_RETVAL_ENUM getObjectInfo(uint64_t objId, TSK_DB_OBJECT** obj_info);
diff --git a/bindings/java/src/org/sleuthkit/datamodel/JniDbHelper.java b/bindings/java/src/org/sleuthkit/datamodel/JniDbHelper.java
index 524d2d999..ae102db98 100644
--- a/bindings/java/src/org/sleuthkit/datamodel/JniDbHelper.java
+++ b/bindings/java/src/org/sleuthkit/datamodel/JniDbHelper.java
@@ -31,228 +31,228 @@
* native code.
*/
class JniDbHelper {
-
- private static final Logger logger = Logger.getLogger(JniDbHelper.class.getName());
-
- private final SleuthkitCase caseDb;
- private CaseDbTransaction trans = null;
-
- private final Map<Long, Long> fsIdToRootDir = new HashMap<>();
-
- JniDbHelper(SleuthkitCase caseDb) {
- this.caseDb = caseDb;
- trans = null;
- }
-
- /**
- * Start the add image transaction
- *
- * @throws TskCoreException
- */
- void beginTransaction() throws TskCoreException {
- trans = caseDb.beginTransaction();
- }
-
- /**
- * Commit the add image transaction
- *
- * @throws TskCoreException
- */
- void commitTransaction() throws TskCoreException {
- trans.commit();
- trans = null;
- }
-
- /**
- * Revert the add image transaction
- *
- * @throws TskCoreException
- */
- void revertTransaction() throws TskCoreException {
- trans.rollback();
- trans = null;
- }
-
- /**
- * Add a new image to the database.
- * Intended to be called from the native code during the add image process.
- *
+
+ private static final Logger logger = Logger.getLogger(JniDbHelper.class.getName());
+
+ private final SleuthkitCase caseDb;
+ private CaseDbTransaction trans = null;
+
+ private final Map<Long, Long> fsIdToRootDir = new HashMap<>();
+
+ JniDbHelper(SleuthkitCase caseDb) {
+ this.caseDb = caseDb;
+ trans = null;
+ }
+
+ /**
+ * Start the add image transaction
+ *
+ * @throws TskCoreException
+ */
+ void beginTransaction() throws TskCoreException {
+ trans = caseDb.beginTransaction();
+ }
+
+ /**
+ * Commit the add image transaction
+ *
+ * @throws TskCoreException
+ */
+ void commitTransaction() throws TskCoreException {
+ trans.commit();
+ trans = null;
+ }
+
+ /**
+ * Revert the add image transaction
+ *
+ * @throws TskCoreException
+ */
+ void revertTransaction() throws TskCoreException {
+ trans.rollback();
+ trans = null;
+ }
+
+ /**
+ * Add a new image to the database.
+ * Intended to be called from the native code during the add image process.
+ *
* @param type Type of image.
- * @param ssize Sector size.
- * @param timezone Time zone.
- * @param size Image size.
- * @param md5 MD5 hash.
- * @param sha1 SHA1 hash.
- * @param sha256 SHA256 hash.
- * @param deviceId Device ID.
- * @param collectionDetails The collection details.
- *
- * @return The object ID of the new image or -1 if an error occurred
- */
- long addImageInfo(int type, long ssize, String timezone,
- long size, String md5, String sha1, String sha256, String deviceId,
- String collectionDetails) {
- try {
- return caseDb.addImageJNI(TskData.TSK_IMG_TYPE_ENUM.valueOf(type), ssize, size,
- timezone, md5, sha1, sha256, deviceId, collectionDetails, trans);
- } catch (TskCoreException ex) {
- logger.log(Level.SEVERE, "Error adding image to the database", ex);
- return -1;
- }
- }
-
- /**
- * Add an image name to the database.
- * Intended to be called from the native code during the add image process.
- *
- * @param objId The object id of the image.
- * @param name The file name for the image
- * @param sequence The sequence number of this file.
- *
- * @return 0 if successful, -1 if not
- */
- int addImageName(long objId, String name, long sequence) {
- try {
- caseDb.addImageNameJNI(objId, name, sequence, trans);
- return 0;
- } catch (TskCoreException ex) {
- logger.log(Level.SEVERE, "Error adding image name to the database - image obj ID: " + objId + ", image name: " + name
- + ", sequence: " + sequence, ex);
- return -1;
- }
- }
-
- /**
- * Add a volume system to the database.
- * Intended to be called from the native code during the add image process.
- *
- * @param parentObjId
- * @param vsType
- * @param imgOffset
- * @param blockSize
- *
- * @return The object ID of the new volume system or -1 if an error occurred
- */
- long addVsInfo(long parentObjId, int vsType, long imgOffset, long blockSize) {
- try {
- VolumeSystem vs = caseDb.addVolumeSystem(parentObjId, TskData.TSK_VS_TYPE_ENUM.valueOf(vsType), imgOffset, blockSize, trans);
- return vs.getId();
- } catch (TskCoreException ex) {
- logger.log(Level.SEVERE, "Error adding volume system to the database - parent obj ID: " + parentObjId
- + ", image offset: " + imgOffset, ex);
- return -1;
- }
- }
-
- /**
- * Add a volume to the database.
- * Intended to be called from the native code during the add image process.
- *
- * @param parentObjId
- * @param addr
- * @param start
- * @param length
- * @param desc
- * @param flags
- *
- * @return The object ID of the new volume or -1 if an error occurred
- */
- long addVolume(long parentObjId, long addr, long start, long length, String desc,
- long flags) {
- try {
- Volume vol = caseDb.addVolume(parentObjId, addr, start, length, desc, flags, trans);
- return vol.getId();
- } catch (TskCoreException ex) {
- logger.log(Level.SEVERE, "Error adding volume to the database - parent object ID: " + parentObjId
- + ", addr: " + addr, ex);
- return -1;
- }
- }
+ * @param ssize Sector size.
+ * @param timezone Time zone.
+ * @param size Image size.
+ * @param md5 MD5 hash.
+ * @param sha1 SHA1 hash.
+ * @param sha256 SHA256 hash.
+ * @param deviceId Device ID.
+ * @param collectionDetails The collection details.
+ *
+ * @return The object ID of the new image or -1 if an error occurred
+ */
+ long addImageInfo(int type, long ssize, String timezone,
+ long size, String md5, String sha1, String sha256, String deviceId,
+ String collectionDetails) {
+ try {
+ return caseDb.addImageJNI(TskData.TSK_IMG_TYPE_ENUM.valueOf(type), ssize, size,
+ timezone, md5, sha1, sha256, deviceId, collectionDetails, trans);
+ } catch (TskCoreException ex) {
+ logger.log(Level.SEVERE, "Error adding image to the database", ex);
+ return -1;
+ }
+ }
+
+ /**
+ * Add an image name to the database.
+ * Intended to be called from the native code during the add image process.
+ *
+ * @param objId The object id of the image.
+ * @param name The file name for the image
+ * @param sequence The sequence number of this file.
+ *
+ * @return 0 if successful, -1 if not
+ */
+ int addImageName(long objId, String name, long sequence) {
+ try {
+ caseDb.addImageNameJNI(objId, name, sequence, trans);
+ return 0;
+ } catch (TskCoreException ex) {
+ logger.log(Level.SEVERE, "Error adding image name to the database - image obj ID: " + objId + ", image name: " + name
+ + ", sequence: " + sequence, ex);
+ return -1;
+ }
+ }
+
+ /**
+ * Add a volume system to the database.
+ * Intended to be called from the native code during the add image process.
+ *
+ * @param parentObjId
+ * @param vsType
+ * @param imgOffset
+ * @param blockSize
+ *
+ * @return The object ID of the new volume system or -1 if an error occurred
+ */
+ long addVsInfo(long parentObjId, int vsType, long imgOffset, long blockSize) {
+ try {
+ VolumeSystem vs = caseDb.addVolumeSystem(parentObjId, TskData.TSK_VS_TYPE_ENUM.valueOf(vsType), imgOffset, blockSize, trans);
+ return vs.getId();
+ } catch (TskCoreException ex) {
+ logger.log(Level.SEVERE, "Error adding volume system to the database - parent obj ID: " + parentObjId
+ + ", image offset: " + imgOffset, ex);
+ return -1;
+ }
+ }
+
+ /**
+ * Add a volume to the database.
+ * Intended to be called from the native code during the add image process.
+ *
+ * @param parentObjId
+ * @param addr
+ * @param start
+ * @param length
+ * @param desc
+ * @param flags
+ *
+ * @return The object ID of the new volume or -1 if an error occurred
+ */
+ long addVolume(long parentObjId, long addr, long start, long length, String desc,
+ long flags) {
+ try {
+ Volume vol = caseDb.addVolume(parentObjId, addr, start, length, desc, flags, trans);
+ return vol.getId();
+ } catch (TskCoreException ex) {
+ logger.log(Level.SEVERE, "Error adding volume to the database - parent object ID: " + parentObjId
+ + ", addr: " + addr, ex);
+ return -1;
+ }
+ }
- /**
- * Add a pool to the database.
- * Intended to be called from the native code during the add image process.
- *
- * @param parentObjId
- * @param poolType
- *
- * @return The object ID of the new pool or -1 if an error occurred
- */
- long addPool(long parentObjId, int poolType) {
- try {
- Pool pool = caseDb.addPool(parentObjId, TskData.TSK_POOL_TYPE_ENUM.valueOf(poolType), trans);
- return pool.getId();
- } catch (TskCoreException ex) {
- logger.log(Level.SEVERE, "Error adding pool to the database - parent object ID: " + parentObjId, ex);
- return -1;
- }
- }
+ /**
+ * Add a pool to the database.
+ * Intended to be called from the native code during the add image process.
+ *
+ * @param parentObjId
+ * @param poolType
+ *
+ * @return The object ID of the new pool or -1 if an error occurred
+ */
+ long addPool(long parentObjId, int poolType) {
+ try {
+ Pool pool = caseDb.addPool(parentObjId, TskData.TSK_POOL_TYPE_ENUM.valueOf(poolType), trans);
+ return pool.getId();
+ } catch (TskCoreException ex) {
+ logger.log(Level.SEVERE, "Error adding pool to the database - parent object ID: " + parentObjId, ex);
+ return -1;
+ }
+ }
- /**
- * Add a file system to the database.
- * Intended to be called from the native code during the add image process.
- *
- * @param parentObjId
- * @param imgOffset
- * @param fsType
- * @param blockSize
- * @param blockCount
- * @param rootInum
- * @param firstInum
- * @param lastInum
- *
- * @return The object ID of the new file system or -1 if an error occurred
- */
- long addFileSystem(long parentObjId, long imgOffset, int fsType, long blockSize, long blockCount,
- long rootInum, long firstInum, long lastInum) {
- try {
- FileSystem fs = caseDb.addFileSystem(parentObjId, imgOffset, TskData.TSK_FS_TYPE_ENUM.valueOf(fsType), blockSize, blockCount,
- rootInum, firstInum, lastInum, null, trans);
- return fs.getId();
- } catch (TskCoreException ex) {
- logger.log(Level.SEVERE, "Error adding file system to the database - parent object ID: " + parentObjId
- + ", offset: " + imgOffset, ex);
- return -1;
- }
- }
+ /**
+ * Add a file system to the database.
+ * Intended to be called from the native code during the add image process.
+ *
+ * @param parentObjId
+ * @param imgOffset
+ * @param fsType
+ * @param blockSize
+ * @param blockCount
+ * @param rootInum
+ * @param firstInum
+ * @param lastInum
+ *
+ * @return The object ID of the new file system or -1 if an error occurred
+ */
+ long addFileSystem(long parentObjId, long imgOffset, int fsType, long blockSize, long blockCount,
+ long rootInum, long firstInum, long lastInum) {
+ try {
+ FileSystem fs = caseDb.addFileSystem(parentObjId, imgOffset, TskData.TSK_FS_TYPE_ENUM.valueOf(fsType), blockSize, blockCount,
+ rootInum, firstInum, lastInum, null, trans);
+ return fs.getId();
+ } catch (TskCoreException ex) {
+ logger.log(Level.SEVERE, "Error adding file system to the database - parent object ID: " + parentObjId
+ + ", offset: " + imgOffset, ex);
+ return -1;
+ }
+ }
- /**
- * Add a file to the database.
- * Intended to be called from the native code during the add image process.
- *
- * @param parentObjId The parent of the file.
- * @param fsObjId The object ID of the file system.
- * @param dataSourceObjId The data source object ID.
- * @param fsType The type.
- * @param attrType The type attribute given to the file by the file system.
- * @param attrId The type id given to the file by the file system.
- * @param name The name of the file.
- * @param metaAddr The meta address of the file.
- * @param metaSeq The meta sequence number of the file.
- * @param dirType The type of the file, usually as reported in
- * the name structure of the file system.
- * @param metaType The type of the file, usually as reported in
- * the metadata structure of the file system.
- * @param dirFlags The allocated status of the file, usually as
- * reported in the name structure of the file system.
- * @param metaFlags The allocated status of the file, usually as
- * reported in the metadata structure of the file system.
- * @param size The file size.
- * @param crtime The created time.
- * @param ctime The last changed time
- * @param atime The last accessed time.
- * @param mtime The last modified time.
- * @param meta_mode The modes for the file.
- * @param gid The group identifier.
- * @param uid The user identifier.
- * @param md5 The MD5 hash.
- * @param known The file known status.
- * @param escaped_path The escaped path to the file.
- * @param extension The file extension.
- *
- * @return The object ID of the new file or -1 if an error occurred
- */
- long addFile(long parentObjId,
+ /**
+ * Add a file to the database.
+ * Intended to be called from the native code during the add image process.
+ *
+ * @param parentObjId The parent of the file.
+ * @param fsObjId The object ID of the file system.
+ * @param dataSourceObjId The data source object ID.
+ * @param fsType The type.
+ * @param attrType The type attribute given to the file by the file system.
+ * @param attrId The type id given to the file by the file system.
+ * @param name The name of the file.
+ * @param metaAddr The meta address of the file.
+ * @param metaSeq The meta sequence number of the file.
+ * @param dirType The type of the file, usually as reported in
+ * the name structure of the file system.
+ * @param metaType The type of the file, usually as reported in
+ * the metadata structure of the file system.
+ * @param dirFlags The allocated status of the file, usually as
+ * reported in the name structure of the file system.
+ * @param metaFlags The allocated status of the file, usually as
+ * reported in the metadata structure of the file system.
+ * @param size The file size.
+ * @param crtime The created time.
+ * @param ctime The last changed time
+ * @param atime The last accessed time.
+ * @param mtime The last modified time.
+ * @param meta_mode The modes for the file.
+ * @param gid The group identifier.
+ * @param uid The user identifier.
+ * @param md5 The MD5 hash.
+ * @param known The file known status.
+ * @param escaped_path The escaped path to the file.
+ * @param extension The file extension.
+ *
+ * @return The object ID of the new file or -1 if an error occurred
+ */
+ long addFile(long parentObjId,
long fsObjId, long dataSourceObjId,
int fsType,
int attrType, int attrId, String name,
@@ -262,141 +262,141 @@ long addFile(long parentObjId,
long crtime, long ctime, long atime, long mtime,
int meta_mode, int gid, int uid,
String escaped_path, String extension) {
- try {
- long objId = caseDb.addFileJNI(parentObjId,
- fsObjId, dataSourceObjId,
- fsType,
- attrType, attrId, name,
- metaAddr, metaSeq,
- dirType, metaType, dirFlags, metaFlags,
- size,
- crtime, ctime, atime, mtime,
- meta_mode, gid, uid,
- null, TskData.FileKnown.UNKNOWN,
- escaped_path, extension,
- false, trans);
-
- // If we're adding the root directory for the file system, cache it
- if (parentObjId == fsObjId) {
- fsIdToRootDir.put(fsObjId, objId);
- }
- return objId;
- } catch (TskCoreException ex) {
- logger.log(Level.SEVERE, "Error adding file to the database - parent object ID: " + parentObjId
- + ", file system object ID: " + fsObjId + ", name: " + name, ex);
- return -1;
- }
- }
-
- /**
- * Add a layout file to the database.
- * Intended to be called from the native code during the add image process.
- *
- * @param parentObjId The parent object ID of the layout file.
- * @param fsObjId The file system object ID.
- * @param dataSourceObjId The data source object ID.
- * @param fileType The file type.
- * @param name The file name.
- * @param size The file size.
- *
- * @return The object ID of the new file or -1 if an error occurred
- */
- long addLayoutFile(long parentObjId,
+ try {
+ long objId = caseDb.addFileJNI(parentObjId,
+ fsObjId, dataSourceObjId,
+ fsType,
+ attrType, attrId, name,
+ metaAddr, metaSeq,
+ dirType, metaType, dirFlags, metaFlags,
+ size,
+ crtime, ctime, atime, mtime,
+ meta_mode, gid, uid,
+ null, TskData.FileKnown.UNKNOWN,
+ escaped_path, extension,
+ false, trans);
+
+ // If we're adding the root directory for the file system, cache it
+ if (parentObjId == fsObjId) {
+ fsIdToRootDir.put(fsObjId, objId);
+ }
+ return objId;
+ } catch (TskCoreException ex) {
+ logger.log(Level.SEVERE, "Error adding file to the database - parent object ID: " + parentObjId
+ + ", file system object ID: " + fsObjId + ", name: " + name, ex);
+ return -1;
+ }
+ }
+
+ /**
+ * Add a layout file to the database.
+ * Intended to be called from the native code during the add image process.
+ *
+ * @param parentObjId The parent object ID of the layout file.
+ * @param fsObjId The file system object ID.
+ * @param dataSourceObjId The data source object ID.
+ * @param fileType The file type.
+ * @param name The file name.
+ * @param size The file size.
+ *
+ * @return The object ID of the new file or -1 if an error occurred
+ */
+ long addLayoutFile(long parentObjId,
long fsObjId, long dataSourceObjId,
int fileType,
- String name, long size) {
- try {
- // The file system may be null for layout files
- Long fsObjIdForDb = fsObjId;
- if (fsObjId == 0) {
- fsObjIdForDb = null;
- }
-
- long objId = caseDb.addFileJNI(parentObjId,
- fsObjIdForDb, dataSourceObjId,
- fileType,
- null, null, name,
- null, null,
- TskData.TSK_FS_NAME_TYPE_ENUM.REG.getValue(),
- TskData.TSK_FS_META_TYPE_ENUM.TSK_FS_META_TYPE_REG.getValue(),
- TskData.TSK_FS_NAME_FLAG_ENUM.UNALLOC.getValue(),
- TskData.TSK_FS_META_FLAG_ENUM.UNALLOC.getValue(),
- size,
- null, null, null, null,
- null, null, null,
- null, TskData.FileKnown.UNKNOWN,
- null, null,
- true, trans);
- return objId;
- } catch (TskCoreException ex) {
- logger.log(Level.SEVERE, "Error adding layout file to the database - parent object ID: " + parentObjId
- + ", file system object ID: " + fsObjId + ", name: " + name, ex);
- return -1;
- }
- }
-
- /**
- * Add a layout file range to the database.
- * Intended to be called from the native code during the add image process.
- *
- * @param objId Object ID of the layout file.
- * @param byteStart Start byte.
- * @param byteLen Length in bytes.
- * @param seq Sequence number of this range.
- *
- * @return 0 if successful, -1 if not
- */
- long addLayoutFileRange(long objId, long byteStart, long byteLen, long seq) {
- try {
- caseDb.addLayoutFileRangeJNI(objId, byteStart, byteLen, seq, trans);
- return 0;
- } catch (TskCoreException ex) {
- logger.log(Level.SEVERE, "Error adding layout file range to the database - layout file ID: " + objId
- + ", byte start: " + byteStart, ex);
- return -1;
- }
- }
-
- /**
- * Look up the parent of a file based on metadata address and name/path.
- * Intended to be called from the native code during the add image process.
- *
- * @param metaAddr
- * @param fsObjId
- * @param path
- * @param name
- *
- * @return The object ID of the parent or -1 if not found
- */
- long findParentObjId(long metaAddr, long fsObjId, String path, String name) {
- try {
- return caseDb.findParentObjIdJNI(metaAddr, fsObjId, path, name, trans);
- } catch (TskCoreException ex) {
- logger.log(Level.WARNING, "Error looking up parent with meta addr: " + metaAddr + " and name " + name, ex);
- return -1;
- }
- }
-
- /**
- * Add a virtual directory to hold unallocated file system blocks.
- * Intended to be called from the native code during the add image process.
- *
- * @param fsObjId
- * @param name
- *
- * @return The object ID of the new virtual directory or -1 if an error occurred
- */
- long addUnallocFsBlockFilesParent(long fsObjId, String name) {
- try {
- if (! fsIdToRootDir.containsKey(fsObjId)) {
- logger.log(Level.SEVERE, "Error - root directory for file system ID {0} not found", fsObjId);
- return -1;
- }
- VirtualDirectory dir = caseDb.addVirtualDirectoryJNI(fsIdToRootDir.get(fsObjId), name, trans);
- return dir.getId();
- } catch (TskCoreException ex) {
- logger.log(Level.SEVERE, "Error creating virtual directory " + name + " under file system ID " + fsObjId, ex);
- return -1;
- }
- }
+ String name, long size) {
+ try {
+ // The file system may be null for layout files
+ Long fsObjIdForDb = fsObjId;
+ if (fsObjId == 0) {
+ fsObjIdForDb = null;
+ }
+
+ long objId = caseDb.addFileJNI(parentObjId,
+ fsObjIdForDb, dataSourceObjId,
+ fileType,
+ null, null, name,
+ null, null,
+ TskData.TSK_FS_NAME_TYPE_ENUM.REG.getValue(),
+ TskData.TSK_FS_META_TYPE_ENUM.TSK_FS_META_TYPE_REG.getValue(),
+ TskData.TSK_FS_NAME_FLAG_ENUM.UNALLOC.getValue(),
+ TskData.TSK_FS_META_FLAG_ENUM.UNALLOC.getValue(),
+ size,
+ null, null, null, null,
+ null, null, null,
+ null, TskData.FileKnown.UNKNOWN,
+ null, null,
+ true, trans);
+ return objId;
+ } catch (TskCoreException ex) {
+ logger.log(Level.SEVERE, "Error adding layout file to the database - parent object ID: " + parentObjId
+ + ", file system object ID: " + fsObjId + ", name: " + name, ex);
+ return -1;
+ }
+ }
+
+ /**
+ * Add a layout file range to the database.
+ * Intended to be called from the native code during the add image process.
+ *
+ * @param objId Object ID of the layout file.
+ * @param byteStart Start byte.
+ * @param byteLen Length in bytes.
+ * @param seq Sequence number of this range.
+ *
+ * @return 0 if successful, -1 if not
+ */
+ long addLayoutFileRange(long objId, long byteStart, long byteLen, long seq) {
+ try {
+ caseDb.addLayoutFileRangeJNI(objId, byteStart, byteLen, seq, trans);
+ return 0;
+ } catch (TskCoreException ex) {
+ logger.log(Level.SEVERE, "Error adding layout file range to the database - layout file ID: " + objId
+ + ", byte start: " + byteStart, ex);
+ return -1;
+ }
+ }
+
+ /**
+ * Look up the parent of a file based on metadata address and name/path.
+ * Intended to be called from the native code during the add image process.
+ *
+ * @param metaAddr
+ * @param fsObjId
+ * @param path
+ * @param name
+ *
+ * @return The object ID of the parent or -1 if not found
+ */
+ long findParentObjId(long metaAddr, long fsObjId, String path, String name) {
+ try {
+ return caseDb.findParentObjIdJNI(metaAddr, fsObjId, path, name, trans);
+ } catch (TskCoreException ex) {
+ logger.log(Level.WARNING, "Error looking up parent with meta addr: " + metaAddr + " and name " + name, ex);
+ return -1;
+ }
+ }
+
+ /**
+ * Add a virtual directory to hold unallocated file system blocks.
+ * Intended to be called from the native code during the add image process.
+ *
+ * @param fsObjId
+ * @param name
+ *
+ * @return The object ID of the new virtual directory or -1 if an error occurred
+ */
+ long addUnallocFsBlockFilesParent(long fsObjId, String name) {
+ try {
+ if (! fsIdToRootDir.containsKey(fsObjId)) {
+ logger.log(Level.SEVERE, "Error - root directory for file system ID {0} not found", fsObjId);
+ return -1;
+ }
+ VirtualDirectory dir = caseDb.addVirtualDirectoryJNI(fsIdToRootDir.get(fsObjId), name, trans);
+ return dir.getId();
+ } catch (TskCoreException ex) {
+ logger.log(Level.SEVERE, "Error creating virtual directory " + name + " under file system ID " + fsObjId, ex);
+ return -1;
+ }
+ }
}
diff --git a/bindings/java/src/org/sleuthkit/datamodel/TimelineManager.java b/bindings/java/src/org/sleuthkit/datamodel/TimelineManager.java
index cf2fc53e2..1eb1d9063 100644
--- a/bindings/java/src/org/sleuthkit/datamodel/TimelineManager.java
+++ b/bindings/java/src/org/sleuthkit/datamodel/TimelineManager.java
@@ -544,7 +544,7 @@ Collection<TimelineEvent> addEventsForNewFile(AbstractFile file, CaseDbConnectio
return events;
}
- void addEventsForNewFileJNI(AbstractFile file, CaseDbConnection connection) throws TskCoreException {
+ Set<TimelineEvent> addEventsForNewFileJNI(AbstractFile file, CaseDbConnection connection) throws TskCoreException {
//gather time stamps into map
Map<TimelineEventType, Long> timeMap = ImmutableMap.of(TimelineEventType.FILE_CREATED, file.getCrtime(),
TimelineEventType.FILE_ACCESSED, file.getAtime(),
@@ -558,23 +558,20 @@ void addEventsForNewFileJNI(AbstractFile file, CaseDbConnection connection) thro
* rest of the event generation.
*/
if (Collections.max(timeMap.values()) <= 0) {
- return;
+ return Collections.emptySet();
}
String description = file.getParentPath() + file.getName();
long fileObjId = file.getId();
+ Set<TimelineEvent> events = new HashSet<>();
caseDB.acquireSingleUserCaseWriteLock();
try {
long descriptionID = addEventDescription(file.getDataSourceObjectId(), fileObjId, null,
description, null, null, false, false, connection);
- //for (Map.Entry<TimelineEventType, Long> timeEntry : timeMap.entrySet()) {
for (TimelineEventType type : tempList) {
- //Map.Entry<TimelineEventType, Long> timeEntry = timeMap.get(type);
Long time = timeMap.get(type);
- //Long time = timeEntry.getValue();
if (time > 0 && time < MAX_TIMESTAMP_TO_ADD) {// if the time is legitimate ( greater than zero and less then 12 years from current date) insert it
- //TimelineEventType type = timeEntry.getKey();
long eventID = addEventWithExistingDescription(time, type, descriptionID, connection);
/*
@@ -582,8 +579,8 @@ void addEventsForNewFileJNI(AbstractFile file, CaseDbConnection connection) thro
* both set to false with the assumption that this is not
* possible for a new file. See JIRA-5407
*/
- //events.add(new TimelineEvent(eventID, descriptionID, fileObjId, null, time, type,
- // description, null, null, false, false));
+ events.add(new TimelineEvent(eventID, descriptionID, fileObjId, null, time, type,
+ description, null, null, false, false));
} else {
if (time >= MAX_TIMESTAMP_TO_ADD) {
//logger.log(Level.WARNING, String.format("Date/Time discarded from Timeline for %s for file %s with Id %d", timeEntry.getKey().getDisplayName(), file.getParentPath() + file.getName(), file.getId()));
@@ -594,11 +591,8 @@ void addEventsForNewFileJNI(AbstractFile file, CaseDbConnection connection) thro
} finally {
caseDB.releaseSingleUserCaseWriteLock();
}
- //events.stream()
- // .map(TimelineEventAddedEvent::new)
- // .forEach(caseDB::fireTSKEvent);
- //return events;
+ return events;
}
/**
--
GitLab