[GR-13272] Introduce prefix for opaque filesystem.

PullRequest: graalpython/383

Author: fangerer

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/Python3Core.java

@@ -450,6 +450,7 @@ public PythonModule initializeSysModule() {
         sys.setAttribute("graal_python_core_home", PythonOptions.getOption(context, PythonOptions.CoreHome));
         sys.setAttribute("graal_python_stdlib_home", PythonOptions.getOption(context, PythonOptions.StdLibHome));
         sys.setAttribute("graal_python_opaque_filesystem", PythonOptions.getOption(context, PythonOptions.OpaqueFilesystem));
+        sys.setAttribute("graal_python_opaque_filesystem_prefix", PythonOptions.getOption(context, PythonOptions.OpaqueFilesystemPrefixes));
         sys.setAttribute("__flags__", factory().createTuple(new Object[]{
                         false, // bytes_warning
                         !PythonOptions.getFlag(context, PythonOptions.PythonOptimizeFlag), // debug

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PosixModuleBuiltins.java

@@ -47,8 +47,12 @@
 import java.nio.channels.SeekableByteChannel;
 import java.nio.channels.WritableByteChannel;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.AccessDeniedException;
+import java.nio.file.FileAlreadyExistsException;
+import java.nio.file.FileSystemException;
 import java.nio.file.InvalidPathException;
 import java.nio.file.LinkOption;
+import java.nio.file.NoSuchFileException;
 import java.nio.file.StandardCopyOption;
 import java.nio.file.StandardOpenOption;
 import java.nio.file.attribute.FileAttribute;
@@ -59,6 +63,7 @@
 import java.nio.file.attribute.UserPrincipal;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Random;
@@ -126,11 +131,6 @@
 import com.oracle.truffle.api.profiles.ValueProfile;
 import com.sun.security.auth.UnixNumericGroupPrincipal;
 import com.sun.security.auth.UnixNumericUserPrincipal;
-import java.nio.file.AccessDeniedException;
-import java.nio.file.FileAlreadyExistsException;
-import java.nio.file.FileSystemException;
-import java.nio.file.NoSuchFileException;
-import java.util.HashMap;
 
 @CoreFunctions(defineModule = "posix")
 public class PosixModuleBuiltins extends PythonBuiltins {
@@ -1074,25 +1074,29 @@ public static ReadFromChannelNode create() {
     public abstract static class ReadNode extends PythonFileNode {
         private static final int MAX_READ = Integer.MAX_VALUE / 2;
 
+        @CompilationFinal private BranchProfile tooLargeProfile = BranchProfile.create();
+
         @Specialization(guards = "readOpaque(frame)")
-        Object readOpaque(@SuppressWarnings("unused") VirtualFrame frame, int fd, @SuppressWarnings("unused") Object requestedSize,
+        Object readOpaque(@SuppressWarnings("unused") VirtualFrame frame, int fd, long requestedSize,
                         @Cached("createClassProfile()") ValueProfile channelClassProfile,
                         @Cached("create()") ReadFromChannelNode readNode) {
-            Channel channel = getResources().getFileChannel(fd, channelClassProfile);
-            ByteSequenceStorage bytes = readNode.execute(channel, MAX_READ);
-            return new OpaqueBytes(Arrays.copyOf(bytes.getInternalByteArray(), bytes.length()));
+            if (OpaqueBytes.isInOpaqueFilesystem(getResources().getFilePath(fd), getContext())) {
+                Channel channel = getResources().getFileChannel(fd, channelClassProfile);
+                ByteSequenceStorage bytes = readNode.execute(channel, MAX_READ);
+                return new OpaqueBytes(Arrays.copyOf(bytes.getInternalByteArray(), bytes.length()));
+            }
+            return read(frame, fd, requestedSize, channelClassProfile, readNode);
         }
 
         @Specialization(guards = "!readOpaque(frame)")
         Object read(@SuppressWarnings("unused") VirtualFrame frame, int fd, long requestedSize,
                         @Cached("createClassProfile()") ValueProfile channelClassProfile,
-                        @Cached("create()") BranchProfile tooLarge,
                         @Cached("create()") ReadFromChannelNode readNode) {
             int size;
             try {
                 size = Math.toIntExact(requestedSize);
             } catch (ArithmeticException e) {
-                tooLarge.enter();
+                tooLargeProfile.enter();
                 size = MAX_READ;
             }
             Channel channel = getResources().getFileChannel(fd, channelClassProfile);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/OpaqueBytes.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -40,10 +40,15 @@
  */
 package com.oracle.graal.python.builtins.objects.bytes;
 
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import com.oracle.graal.python.builtins.Python3Core;
 import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.graal.python.runtime.PythonOptions;
 import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.interop.CanResolve;
 import com.oracle.truffle.api.interop.ForeignAccess;
@@ -90,6 +95,19 @@ private static Boolean checkOption(PythonContext context) {
         return PythonOptions.getOption(context, PythonOptions.OpaqueFilesystem);
     }
 
+    @TruffleBoundary
+    public static boolean isInOpaqueFilesystem(String path, PythonContext context) {
+        Path filePath = Paths.get(path);
+        String prefixStr = PythonOptions.getOption(context, PythonOptions.OpaqueFilesystemPrefixes);
+        String[] prefixes = prefixStr.split(Python3Core.PATH_SEPARATOR);
+        for (int i = 0; i < prefixes.length; i++) {
+            if (filePath.startsWith(Paths.get(prefixes[i]))) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     public static void initializeForNewContext(PythonContext context) {
         CompilerDirectives.transferToInterpreter();
         if (checkOption(context)) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonOptions.java

@@ -25,12 +25,12 @@
  */
 package com.oracle.graal.python.runtime;
 
-import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import org.graalvm.options.OptionCategory;
 import org.graalvm.options.OptionDescriptors;
 import org.graalvm.options.OptionKey;
 
 import com.oracle.graal.python.PythonLanguage;
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.Option;
 
 @Option.Group(PythonLanguage.ID)
@@ -54,6 +54,9 @@ private PythonOptions() {
                     "but all other access to the contents of the file is disabled, so the files are kept secret.") //
     public static final OptionKey<Boolean> OpaqueFilesystem = new OptionKey<>(false);
 
+    @Option(category = OptionCategory.USER, help = "List of root paths for the opaque file system (default: '/'); use system-specific path separator.") //
+    public static final OptionKey<String> OpaqueFilesystemPrefixes = new OptionKey<>("/");
+
     @Option(category = OptionCategory.USER, help = "Equivalent to the Python -i flag. Inspect interactively after running a script.") //
     public static final OptionKey<Boolean> InspectFlag = new OptionKey<>(false);