stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8008166: URL handling was broken on windows, causing "load" to malfunction

Browse Source 
Reviewed-by: attila, jlaskey
This commit is contained in:
Klara Ward 2013-02-20 16:43:21 +01:00 committed by Marcus Lagergren
parent 4a5a1e4404
commit 017e73cbd0
2 changed files with 22 additions and 27 deletions
nashorn
make
build.xml
src/jdk/nashorn/internal/runtime
Context.java

2
nashorn/make/build.xml

@ -211,6 +211,8 @@
<echo message="" file="${build.dir}/nashorn.policy" append="true"/>
<!-- test/script/basic .js scripts load other script tests -->
<echo message=" permission java.io.FilePermission &quot;${basedir}/test/script/-&quot;, &quot;read&quot;;" file="${build.dir}/nashorn.policy" append="true"/>
<echo message=" permission java.io.FilePermission &quot;user.dir&quot;, &quot;read&quot;;" file="${build.dir}/nashorn.policy" append="true"/>
<echo message=" permission java.util.PropertyPermission &quot;user.dir&quot;, &quot;read&quot;;" file="${build.dir}/nashorn.policy" append="true"/>
<echo message="" file="${build.dir}/nashorn.policy" append="true"/>
<!-- test/script/basic .js scripts can read nashorn.test.* properties -->
<echo message=" permission java.util.PropertyPermission &quot;nashorn.test.*&quot;, &quot;read&quot;;" file="${build.dir}/nashorn.policy" append="true"/>

47
nashorn/src/jdk/nashorn/internal/runtime/Context.java

@ -37,7 +37,6 @@ import java.io.PrintWriter;
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
import java.lang.reflect.Constructor;
import java.net.MalformedURLException;
import java.net.URL;
import java.security.AccessController;
import java.security.CodeSigner;
@ -620,34 +619,28 @@ public final class Context {
// load accepts a String (which could be a URL or a file name), a File, a URL
// or a ScriptObject that has "name" and "source" (string valued) properties.
if (src instanceof String) {
String srcStr = (String)src;
final File file = new File((String)src);
final String srcStr = (String)src;
final File file = new File(srcStr);
if (srcStr.indexOf(':') != -1) {
try {
final URL url = new URL((String)src);
source = new Source(url.toString(), url);
} catch (final MalformedURLException e) {
// fallback URL - nashorn:foo.js - check under jdk/nashorn/internal/runtime/resources
final String str = (String)src;
if (str.startsWith("nashorn:")) {
final String resource = "resources/" + str.substring("nashorn:".length());
// NOTE: even sandbox scripts should be able to load scripts in nashorn: scheme
// These scripts are always available and are loaded from nashorn.jar's resources.
source = AccessController.doPrivileged(
new PrivilegedAction<Source>() {
@Override
public Source run() {
try {
final URL resURL = Context.class.getResource(resource);
return (resURL != null)? new Source(str, resURL) : null;
} catch (final IOException exp) {
return null;
}
if (srcStr.startsWith("nashorn:")) {
final String resource = "resources/" + srcStr.substring("nashorn:".length());
// NOTE: even sandbox scripts should be able to load scripts in nashorn: scheme
// These scripts are always available and are loaded from nashorn.jar's resources.
source = AccessController.doPrivileged(
new PrivilegedAction<Source>() {
@Override
public Source run() {
try {
final URL resURL = Context.class.getResource(resource);
return (resURL != null)? new Source(srcStr, resURL) : null;
} catch (final IOException exp) {
return null;
}
});
} else {
throw e;
}
}
});
} else {
final URL url = file.toURI().toURL();
source = new Source(url.toString(), url);
}
} else if (file.isFile()) {
source = new Source(srcStr, file);