NIFI-12750 ExecuteStreamCommand incorrectly decodes std error stream

Signed-off-by: Matt Burgess <[email protected]>

This closes #8993

nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteStreamCommand.java

@@ -53,6 +53,7 @@
 import org.apache.nifi.processor.util.StandardValidators;
 import org.apache.nifi.processors.standard.util.ArgumentUtils;
 import org.apache.nifi.processors.standard.util.SoftLimitBoundedByteArrayOutputStream;
+import org.apache.nifi.stream.io.LimitingInputStream;
 import org.apache.nifi.stream.io.StreamUtils;
 
 import java.io.BufferedInputStream;
@@ -63,6 +64,7 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.lang.ProcessBuilder.Redirect;
+import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -504,24 +506,20 @@ public void onTrigger(ProcessContext context, final ProcessSession session) thro
 
             Map<String, String> attributes = new HashMap<>();
 
-            final StringBuilder strBldr = new StringBuilder();
-            try (final InputStream is = new FileInputStream(errorOut)) {
-                int c;
-                while ((c = is.read()) != -1) {
-                    strBldr.append((char) c);
-                }
-            } catch (IOException e) {
-                strBldr.append("Unknown...could not read Process's Std Error");
+            String stdErr = "";
+            try (final InputStream in = new BufferedInputStream(new LimitingInputStream(new FileInputStream(errorOut), 4000))) {
+                stdErr = IOUtils.toString(in, Charset.defaultCharset());
+            } catch (final Exception e) {
+                stdErr = "Unknown...could not read Process's Std Error due to " + e.getClass().getName() + ": " + e.getMessage();
             }
-            int length = Math.min(strBldr.length(), 4000);
-            attributes.put("execution.error", strBldr.substring(0, length));
+            attributes.put("execution.error", stdErr);
 
             final Relationship outputFlowFileRelationship = putToAttribute ? ORIGINAL_RELATIONSHIP : (exitCode != 0) ? NONZERO_STATUS_RELATIONSHIP : OUTPUT_STREAM_RELATIONSHIP;
             if (exitCode == 0) {
                 logger.info("Transferring {} to {}", outputFlowFile, outputFlowFileRelationship.getName());
             } else {
-                logger.error("Transferring {} to {}. Executable command {} ended in an error: {}",
-                        outputFlowFile, outputFlowFileRelationship.getName(), executeCommand, strBldr.toString());
+                logger.error("Transferring {} to {}. Executable command {} returned exitCode {} and error message: {}",
+                        outputFlowFile, outputFlowFileRelationship.getName(), executeCommand, exitCode, stdErr);
             }
 
             attributes.put("execution.status", Integer.toString(exitCode));

nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/TestLogStdErr.java

@@ -24,6 +24,7 @@ public class TestLogStdErr {
     public static void main(String[] args) throws IOException, URISyntaxException {
         char[] chars = new char[1024 * 1024];
         Arrays.fill(chars, 'f');
+        System.arraycopy("ÄÖÜäöüß".toCharArray(), 0, chars, 0, 7);
         System.err.println(new String(chars));
     }
 

nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestExecuteStreamCommand.java

@@ -297,6 +297,7 @@ public void testLoggingToStdErr() throws IOException {
         List<MockFlowFile> flowFiles = controller.getFlowFilesForRelationship(ExecuteStreamCommand.OUTPUT_STREAM_RELATIONSHIP);
         MockFlowFile flowFile = flowFiles.get(0);
         assertEquals(0, flowFile.getSize());
+        assertTrue(flowFile.getAttribute("execution.error").contains("ÄÖÜäöüß"));
         assertTrue(flowFile.getAttribute("execution.error").contains("fffffffffffffffffffffffffffffff"));
     }
 
@@ -329,6 +330,7 @@ public void testLoggingToStdErrDynamicProperties() throws IOException {
         List<MockFlowFile> flowFiles = controller.getFlowFilesForRelationship(ExecuteStreamCommand.OUTPUT_STREAM_RELATIONSHIP);
         MockFlowFile flowFile = flowFiles.get(0);
         assertEquals(0, flowFile.getSize());
+        assertTrue(flowFile.getAttribute("execution.error").contains("ÄÖÜäöüß"));
         assertTrue(flowFile.getAttribute("execution.error").contains("fffffffffffffffffffffffffffffff"));
     }