[DMAAP-DR] Fix sec hotspots

Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Change-Id: I4fb02bd7874d51e340faec17dad985e2382234f8
Issue-ID: DMAAP-1624

diff --git a/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/DeliveryTask.java b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/DeliveryTask.java
index eb79b56..55ad6aa 100644 (file)
--- a/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/DeliveryTask.java
+++ b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/DeliveryTask.java
@@ -117,7 +117,7 @@ public class DeliveryTask implements Runnable, Comparable<DeliveryTask> {
                 String header = line.substring(0, index);
                 String headerValue = line.substring(index + 1);
                 if ("x-dmaap-dr-routing".equalsIgnoreCase(header)) {
-                    subid = headerValue.replaceAll("[^ ]*/", "");
+                    subid = headerValue.replaceAll("[^ ]*/+", "");
                     feedid = deliveryTaskHelper.getFeedId(subid.replaceAll(" .*", ""));
                 }
                 if (length == 0 && header.toLowerCase().startsWith("content-")) {

diff --git a/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeUtils.java b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeUtils.java
index 37e5db6..2c8dcdb 100644 (file)
--- a/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeUtils.java
+++ b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeUtils.java
@@ -99,14 +99,14 @@ public class NodeUtils {
      */
     public static String getNodeAuthHdr(String node, String key) {
         try {
-            MessageDigest md = MessageDigest.getInstance("SHA");
+            MessageDigest md = MessageDigest.getInstance("SHA-512");
             md.update(key.getBytes());
             md.update(node.getBytes());
             md.update(key.getBytes());
             return (getAuthHdr(node, base64Encode(md.digest())));
         } catch (Exception exception) {
             eelfLogger
-                    .error("Exception in generating Credentials for given node name:= " + exception.toString(),
+                    .error("Exception in generating Credentials for given node name:= " + exception.getMessage(),
                             exception);
             return (null);
         }

diff --git a/datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/NodeConfigManagerTest.java b/datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/NodeConfigManagerTest.java
index 88e6e48..e64579e 100644 (file)
--- a/datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/NodeConfigManagerTest.java
+++ b/datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/NodeConfigManagerTest.java
@@ -133,7 +133,7 @@ public class NodeConfigManagerTest {
         Assert.assertFalse(nodeConfigManager.isFollowRedirects());
         Assert.assertNotNull(nodeConfigManager.getTimer());
         Assert.assertEquals("1", nodeConfigManager.getFeedId("1"));
-        Assert.assertEquals("Basic ZG1hYXAtZHItbm9kZTpsaEFUNHY2N3F3blY3QVFxV3ByMm84WXNuVjg9", nodeConfigManager.getMyAuth());
+        Assert.assertEquals("Basic ZG1hYXAtZHItbm9kZTp2OStFanZpWVBXSURrazVxRlF5ZkoxSC9LdHBuYWo4K0NVTXlNL0lRRUp2UGdjOUxpU2s5ZnpKTjdFazl3SzZkaG11S1E4S3RtcC9kelpBU3BRUGZCdz09", nodeConfigManager.getMyAuth());
         Assert.assertEquals(0.05, nodeConfigManager.getFreeDiskStart(), 0.0);
         Assert.assertEquals(0.2, nodeConfigManager.getFreeDiskStop(), 0.0);
         Assert.assertEquals("org.onap.dmaap-dr.feed|legacy|publish", nodeConfigManager.getPermission("legacy"));

diff --git a/datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/NodeConfigTest.java b/datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/NodeConfigTest.java
index 05cd0dc..6804ebf 100644 (file)
--- a/datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/NodeConfigTest.java
+++ b/datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/NodeConfigTest.java
@@ -239,7 +239,7 @@ public class NodeConfigTest {
     @Test
     public void Given_Different_Ip_Then_Is_Another_Node_Returns_True() {
         Boolean isAnotherNode =
-                nodeConfig.isAnotherNode("Basic MTcyLjAuMC40OmtCTmhkWVFvbzhXNUphZ2g4T1N4Zmp6Mzl1ND0=", "172.0.0.4");
+                nodeConfig.isAnotherNode("Basic MTcyLjAuMC40OjlKOEFMUEhWQ2FpZ3FnZFpMMlRMYVRKSE1QQS8wNjdjR2JhV2RaUU1XSG1MNk5KbEtBVmpPbWtoZTR6ZmVlYjJzbElNMVR0REc2b0tYb0dLSDRMa1BBPT0=", "172.0.0.4");
         Assert.assertTrue(isAnotherNode);
     }
 
@@ -258,6 +258,6 @@ public class NodeConfigTest {
     @Test
     public void Validate_Get_MyAuth_Returns_Correct_Auth() {
         String auth = nodeConfig.getMyAuth();
-        Assert.assertEquals("Basic TmFtZTp6Z04wMFkyS3gybFppbXltNy94ZDhuMkdEYjA9", auth);
+        Assert.assertEquals("Basic TmFtZTo3YTRsQkxqMENQQ3lEbVVPaUI5Tks3b0pSeGROVUxqZzNNUHpkcEFYNHcvN09DNVR5S1hhWFA0MGR5aHhzbm90bXM4d1BGeXdHVlQ3MTJhcldXSFR1dz09", auth);
     }
 }

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/StatisticsServlet.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/StatisticsServlet.java
index 6049eea..1a07ffa 100755 (executable)
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/StatisticsServlet.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/StatisticsServlet.java
@@ -542,7 +542,6 @@ public class StatisticsServlet extends BaseServlet {
             intlogger.debug("Time: " + (System.currentTimeMillis() - start) + " ms");\r
         } catch (SQLException e) {\r
             eventlogger.error("SQLException:" + e.getMessage());\r
-            e.printStackTrace();\r
         } catch (IOException e) {\r
             eventlogger.error("IOException - Generating JSON/CSV:" + e);\r
         } catch (JSONException e) {\r