fix: unix output in windows envs

Signed-off-by: Ruben Romero Montes <rromerom@redhat.com>

Author: ruromero

src/main/java/com/redhat/exhort/providers/GoModulesProvider.java

@@ -17,6 +17,9 @@
 
 import static com.redhat.exhort.impl.ExhortApi.debugLoggingIsNeeded;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.packageurl.MalformedPackageURLException;
 import com.github.packageurl.PackageURL;
 import com.redhat.exhort.Api;
@@ -40,7 +43,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Optional;
 import java.util.TreeMap;
 import java.util.logging.Logger;
 import java.util.regex.Pattern;
@@ -69,14 +71,14 @@ public String getMainModuleVersion() {
   public GoModulesProvider(Path manifest) {
     super(Type.GOLANG, manifest);
     this.goExecutable = Operations.getExecutable("go", "version");
-    this.goEnvironmentVariableForPurl = getQualifiers(true);
+    this.goEnvironmentVariableForPurl = getQualifiers();
     this.mainModuleVersion = getDefaultMainModuleVersion();
   }
 
   @Override
   public Content provideStack() throws IOException {
     // check for custom executable
-    Sbom sbom = getDependenciesSbom(manifest, true);
+    var sbom = getDependenciesSbom(manifest, true);
     return new Content(
         sbom.getAsJsonString().getBytes(StandardCharsets.UTF_8), Api.CYCLONEDX_MEDIA_TYPE);
   }
@@ -138,7 +140,7 @@ Sbom getDependenciesSbom(Path manifestPath, boolean buildTree) throws IOExceptio
     boolean matchManifestVersions =
         Environment.getBoolean(Provider.PROP_MATCH_MANIFEST_VERSIONS, false);
     if (matchManifestVersions) {
-      String[] goModGraphLines = goModulesResult.split(System.lineSeparator());
+      String[] goModGraphLines = goModulesResult.split(Operations.GENERIC_LINE_SEPARATOR);
       performManifestVersionsCheck(goModGraphLines, manifestPath);
     }
     if (!buildTree) {
@@ -152,7 +154,7 @@ Sbom getDependenciesSbom(Path manifestPath, boolean buildTree) throws IOExceptio
   private void performManifestVersionsCheck(String[] goModGraphLines, Path manifestPath) {
     try {
       String goModLines = Files.readString(manifestPath);
-      String[] lines = goModLines.split(System.lineSeparator());
+      String[] lines = goModLines.split(Operations.GENERIC_LINE_SEPARATOR);
       String root = getParentVertex(goModGraphLines[0]);
       List<String> comparisonLines =
           Arrays.stream(goModGraphLines)
@@ -271,7 +273,8 @@ private Sbom buildSbomFromGraph(
     // iterate over go mod graph line by line and create map , with each entry to contain module as
     // a key , and
     // value of list of that module' dependencies.
-    List<String> linesList = Arrays.asList(goModulesResult.split(System.lineSeparator()));
+    List<String> linesList =
+        Arrays.asList(goModulesResult.split(Operations.GENERIC_LINE_SEPARATOR));
 
     int startingIndex = 0;
     for (String line : linesList) {
@@ -325,7 +328,7 @@ private Map<String, List<String>> getFinalPackagesVersionsForModule(
     String finalVersionsForAllModules =
         Operations.runProcessGetOutput(manifestPath.getParent(), "go", "list", "-m", "all");
     Map<String, String> finalModulesVersions =
-        Arrays.stream(finalVersionsForAllModules.split(System.lineSeparator()))
+        Arrays.stream(finalVersionsForAllModules.split(Operations.GENERIC_LINE_SEPARATOR))
             .filter(string -> string.trim().split(" ").length == 2)
             .collect(
                 Collectors.toMap(
@@ -379,45 +382,39 @@ private static List<String> collectAllDirectDependencies(List<String> targetLine
         .collect(Collectors.toList());
   }
 
-  private TreeMap<String, String> getQualifiers(boolean includeOsAndArch) {
-    if (includeOsAndArch) {
-      String goEnvironmentVariables = Operations.runProcessGetOutput(null, goExecutable, "env");
-      var qualifiers = new TreeMap<String, String>();
-      qualifiers.put("type", "module");
-      Optional<String> hostArch =
-          getEnvironmentVariable(goEnvironmentVariables, GO_HOST_ARCHITECTURE_ENV_NAME);
-      Optional<String> hostOS =
-          getEnvironmentVariable(goEnvironmentVariables, GO_HOST_OPERATION_SYSTEM_ENV_NAME);
-      if (hostArch.isPresent()) {
-        qualifiers.put("goarch", hostArch.get());
-      }
-      if (hostOS.isPresent()) {
-        qualifiers.put("goos", hostOS.get());
-      }
-      return qualifiers;
+  private TreeMap<String, String> getQualifiers() {
+    var goEnvironmentVariables = getGoEnvironmentVariables();
+    var qualifiers = new TreeMap<String, String>();
+    qualifiers.put("type", "module");
+    if (goEnvironmentVariables.containsKey(GO_HOST_ARCHITECTURE_ENV_NAME)) {
+      qualifiers.put("goarch", goEnvironmentVariables.get(GO_HOST_ARCHITECTURE_ENV_NAME));
+    }
+    if (goEnvironmentVariables.containsKey(GO_HOST_OPERATION_SYSTEM_ENV_NAME)) {
+      qualifiers.put("goos", goEnvironmentVariables.get(GO_HOST_OPERATION_SYSTEM_ENV_NAME));
     }
 
-    return new TreeMap<>(Map.of("type", "module"));
+    return qualifiers;
   }
 
-  private static Optional<String> getEnvironmentVariable(
-      String goEnvironmentVariables, String envName) {
-    int i = goEnvironmentVariables.indexOf(String.format("%s=", envName));
-    if (i == -1) {
-      return Optional.empty();
-    }
-    int beginIndex = i + String.format("%s=", envName).length();
-    int endOfLineIndex =
-        goEnvironmentVariables.substring(beginIndex).indexOf(System.lineSeparator());
-
-    String envValue;
-    if (endOfLineIndex == -1) {
-      envValue = goEnvironmentVariables.substring(beginIndex);
-    } else {
-      envValue = goEnvironmentVariables.substring(beginIndex).substring(0, endOfLineIndex);
+  private Map<String, String> getGoEnvironmentVariables() {
+    String goEnvironmentVariables =
+        Operations.runProcessGetOutput(null, goExecutable, "env", "--json");
+    JsonNode tree;
+    try {
+      tree = new ObjectMapper().readTree(goEnvironmentVariables);
+    } catch (JsonProcessingException e) {
+      log.warning(String.format("Failed to parse go environment variables: %s", e.getMessage()));
+      return new HashMap<>();
     }
-
-    return Optional.of(envValue.replaceAll("\"", ""));
+    var envMap = new HashMap<String, String>();
+    tree.fields()
+        .forEachRemaining(
+            entry -> {
+              String key = entry.getKey();
+              String value = entry.getValue().asText();
+              envMap.put(key, value);
+            });
+    return envMap;
   }
 
   private String buildGoModulesDependencies(Path manifestPath) {
@@ -437,7 +434,7 @@ private String buildGoModulesDependencies(Path manifestPath) {
   }
 
   private Sbom buildSbomFromList(String golangDeps, List<PackageURL> ignoredDeps) {
-    String[] allModulesFlat = golangDeps.split(System.lineSeparator());
+    String[] allModulesFlat = golangDeps.split(Operations.GENERIC_LINE_SEPARATOR);
     String parentVertex = getParentVertex(allModulesFlat[0]);
     PackageURL root = toPurl(parentVertex, "@", this.goEnvironmentVariableForPurl);
     // Get only direct dependencies of root package/module, and that's it.

src/main/java/com/redhat/exhort/providers/YarnBerryProcessor.java

@@ -20,6 +20,7 @@
 import com.github.packageurl.PackageURL;
 import com.redhat.exhort.providers.javascript.model.Manifest;
 import com.redhat.exhort.sbom.Sbom;
+import com.redhat.exhort.tools.Operations;
 import java.nio.file.Path;
 import java.util.Map;
 import java.util.TreeMap;
@@ -36,6 +37,7 @@ public YarnBerryProcessor(String packageManager, Manifest manifest) {
     super(packageManager, manifest);
   }
 
+  @Override
   public String[] installCmd(Path manifestDir) {
     if (manifestDir != null) {
       return new String[] {
@@ -89,7 +91,9 @@ private boolean isRoot(String name) {
 
   @Override
   public String parseDepTreeOutput(String output) {
-    return "[" + output.trim().replace(System.lineSeparator(), "").replace("}{", "},{") + "]";
+    return "["
+        + output.trim().replaceAll(Operations.GENERIC_LINE_SEPARATOR, "").replace("}{", "},{")
+        + "]";
   }
 
   private PackageURL purlFromNode(String normalizedLocator, JsonNode node) {

src/main/java/com/redhat/exhort/tools/Operations.java

@@ -34,7 +34,9 @@
 
 /** Utility class used for executing process on the operating system. * */
 public final class Operations {
-
+  // Some package providers might return Unix output in Windows, so we need to use a generic line
+  // separator
+  public static final String GENERIC_LINE_SEPARATOR = "\\r?\\n";
   private static final Logger log = LoggersFactory.getLogger(Operations.class.getName());
 
   private Operations() {