From 7fa5897a87b5246b0157c8363c297139c0a6d1c0 Mon Sep 17 00:00:00 2001 From: tathagta15 Date: Thu, 18 Jun 2026 12:14:03 +0530 Subject: [PATCH] ACS-11995 codeql alerts cleanup (#1290) --- .../alfresco/transformer/AbstractMetadataExtractsIT.java | 4 +++- .../alfresco/transform/base/executors/RuntimeExec.java | 8 ++++---- .../base/metadata/AbstractMetadataExtractsIT.java | 4 +++- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/deprecated/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractMetadataExtractsIT.java b/deprecated/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractMetadataExtractsIT.java index 2a163f89..25e0f833 100644 --- a/deprecated/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractMetadataExtractsIT.java +++ b/deprecated/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractMetadataExtractsIT.java @@ -39,6 +39,7 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; import java.io.Serializable; +import java.nio.file.Files; import java.util.HashMap; import java.util.Map; @@ -101,7 +102,8 @@ public abstract class AbstractMetadataExtractsIT String metadataFilename = sourceFile + "_metadata.json"; Map actualMetadata = readMetadata(response.getBody().getInputStream()); - File actualMetadataFile = new File(metadataFilename); + File actualMetadataFile = Files.createTempFile( + "actual-" + new File(sourceFile).getName() + "-", ".json").toFile(); jsonObjectMapper.writerWithDefaultPrettyPrinter().writeValue(actualMetadataFile, actualMetadata); Map expectedMetadata = readExpectedMetadata(metadataFilename, actualMetadataFile); diff --git a/engines/base/src/main/java/org/alfresco/transform/base/executors/RuntimeExec.java b/engines/base/src/main/java/org/alfresco/transform/base/executors/RuntimeExec.java index 672ba677..1ee77ba6 100644 --- a/engines/base/src/main/java/org/alfresco/transform/base/executors/RuntimeExec.java +++ b/engines/base/src/main/java/org/alfresco/transform/base/executors/RuntimeExec.java @@ -666,11 +666,11 @@ public class RuntimeExec for (Map.Entry entry : execProperties.entrySet()) { String key = entry.getKey(); - String value = entry.getValue(); - // ignore null - if (value == null) + String value = entry.getValue() == null ? "" : entry.getValue(); + if (value.contains("\n") || value.contains("\r") || value.contains("\0")) { - value = ""; + throw new IllegalArgumentException( + "Command property '" + key + "' contains an illegal character"); } // progressively replace the property in the command key = (VAR_OPEN + key + VAR_CLOSE); diff --git a/engines/base/src/test/java/org/alfresco/transform/base/metadata/AbstractMetadataExtractsIT.java b/engines/base/src/test/java/org/alfresco/transform/base/metadata/AbstractMetadataExtractsIT.java index bd657081..e1e93ae5 100644 --- a/engines/base/src/test/java/org/alfresco/transform/base/metadata/AbstractMetadataExtractsIT.java +++ b/engines/base/src/test/java/org/alfresco/transform/base/metadata/AbstractMetadataExtractsIT.java @@ -39,6 +39,7 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; import java.io.Serializable; +import java.nio.file.Files; import java.util.HashMap; import java.util.Map; @@ -100,7 +101,8 @@ public abstract class AbstractMetadataExtractsIT String metadataFilename = sourceFile + "_metadata.json"; Map actualMetadata = readMetadata(response.getBody().getInputStream()); - File actualMetadataFile = new File(metadataFilename); + File actualMetadataFile = Files.createTempFile( + "actual-" + new File(sourceFile).getName() + "-", ".json").toFile(); jsonObjectMapper.writerWithDefaultPrettyPrinter().writeValue(actualMetadataFile, actualMetadata); Map expectedMetadata = readExpectedMetadata(metadataFilename, actualMetadataFile);