diff --git a/src/share/classes/javax/imageio/ImageIO.java b/src/share/classes/javax/imageio/ImageIO.java index 77f2a6b65e88550d3cd969af76b8837d9ca8ac45..51b5eaeb804f5669e38e1f26e57e1dae9ee97195 100644 --- a/src/share/classes/javax/imageio/ImageIO.java +++ b/src/share/classes/javax/imageio/ImageIO.java @@ -28,6 +28,7 @@ package javax.imageio; import java.awt.image.BufferedImage; import java.awt.image.RenderedImage; import java.io.File; +import java.io.FilePermission; import java.io.InputStream; import java.io.IOException; import java.io.OutputStream; @@ -195,13 +196,22 @@ public final class ImageIO { } else { cachepath = getTempDir(); - if (cachepath == null) { + if (cachepath == null || cachepath.isEmpty()) { getCacheInfo().setHasPermission(Boolean.FALSE); return false; } } - security.checkWrite(cachepath); + // we have to check whether we can read, write, + // and delete cache files. + // So, compose cache file path and check it. + String filepath = cachepath; + if (!filepath.endsWith(File.separator)) { + filepath += File.separator; + } + filepath += "*"; + + security.checkPermission(new FilePermission(filepath, "read, write, delete")); } } catch (SecurityException e) { getCacheInfo().setHasPermission(Boolean.FALSE); diff --git a/test/javax/imageio/CachePremissionsTest/CachePermissionsTest.java b/test/javax/imageio/CachePremissionsTest/CachePermissionsTest.java new file mode 100644 index 0000000000000000000000000000000000000000..4aa3a306493192ba938ab4397674431938770a43 --- /dev/null +++ b/test/javax/imageio/CachePremissionsTest/CachePermissionsTest.java @@ -0,0 +1,120 @@ +/* + * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + */ + +/** + * @test + * @bug 6684104 + * @summary Test verifies that ImageIO checks all permissions required for + * the file cache usage: + * + * no policy file: No security restrictions. + * Expected result: ImageIO creates file-cached stream. + * + * w.policy: the case when we have read and write permissions + * for java.io.temp directory but have only write permission + * for a temp file. + * Expected result: ImageIO create a memory-cached stream + * image output stream. + * + * rw.policy: the case when we have read and write permissions + * for java.io.temp directory but have only read and write + * permission for a temp cache file. + * Expected result: ImageIO creates a memory-cached stream + * because temporary cache file can not be deleted. + * + * rwd.policy: the case when we have read and write permissions + * for java.io.temp directory and have all required permissions + * (read, write, and delete) for a temporary cache file. + * Expected result: ImageIO creates file-cached stream. + * + * -Djava.security.debug=access can be used to verify file permissions. + * + * @run main CachePermissionsTest true + * @run main/othervm/policy=w.policy CachePermissionsTest false + * @run main/othervm/policy=rw.policy CachePermissionsTest false + * @run main/othervm/policy=rwd.policy CachePermissionsTest true + */ + +import java.io.File; +import java.io.IOException; +import java.io.ByteArrayOutputStream; +import javax.imageio.stream.ImageOutputStream; + +import javax.imageio.ImageIO; + + +public class CachePermissionsTest { + public static void main(String[] args) { + boolean isFileCacheExpected = + Boolean.valueOf(args[0]).booleanValue(); + System.out.println("Is file cache expected: " + isFileCacheExpected); + + ImageIO.setUseCache(true); + + System.out.println("java.io.tmpdir is " + System.getProperty("java.io.tmpdir")); + + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + + try { + ImageOutputStream ios = ImageIO.createImageOutputStream(baos); + + boolean isFileCache = ios.isCachedFile(); + System.out.println("Is file cache used: " + isFileCache); + + if (isFileCache !=isFileCacheExpected) { + System.out.println("WARNING: file chace usage is not as expected!"); + } + + System.out.println("Verify data writing..."); + for (int i = 0; i < 8192; i++) { + ios.writeInt(i); + } + + System.out.println("Verify data reading..."); + ios.seek(0L); + + for (int i = 0; i < 8192; i++) { + int j = ios.readInt(); + if (i != j) { + throw new RuntimeException("Wrong data in the stream " + j + " instead of " + i); + } + } + + System.out.println("Verify stream closing..."); + ios.close(); + } catch (IOException e) { + /* + * Something went wrong? + */ + throw new RuntimeException("Test FAILED.", e); + } catch (SecurityException e) { + /* + * We do not expect security execptions here: + * we there are any security restrition, ImageIO + * should swith to memory-cached streams, instead + * of using file cache. + */ + throw new RuntimeException("Test FAILED.", e); + } + } +} diff --git a/test/javax/imageio/CachePremissionsTest/rw.policy b/test/javax/imageio/CachePremissionsTest/rw.policy new file mode 100644 index 0000000000000000000000000000000000000000..003c85b5784c439c0d2fc41c8b79eb20ba7ec94e --- /dev/null +++ b/test/javax/imageio/CachePremissionsTest/rw.policy @@ -0,0 +1,5 @@ +grant { + permission java.util.PropertyPermission "test.classes", "read"; + permission java.util.PropertyPermission "java.io.tmpdir", "read"; + permission java.io.FilePermission "${java.io.tmpdir}${/}*", "read, write"; +}; diff --git a/test/javax/imageio/CachePremissionsTest/rwd.policy b/test/javax/imageio/CachePremissionsTest/rwd.policy new file mode 100644 index 0000000000000000000000000000000000000000..f4d1f90a36ed0b0915fd990c16504f7c41fa3c44 --- /dev/null +++ b/test/javax/imageio/CachePremissionsTest/rwd.policy @@ -0,0 +1,5 @@ +grant { + permission java.util.PropertyPermission "test.classes", "read"; + permission java.util.PropertyPermission "java.io.tmpdir", "read"; + permission java.io.FilePermission "${java.io.tmpdir}${/}*", "read, write, delete"; +}; diff --git a/test/javax/imageio/CachePremissionsTest/w.policy b/test/javax/imageio/CachePremissionsTest/w.policy new file mode 100644 index 0000000000000000000000000000000000000000..ff354e9616b4018744423756a785bef43770b570 --- /dev/null +++ b/test/javax/imageio/CachePremissionsTest/w.policy @@ -0,0 +1,5 @@ +grant { + permission java.util.PropertyPermission "test.classes", "read"; + permission java.util.PropertyPermission "java.io.tmpdir", "read"; + permission java.io.FilePermission "${java.io.tmpdir}${/}*", "write"; +};