mirror of
https://github.com/haraldk/TwelveMonkeys.git
synced 2025-08-04 20:15:28 -04:00
Allow embedded resource URLs if external resources are disabled
This commit is contained in:
parent
da45c5783d
commit
96223f9f9f
@ -655,7 +655,7 @@ public class SVGImageReader extends ImageReaderBase {
|
|||||||
if (allowExternalResources) {
|
if (allowExternalResources) {
|
||||||
return super.getExternalResourceSecurity(resourceURL, docURL);
|
return super.getExternalResourceSecurity(resourceURL, docURL);
|
||||||
}
|
}
|
||||||
return new NoLoadExternalResourceSecurity();
|
return new EmbededExternalResourceSecurity(resourceURL);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -297,6 +297,25 @@ public class SVGImageReaderTest extends ImageReaderAbstractTest<SVGImageReader>
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testReadEmbeddedWithDisallowExternalResources() throws IOException{
|
||||||
|
// File using "data:" URLs for embedded resources
|
||||||
|
URL resource = getClassLoaderResource("/svg/embedded-data-resource.svg");
|
||||||
|
SVGImageReader reader = createReader();
|
||||||
|
|
||||||
|
TestData data = new TestData(resource, (Dimension) null);
|
||||||
|
try (ImageInputStream stream = data.getInputStream()) {
|
||||||
|
reader.setInput(stream);
|
||||||
|
|
||||||
|
SVGReadParam param = reader.getDefaultReadParam();
|
||||||
|
param.setAllowExternalResources(false);
|
||||||
|
reader.read(0, param);
|
||||||
|
}
|
||||||
|
finally {
|
||||||
|
reader.dispose();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Test(expected = SecurityException.class)
|
@Test(expected = SecurityException.class)
|
||||||
public void testDisallowedExternalResources() throws URISyntaxException, IOException {
|
public void testDisallowedExternalResources() throws URISyntaxException, IOException {
|
||||||
// system-property set to true in surefire-plugin-settings in the pom
|
// system-property set to true in surefire-plugin-settings in the pom
|
||||||
|
File diff suppressed because one or more lines are too long
After Width: | Height: | Size: 92 KiB |
Loading…
x
Reference in New Issue
Block a user