Add urlhistoryfacet

Add urlhistoryfacet

case-uco/java/src/org/sleuthkit/caseuco/CaseUcoExporter.java

@@ -604,13 +604,15 @@ private void assembleWebHistory(String uuid, BlackboardArtifact artifact, List<J
         userNameNode.addFacet(identityFacet);
 
         ObservableObject export = new ObservableObject(uuid)
-                .addFacet(new URLFacet()
-                        .setUserName(userNameNode)
-                        .setFullValue(getValueIfPresent(artifact, StandardAttributeTypes.TSK_URL)))
+                .addFacet(new URLHistoryFacet()
+                        .setBrowserInformation(getValueIfPresent(artifact, StandardAttributeTypes.TSK_PROG_NAME))
+                        .setUrlHistoryEntry(getValueIfPresent(artifact, StandardAttributeTypes.TSK_URL)))
                 .addFacet(new DomainNameFacet()
                         .setValue(getValueIfPresent(artifact, StandardAttributeTypes.TSK_DOMAIN)))
                 .addFacet(new ApplicationFacet()
-                        .setApplicationIdentifier(getValueIfPresent(artifact, StandardAttributeTypes.TSK_PROG_NAME)));
+                        .setApplicationIdentifier(getValueIfPresent(artifact, StandardAttributeTypes.TSK_PROG_NAME)))
+                .addFacet(identityFacet);
+                         
          
 
         serializeObjectToOutput(export, output);

case-uco/java/src/org/sleuthkit/caseuco/URLHistoryFacet.java

+/*
+ * Sleuth Kit CASE JSON LD Support
+ *
+ * Copyright 2020-2021 Basis Technology Corp.
+ * Contact: carrier <at> sleuthkit <dot> org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	 http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.sleuthkit.caseuco;
+
+import com.google.gson.annotations.SerializedName;
+
+/**
+ * This class definition mirrors the UrlHistoryFacet observable described in the UCO
+ ontology.
+ */
+class URLHistoryFacet extends Facet {
+
+    @SerializedName("observable:browserInformation")
+    private String browserInformation;
+
+    @SerializedName("observable:urlHistoryEntry")
+    private String urlHistoryEntry;
+
+    URLHistoryFacet() {
+        super(UcoObject.UCO_OBSERV + URLHistoryFacet.class.getSimpleName());
+    }
+
+    URLHistoryFacet setBrowserInformation(String browserInfromation) {
+        this.browserInformation = browserInformation;
+        return this;
+    }
+
+    URLHistoryFacet setUrlHistoryEntry(String urlHistoryEntry) {
+        this.urlHistoryEntry = urlHistoryEntry;
+        return this;
+    }
+
+    String getBrowserInfromation() {
+        return browserInformation;
+    }
+
+    String getUrlHistoryEntry() {
+        return urlHistoryEntry;
+    }
+}