From 679f15a19660d90a993e52c8aa035589912d87f7 Mon Sep 17 00:00:00 2001
From: apriestman <apriestman@basistech.com>
Date: Thu, 29 Jul 2021 10:39:16 -0400
Subject: [PATCH] Added correlation attributes

---
 .../sleuthkit/datamodel/BlackboardAttribute.java  | 15 +++++++++++++--
 .../src/org/sleuthkit/datamodel/Bundle.properties |  2 ++
 .../sleuthkit/datamodel/Bundle.properties-MERGED  |  2 ++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/bindings/java/src/org/sleuthkit/datamodel/BlackboardAttribute.java b/bindings/java/src/org/sleuthkit/datamodel/BlackboardAttribute.java
index 5696355d4..969c283d1 100755
--- a/bindings/java/src/org/sleuthkit/datamodel/BlackboardAttribute.java
+++ b/bindings/java/src/org/sleuthkit/datamodel/BlackboardAttribute.java
@@ -609,6 +609,9 @@ public static final class Type implements Serializable {
 		public static final Type TSK_HOST = new Type(154, "TSK_HOST", bundle.getString("BlackboardAttribute.tskHost.text"), TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.STRING);
 		public static final Type TSK_HOME_DIR = new Type(155, "TSK_HOME_DIR", bundle.getString("BlackboardAttribute.tskHomeDir.text"), TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.STRING);
 		public static final Type TSK_IS_ADMIN = new Type(156, "TSK_IS_ADMIN", bundle.getString("BlackboardAttribute.tskIsAdmin.text"), TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.INTEGER);
+		public static final Type TSK_CORRELATION_TYPE = new Type(157, "TSK_CORRELATION_TYPE", bundle.getString("BlackboardAttribute.tskCorrelationType.text"), TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.STRING);
+		public static final Type TSK_CORRELATION_VALUE = new Type(158, "TSK_CORRELATION_VALUE", bundle.getString("BlackboardAttribute.tskCorrelationValue.text"), TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.STRING);
+		
 		// NOTE: When adding a new standard BlackboardAttribute.Type, add the instance and then add to the STANDARD_TYPES list.
 		/**
 		 * A list of all the standard attribute types.
@@ -761,7 +764,9 @@ public static final class Type implements Serializable {
 				TSK_REALM,
 				TSK_HOST,
 				TSK_HOME_DIR,
-				TSK_IS_ADMIN
+				TSK_IS_ADMIN,
+				TSK_CORRELATION_TYPE,
+				TSK_CORRELATION_VALUE
 		));
 
 		private static final long serialVersionUID = 1L;
@@ -1529,7 +1534,13 @@ public enum ATTRIBUTE_TYPE {
 				TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.STRING),
 		TSK_IS_ADMIN(156, "TSK_IS_ADMIN",
 				bundle.getString("BlackboardAttribute.tskIsAdmin.text"),
-				TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.INTEGER),;
+				TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.INTEGER),
+		TSK_CORRELATION_TYPE(157, "TSK_CORRELATION_TYPE",
+				bundle.getString("BlackboardAttribute.tskCorrelationType.text"),
+				TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.STRING),
+		TSK_CORRELATION_VALUE(158, "TSK_CORRELATION_VALUE",
+				bundle.getString("BlackboardAttribute.tskCorrelationValue.text"),
+				TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.STRING),;
 
 		private final int typeID;
 		private final String typeName;
diff --git a/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties b/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties
index 7a72e2577..a90f29655 100644
--- a/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties
+++ b/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties
@@ -218,6 +218,8 @@ BlackboardAttribute.tskRealm.text=Realm
 BlackboardAttribute.tskHost.text=Host
 BlackboardAttribute.tskHomeDir.text=Home Directory
 BlackboardAttribute.tskIsAdmin.text=Is Administrator
+BlackboardAttribute.tskCorrelationType.text=Correlation Type
+BlackboardAttribute.tskCorrelationValue.text=Correlation Value
 AbstractFile.readLocal.exception.msg4.text=Error reading local file\: {0}
 AbstractFile.readLocal.exception.msg1.text=Error reading local file, local path is not set
 AbstractFile.readLocal.exception.msg2.text=Error reading local file, it does not exist at local path\: {0}
diff --git a/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties-MERGED b/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties-MERGED
index 7a72e2577..a90f29655 100644
--- a/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties-MERGED
+++ b/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties-MERGED
@@ -218,6 +218,8 @@ BlackboardAttribute.tskRealm.text=Realm
 BlackboardAttribute.tskHost.text=Host
 BlackboardAttribute.tskHomeDir.text=Home Directory
 BlackboardAttribute.tskIsAdmin.text=Is Administrator
+BlackboardAttribute.tskCorrelationType.text=Correlation Type
+BlackboardAttribute.tskCorrelationValue.text=Correlation Value
 AbstractFile.readLocal.exception.msg4.text=Error reading local file\: {0}
 AbstractFile.readLocal.exception.msg1.text=Error reading local file, local path is not set
 AbstractFile.readLocal.exception.msg2.text=Error reading local file, it does not exist at local path\: {0}
-- 
GitLab