[GR-49849] Remove internal resource TruffleFile workaround

PullRequest: truffleruby/4051
oracle · Nov 7, 2023 · 9eaa9df · 9eaa9df
2 parents fe12e7f + 239acde
commit 9eaa9df
Showing 1 changed file with 13 additions and 17 deletions.
diff --git a/src/main/java/org/truffleruby/language/loader/FileLoader.java b/src/main/java/org/truffleruby/language/loader/FileLoader.java
@@ -90,25 +90,21 @@ public static TruffleFile getSafeTruffleFile(RubyLanguage language, RubyContext
                     context.getCoreExceptions().loadError("Failed to canonicalize -- " + path, path, null));
         }
 
-        String homeLibDir = language.getRubyHome() + "/lib/";
-        if (file.getPath().startsWith(homeLibDir)) {
-            String homeRelativePath = file.getPath().substring(language.getRubyHome().length() + 1);
-            TruffleFile internalResourceFile = language.getRubyHomeTruffleFile().resolve(homeRelativePath);
-            if (isStdLibRubyOrCExtFile(internalResourceFile.getPath())) {
-                return internalResourceFile;
+        final TruffleFile home = language.getRubyHomeTruffleFile();
+        if (file.startsWith(home.resolve("lib")) && isStdLibRubyOrCExtFile(file.getPath())) {
+            return file;
+        } else {
+            try {
+                return env.getPublicTruffleFile(path);
+            } catch (SecurityException e) {
+                throw new RaiseException(
+                        context,
+                        context.getCoreExceptions().loadError(
+                                "Permission denied (" + e.getMessage() + ") -- " + path,
+                                path,
+                                null));
             }
         }
-
-        try {
-            return env.getPublicTruffleFile(path);
-        } catch (SecurityException e) {
-            throw new RaiseException(
-                    context,
-                    context.getCoreExceptions().loadError(
-                            "Permission denied (" + e.getMessage() + ") -- " + path,
-                            path,
-                            null));
-        }
     }
 
     private static boolean isStdLibRubyOrCExtFile(String path) {