From c25e2a665bed8cd9263f0d365148d5c129293754 Mon Sep 17 00:00:00 2001
From: Greg DiCristofaro <gregd@basistech.com>
Date: Fri, 4 Dec 2020 13:02:51 -0500
Subject: [PATCH] updated artifact and attribute names
---
bindings/java/doxygen/artifact_catalog.dox | 10 +++++-----
.../org/sleuthkit/datamodel/BlackboardArtifact.java | 2 +-
.../org/sleuthkit/datamodel/BlackboardAttribute.java | 3 +++
.../java/src/org/sleuthkit/datamodel/Bundle.properties | 3 ++-
.../org/sleuthkit/datamodel/Bundle.properties-MERGED | 3 ++-
5 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/bindings/java/doxygen/artifact_catalog.dox b/bindings/java/doxygen/artifact_catalog.dox
index 8d711851f..dbef2d9c8 100644
--- a/bindings/java/doxygen/artifact_catalog.dox
+++ b/bindings/java/doxygen/artifact_catalog.dox
@@ -191,13 +191,13 @@ Details about a device data source.
---
-## TSK_DOMAIN_CATEGORY
-Details about the category of the domain.
+## TSK_WEB_CATEGORY
+A web host corresponding to a particular usage type, e.g. mail.google.com would correspond to Web Email.
### REQUIRED ATTRIBUTES
-- TSK_NAME (The category identifier)
-- TSK_DOMAIN (The domain of the category)
-- TSK_REALM (The full host of the category)
+- TSK_NAME (The usage category identifier, e.g. Web Email)
+- TSK_DOMAIN (The domain of the host, e.g. google.com)
+- TSK_HOST (The full host, e.g. mail.google.com)
---
diff --git a/bindings/java/src/org/sleuthkit/datamodel/BlackboardArtifact.java b/bindings/java/src/org/sleuthkit/datamodel/BlackboardArtifact.java
index 386c08f40..125927e66 100644
--- a/bindings/java/src/org/sleuthkit/datamodel/BlackboardArtifact.java
+++ b/bindings/java/src/org/sleuthkit/datamodel/BlackboardArtifact.java
@@ -1303,7 +1303,7 @@ public enum ARTIFACT_TYPE implements SleuthkitVisitableItem {
TSK_GPS_AREA(67, "TSK_GPS_AREA",
bundle.getString("BlackboardArtifact.tskGPSArea.text")),
- TSK_DOMAIN_CATEGORY(68, "TSK_DOMAIN_CATEGORY",
+ TSK_WEB_CATEGORY(68, "TSK_WEB_CATEGORY",
bundle.getString("BlackboardArtifact.tskDomainCategoryType.text")),
;
diff --git a/bindings/java/src/org/sleuthkit/datamodel/BlackboardAttribute.java b/bindings/java/src/org/sleuthkit/datamodel/BlackboardAttribute.java
index 28e63c3ff..f57b1d6a9 100755
--- a/bindings/java/src/org/sleuthkit/datamodel/BlackboardAttribute.java
+++ b/bindings/java/src/org/sleuthkit/datamodel/BlackboardAttribute.java
@@ -1416,6 +1416,9 @@ public enum ATTRIBUTE_TYPE {
TSK_REALM(153, "TSK_REALM",
bundle.getString("BlackboardAttribute.tskRealm.text"),
TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.STRING),
+ TSK_HOST(154, "TSK_HOST",
+ bundle.getString("BlackboardAttribute.tskHost.text"),
+ TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.STRING),
;
private final int typeID;
diff --git a/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties b/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties
index 598628014..c72bd34bb 100644
--- a/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties
+++ b/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties
@@ -63,7 +63,7 @@ BlackboardArtifact.tskDeletedProg.text=Deleted Programs
BlackboardArtifact.tskUserDeviceEvent.text=User Device Events
BlackboardArtifact.shortDescriptionDate.text=at {0}
BlackboardArtifact.tskAssociatedObject.text=Associated Object
-BlackboardArtifact.tskDomainCategoryType.text=Domain Category
+BlackboardArtifact.tskDomainCategoryType.text=Web Category
BlackboardArtifact.tskYaraHit.text=YARA Hit
BlackboardArtifact.tskGPSArea.text=GPS Area
BlackboardAttribute.tskAccountType.text=Account Type
@@ -213,6 +213,7 @@ BlackboardAttribute.tskgeoareapoints.text=List of points making up the outline o
BlackboardAttribute.tskrule.text = Rule
BlackboardAttribute.tskActivityType.text=Activity Type
BlackboardAttribute.tskRealm.text=Realm
+BlackboardAttribute.tskHost.text=Host
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 598628014..c72bd34bb 100644
--- a/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties-MERGED
+++ b/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties-MERGED
@@ -63,7 +63,7 @@ BlackboardArtifact.tskDeletedProg.text=Deleted Programs
BlackboardArtifact.tskUserDeviceEvent.text=User Device Events
BlackboardArtifact.shortDescriptionDate.text=at {0}
BlackboardArtifact.tskAssociatedObject.text=Associated Object
-BlackboardArtifact.tskDomainCategoryType.text=Domain Category
+BlackboardArtifact.tskDomainCategoryType.text=Web Category
BlackboardArtifact.tskYaraHit.text=YARA Hit
BlackboardArtifact.tskGPSArea.text=GPS Area
BlackboardAttribute.tskAccountType.text=Account Type
@@ -213,6 +213,7 @@ BlackboardAttribute.tskgeoareapoints.text=List of points making up the outline o
BlackboardAttribute.tskrule.text = Rule
BlackboardAttribute.tskActivityType.text=Activity Type
BlackboardAttribute.tskRealm.text=Realm
+BlackboardAttribute.tskHost.text=Host
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