Merge pull request #2866 from sleuthkit/develop

Merge develop

bindings/java/ivy.xml

@@ -13,7 +13,7 @@
 
         <!-- NOTE: When SQLITE version is changed, also change the version number in
           debian/sleuthkit-java.install so that it gets packaged correctly on Linux -->
-		<dependency org="org.xerial" name="sqlite-jdbc" rev="3.42.0.0"/>
+		<dependency org="org.xerial" name="sqlite-jdbc" rev="3.42.0.1"/>
 
 		<dependency org="org.postgresql" name="postgresql" rev="42.3.5" >
 			<artifact name="postgresql" type="jar" />

bindings/java/src/org/sleuthkit/datamodel/BlackboardArtifact.java

@@ -1381,6 +1381,11 @@ public static final class Type implements Serializable {
 		 * interesting.
 		 */
 		public static final Type TSK_INTERESTING_ITEM = new BlackboardArtifact.Type(72, "TSK_INTERESTING_ITEM", bundle.getString("BlackboardArtifact.tskInterestingItem.text"), Category.ANALYSIS_RESULT);
+		
+		/**
+		 * Malware artifact.
+		 */
+		public static final Type TSK_MALWARE = new BlackboardArtifact.Type(73, "TSK_MALWARE", bundle.getString("BlackboardArtifact.tskMalware.text"), Category.ANALYSIS_RESULT);
 		/*
 		 * IMPORTANT!
 		 *
@@ -1460,7 +1465,8 @@ public static final class Type implements Serializable {
 				TSK_PREVIOUSLY_SEEN,
 				TSK_PREVIOUSLY_UNSEEN,
 				TSK_PREVIOUSLY_NOTABLE,
-				TSK_INTERESTING_ITEM
+				TSK_INTERESTING_ITEM,
+				TSK_MALWARE
 		).collect(Collectors.toMap(type -> type.getTypeID(), type -> type)));
 
 		private final String typeName;
@@ -1986,7 +1992,12 @@ public enum ARTIFACT_TYPE {
 		 * interesting.
 		 */
 		TSK_INTERESTING_ITEM(72, "TSK_INTERESTING_ITEM", //NON-NLS
-				bundle.getString("BlackboardArtifact.tskInterestingItem.text"), Category.ANALYSIS_RESULT);
+				bundle.getString("BlackboardArtifact.tskInterestingItem.text"), Category.ANALYSIS_RESULT),
+		/**
+		 * Malware artifact.
+		 */
+		TSK_MALWARE(73, "TSK_MALWARE", //NON-NLS
+				bundle.getString("BlackboardArtifact.tskMalware.text"), Category.ANALYSIS_RESULT);
 		/*
 		 * IMPORTANT!
 		 *

bindings/java/src/org/sleuthkit/datamodel/Bundle.properties

@@ -68,6 +68,7 @@ BlackboardArtifact.tskPreviouslySeen.text=Previously Seen
 BlackboardArtifact.tskPreviouslyUnseen.text=Previously Unseen
 BlackboardArtifact.tskPreviouslyNotable.text=Previously Notable
 BlackboardArtifact.tskInterestingItem.text=Interesting Items
+BlackboardArtifact.tskMalware.text=Malware
 BlackboardArtifact.tskYaraHit.text=YARA Hit
 BlackboardArtifact.tskGPSArea.text=GPS Area
 BlackboardAttribute.tskAccountType.text=Account Type

bindings/java/src/org/sleuthkit/datamodel/Bundle.properties-MERGED

@@ -68,6 +68,7 @@ BlackboardArtifact.tskPreviouslySeen.text=Previously Seen
 BlackboardArtifact.tskPreviouslyUnseen.text=Previously Unseen
 BlackboardArtifact.tskPreviouslyNotable.text=Previously Notable
 BlackboardArtifact.tskInterestingItem.text=Interesting Items
+BlackboardArtifact.tskMalware.text=Malware
 BlackboardArtifact.tskYaraHit.text=YARA Hit
 BlackboardArtifact.tskGPSArea.text=GPS Area
 BlackboardAttribute.tskAccountType.text=Account Type
@@ -250,8 +251,10 @@ SleuthkitCase.addLocalFile.exception.msg1.text=Error adding local file\: {0}, pa
 SleuthkitCase.addLocalFile.exception.msg2.text=Error creating a local file, cannot get new id of the object, file name\: {0}
 SleuthkitCase.addLocalFile.exception.msg3.text=Error creating a derived file, file name\: {0}
 SleuthkitCase.getLastObjectId.exception.msg.text=Error closing result set after getting last object id.
+TskData.tskFsNameFlagEnum.unknown=Unknown
 TskData.tskFsNameFlagEnum.allocated=Allocated
 TskData.tskFsNameFlagEnum.unallocated=Unallocated
+TskData.tskFsMetaFlagEnum.unknown=Unknown
 TskData.tskFsMetaFlagEnum.allocated=Allocated
 TskData.tskFsMetaFlagEnum.unallocated=Unallocated
 TskData.tskFsMetaFlagEnum.used=Used
@@ -282,6 +285,7 @@ TskData.fileKnown.known=known
 TskData.fileKnown.knownBad=notable
 TskData.fileKnown.exception.msg1.text=No FileKnown of value\: {0}
 TskData.encodingType.exception.msg1.text=No EncodingType of value\: {0}
+TskData.collectedStatus.exception.msg1.text=No CollectedStatus of value\: {0}
 TskData.keywordSearchQueryType.exception.msg1.text=No KeywordSearchQueryType of value\: {0}
 TskData.tskDbFilesTypeEnum.exception.msg1.text=No TSK_FILE_TYPE_ENUM of value\: {0}
 TskData.objectTypeEnum.exception.msg1.text=No ObjectType of value\: {0}

bindings/java/src/org/sleuthkit/datamodel/SleuthkitCase.java

@@ -13367,7 +13367,7 @@ private final class SQLiteConnections extends ConnectionPool {
 			SQLiteConfig config = new SQLiteConfig();
 			config.setSynchronous(SQLiteConfig.SynchronousMode.OFF); // Reduce I/O operations, we have no OS crash recovery anyway.
-			config.setReadUncommited(true);
+			config.setReadUncommitted(true);
 			config.enforceForeignKeys(true); // Enforce foreign key constraints.
 			SQLiteDataSource unpooled = new SQLiteDataSource(config);
 			unpooled.setUrl("jdbc:sqlite:" + dbPath);

debian/sleuthkit-java.install

-bindings/java/lib/sqlite-jdbc-3.42.0.0.jar /usr/share/java
+bindings/java/lib/sqlite-jdbc-3.42.0.1.jar /usr/share/java
 bindings/java/dist/sleuthkit-4.12.1.jar /usr/share/java
 case-uco/java/dist/sleuthkit-caseuco-4.12.1.jar /usr/share/java