[GR-69033] Support reading non-compressed zip files in web-image

PullRequest: graal/21958

Author: simongruenbacher

web-image/src/com.oracle.svm.hosted.webimage.test/src/com/oracle/svm/hosted/webimage/test/JS_JTT_Spec_Test.java

@@ -24,6 +24,7 @@
  */
 package com.oracle.svm.hosted.webimage.test;
 
+import com.oracle.svm.hosted.webimage.test.spec.JS_JTT_Zip;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
@@ -45,6 +46,7 @@
                 JS_JTT_JavaScriptBody.class,
                 JS_JTT_JSAnnotation.class,
                 JS_JTT_XHR.class,
+                JS_JTT_Zip.class,
 })
 public class JS_JTT_Spec_Test extends JTTTestSuite {
 

web-image/src/com.oracle.svm.hosted.webimage.test/src/com/oracle/svm/hosted/webimage/test/spec/JS_JTT_Zip.java

@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2025, 2025, 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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+package com.oracle.svm.hosted.webimage.test.spec;
+
+import com.oracle.svm.webimage.jtt.zip.InflatedZipTest;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import com.oracle.svm.hosted.webimage.test.util.JTTTestSuite;
+
+public class JS_JTT_Zip extends JTTTestSuite {
+    @BeforeClass
+    public static void setupClass() {
+        compileToJS(InflatedZipTest.class, "--initialize-at-build-time=InflatedZipTest");
+    }
+
+    @Test
+    public void readStoredTest() {
+        testFileAgainstNoBuild(new String[]{"Read from ZIP: Hello, stored ZIP!"});
+    }
+}

web-image/src/com.oracle.svm.hosted.webimage/src/com/oracle/svm/hosted/webimage/WebImageFeature.java

@@ -274,6 +274,7 @@ public void afterRegistration(AfterRegistrationAccess access) {
         rci.initializeAtRunTime(WebImageFileSystem.class, "Static fields need to read system properties at runtime");
         rci.initializeAtRunTime(FileSystemInitializer.class, "Static fields need to read system properties at runtime");
         rci.initializeAtRunTime("java.nio.file.FileSystems$DefaultFileSystemHolder", "Parts of static initializer is substituted to inject custom FileSystemProvider");
+        rci.initializeAtRunTime("java.util.zip.ZipFile$Source", "avoid initializing wrong file system");
 
         for (Class<? extends JSObject> jsObjectSubclass : accessImpl.findSubclasses(JSObject.class)) {
             rci.initializeAtRunTime(jsObjectSubclass,

web-image/src/com.oracle.svm.webimage.jtt/src/com/oracle/svm/webimage/jtt/zip/InflatedZipTest.java

@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2025, 2025, 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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+package com.oracle.svm.webimage.jtt.zip;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.zip.CRC32;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+import java.util.zip.ZipOutputStream;
+
+public class InflatedZipTest {
+    static final byte[] compressed;
+    static final String filename = "hello.txt";
+
+    static {
+        byte[] content = "Hello, stored ZIP!".getBytes();
+        CRC32 crc = new CRC32();
+        crc.update(content);
+        long crcValue = crc.getValue();
+        ByteArrayOutputStream bos = new ByteArrayOutputStream();
+        try (ZipOutputStream zos = new ZipOutputStream(bos)) {
+            ZipEntry entry = new ZipEntry(filename);
+            entry.setMethod(ZipEntry.STORED);   // non-deflated
+            entry.setSize(content.length);
+            entry.setCompressedSize(content.length);
+            entry.setCrc(crcValue);
+            zos.putNextEntry(entry);
+            zos.write(content);
+            zos.closeEntry();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        compressed = bos.toByteArray();
+    }
+
+    public static void main(String[] args) throws Exception {
+        Path tempZip = Files.createTempFile("example", ".zip");
+        Files.write(tempZip, compressed);
+        try (ZipFile zipFile = new ZipFile(tempZip.toFile())) {
+            ZipEntry entry = zipFile.getEntry(filename);
+            try (InputStream is = zipFile.getInputStream(entry)) {
+                String text = new String(is.readAllBytes());
+                System.out.println("Read from ZIP: " + text);
+            }
+        }
+    }
+}

web-image/src/com.oracle.svm.webimage/src/com/oracle/svm/webimage/substitute/system/WebImageIOSubstitutions.java

@@ -33,6 +33,7 @@
 import java.io.OutputStream;
 import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
+import java.nio.file.FileSystem;
 import java.nio.file.Files;
 import java.nio.file.LinkOption;
 import java.nio.file.Path;
@@ -42,6 +43,7 @@
 import java.nio.file.spi.FileSystemProvider;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
 
 import org.graalvm.nativeimage.ImageSingletons;
 
@@ -345,20 +347,44 @@ public static Path createTempDirectory(String prefix, FileAttribute<?>... attrs)
 @TargetClass(java.io.RandomAccessFile.class)
 @SuppressWarnings("all")
 final class Target_java_io_RandomAccessFile_Web {
+    @Alias static int O_RDWR;
+    @Alias FileChannel channel;
 
     @Substitute
     private void open0(String name, int mode) throws FileNotFoundException {
-        throw new UnsupportedOperationException("RandomAccessFile.open0");
+        Path path = Path.of(name);
+        if (Files.notExists(path)) {
+            throw new FileNotFoundException(name + " does not exist.");
+        }
+        if (Files.isDirectory(path)) {
+            throw new FileNotFoundException(name + " is a directory.");
+        }
+        if ((mode & O_RDWR) != 0) {
+            throw new UnsupportedOperationException("open RandomAccessFile with mode other than readonly.");
+        }
+
+        try {
+            Set<StandardOpenOption> options = Set.of(StandardOpenOption.READ);
+            channel = FileChannel.open(Path.of(name), options);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
     }
 
     @Substitute
     private int read0() throws IOException {
-        throw new UnsupportedOperationException("RandomAccessFile.read0");
+        ByteBuffer buffer = ByteBuffer.allocate(1);
+        int result = channel.read(buffer);
+        return buffer.get(0);
     }
 
     @Substitute
-    private int readBytes(byte[] b, int off, int len) throws IOException {
-        throw new UnsupportedOperationException("RandomAccessFile.readBytes");
+    private int readBytes0(byte[] b, int off, int len) throws IOException {
+        ByteBuffer buf = ByteBuffer.allocate(len);
+        int read = channel.read(buf);
+        buf.flip();
+        buf.get(b, off, Math.min(read, len));
+        return read;
     }
 
     @Substitute
@@ -373,17 +399,17 @@ private void writeBytes(byte[] b, int off, int len) throws IOException {
 
     @Substitute
     public long getFilePointer() throws IOException {
-        throw new UnsupportedOperationException("RandomAccessFile.getFilePointer");
+        return channel.position();
     }
 
     @Substitute
     private void seek0(long pos) throws IOException {
-        throw new UnsupportedOperationException("RandomAccessFile.seek0");
+        channel.position(pos);
     }
 
     @Substitute
     public long length() throws IOException {
-        throw new UnsupportedOperationException("RandomAccessFile.length");
+        return channel.size();
     }
 
     @Substitute
@@ -393,7 +419,7 @@ public void setLength(long newLength) throws IOException {
 
     @Substitute
     private static void initIDs() {
-        throw new UnsupportedOperationException("RandomAccessFile.initIDs");
+        // do nothing
     }
 }
 
@@ -422,6 +448,14 @@ public long size() {
 
 }
 
+@TargetClass(className = "sun.nio.fs.DefaultFileSystemProvider")
+final class Target_sun_nio_fs_DefaultFileSystemProvider {
+    @Substitute
+    public static FileSystem theFileSystem() {
+        return WebImageNIOFileSystemProvider.INSTANCE.getFileSystem(null);
+    }
+}
+
 @TargetClass(className = "java.nio.file.TempFileHelper")
 final class Target_java_nio_file_TempFileHelper_Web {