changeset 7055:73793f2af80a

8007799: Base64.getEncoder(0, byte[]) returns an encoder that unexpectedly inserts line separators Reviewed-by: sherman, iris
author msheppar
date Tue, 30 Apr 2013 16:24:08 +0100
parents dddd17cf61ff
children 5941f7c9c76a
files src/share/classes/java/util/Base64.java test/java/util/Base64/Base64GetEncoderTest.java
diffstat 2 files changed, 165 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/java/util/Base64.java	Wed May 01 10:03:39 2013 +0100
+++ b/src/share/classes/java/util/Base64.java	Tue Apr 30 16:24:08 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013 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
@@ -139,6 +139,9 @@
                  throw new IllegalArgumentException(
                      "Illegal base64 line separator character 0x" + Integer.toString(b, 16));
          }
+         if (lineLength <= 0) {
+             return Encoder.RFC4648;
+         }
          return new Encoder(false, lineSeparator, lineLength >> 2 << 2);
     }
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/java/util/Base64/Base64GetEncoderTest.java	Tue Apr 30 16:24:08 2013 +0100
@@ -0,0 +1,161 @@
+/*
+ * Copyright (c) 2013, 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.
+ */
+
+
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+
+import java.util.Base64;
+
+import static java.nio.charset.StandardCharsets.US_ASCII;
+
+/**
+ * @test
+ * @bug 8007799
+ * @summary test Encoder with linemax == 0, line separator should not appear in encoded data
+ */
+
+public class Base64GetEncoderTest {
+
+    public static void main(String args[]) throws Throwable {
+        final Base64.Encoder encoder = Base64.getEncoder(0, "$$$".getBytes(US_ASCII));
+
+        testEncodeToString(encoder);
+
+        testWrapEncode1(encoder);
+
+        testEncodeToStringWithLongInputData(encoder);
+
+        testWrapEncode2(encoder);
+
+        testEncodeWithByteBuffer(encoder);
+
+    }
+
+    private static void testEncodeWithByteBuffer(final Base64.Encoder encoder) {
+        System.err.println("\n\nEncoder.encode with ByteBuffer test  ");
+        final byte[] secondTestBuffer =
+                "api/java_util/Base64/index.html#GetEncoderMimeCustom[noLineSeparatorInEncodedString]"
+                .getBytes(US_ASCII);
+        String base64EncodedString;
+        ByteBuffer srcData = ByteBuffer.wrap(secondTestBuffer);
+        ByteBuffer dstData = ByteBuffer.allocate(secondTestBuffer.length * 2);
+
+        encoder.encode(srcData, dstData, 0);
+        dstData.flip();
+        if (dstData.hasArray()) {
+            System.err.println("\nByteBuffer test dstData is Base64 encoding = "
+                    + new String(dstData.array(), US_ASCII) + "\n");
+        }
+
+        base64EncodedString = new String(dstData.array(), US_ASCII);
+        if (base64EncodedString.contains("$$$")) {
+            throw new RuntimeException("Base64 encoding contains line separator after Encoder.encode ByteBuffer ... \n");
+        }
+    }
+
+    private static void testWrapEncode2(final Base64.Encoder encoder)
+            throws IOException {
+        System.err.println("\nEncoder.wrap test II ");
+        final byte[] secondTestBuffer =
+                "api/java_util/Base64/index.html#GetEncoderMimeCustom[noLineSeparatorInEncodedString]"
+                .getBytes(US_ASCII);
+        String base64EncodedString;
+        ByteArrayOutputStream secondEncodingStream = new ByteArrayOutputStream();
+        OutputStream base64EncodingStream = encoder.wrap(secondEncodingStream);
+        base64EncodingStream.write(secondTestBuffer);
+        base64EncodingStream.close();
+
+        final byte[] encodedByteArray = secondEncodingStream.toByteArray();
+
+        System.err.print("result = " + new String(encodedByteArray, US_ASCII)
+                + "  after wrap Base64 encoding of string");
+
+        base64EncodedString = new String(encodedByteArray, US_ASCII);
+
+        if (base64EncodedString.contains("$$$")) {
+            throw new RuntimeException(
+                    "Base64 encoding contains line separator after wrap 2 invoked  ... \n");
+        }
+    }
+
+    private static void testEncodeToStringWithLongInputData(
+            final Base64.Encoder encoder) {
+        System.err.println("\n\nEncoder.encodeToStringWithLongInputData test  ");
+
+        final byte[] secondTestBuffer =
+                "api/java_util/Base64/index.html#GetEncoderMimeCustom[noLineSeparatorInEncodedString]"
+                .getBytes(US_ASCII);
+        String base64EncodedString;
+        base64EncodedString = encoder.encodeToString(secondTestBuffer);
+
+        System.err.println("Second Base64 encoded string is "
+                + base64EncodedString);
+
+        if (base64EncodedString.contains("$$$")) {
+            throw new RuntimeException(
+                    "Base64 encoding contains line separator after encodeToString invoked  ... \n");
+        }
+    }
+
+    private static void testWrapEncode1(final Base64.Encoder encoder)
+            throws IOException {
+        System.err.println("\nEncoder.wrap test I ");
+
+        final byte[] bytesIn = "fo".getBytes(US_ASCII);
+        String base64EncodedString;
+        ByteArrayOutputStream encodingStream = new ByteArrayOutputStream();
+        OutputStream encoding = encoder.wrap(encodingStream);
+        encoding.write(bytesIn);
+        encoding.close();
+
+        final byte[] encodedBytes = encodingStream.toByteArray();
+
+        System.err.print("result = " + new String(encodedBytes, US_ASCII)
+                + "  after the Base64 encoding \n");
+
+        base64EncodedString = new String(encodedBytes, US_ASCII);
+
+        if (base64EncodedString.contains("$$$")) {
+            throw new RuntimeException(
+                    "Base64 encoding contains line separator after wrap I test ... \n");
+        }
+    }
+
+    private static void testEncodeToString(final Base64.Encoder encoder) {
+        final byte[] bytesIn = "fo".getBytes(US_ASCII);
+
+        System.err.println("\nEncoder.encodeToString test  ");
+
+        String base64EncodedString = encoder.encodeToString(bytesIn);
+
+        System.err.println("Base64 encoded string is " + base64EncodedString);
+
+        if (base64EncodedString.contains("$$$")) {
+            throw new RuntimeException("Base64 encoding contains line separator after Encoder.encodeToString invoked ... \n");
+        }
+    }
+}