Fix file mode handling for zip entries with non-Unix platform

Let's say you have a zip archive created under windows or with tool
that does not support unix files modes.
org.apache.commons.compress.archivers.zip.ZipArchiveEntry::getUnixMode
will return 0 for any entry that does not have platform set to Unix.

On the other hand ZipResource::getAttributes does not check for this
case and will return 0 (this is valid Unix mode).

As a result if you add zip archive using
AbstractArchiver::addArchivedFileSet the resulting archive
will have entries with file mode set to 0. That's quite bad because
when unpacked on some Unix platforms the files will be
accessible only by the root user.

Instead ZipResource::getAttributes should return -1 so the rest of
plexus-archiver code could handle the case properly and distinguish it
from the 0 file mode.

Add check in the ZipResource::getAttributes to properly handle
non-Unix platform entries.

Author: Plamen Totev

src/main/java/org/codehaus/plexus/archiver/zip/ZipResource.java

@@ -45,14 +45,15 @@ private static long getLastModofied( ZipArchiveEntry entry )
 
     public synchronized PlexusIoResourceAttributes getAttributes()
     {
-        int mode = entry.getUnixMode();
-        if ( ( mode & UnixStat.FILE_FLAG ) == UnixStat.FILE_FLAG )
+        int mode = -1;
+        if (entry.getPlatform() == ZipArchiveEntry.PLATFORM_UNIX)
         {
-            mode = mode & ~UnixStat.FILE_FLAG;
-        }
-        else
-        {
-            mode = mode & ~UnixStat.DIR_FLAG;
+            mode = entry.getUnixMode();
+            if ((mode & UnixStat.FILE_FLAG) == UnixStat.FILE_FLAG) {
+                mode = mode & ~UnixStat.FILE_FLAG;
+            } else {
+                mode = mode & ~UnixStat.DIR_FLAG;
+            }
         }
 
         if ( attributes == null )

src/test/java/org/codehaus/plexus/archiver/zip/PlexusArchiverZipFileResourceCollectionTest.java

@@ -1,12 +1,16 @@
 package org.codehaus.plexus.archiver.zip;
 
 import org.codehaus.plexus.PlexusTestCase;
+import org.codehaus.plexus.components.io.functions.ResourceAttributeSupplier;
 import org.codehaus.plexus.components.io.resources.PlexusIoResource;
 
 import java.io.File;
+import java.io.IOException;
 import java.io.InputStream;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.Map;
 import java.util.Set;
 
 public class PlexusArchiverZipFileResourceCollectionTest
@@ -33,4 +37,25 @@ public void testFilesWithIllegalHtmlChars()
         }
     }
 
+    public void testFileModes()
+        throws IOException
+    {
+        File testZip = new File( getBasedir(), "src/test/resources/zeroFileMode/mixed-file-mode.zip" );
+        Map<String, Integer> originalUnixModes = new HashMap<String, Integer>();
+        originalUnixModes.put( "platform-fat", -1 );
+        originalUnixModes.put( "zero-unix-mode", 0 );
+        // ---xrw-r-- the crazy permissions are on purpose so we don't hit some default value
+        originalUnixModes.put( "non-zero-unix-mode", 0164 );
+        PlexusArchiverZipFileResourceCollection prc = new PlexusArchiverZipFileResourceCollection();
+        prc.setFile( testZip );
+        Iterator<PlexusIoResource> entries = prc.getEntries();
+        while ( entries.hasNext() )
+        {
+            PlexusIoResource entry = entries.next();
+            int entryUnixMode = ( (ResourceAttributeSupplier) entry ).getAttributes().getOctalMode();
+            int originalUnixMode = (int) originalUnixModes.get( entry.getName() );
+            assertEquals( originalUnixMode, entryUnixMode );
+        }
+    }
+
 }