[COMPRESS-661] ArchiveInputStream markSupported should always return

false

src/changes/changes.xml

@@ -52,6 +52,7 @@ The <action> type attribute can be add,update,fix,remove.
       <action type="fix" issue="COMPRESS-664" dev="ggregory" due-to="Elliotte Rusty Harold">Remove unused variables in tests #487.</action>
       <action type="fix" issue="COMPRESS-666" dev="ggregory" due-to="Cosmin Carabet, Gary Gregory">Multithreaded access to Tar archive throws java.util.zip.ZipException: Corrupt GZIP trailer.</action>
       <action type="fix" issue="COMPRESS-644" dev="ggregory" due-to="Tim Allison, Gary Gregory">ArchiveStreamFactory.detect(InputStream) returns TAR for ICO file #386.</action>
+      <action type="fix" issue="COMPRESS-661" dev="ggregory" due-to="Alexander Veit, Tilman Hausherr, Gary Gregory">ArchiveInputStream markSupported should always return false.</action>
       <!-- REMOVE -->
       <action type="remove" issue="COMPRESS-662" dev="ggregory" due-to="Christoph Loy, Gary Gregory">Remove out of date jar and scripts #483.</action> 
      </release>

src/main/java/org/apache/commons/compress/archivers/ArchiveInputStream.java

@@ -160,6 +160,30 @@ public int getCount() {
      */
     public abstract E getNextEntry() throws IOException;
 
+    /**
+     * Does nothing.
+     *
+     * TODO [COMPRESS-670] Support mark() and reset() in ArchiveInputStream.
+     *
+     * @param readlimit ignored.
+     */
+    @Override
+    public synchronized void mark(final int readlimit) {
+        // noop
+    }
+
+    /**
+     * Always returns false.
+     *
+     * TODO [COMPRESS-670] Support mark() and reset() in ArchiveInputStream.
+     *
+     * @return Always returns false.
+     */
+    @Override
+    public boolean markSupported() {
+        return false;
+    }
+
     /**
      * Decrements the counter of already read bytes.
      *
@@ -186,4 +210,13 @@ public int read() throws IOException {
         return num == -1 ? -1 : single[0] & BYTE_MASK;
     }
 
+    /**
+     * Does nothing.
+     *
+     * TODO [COMPRESS-670] Support mark() and reset() in ArchiveInputStream.
+     */
+    @Override
+    public synchronized void reset() {
+        // noop
+    }
 }

src/test/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStreamTest.java

@@ -76,6 +76,31 @@ public void testCantReadWithoutOpeningAnEntry() throws Exception {
         }
     }
 
+    @Test
+    public void testCompress661() throws IOException {
+        testCompress661(false);
+        testCompress661(true);
+    }
+
+    private void testCompress661(final boolean checkMarkReadReset) throws IOException {
+        try (InputStream in = newInputStream("org/apache/commons/compress/COMPRESS-661/testARofText.ar");
+                ArArchiveInputStream archive = new ArArchiveInputStream(new BufferedInputStream(in))) {
+            assertNotNull(archive.getNextEntry());
+            if (checkMarkReadReset && archive.markSupported()) {
+                // mark() shouldn't be supported, but if it would be,
+                // mark+read+reset should not do any harm.
+                archive.mark(10);
+                archive.read(new byte[10]);
+                archive.reset();
+            }
+            final byte[] ba = IOUtils.toByteArray(archive);
+            assertEquals("Test d'indexation de Txt\nhttp://www.apache.org\n", new String(ba));
+            assertEquals(-1, archive.read());
+            assertEquals(-1, archive.read());
+            assertNull(archive.getNextEntry());
+        }
+    }
+
     @Test
     public void testInvalidBadTableLength() throws Exception {
         try (InputStream in = newInputStream("org/apache/commons/compress/ar/number_parsing/bad_table_length_gnu-fail.ar");