[jboss-svn-commits] JBoss Common SVN: r3533 - in shrinkwrap/trunk/impl-base/src: test/java/org/jboss/shrinkwrap/impl/base/asset and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: ALRubinger
Date: 2009-09-18 12:00:16 -0400 (Fri, 18 Sep 2009)
New Revision: 3533

Added:
   shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/asset/ByteArrayAssetTestCase.java
Modified:
   shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/asset/ByteArrayAsset.java
Log:
[SHRINKWRAP-38] Add a defensive copy on ByteArrayAsset

Modified: shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/asset/ByteArrayAsset.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/asset/ByteArrayAsset.java	2009-09-18 15:59:07 UTC (rev 3532)
+++ shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/asset/ByteArrayAsset.java	2009-09-18 16:00:16 UTC (rev 3533)
@@ -70,11 +70,19 @@
       // Precondition check
       Validate.notNull(content, "content must be specified");
 
+      // Defensive copy on set, SHRINKWRAP-38
+      final int length = content.length;
+      byte[] newArray = new byte[length];
+      for (int i = 0; i < length; i++)
+      {
+         newArray[i] = content[i];
+      }
+
       // Set
-      this.content = content;
+      this.content = newArray;
       if (log.isLoggable(Level.FINER))
       {
-         log.finer("Created " + this + " with backing byte array of size " + content.length + "b");
+         log.finer("Created " + this + " with backing byte array of size " + length + "b");
       }
    }
 

Added: shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/asset/ByteArrayAssetTestCase.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/asset/ByteArrayAssetTestCase.java	                        (rev 0)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/asset/ByteArrayAssetTestCase.java	2009-09-18 16:00:16 UTC (rev 3533)
@@ -0,0 +1,100 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed 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.jboss.shrinkwrap.impl.base.asset;
+
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.util.Arrays;
+import java.util.logging.Logger;
+
+import junit.framework.Assert;
+
+import org.junit.Test;
+
+/**
+ * ByteArrayAssetTestCase
+ * 
+ * Test Cases for the {@link ByteArrayAsset}
+ *
+ * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
+ * @version $Revision: $
+ */
+public class ByteArrayAssetTestCase
+{
+
+   //-------------------------------------------------------------------------------------||
+   // Class Members ----------------------------------------------------------------------||
+   //-------------------------------------------------------------------------------------||
+
+   /**
+    * Logger
+    */
+   private static final Logger log = Logger.getLogger(ByteArrayAssetTestCase.class.getName());
+
+   //-------------------------------------------------------------------------------------||
+   // Instance Members -------------------------------------------------------------------||
+   //-------------------------------------------------------------------------------------||
+
+   //-------------------------------------------------------------------------------------||
+   // Tests ------------------------------------------------------------------------------||
+   //-------------------------------------------------------------------------------------||
+
+   /**
+    * Ensures that the contents of the asset match that which was passed in, 
+    * and that the state of the asset can not be mutated from the outside
+    */
+   @Test
+   public void testRoundtripAndExternalMutationGuard() throws Exception
+   {
+      // Log
+      log.info("testRoundtrip");
+
+      // Make contents
+      final int length = 10;
+      final byte[] contents = new byte[length];
+      for (int i = 0; i < length; i++)
+      {
+         contents[i] = (byte) i;
+      }
+      log.info("Inbound contents: " + Arrays.toString(contents));
+
+      // Make Asset
+      final ByteArrayAsset asset = new ByteArrayAsset(contents);
+
+      // Change the contents passed in (so we ensure we protect against mutation, SHRINKWRAP-38)
+      contents[0] = 0x1;
+      log.info("Contents after change: " + Arrays.toString(contents));
+
+      // Get the contents back out of the asset
+      final InputStream stream = asset.getStream();
+      final ByteArrayOutputStream out = new ByteArrayOutputStream(length);
+      int read;
+      while ((read = stream.read()) != -1)
+      {
+         out.write(read);
+      }
+      byte[] roundtrip = out.toByteArray();
+      log.info("Roundtrip contents: " + Arrays.toString(roundtrip));
+
+      // Ensure the roundtrip matches the input (index number)
+      for (int i = 0; i < length; i++)
+      {
+         Assert.assertEquals("Roundtrip did not equal passed in contents", i, roundtrip[i]);
+      }
+
+   }
+}