Merge pull request #23 from blackducksoftware/dev/idetect-4058

Fix for IDETECT-4058

Author: Madhu

src/main/java/com/synopsys/integration/blackduck/imageinspector/containerfilesystem/DataStripper.java

@@ -0,0 +1,17 @@
+package com.synopsys.integration.blackduck.imageinspector.containerfilesystem;
+
+public class DataStripper {
+    
+    public static String stripEpochFromVersion(String version) {
+        return version != null && version.startsWith("0:") ? version.substring(2) : version;
+    }
+    
+    public static String stripEpochFromExternalId(String externalId) {
+        int pos;
+        if (externalId != null && (pos = externalId.indexOf("/0:")) > -1) {
+            return externalId.substring(0, pos + 1).concat(externalId.substring(pos + 3));
+        }
+        return externalId;
+    }
+    
+}

src/main/java/com/synopsys/integration/blackduck/imageinspector/containerfilesystem/pkgmgr/apk/ApkPkgMgr.java

@@ -27,6 +27,7 @@
 import org.springframework.stereotype.Component;
 
 import com.synopsys.integration.blackduck.imageinspector.api.PackageManagerEnum;
+import com.synopsys.integration.blackduck.imageinspector.containerfilesystem.DataStripper;
 import com.synopsys.integration.blackduck.imageinspector.containerfilesystem.components.ComponentDetails;
 import com.synopsys.integration.blackduck.imageinspector.containerfilesystem.pkgmgr.ComponentRelationshipPopulater;
 import com.synopsys.integration.blackduck.imageinspector.containerfilesystem.pkgmgr.pkgmgrdb.CommonRelationshipPopulater;
@@ -146,7 +147,7 @@ private Optional<ComponentDetails> createComponentForPackage(final String linuxD
             logger.warn(String.format("apk output contains an invalid line: %s", packageLine));
             return Optional.empty();
         }
-        final String version = extractVersion(parts);
+        final String version = DataStripper.stripEpochFromVersion(extractVersion(parts));
         final String component = extractComponent(parts);
         // if a package starts with a period, ignore it. It's a virtual meta package and the version information is missing
         if (component.startsWith(".")) {

src/main/java/com/synopsys/integration/blackduck/imageinspector/containerfilesystem/pkgmgr/rpm/RpmPkgMgr.java

@@ -97,8 +97,8 @@ public List<ComponentDetails> extractComponentsFromPkgMgrOutput(File imageFileSy
                 final RpmPackage rpmPackage = gson.fromJson(packageLine, RpmPackage.class);
                 final String packageName = rpmPackage.getName();
                 String packageVersion = rpmPackage.getVersion();
-                if (!NO_VALUE.equals(rpmPackage.getEpoch())) {
-                    packageVersion = String.format("%s:%s", rpmPackage.getEpoch(), rpmPackage.getVersion());
+                if (!NO_VALUE.equals(rpmPackage.getEpoch()) && rpmPackage.getEpoch() != null && !rpmPackage.getEpoch().equals("0")) {
+                    packageVersion = String.format("%s:%s", rpmPackage.getEpoch(), packageVersion);
                 }
                 String arch = "";
                 if (!NO_VALUE.equals(rpmPackage.getArch())) {

src/test/java/com/synopsys/integration/blackduck/imageinspector/containerfilesystem/DataStripperTest.java

@@ -0,0 +1,27 @@
+package com.synopsys.integration.blackduck.imageinspector.containerfilesystem;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
+
+public class DataStripperTest {
+    
+    @Test
+    void stripEpocFromVersionTest() {
+        assertEquals(null, DataStripper.stripEpocFromVersion(null));
+        assertEquals("", DataStripper.stripEpocFromVersion(""));
+        assertEquals("1:0:", DataStripper.stripEpocFromVersion("1:0:"));
+        assertEquals("0:", DataStripper.stripEpocFromVersion("0:0:"));
+        assertEquals(" ", DataStripper.stripEpocFromVersion(" "));
+        assertEquals("1.62.0-r5", DataStripper.stripEpocFromVersion("1.62.0-r5"));
+        assertEquals("1.62.0-r5", DataStripper.stripEpocFromVersion("0:1.62.0-r5"));
+    }
+    
+    @Test
+    void stripEpochFromExternalIdTest() {
+        assertEquals("name/:7.0.0", DataStripper.stripEpochFromExternalId("name/:7.0.0"));
+        assertEquals("/7.0.0", DataStripper.stripEpochFromExternalId("/7.0.0"));
+        assertEquals("name/7.0.0", DataStripper.stripEpochFromExternalId("name/0:7.0.0"));
+        assertEquals("name/1:7.0.0", DataStripper.stripEpochFromExternalId("name/1:7.0.0"));
+    }
+    
+}