Address Lift findings

Signed-off-by: nscuro <[email protected]>
DependencyTrack · Mar 26, 2023 · 2a101f9 · 2a101f9
1 parent 81b888e
commit 2a101f9
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 17 deletions.
diff --git a/src/main/java/org/dependencytrack/integrations/defectdojo/DefectDojoClient.java b/src/main/java/org/dependencytrack/integrations/defectdojo/DefectDojoClient.java
@@ -103,7 +103,7 @@ public ArrayNode getDojoTestIds(final String token, final String eid) {
                     if (jsonObject != null) {
                         final ArrayNode dojoArray = Jackson.optArray(jsonObject, "results", Jackson.newArray());
                         String nextUrl;
-                        while (jsonObject.get("next") != null) {
+                        while (jsonObject != null && jsonObject.get("next") != null) {
                             nextUrl = jsonObject.get("next").toString();
                             LOGGER.debug("Making the subsequent pagination call on " + nextUrl);
                             uriBuilder = new URIBuilder(nextUrl);
@@ -113,7 +113,9 @@ public ArrayNode getDojoTestIds(final String token, final String eid) {
                             try (CloseableHttpResponse response1 = HttpClientPool.getClient().execute(request)) {
                                 nextUrl = jsonObject.get("next").toString();
                                 jsonObject = Jackson.readHttpResponse(response1);
-                                dojoArray.addAll(Jackson.optArray(jsonObject, "results", Jackson.newArray()));
+                                if (jsonObject != null) {
+                                    dojoArray.addAll(Jackson.optArray(jsonObject, "results", Jackson.newArray()));
+                                }
                             }
                         }
                         LOGGER.debug("Successfully retrieved the test list ");

diff --git a/src/main/java/org/dependencytrack/integrations/kenna/KennaSecurityUploader.java b/src/main/java/org/dependencytrack/integrations/kenna/KennaSecurityUploader.java
@@ -90,7 +90,7 @@ public InputStream process() {
                 kdi.process(project, externalId.getPropertyValue());
             }
         }
-        return new ByteArrayInputStream(Jackson.toString(kdi.generate()).getBytes());
+        return new ByteArrayInputStream(Jackson.toString(kdi.generate()).getBytes(StandardCharsets.UTF_8));
     }
 
     @Override

diff --git a/src/main/java/org/dependencytrack/tasks/repositories/CpanMetaAnalyzer.java b/src/main/java/org/dependencytrack/tasks/repositories/CpanMetaAnalyzer.java
@@ -76,17 +76,19 @@ public MetaModel analyze(final Component component) {
             try (final CloseableHttpResponse response = processHttpRequest(url)) {
                 if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {
                     JsonNode jsonObject = Jackson.readHttpResponse(response);
-                    final String latest = Jackson.optString(jsonObject, "version", null);
-                    if (latest != null) {
-                        meta.setLatestVersion(latest);
-                    }
-                    final String published = Jackson.optString(jsonObject, "date");
-                    if (!published.isBlank()) {
-                        final DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
-                        try {
-                            meta.setPublishedTimestamp(dateFormat.parse(published));
-                        } catch (ParseException e) {
-                            LOGGER.warn("An error occurred while parsing upload time", e);
+                    if (jsonObject != null) {
+                        final String latest = Jackson.optString(jsonObject, "version", null);
+                        if (latest != null) {
+                            meta.setLatestVersion(latest);
+                        }
+                        final String published = Jackson.optString(jsonObject, "date");
+                        if (!published.isBlank()) {
+                            final DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
+                            try {
+                                meta.setPublishedTimestamp(dateFormat.parse(published));
+                            } catch (ParseException e) {
+                                LOGGER.warn("An error occurred while parsing upload time", e);
+                            }
                         }
                     }
                 } else {

diff --git a/src/main/java/org/dependencytrack/tasks/scanners/SnykAnalysisTask.java b/src/main/java/org/dependencytrack/tasks/scanners/SnykAnalysisTask.java
@@ -339,9 +339,12 @@ private void handle(final Component component, final JsonNode object) {
             String purl = null;
             final JsonNode metaInfo = object.get("meta");
             if (metaInfo != null) {
-                purl = Jackson.optString(metaInfo.get("package"), "url");
-                if (purl == null) {
-                    purl = component.getPurlCoordinates().toString();
+                final JsonNode pkg = metaInfo.get("package");
+                if (pkg != null) {
+                    purl = Jackson.optString(pkg, "url");
+                    if (purl == null) {
+                        purl = component.getPurlCoordinates().toString();
+                    }
                 }
             }
             final ArrayNode data = Jackson.optArray(object, "data");