diff --git a/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java b/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java index 92163845283..6768c1234d9 100644 --- a/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java +++ b/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java @@ -621,8 +621,14 @@ public class ConfigFile extends javax.security.auth.login.Configuration { */ private InputStream getInputStream(URL url) throws IOException { if ("file".equals(url.getProtocol())) { - String path = url.getFile().replace('/', File.separatorChar); - return new FileInputStream(path); + 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); + } } else { return url.openStream(); } diff --git a/jdk/test/javax/security/auth/login/Configuration/ConfigFileWithBlank.java b/jdk/test/javax/security/auth/login/Configuration/ConfigFileWithBlank.java new file mode 100644 index 00000000000..9e49a0cf4fc --- /dev/null +++ b/jdk/test/javax/security/auth/login/Configuration/ConfigFileWithBlank.java @@ -0,0 +1,50 @@ +/* + * 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 6675606 + * @summary javax.security.auth.login.Configuration does not recognize path with spaces + */ + +import java.io.File; +import java.io.FileOutputStream; +import javax.security.auth.login.*; + +import java.net.URI; +import java.security.URIParameter; + +public class ConfigFileWithBlank { + public static void main(String[] args) throws Exception { + File f = new File("a b c"); + FileOutputStream fos = new FileOutputStream(f); + fos.write("".getBytes()); + fos.close(); + System.err.println(f.toURI()); + try { + Configuration.getInstance("JavaLoginConfig", new URIParameter(f.toURI())); + } finally { + f.delete(); + } + } +}