Mercurial > hg > shenandoah-preopenjdk-archive > openjdk8 > jdk
changeset 260:4e7ad09de58b
6689000: Changes in 6675606 causing regression test failures on windows-i586
Summary: Accept illegal URLs like file:c:/root/x.conf and file:this/that/x.conf
Reviewed-by: alanb, chegar
author | weijun |
---|---|
date | Wed, 23 Apr 2008 08:10:28 +0800 |
parents | a71ab67d3ece |
children | d3af7105cc15 |
files | src/share/classes/com/sun/security/auth/login/ConfigFile.java test/com/sun/security/auth/login/ConfigFile/IllegalURL.java |
diffstat | 2 files changed, 81 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/com/sun/security/auth/login/ConfigFile.java Fri Apr 18 15:23:27 2008 +0200 +++ b/src/share/classes/com/sun/security/auth/login/ConfigFile.java Wed Apr 23 08:10:28 2008 +0800 @@ -620,14 +620,34 @@ * start up time noticeably for the new launcher. -- DAC */ private InputStream getInputStream(URL url) throws IOException { - if ("file".equals(url.getProtocol())) { + if ("file".equalsIgnoreCase(url.getProtocol())) { + // Compatibility notes: + // + // Code changed from + // String path = url.getFile().replace('/', File.separatorChar); + // return new FileInputStream(path); + // + // The original implementation would search for "/tmp/a%20b" + // when url is "file:///tmp/a%20b". This is incorrect. The + // current codes fix this bug and searches for "/tmp/a b". + // For compatibility reasons, when the file "/tmp/a b" does + // not exist, the file named "/tmp/a%20b" will be tried. + // + // This also means that if both file exists, the behavior of + // this method is changed, and the current codes choose the + // correct one. try { - File path = new File(url.toURI()); - return new FileInputStream(path); - } catch (IOException ioe) { - throw ioe; - } catch (Exception ex) { - throw new IOException(ex.getMessage(), ex); + return url.openStream(); + } catch (Exception e) { + String file = url.getPath(); + if (url.getHost().length() > 0) { // For Windows UNC + file = "//" + url.getHost() + file; + } + if (debugConfig != null) { + debugConfig.println("cannot read " + url + + ", try " + file); + } + return new FileInputStream(file); } } else { return url.openStream();
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/com/sun/security/auth/login/ConfigFile/IllegalURL.java Wed Apr 23 08:10:28 2008 +0800 @@ -0,0 +1,54 @@ +/* + * Copyright 2008 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 6689000 + * @summary Changes in 6675606 causing regression test failures on windows-i586 + */ + +import com.sun.security.auth.login.*; +import java.io.*; +import java.net.URL; + +public class IllegalURL { + public static void main(String[] args) throws Exception { + FileOutputStream fos = new FileOutputStream("x.conf"); + fos.close(); + use("file:" + System.getProperty("user.dir") + "/x.conf"); + use("file:x.conf"); + System.out.println("Test passed"); + } + + static void use(String f) throws Exception { + System.out.println("Testing " + f + "..."); + System.setProperty("java.security.auth.login.config", f); + try { + new FileInputStream(new URL(f).getFile().replace('/', File.separatorChar)); + } catch (Exception e) { + System.out.println("Even old implementation does not support it. Ignored."); + return; + } + new ConfigFile(); + } +}