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

8177085: Accept including .conf files in krb5.conf's includedir

Browse Source 
Reviewed-by: jnimeh
This commit is contained in:
Weijun Wang 2017-03-22 17:24:14 +08:00
parent 3ff7e077ea
commit afef66313b
2 changed files with 47 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jdk/src/java.security.jgss/share/classes/sun/security/krb5/Config.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -577,7 +577,8 @@ public class Config {
for (Path p: files) { for (Path p: files) {
if (Files.isDirectory(p)) continue; if (Files.isDirectory(p)) continue;
String name = p.getFileName().toString(); String name = p.getFileName().toString();
if (name.matches("[a-zA-Z0-9_-]+")) { if (name.matches("[a-zA-Z0-9_-]+") ||
name.endsWith(".conf")) {
// if dir is absolute, so is p // if dir is absolute, so is p
readConfigFileLines(p, content, dups); readConfigFileLines(p, content, dups);
} }

76
jdk/test/sun/security/krb5/config/Include.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -23,7 +23,7 @@
/* /*
* @test * @test
* @bug 8029994 * @bug 8029994 8177085
* @summary Support "include" and "includedir" in krb5.conf * @summary Support "include" and "includedir" in krb5.conf
* @modules java.security.jgss/sun.security.krb5 * @modules java.security.jgss/sun.security.krb5
* @compile -XDignore.symbol.file Include.java * @compile -XDignore.symbol.file Include.java
@ -35,6 +35,7 @@ import sun.security.krb5.KrbException;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.util.Arrays;
public class Include { public class Include {
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
@ -43,13 +44,15 @@ public class Include {
Path conf = Paths.get("krb5.conf"); // base krb5.conf Path conf = Paths.get("krb5.conf"); // base krb5.conf
Path ifile = Paths.get("f"); // include f Path f = Paths.get("f"); // include
Path idir = Paths.get("x"); // includedir fx Path f2 = Paths.get("f2"); // f include f2
Path idirdir = Paths.get("x/xx"); // sub dir, will be ignored Path d = Paths.get("d"); // includedir
Path idirdirfile = Paths.get("x/xx/ff"); // sub dir, will be ignored Path dd = Paths.get("d/dd"); // sub dir, ignore
Path idirfile1 = Paths.get("x/f1"); // one file Path ddf = Paths.get("d/dd/ddf"); // file in sub dir, ignore
Path idirfile2 = Paths.get("x/f2"); // another file Path df1 = Paths.get("d/f1"); // one file in dir
Path idirfile3 = Paths.get("x/f.3"); // third file bad name Path df2 = Paths.get("d/f2"); // another file
Path df3 = Paths.get("d/f.3"); // third file bad name
Path df4 = Paths.get("d/f4.conf"); // fourth file
// OK: The base file can be missing // OK: The base file can be missing
System.setProperty("java.security.krb5.conf", "no-such-file"); System.setProperty("java.security.krb5.conf", "no-such-file");
@ -59,8 +62,8 @@ public class Include {
// Write base file // Write base file
Files.write(conf, Files.write(conf,
("include " + ifile.toAbsolutePath() + "\n" + ("include " + f.toAbsolutePath() + "\n" +
"includedir " + idir.toAbsolutePath() + "\n" + "includedir " + d.toAbsolutePath() + "\n" +
krb5Conf + "base").getBytes() krb5Conf + "base").getBytes()
); );
@ -68,54 +71,63 @@ public class Include {
tryReload(false); tryReload(false);
// Error: Only includedir exists // Error: Only includedir exists
Files.createDirectory(idir); Files.createDirectory(d);
tryReload(false); tryReload(false);
// Error: Both exists, but include is a cycle // Error: Both exists, but include is a cycle
Files.write(ifile, Files.write(f,
("include " + conf.toAbsolutePath() + "\n" + ("include " + conf.toAbsolutePath() + "\n" +
krb5Conf + "incfile").getBytes()); krb5Conf + "f").getBytes());
tryReload(false); tryReload(false);
// Error: A good include exists, but no includedir // Error: A good include exists, but no includedir yet
Files.delete(idir); Files.delete(d);
Files.write(ifile, (krb5Conf + "incfile").getBytes()); Files.write(f, (krb5Conf + "f").getBytes());
tryReload(false); tryReload(false);
// OK: Everything is set // OK: Everything is set
Files.createDirectory(idir); Files.createDirectory(d);
tryReload(true); // Now OK tryReload(true); // Now OK
// make f include f2
Files.write(f,
("include " + f2.toAbsolutePath() + "\n" +
krb5Conf + "f").getBytes());
Files.write(f2, (krb5Conf + "f2").getBytes());
// fx1 and fx2 will be loaded // fx1 and fx2 will be loaded
Files.write(idirfile1, (krb5Conf + "incdir1").getBytes()); Files.write(df1, (krb5Conf + "df1").getBytes());
Files.write(idirfile2, (krb5Conf + "incdir2").getBytes()); Files.write(df2, (krb5Conf + "df2").getBytes());
// fx3 and fxs (and file inside it) will be ignored // fx3 and fxs (and file inside it) will be ignored
Files.write(idirfile3, (krb5Conf + "incdir3").getBytes()); Files.write(df3, (krb5Conf + "df3").getBytes());
Files.createDirectory(idirdir); Files.createDirectory(dd);
Files.write(idirdirfile, (krb5Conf + "incdirdir").getBytes()); Files.write(ddf, (krb5Conf + "ddf").getBytes());
// fx4 will be loaded
Files.write(df4, (krb5Conf + "df4").getBytes());
// OK: All good files read // OK: All good files read
tryReload(true); tryReload(true);
String v = Config.getInstance().getAll("section", "key"); String[] v = Config.getInstance().getAll("section", "key") .split(" ");
// The order of files in includedir could be either // v will contain f2, f, df[124], and base.
if (!v.equals("incfile incdir1 incdir2 base") && // Order of df[124] is not determined. Sort them first.
!v.equals("incfile incdir2 incdir1 base")) { Arrays.sort(v, 2, 5);
throw new Exception(v); String longv = Arrays.toString(v);
if (!longv.equals("[f2, f, df1, df2, df4, base]")) {
throw new Exception(longv);
} }
// Error: include file not absolute // Error: include file not absolute
Files.write(conf, Files.write(conf,
("include " + ifile + "\n" + ("include " + f + "\n" +
"includedir " + idir.toAbsolutePath() + "\n" + "includedir " + d.toAbsolutePath() + "\n" +
krb5Conf + "base").getBytes() krb5Conf + "base").getBytes()
); );
tryReload(false); tryReload(false);
// Error: includedir not absolute // Error: includedir not absolute
Files.write(conf, Files.write(conf,
("include " + ifile.toAbsolutePath() + "\n" + ("include " + f.toAbsolutePath() + "\n" +
"includedir " + idir + "\n" + "includedir " + d + "\n" +
krb5Conf + "base").getBytes() krb5Conf + "base").getBytes()
); );
tryReload(false); tryReload(false);