AVRO-4247: Enforce decompression size limits

lang/java/avro/src/main/java/org/apache/avro/SystemLimitException.java

@@ -18,6 +18,7 @@
 
 package org.apache.avro;
 
+import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
@@ -58,6 +59,24 @@ public class SystemLimitException extends AvroRuntimeException {
   private static int maxCollectionLength = MAX_ARRAY_VM_LIMIT;
   private static int maxStringLength = MAX_ARRAY_VM_LIMIT;
 
+  private static final Logger LOG = LoggerFactory.getLogger(SystemLimitException.class);
+
+  /**
+   * System property declaring max size of any decompression stream: {@value}.
+   */
+  public static final String MAX_DECOMPRESS_LENGTH_PROPERTY = "org.apache.avro.limits.decompress.maxLength";
+
+  /**
+   * Default limit: {@value}.
+   */
+  private static final long DEFAULT_MAX_DECOMPRESS_LENGTH = 200L * 1024 * 1024;
+
+  /**
+   * Calculated max decompress length.
+   */
+  public static final long MAX_DECOMPRESS_LENGTH = getLongLimitFromProperty(MAX_DECOMPRESS_LENGTH_PROPERTY,
+      DEFAULT_MAX_DECOMPRESS_LENGTH);
+
   static {
     resetLimits();
   }
@@ -89,6 +108,34 @@ private static int getLimitFromProperty(String property, int defaultValue) {
     return i;
   }
 
+  /**
+   * Get a long value stored in a system property, used to configure the system
+   * behaviour of output.
+   *
+   * @param property     The system property to fetch
+   * @param defaultValue The value to use if the system property is not present or
+   *                     parsable as an int
+   * @return The value from the system property
+   */
+  private static long getLongLimitFromProperty(String property, long defaultValue) {
+    String prop = System.getProperty(property);
+    long limit = defaultValue;
+    if (prop != null) {
+      try {
+        long parsed = Long.parseLong(prop);
+        if (parsed <= 0) {
+          LOG.warn("Invalid value '{}' for property '{}': must be positive. Using default: {}", prop, property,
+              defaultValue);
+        } else {
+          limit = parsed;
+        }
+      } catch (NumberFormatException e) {
+        LOG.warn("Could not parse property '{}' value '{}'. Using default: {}", property, prop, defaultValue);
+      }
+    }
+    return limit;
+  }
+
   /**
    * Check to ensure that reading the bytes is within the specified limits.
    *
@@ -209,6 +256,21 @@ public static int checkMaxStringLength(long length) {
     return (int) length;
   }
 
+  /**
+   * Check there is capacity to write data to a stream.
+   *
+   * @param limit        total capacity limit
+   * @param streamLength current stream size
+   * @param bytes        bytes to add to the stream
+   * @throws SystemLimitException if the limit is exceeded.
+   */
+  public static void checkMaxDecompressCapacity(long limit, long streamLength, int bytes) {
+    if (streamLength + bytes > limit) {
+      throw new SystemLimitException(
+          String.format("Buffer size %,d (bytes) exceeds maximum allowed size %,d.", (streamLength + bytes), limit));
+    }
+  }
+
   /** Reread the limits from the system properties. */
   // VisibleForTesting
   static void resetLimits() {

lang/java/avro/src/main/java/org/apache/avro/file/BZip2Codec.java

@@ -25,6 +25,8 @@
 import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream;
 import org.apache.commons.compress.compressors.bzip2.BZip2CompressorOutputStream;
 
+import static org.apache.avro.util.NonCopyingByteArrayOutputStream.restrictedCapacityOutputStream;
+
 /** * Implements bzip2 compression and decompression. */
 public class BZip2Codec extends Codec {
 
@@ -45,7 +47,7 @@ public String getName() {
 
   @Override
   public ByteBuffer compress(ByteBuffer uncompressedData) throws IOException {
-    NonCopyingByteArrayOutputStream baos = new NonCopyingByteArrayOutputStream(DEFAULT_BUFFER_SIZE);
+    NonCopyingByteArrayOutputStream baos = restrictedCapacityOutputStream(DEFAULT_BUFFER_SIZE);
 
     try (BZip2CompressorOutputStream outputStream = new BZip2CompressorOutputStream(baos)) {
       outputStream.write(uncompressedData.array(), computeOffset(uncompressedData), uncompressedData.remaining());
@@ -60,7 +62,7 @@ public ByteBuffer decompress(ByteBuffer compressedData) throws IOException {
         compressedData.remaining());
 
     @SuppressWarnings("resource")
-    NonCopyingByteArrayOutputStream baos = new NonCopyingByteArrayOutputStream(DEFAULT_BUFFER_SIZE);
+    NonCopyingByteArrayOutputStream baos = restrictedCapacityOutputStream(DEFAULT_BUFFER_SIZE);
 
     try (BZip2CompressorInputStream inputStream = new BZip2CompressorInputStream(bais)) {
 

lang/java/avro/src/main/java/org/apache/avro/file/DeflateCodec.java

@@ -27,6 +27,8 @@
 
 import org.apache.avro.util.NonCopyingByteArrayOutputStream;
 
+import static org.apache.avro.util.NonCopyingByteArrayOutputStream.restrictedCapacityOutputStream;
+
 /**
  * Implements DEFLATE (RFC1951) compression and decompression.
  *
@@ -69,7 +71,7 @@ public String getName() {
 
   @Override
   public ByteBuffer compress(ByteBuffer data) throws IOException {
-    NonCopyingByteArrayOutputStream baos = new NonCopyingByteArrayOutputStream(DEFAULT_BUFFER_SIZE);
+    NonCopyingByteArrayOutputStream baos = restrictedCapacityOutputStream(DEFAULT_BUFFER_SIZE);
     try (OutputStream outputStream = new DeflaterOutputStream(baos, getDeflater())) {
       outputStream.write(data.array(), computeOffset(data), data.remaining());
     }
@@ -78,7 +80,7 @@ public ByteBuffer compress(ByteBuffer data) throws IOException {
 
   @Override
   public ByteBuffer decompress(ByteBuffer data) throws IOException {
-    NonCopyingByteArrayOutputStream baos = new NonCopyingByteArrayOutputStream(DEFAULT_BUFFER_SIZE);
+    NonCopyingByteArrayOutputStream baos = restrictedCapacityOutputStream(DEFAULT_BUFFER_SIZE);
     try (OutputStream outputStream = new InflaterOutputStream(baos, getInflater())) {
       outputStream.write(data.array(), computeOffset(data), data.remaining());
     }

lang/java/avro/src/main/java/org/apache/avro/file/SnappyCodec.java

@@ -24,6 +24,8 @@
 
 import org.xerial.snappy.Snappy;
 
+import org.apache.avro.SystemLimitException;
+
 /** * Implements Snappy compression and decompression. */
 public class SnappyCodec extends Codec {
   private final CRC32 crc32 = new CRC32();
@@ -66,7 +68,9 @@ public ByteBuffer compress(ByteBuffer in) throws IOException {
   @Override
   public ByteBuffer decompress(ByteBuffer in) throws IOException {
     int offset = computeOffset(in);
-    ByteBuffer out = ByteBuffer.allocate(Snappy.uncompressedLength(in.array(), offset, in.remaining() - 4));
+    final int uncompressedLength = Snappy.uncompressedLength(in.array(), offset, in.remaining() - 4);
+    SystemLimitException.checkMaxDecompressCapacity(SystemLimitException.MAX_DECOMPRESS_LENGTH, 0, uncompressedLength);
+    ByteBuffer out = ByteBuffer.allocate(uncompressedLength);
     int size = Snappy.uncompress(in.array(), offset, in.remaining() - 4, out.array(), 0);
     ((Buffer) out).limit(size);
 

lang/java/avro/src/main/java/org/apache/avro/file/XZCodec.java

@@ -58,7 +58,8 @@ public String getName() {
 
   @Override
   public ByteBuffer compress(ByteBuffer data) throws IOException {
-    NonCopyingByteArrayOutputStream baos = new NonCopyingByteArrayOutputStream(DEFAULT_BUFFER_SIZE);
+    NonCopyingByteArrayOutputStream baos = NonCopyingByteArrayOutputStream
+        .restrictedCapacityOutputStream(DEFAULT_BUFFER_SIZE);
     try (OutputStream outputStream = new XZCompressorOutputStream(baos, compressionLevel)) {
       outputStream.write(data.array(), computeOffset(data), data.remaining());
     }
@@ -67,7 +68,8 @@ public ByteBuffer compress(ByteBuffer data) throws IOException {
 
   @Override
   public ByteBuffer decompress(ByteBuffer data) throws IOException {
-    NonCopyingByteArrayOutputStream baos = new NonCopyingByteArrayOutputStream(DEFAULT_BUFFER_SIZE);
+    NonCopyingByteArrayOutputStream baos = NonCopyingByteArrayOutputStream
+        .restrictedCapacityOutputStream(DEFAULT_BUFFER_SIZE);
     InputStream bytesIn = new ByteArrayInputStream(data.array(), computeOffset(data), data.remaining());
 
     try (InputStream ios = new XZCompressorInputStream(bytesIn)) {

lang/java/avro/src/main/java/org/apache/avro/file/ZstandardCodec.java

@@ -68,7 +68,8 @@ public String getName() {
 
   @Override
   public ByteBuffer compress(ByteBuffer data) throws IOException {
-    NonCopyingByteArrayOutputStream baos = new NonCopyingByteArrayOutputStream(DEFAULT_BUFFER_SIZE);
+    NonCopyingByteArrayOutputStream baos = NonCopyingByteArrayOutputStream
+        .restrictedCapacityOutputStream(DEFAULT_BUFFER_SIZE);
     try (OutputStream outputStream = ZstandardLoader.output(baos, compressionLevel, useChecksum, useBufferPool)) {
       outputStream.write(data.array(), computeOffset(data), data.remaining());
     }
@@ -77,7 +78,8 @@ public ByteBuffer compress(ByteBuffer data) throws IOException {
 
   @Override
   public ByteBuffer decompress(ByteBuffer compressedData) throws IOException {
-    NonCopyingByteArrayOutputStream baos = new NonCopyingByteArrayOutputStream(DEFAULT_BUFFER_SIZE);
+    NonCopyingByteArrayOutputStream baos = NonCopyingByteArrayOutputStream
+        .restrictedCapacityOutputStream(DEFAULT_BUFFER_SIZE);
     InputStream bytesIn = new ByteArrayInputStream(compressedData.array(), computeOffset(compressedData),
         compressedData.remaining());
     try (InputStream ios = ZstandardLoader.input(bytesIn, useBufferPool)) {

lang/java/avro/src/main/java/org/apache/avro/util/NonCopyingByteArrayOutputStream.java

@@ -21,21 +21,43 @@
 import java.io.ByteArrayOutputStream;
 import java.nio.ByteBuffer;
 
+import org.apache.avro.SystemLimitException;
+
 /**
  * Utility to make data written to an {@link ByteArrayOutputStream} directly
- * available as a {@link ByteBuffer}.
+ * available as a {@link ByteBuffer}.Supports limits to the amount of data which
+ * may be written. All decompressors MUST create capacity restricted streams to
+ * prevent maliciously compressed data to trigger memory problems across
+ * threads.
+ *
  */
 public class NonCopyingByteArrayOutputStream extends ByteArrayOutputStream {
 
   /**
-   * Creates a new byte array output stream, with a buffer capacity of the
-   * specified size, in bytes.
+   * Size limit, -1 for no limits.
+   */
+  private final long limit;
+
+  /**
+   * Creates a new byte array output stream, with no size limit.
    *
    * @param size the initial size
    * @throws IllegalArgumentException if size is negative
    */
   public NonCopyingByteArrayOutputStream(int size) {
+    this(size, -1);
+  }
+
+  /**
+   * Creates a new byte array output stream, with a buffer capacity of the
+   * specified size, in bytes, capacity limit as specified in {@code limit}.
+   *
+   * @param size  buffer capacity
+   * @param limit size limit or -1 for no limit.
+   */
+  private NonCopyingByteArrayOutputStream(final int size, final long limit) {
     super(size);
+    this.limit = limit;
   }
 
   /**
@@ -48,4 +70,61 @@ public NonCopyingByteArrayOutputStream(int size) {
   public ByteBuffer asByteBuffer() {
     return ByteBuffer.wrap(super.buf, 0, super.count);
   }
+
+  /**
+   * Check there is capacity to write data. Throws SystemLimitException if the
+   * limit is exceeded.
+   *
+   * @param bytes bytes to add
+   */
+  private void checkCapacity(int bytes) {
+    if (limit > 0) {
+      SystemLimitException.checkMaxDecompressCapacity(limit, size(), bytes);
+    }
+  }
+
+  @Override
+  public synchronized void write(final int b) {
+    checkCapacity(1);
+    super.write(b);
+  }
+
+  @Override
+  public synchronized void write(final byte[] b, final int off, final int len) {
+    checkCapacity(len);
+    super.write(b, off, len);
+  }
+
+  @Override
+  public void writeBytes(final byte[] b) {
+    checkCapacity(b.length);
+    super.writeBytes(b);
+  }
+
+  /**
+   * Creates a new byte array output stream, with a buffer capacity of the
+   * specified size, in bytes. The amount of data which can be written to any
+   * output stream is limited by the system property
+   * {@link SystemLimitException#MAX_DECOMPRESS_LENGTH_PROPERTY}
+   *
+   * @param size buffer capacity
+   * @return the output stream
+   */
+  public static NonCopyingByteArrayOutputStream restrictedCapacityOutputStream(final int size) {
+    final long limit = SystemLimitException.MAX_DECOMPRESS_LENGTH;
+    return new NonCopyingByteArrayOutputStream((int) Math.min(size, limit), limit);
+  }
+
+  /**
+   * Creates a new byte array output stream, with a buffer capacity of the
+   * specified size, in bytes, capacity limit as specified in {@code limit}.
+   *
+   * @param size  buffer capacity
+   * @param limit max size of output buffer
+   * @return the output stream
+   */
+  public static NonCopyingByteArrayOutputStream restrictedCapacityOutputStream(final int size, long limit) {
+    return new NonCopyingByteArrayOutputStream(size, limit);
+  }
+
 }

lang/java/avro/src/test/java/org/apache/avro/util/NonCopyingByteArrayOutputStreamTest.java

@@ -0,0 +1,79 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.avro.util;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+
+import org.junit.jupiter.api.Test;
+
+import org.apache.avro.SystemLimitException;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+public class NonCopyingByteArrayOutputStreamTest {
+
+  /**
+   * Basic test: write then read.
+   */
+  @Test
+  public void testDefaultWriteWorks() throws IOException {
+    NonCopyingByteArrayOutputStream out = new NonCopyingByteArrayOutputStream(1);
+    out.write('a');
+    final byte[] b = "string".getBytes();
+    out.write(b, 0, b.length);
+    out.close();
+    final ByteBuffer buffer = out.asByteBuffer();
+    assertEquals('a', buffer.get());
+    for (byte value : b) {
+      assertEquals(value, buffer.get());
+    }
+  }
+
+  /**
+   * Test write limiting.
+   */
+  @Test
+  public void testLimitedWrite() throws IOException {
+    NonCopyingByteArrayOutputStream out = NonCopyingByteArrayOutputStream.restrictedCapacityOutputStream(1, 4);
+    out.write('a');
+    // it's impossible to go over the limit in a write(bytes) call.
+    final byte[] b = "longstring".getBytes();
+    assertThrows(SystemLimitException.class, () -> out.write(b),
+        "Buffer size 11 (bytes) exceeds maximum allowed size 4.");
+    // we can still write up to the limit...the buffer has not been written to yet.
+    out.write(b, 0, 2);
+    out.write('z');
+    // now at end of file, so another write shall fail.
+    assertThrows(SystemLimitException.class, () -> out.write('x'));
+    out.close();
+    // validate everything successfully written is there
+    final ByteBuffer buffer = out.asByteBuffer();
+    for (byte value : "aloz".getBytes()) {
+      assertEquals(value, buffer.get());
+    }
+  }
+
+  @Test
+  public void testInnerLimitCheck() throws Throwable {
+    assertThrows(SystemLimitException.class, () -> SystemLimitException.checkMaxDecompressCapacity(256L, 0, 100_000));
+    SystemLimitException.checkMaxDecompressCapacity(256L, 0, 256);
+  }
+}