undefect. CWE-407 — 63 sites patched across 27 ecosystems
Authors: russell@unturf.com · brackishbert@gmail.com · foxhop.net · TimeHexOn.com Patches, unit tests, benchmarks, whitepaper, and outreach briefs. Public domain — no copyright claimed. Use freely.
This commit is contained in:
commit
0a580b313d
70422 changed files with 17213626 additions and 0 deletions
|
|
@ -0,0 +1,270 @@
|
|||
/*
|
||||
* Copyright (c) 2020, 2021, Oracle and/or its affiliates. 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
/*
|
||||
* @test
|
||||
* @bug 8225056
|
||||
* @summary Class redefinition must preclude changes to PermittedSubclasses attributes
|
||||
* @comment This is a copy of test/jdk/java/lang/instrument/RedefineNestmateAttr/
|
||||
* @comment modified for sealed classes and the PermittedSubclasses attribute.
|
||||
*
|
||||
* @library /test/lib
|
||||
* @modules java.base/jdk.internal.misc
|
||||
* @modules java.compiler
|
||||
* java.instrument
|
||||
* @compile ../NamedBuffer.java
|
||||
* @run main RedefineClassHelper
|
||||
* @compile Host/Host.java ClassOne.java ClassTwo.java ClassThree.java ClassFour.java
|
||||
* @compile TestPermittedSubclassesAttr.java
|
||||
* @run main/othervm -javaagent:redefineagent.jar -Xlog:redefine+class+sealed=trace TestPermittedSubclassesAttr Host
|
||||
* @compile HostA/Host.java
|
||||
* @run main/othervm -javaagent:redefineagent.jar -Xlog:redefine+class+sealed=trace TestPermittedSubclassesAttr HostA
|
||||
* @compile HostAB/Host.java
|
||||
* @run main/othervm -javaagent:redefineagent.jar -Xlog:redefine+class+sealed=trace TestPermittedSubclassesAttr HostAB
|
||||
* @compile HostABC/Host.java
|
||||
* @run main/othervm -javaagent:redefineagent.jar -Xlog:redefine+class+sealed=trace TestPermittedSubclassesAttr HostABC
|
||||
*/
|
||||
|
||||
/* Test Description
|
||||
|
||||
The basic test class is called Host and we have variants that have zero or more
|
||||
permitted subclasses ClassOne, ClassTwo, ClassThree, and ClassFour. Each variant
|
||||
of Host is defined in source code in its own directory i.e.
|
||||
|
||||
Host/Host.java defines zero permitted classes
|
||||
Sealed class HostA/Host.java permits ClassOne
|
||||
Sealed HostAB/Host.java permits ClassOne and ClassTwo (in that order)
|
||||
Sealed HostABC/Host.java permits ClassOne, ClassTwo, and ClassThree (in that order)
|
||||
etc.
|
||||
|
||||
Each Host class has the form:
|
||||
|
||||
public sealed class Host <permits zero or more classes> {
|
||||
public static String getID() { return "<directory name>/Host.java"; }
|
||||
|
||||
public int m() {
|
||||
return 1; // original class
|
||||
}
|
||||
}
|
||||
|
||||
Under each directory is a directory "redef" with a modified version of the Host
|
||||
class that changes the ID to e.g. Host/redef/Host.java, and the method m()
|
||||
returns 2. This allows us to check we have the redefined class loaded.
|
||||
|
||||
Using Host' to represent the redefined version we test redefinition
|
||||
combinations as follows:
|
||||
|
||||
Host:
|
||||
Host -> Host' - succeeds m() returns 2
|
||||
Host -> HostA' - fails - added a permitted subclass
|
||||
|
||||
HostA:
|
||||
HostA -> HostA' - succeeds m() returns 2
|
||||
HostA -> Host' - fails - removed a permitted subclass
|
||||
HostA -> HostAB' - fails - added a permitted subclass
|
||||
HostA -> HostB' - fails - replaced a permitted subclass
|
||||
|
||||
HostAB:
|
||||
HostAB -> HostAB' - succeeds m() returns 2
|
||||
HostAB -> HostBA' - succeeds m() returns 2
|
||||
HostAB -> HostA' - fails - removed a permitted subclass
|
||||
HostAB -> HostABC' - fails - added a permitted subclass
|
||||
HostAB -> HostAC' - fails - replaced a permitted subclass
|
||||
|
||||
HostABC:
|
||||
HostABC -> HostABC' - succeeds m() returns 2
|
||||
HostABC -> HostACB' - succeeds m() returns 2
|
||||
HostABC -> HostBAC' - succeeds m() returns 2
|
||||
HostABC -> HostBCA' - succeeds m() returns 2
|
||||
HostABC -> HostCAB' - succeeds m() returns 2
|
||||
HostABC -> HostCBA' - succeeds m() returns 2
|
||||
HostABC -> HostAB' - fails - removed a permitted subclass
|
||||
HostABC -> HostABCD' - fails - added a permitted subclass
|
||||
HostABC -> HostABD' - fails - replaced a permitted subclass
|
||||
|
||||
More than three permitted subclasses doesn't add to the code coverage so
|
||||
we stop here.
|
||||
|
||||
Note that we always try to load the redefined version even when we expect it
|
||||
to fail.
|
||||
|
||||
We can only directly load one class Host per classloader, so to run all the
|
||||
groups we either need to use new classloaders, or we reinvoke the test
|
||||
requesting a different primary directory. We chose the latter using
|
||||
multiple @run tags. So we preceed as follows:
|
||||
|
||||
@compile Host/Host.java
|
||||
@run TestPermittedSubclassesAttr Host
|
||||
@compile HostA/Host.java - replaces previous Host.class
|
||||
@run TestPermittedSubclassesAttr HostA
|
||||
@compile HostAB/Host.java - replaces previous Host.class
|
||||
@run TestPermittedSubclassesAttr HostAB
|
||||
etc.
|
||||
|
||||
Within the test we directly compile redefined versions of the classes,
|
||||
using CompilerUtil, and then read the .class file directly as a byte[]
|
||||
to use with the RedefineClassHelper.
|
||||
|
||||
*/
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
import jdk.test.lib.ByteCodeLoader;
|
||||
import jdk.test.lib.compiler.CompilerUtils;
|
||||
import jdk.test.lib.compiler.InMemoryJavaCompiler;
|
||||
import static jdk.test.lib.Asserts.assertTrue;
|
||||
|
||||
public class TestPermittedSubclassesAttr {
|
||||
|
||||
static final String SRC = System.getProperty("test.src");
|
||||
static final String DEST = System.getProperty("test.classes");
|
||||
static final boolean VERBOSE = Boolean.getBoolean("verbose");
|
||||
|
||||
public static void main(String[] args) throws Throwable {
|
||||
String origin = args[0];
|
||||
System.out.println("Testing original Host class from " + origin);
|
||||
|
||||
// Make sure the Host class loaded directly is an original version
|
||||
// and from the expected location
|
||||
Host h = new Host();
|
||||
assertTrue(h.m() == 1);
|
||||
assertTrue(Host.getID().startsWith(origin + "/"));
|
||||
|
||||
String[] badTransforms; // directories of bad classes
|
||||
String[] goodTransforms; // directories of good classes
|
||||
|
||||
switch (origin) {
|
||||
case "Host":
|
||||
badTransforms = new String[] {
|
||||
"HostA" // add permitted subclass
|
||||
};
|
||||
goodTransforms = new String[] {
|
||||
origin
|
||||
};
|
||||
break;
|
||||
|
||||
case "HostA":
|
||||
badTransforms = new String[] {
|
||||
"Host", // remove permitted subclass
|
||||
"HostAB", // add permitted subclass
|
||||
"HostB" // change permitted subclass
|
||||
};
|
||||
goodTransforms = new String[] {
|
||||
origin
|
||||
};
|
||||
break;
|
||||
|
||||
case "HostAB":
|
||||
badTransforms = new String[] {
|
||||
"HostA", // remove permitted subclass
|
||||
"HostABC", // add permitted subclass
|
||||
"HostAC" // change permitted subclass
|
||||
};
|
||||
goodTransforms = new String[] {
|
||||
origin,
|
||||
"HostBA" // reorder permitted subclasses
|
||||
};
|
||||
break;
|
||||
|
||||
case "HostABC":
|
||||
badTransforms = new String[] {
|
||||
"HostAB", // remove permitted subclass
|
||||
"HostABCD", // add permitted subclass
|
||||
"HostABD" // change permitted subclass
|
||||
};
|
||||
goodTransforms = new String[] {
|
||||
origin,
|
||||
"HostACB", // reorder permitted subclasses
|
||||
"HostBAC", // reorder permitted subclasses
|
||||
"HostBCA", // reorder permitted subclasses
|
||||
"HostCAB", // reorder permitted subclasses
|
||||
"HostCBA" // reorder permitted subclasses
|
||||
};
|
||||
break;
|
||||
|
||||
default: throw new Error("Unknown test directory: " + origin);
|
||||
}
|
||||
|
||||
// Compile and check bad transformations
|
||||
checkBadTransforms(Host.class, badTransforms);
|
||||
|
||||
// Compile and check good transformations
|
||||
checkGoodTransforms(Host.class, goodTransforms);
|
||||
}
|
||||
|
||||
static void checkGoodTransforms(Class<?> c, String[] dirs) throws Throwable {
|
||||
for (String dir : dirs) {
|
||||
dir += "/redef";
|
||||
System.out.println("Trying good retransform from " + dir);
|
||||
byte[] buf = bytesForHostClass(dir);
|
||||
RedefineClassHelper.redefineClass(c, buf);
|
||||
|
||||
// Test redefintion worked
|
||||
Host h = new Host();
|
||||
assertTrue(h.m() == 2);
|
||||
if (VERBOSE) System.out.println("Redefined ID: " + Host.getID());
|
||||
assertTrue(Host.getID().startsWith(dir));
|
||||
}
|
||||
}
|
||||
|
||||
static void checkBadTransforms(Class<?> c, String[] dirs) throws Throwable {
|
||||
for (String dir : dirs) {
|
||||
dir += "/redef";
|
||||
System.out.println("Trying bad retransform from " + dir);
|
||||
byte[] buf = bytesForHostClass(dir);
|
||||
try {
|
||||
RedefineClassHelper.redefineClass(c, buf);
|
||||
throw new Error("Retransformation from directory " + dir +
|
||||
" succeeded unexpectedly");
|
||||
}
|
||||
catch (UnsupportedOperationException uoe) {
|
||||
if (uoe.getMessage().contains("attempted to change the class") &&
|
||||
uoe.getMessage().contains(" PermittedSubclasses")) {
|
||||
System.out.println("Got expected exception " + uoe);
|
||||
}
|
||||
else throw new Error("Wrong UnsupportedOperationException", uoe);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static byte[] bytesForHostClass(String dir) throws Throwable {
|
||||
compile("/" + dir);
|
||||
File clsfile = new File(DEST + "/" + dir + "/Host.class");
|
||||
if (VERBOSE) System.out.println("Reading bytes from " + clsfile);
|
||||
byte[] buf = null;
|
||||
try (FileInputStream str = new FileInputStream(clsfile)) {
|
||||
return buf = NamedBuffer.loadBufferFromStream(str);
|
||||
}
|
||||
}
|
||||
|
||||
static void compile(String dir) throws Throwable {
|
||||
File src = new File(SRC + dir);
|
||||
File dst = new File(DEST + dir);
|
||||
if (VERBOSE) System.out.println("Compiling from: " + src + "\n" +
|
||||
" to: " + dst);
|
||||
CompilerUtils.compile(src.toPath(),
|
||||
dst.toPath(),
|
||||
false /* don't recurse */,
|
||||
"-classpath", DEST);
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue