8285517: System.getenv() returns unexpected value if environment variable has non ASCII character

src/java.base/share/classes/jdk/internal/util/StaticProperty.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
 package jdk.internal.util;
 
 import java.util.Properties;
+import java.nio.charset.Charset;
 
 /**
  * System Property access for internal use only.
@@ -52,6 +53,8 @@ public final class StaticProperty {
     private static final String NATIVE_ENCODING;
     private static final String FILE_ENCODING;
     private static final String JAVA_PROPERTIES_DATE;
+    private static final String SUN_JNU_ENCODING;
+    private static final Charset jnuCharset;
 
     private StaticProperty() {}
 
@@ -69,6 +72,8 @@ private StaticProperty() {}
         NATIVE_ENCODING = getProperty(props, "native.encoding");
         FILE_ENCODING = getProperty(props, "file.encoding");
         JAVA_PROPERTIES_DATE = getProperty(props, "java.properties.date", null);
+        SUN_JNU_ENCODING = getProperty(props, "sun.jnu.encoding");
+        jnuCharset = Charset.forName(SUN_JNU_ENCODING, Charset.defaultCharset());
     }
 
     private static String getProperty(Properties props, String key) {
@@ -241,4 +246,29 @@ public static String fileEncoding() {
     public static String javaPropertiesDate() {
         return JAVA_PROPERTIES_DATE;
     }
+
+    /**
+     * Return the {@code sun.jnu.encoding} system property.
+     *
+     * <strong>{@link SecurityManager#checkPropertyAccess} is NOT checked
+     * in this method. The caller of this method should take care to ensure
+     * that the returned property is not made accessible to untrusted code.</strong>
+     *
+     * @return the {@code sun.jnu.encoding} system property
+     */
+    public static String jnuEncoding() {
+        return SUN_JNU_ENCODING;
+    }
+
+    /**
+     * Return charset for {@code sun.jnu.encoding} system property.
+     *
+     * <strong>If {@code sun.jnu.encoding} system property has invalid
+     * encoding name, {@link Charset#defaultCharset()} is returned.</strong>
+     *
+     * @return charset for {@code sun.jnu.encoding} system property
+     */
+    public static Charset jnuCharset() {
+        return jnuCharset;
+    }
 }

src/java.base/unix/classes/java/lang/ProcessEnvironment.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,14 +55,17 @@
 package java.lang;
 
 import java.io.*;
+import java.nio.charset.Charset;
 import java.util.*;
