Merge pull request #203 from tommylehmann/fix/202-referenceUrl_not_correct

Add fix for reference URL calculation and add/change coresponding tests

Author: mfd2007

src/main/java/de/bsi/secvisogram/csaf_cms_backend/json/AdvisoryWrapper.java

@@ -511,7 +511,7 @@ public String getDocumentPublisherName() {
      */
     public String getDocumentDistributionTlp() {
 
-        JsonNode tlpNode = this.at("/csaf/document/distribution/tlp");
+        JsonNode tlpNode = this.at("/csaf/document/distribution/tlp/label");
         return (tlpNode.isMissingNode()) ? null : tlpNode.asText();
     }
 
@@ -922,7 +922,7 @@ String calculateReferenceUrl(String baseUrl, String trackingId) {
         int year = calculatePublishYear();
         String fileName = calculateFileName(trackingId);
         String tlpLabel = getDocumentDistributionTlp() != null ? getDocumentDistributionTlp() : "WHITE";
-        return baseUrl + "/" + tlpLabel + "/" + year + "/" + fileName;
+        return baseUrl + "/" + tlpLabel.toLowerCase() + "/" + year + "/" + fileName;
     }
 
     /**

src/test/java/de/bsi/secvisogram/csaf_cms_backend/json/AdvisoryWrapperTest.java

@@ -606,10 +606,39 @@ public void setFinalTrackingIdTest() throws IOException, CsafException {
         advisory.setFinalTrackingIdAndUrl("https://example.com", "example", "5", 158L);
         long year = ZonedDateTime.now().getYear();
         assertEquals("example-" + year + "-00158", advisory.getDocumentTrackingId());
-        assertEquals("https://example.com/WHITE/" + year + "/example-" + year + "-00158.json", advisory.at("/csaf/document/references/0/url").asText());
+        assertEquals("https://example.com/white/" + year + "/example-" + year + "-00158.json", advisory.at("/csaf/document/references/0/url").asText());
         assertEquals("URL generated by system", advisory.at("/csaf/document/references/0/summary").asText());
         assertEquals("self", advisory.at("/csaf/document/references/0/category").asText());
         assertEquals("tempExamle-TEMP-0000123", advisory.getTempTrackingIdInFromMeta());
     }
 
+    @Test
+    @SuppressFBWarnings(value = "CE_CLASS_ENVY", justification = "Only for Test")
+    public void setFinalTrackingIdTest_label_not_null() throws IOException, CsafException {
+
+        final String TLP_LABEL = "AMBER";
+
+        var csafJsonWithReleaseDate = """
+                { "document": {
+                     "distribution": {
+                         "tlp": {
+                           "label": "%s"
+                         }
+                       },
+                      "publisher": {
+                         "name": "Red flag company"
+                      }
+                   }
+                }""".formatted(TLP_LABEL);
+
+        AdvisoryWrapper advisory = AdvisoryWrapper.createNewFromCsaf(csafToRequest(csafJsonWithReleaseDate), "Mustermann", Semantic.name());
+        advisory.setTemporaryTrackingId("tempExamle", "7", 123L);
+        advisory.setFinalTrackingIdAndUrl("https://example.com", "example", "5", 158L);
+        long year = ZonedDateTime.now().getYear();
+        assertEquals("example-" + year + "-00158", advisory.getDocumentTrackingId());
+        assertEquals("https://example.com/" + TLP_LABEL.toLowerCase() + "/" + year + "/example-" + year + "-00158.json", advisory.at("/csaf/document/references/0/url").asText());
+        assertEquals("URL generated by system", advisory.at("/csaf/document/references/0/summary").asText());
+        assertEquals("self", advisory.at("/csaf/document/references/0/category").asText());
+        assertEquals("tempExamle-TEMP-0000123", advisory.getTempTrackingIdInFromMeta());
+    }
 }