[GR-64032] Allow non-file URLs in uriToURL on SVM.

fniephaus · fniephaus · commit 20cf920b900b · 2025-04-15T07:02:36.000Z
PullRequest: js/3476
diff --git a/graal-js/mx.graal-js/truffle.tck.permissions/js_excludes.json b/graal-js/mx.graal-js/truffle.tck.permissions/js_excludes.json
@@ -28,6 +28,14 @@
       }
     ]
   },
+  {
+    "name" : "com.oracle.truffle.js.runtime.objects.DefaultESModuleLoader",
+    "methods" : [
+      { "name" : "uriToURL",
+        "justification" : "URI to URL conversion without URLStreamHandler. Only privileged call with URLStreamHandler."
+      }
+    ]
+  },
   {
     "name" : "com.oracle.truffle.js.runtime.util.DebugJSAgent",
     "methods" : [
diff --git a/graal-js/src/com.oracle.truffle.js.test/src/com/oracle/truffle/js/test/regress/GR32763.java b/graal-js/src/com.oracle.truffle.js.test/src/com/oracle/truffle/js/test/regress/GR32763.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, 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
@@ -60,8 +60,8 @@ public void testUnknownImportUrl() throws IOException {
     }
 
     @Test
-    public void testSchemeNotSupported() throws IOException {
-        assertErrorMessage("foo://bar.mjs", "Error: Unsupported URI scheme foo");
+    public void testUnknownProtocol() throws IOException {
+        assertErrorMessage("foo://bar.mjs", "Error: unknown protocol: foo");
     }
 
     private static void assertErrorMessage(String importUrl, String expected) throws IOException {
diff --git a/graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/runtime/objects/DefaultESModuleLoader.java b/graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/runtime/objects/DefaultESModuleLoader.java
@@ -65,7 +65,6 @@
 import com.oracle.truffle.api.strings.TruffleString;
 import com.oracle.truffle.js.lang.JavaScriptLanguage;
 import com.oracle.truffle.js.runtime.Errors;
-import com.oracle.truffle.js.runtime.JSConfig;
 import com.oracle.truffle.js.runtime.JSException;
 import com.oracle.truffle.js.runtime.JSRealm;
 import com.oracle.truffle.js.runtime.Strings;
@@ -260,13 +259,7 @@ protected AbstractModuleRecord loadModuleFromURL(ScriptOrModule referrer, Module
     }
 
     private static URL uriToURL(URI moduleURI) throws MalformedURLException {
-        if (!JSConfig.SubstrateVM) {
-            try {
-                return moduleURI.toURL();
-            } catch (MalformedURLException e) {
-            }
-        }
-        throw new MalformedURLException("Unsupported URI scheme " + moduleURI.getScheme());
+        return moduleURI.toURL();
     }
 
     protected AbstractModuleRecord loadModuleFromFile(ScriptOrModule referrer, ModuleRequest moduleRequest, TruffleFile moduleFile, String maybeCanonicalPath) throws IOException {

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,14 @@`
`28`	`28`	`}`
`29`	`29`	`]`
`30`	`30`	`},`
	`31`	`+ {`
	`32`	`+ "name" : "com.oracle.truffle.js.runtime.objects.DefaultESModuleLoader",`
	`33`	`+ "methods" : [`
	`34`	`+ { "name" : "uriToURL",`
	`35`	`+ "justification" : "URI to URL conversion without URLStreamHandler. Only privileged call with URLStreamHandler."`
	`36`	`+ }`
	`37`	`+ ]`
	`38`	`+ },`
`31`	`39`	`{`
`32`	`40`	`"name" : "com.oracle.truffle.js.runtime.util.DebugJSAgent",`
`33`	`41`	`"methods" : [`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.`
	`2`	`+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.`
`3`	`3`	`* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.`
`4`	`4`	`*`
`5`	`5`	`* The Universal Permissive License (UPL), Version 1.0`
`@@ -60,8 +60,8 @@ public void testUnknownImportUrl() throws IOException {`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`@Test`
`63`		`- public void testSchemeNotSupported() throws IOException {`
`64`		`- assertErrorMessage("foo://bar.mjs", "Error: Unsupported URI scheme foo");`
	`63`	`+ public void testUnknownProtocol() throws IOException {`
	`64`	`+ assertErrorMessage("foo://bar.mjs", "Error: unknown protocol: foo");`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`private static void assertErrorMessage(String importUrl, String expected) throws IOException {`