+import jdk.internal.util.StaticProperty;
 
 
 final class ProcessEnvironment
 {
     private static final HashMap<Variable,Value> theEnvironment;
     private static final Map<String,String> theUnmodifiableEnvironment;
     static final int MIN_NAME_LENGTH = 0;
+    private static final Charset jnuCharset = StaticProperty.jnuCharset();
 
     static {
         // We cache the C environment.  This means that subsequent calls
@@ -163,7 +166,7 @@ public static Variable valueOfQueryOnly(Object str) {
         }
 
         public static Variable valueOfQueryOnly(String str) {
-            return new Variable(str, str.getBytes());
+            return new Variable(str, str.getBytes(jnuCharset));
         }
 
         public static Variable valueOf(String str) {
@@ -172,7 +175,7 @@ public static Variable valueOf(String str) {
         }
 
         public static Variable valueOf(byte[] bytes) {
-            return new Variable(new String(bytes), bytes);
+            return new Variable(new String(bytes, jnuCharset), bytes);
         }
 
         public int compareTo(Variable variable) {
@@ -196,7 +199,7 @@ public static Value valueOfQueryOnly(Object str) {
         }
 
         public static Value valueOfQueryOnly(String str) {
-            return new Value(str, str.getBytes());
+            return new Value(str, str.getBytes(jnuCharset));
         }
 
         public static Value valueOf(String str) {
@@ -205,7 +208,7 @@ public static Value valueOf(String str) {
         }
 
         public static Value valueOf(byte[] bytes) {
-            return new Value(new String(bytes), bytes);
+            return new Value(new String(bytes, jnuCharset), bytes);
         }
 
         public int compareTo(Value value) {

src/java.base/unix/classes/java/lang/ProcessImpl.java

@@ -35,6 +35,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.nio.charset.Charset;
 import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.Locale;
@@ -141,12 +142,13 @@ static Platform get() {
 
     private static final Platform platform = Platform.get();
     private static final LaunchMechanism launchMechanism = platform.launchMechanism();
+    private static final Charset jnuCharset = StaticProperty.jnuCharset();
     private static final byte[] helperpath = toCString(StaticProperty.javaHome() + "/lib/jspawnhelper");
 
     private static byte[] toCString(String s) {
         if (s == null)
             return null;
-        byte[] bytes = s.getBytes();
+        byte[] bytes = s.getBytes(jnuCharset);
         byte[] result = new byte[bytes.length + 1];
         System.arraycopy(bytes, 0,
                          result, 0,
@@ -170,7 +172,7 @@ static Process start(String[] cmdarray,
         byte[][] args = new byte[cmdarray.length-1][];
         int size = args.length; // For added NUL bytes
         for (int i = 0; i < args.length; i++) {
-            args[i] = cmdarray[i+1].getBytes();
+            args[i] = cmdarray[i+1].getBytes(jnuCharset);
             size += args[i].length;
         }
         byte[] argBlock = new byte[size];

test/jdk/java/lang/ProcessBuilder/Basic.java

@@ -27,7 +27,7 @@
  *      5026830 5023243 5070673 4052517 4811767 6192449 6397034 6413313
  *      6464154 6523983 6206031 4960438 6631352 6631966 6850957 6850958
  *      4947220 7018606 7034570 4244896 5049299 8003488 8054494 8058464
- *      8067796 8224905 8263729 8265173 8272600 8231297 8282219
+ *      8067796 8224905 8263729 8265173 8272600 8231297 8282219 8285517
  * @key intermittent
  * @summary Basic tests for Process and Environment Variable code
  * @modules java.base/java.lang:open
@@ -50,6 +50,7 @@
 import static java.lang.ProcessBuilder.Redirect.*;
 
 import java.io.*;
+import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -598,7 +599,11 @@ private static void testEncoding(String encoding, String tested) {
         try {
             // If round trip conversion works, should be able to set env vars
             // correctly in child.
-            if (new String(tested.getBytes()).equals(tested)) {
+            String jnuEncoding = System.getProperty("sun.jnu.encoding");
+            Charset cs = jnuEncoding != null
+                ? Charset.forName(jnuEncoding, Charset.defaultCharset())
+                : Charset.defaultCharset();
+            if (new String(tested.getBytes(cs), cs).equals(tested)) {
                 out.println("Testing " + encoding + " environment values");
                 ProcessBuilder pb = new ProcessBuilder();
                 pb.environment().put("ASCIINAME",tested);

test/jdk/java/lang/System/i18nEnvArg.java

@@ -0,0 +1,138 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8285517
+ * @summary System.getenv() and argument don't return locale dependent data by JEP400
+ * @requires (os.family == "linux")
+ * @modules jdk.charsets
+ * @library /test/lib
+ * @build jdk.test.lib.process.*
+ * @run main i18nEnvArg
+ */
+
+import java.lang.reflect.Method;
+import java.nio.ByteBuffer;
+import java.nio.charset.Charset;
+import java.util.Arrays;
+import java.util.ArrayList;
+import java.util.HexFormat;
+import java.util.List;
+import java.util.Map;
+import jdk.test.lib.process.ProcessTools;
+
+public class i18nEnvArg {
+    final static String EUC_JP_TEXT = "\u6F22\u5B57";
+
+    /*
+     * Checks OS is Linux and OS has ja_JP.eucjp locale or not.
+     * Sets EUC_JP's environment variable and argunments against ProcessBuilder
+     */
+    public static void main(String[] args) throws Exception {
+        ProcessBuilder pb;
+        List<String> cmds = new ArrayList<>();
+        cmds.addAll(List.of(
+            "--add-modules=" + System.getProperty("test.modules"),
+            "-classpath",
+            System.getProperty("test.class.path"),
+            "-Dtest.class.path=" + System.getProperty("test.class.path"),
+            "-Dtest.modules=" + System.getProperty("test.modules")));
+        if (args.length == 0) {
+            cmds.addAll(
+                List.of("-Dtest.jdk=" + System.getProperty("test.jdk"),
+                        "i18nEnvArg",
+                        "Start"));
+        } else {
+            String jnuEncoding = System.getProperty("sun.jnu.encoding");
+            Charset dcs = jnuEncoding != null
+                ? Charset.forName(jnuEncoding)
+                : Charset.defaultCharset();
+            Charset cs = Charset.forName("x-euc-jp-linux");
+            if (!dcs.equals(cs)) {
+                return;
+            }
+            cmds.addAll(
+                List.of("--add-opens=java.base/java.lang=ALL-UNNAMED",
+                        "i18nEnvArg$Verify",
+                        EUC_JP_TEXT));
+        }
+        pb = ProcessTools.createTestJvm(cmds);
+        Map<String, String> environ = pb.environment();
+        environ.clear();
+        environ.put("LANG", "ja_JP.eucjp");
+        if (args.length != 0) {
+            environ.put(EUC_JP_TEXT, EUC_JP_TEXT);
+        }
+        ProcessTools.executeProcess(pb)
+            .outputTo(System.out)
+            .errorTo(System.err)
+            .shouldNotContain("ERROR:");
+    }
+
+    public static class Verify {
+        private final static int maxSize = 4096;
+        /*
+         * Verify environment variable and argument are encoded by Linux's eucjp or not
+         */
+        public static void main(String[] args) throws Exception {
+            Charset cs = Charset.forName("x-euc-jp-linux");
+            byte[] euc = (EUC_JP_TEXT + "=" + EUC_JP_TEXT).getBytes(cs);
+            byte[] eucjp = "LANG=ja_JP.eucjp".getBytes(cs);
+            String s = System.getenv(EUC_JP_TEXT);
+            if (!EUC_JP_TEXT.equals(s)) {
+                System.err.println("ERROR: getenv() returns unexpected data");
+            }
+            if (!EUC_JP_TEXT.equals(args[0])) {
+                System.err.print("ERROR: Unexpected argument was received: ");
+                for(char ch : EUC_JP_TEXT.toCharArray()) {
+                   System.err.printf("\\u%04X", (int)ch);
+                }
+                System.err.print("<->");
+                for(char ch : args[0].toCharArray()) {
+                   System.err.printf("\\u%04X", (int)ch);
+                }
+                System.err.println();
+            }
+            Class<?> cls = Class.forName("java.lang.ProcessEnvironment");
+            Method environ_mid = cls.getDeclaredMethod("environ");
+            environ_mid.setAccessible(true);
+            byte[][] environ = (byte[][]) environ_mid.invoke(null,
+                (Object[])null);
+            HexFormat hf = HexFormat.of().withUpperCase().withPrefix("\\x");
+            byte[] ba = new byte[maxSize];
+            for(int i = 0; i < environ.length; i += 2) {
+                ByteBuffer bb = ByteBuffer.wrap(ba);
+                bb.put(environ[i]);
+                bb.put((byte)'=');
+                bb.put(environ[i+1]);
+                byte[] envb = Arrays.copyOf(ba, bb.position());
+                if (Arrays.equals(eucjp, envb)) continue;
+                if (!Arrays.equals(euc, envb)) {
+                    System.err.println("ERROR: Unexpected environment variables: " +
+                        hf.formatHex(envb));
+                }
+            }
+        }
+    }
+}