[GR-64254] Backport to 24.2: Allow non-file URLs in uriToURL on SVM.

PullRequest: js/3485

Author: OracleLabsAutomation

graal-js/mx.graal-js/truffle.tck.permissions/js_excludes.json

@@ -7,6 +7,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" : [

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 {

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/runtime/objects/DefaultESModuleLoader.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -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.JSContext;
 import com.oracle.truffle.js.runtime.JSException;
 import com.oracle.truffle.js.runtime.JSRealm;
@@ -261,13 +260,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 {