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
BIN
test/jdk/java/util/jar/JarInputStream/BadSignedJar.jar
Normal file
BIN
test/jdk/java/util/jar/JarInputStream/BadSignedJar.jar
Normal file
Binary file not shown.
47
test/jdk/java/util/jar/JarInputStream/EmptyJar.java
Normal file
47
test/jdk/java/util/jar/JarInputStream/EmptyJar.java
Normal file
|
|
@ -0,0 +1,47 @@
|
|||
/*
|
||||
* Copyright (c) 1998, 2026, 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 4166469
|
||||
@summary Make sure JarInputStream constructor will not
|
||||
throw NullPointerException when the JAR file is
|
||||
empty.
|
||||
@run junit EmptyJar
|
||||
*/
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import java.util.jar.*;
|
||||
import java.io.*;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
|
||||
|
||||
public class EmptyJar {
|
||||
|
||||
@Test
|
||||
void npeTest() {
|
||||
// Ensure no NPE is thrown
|
||||
assertDoesNotThrow(() -> new JarInputStream(new ByteArrayInputStream(new byte[0])),
|
||||
"unexpected NullPointerException");
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,81 @@
|
|||
/*
|
||||
* Copyright (c) 2013, 2026, 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 8021788
|
||||
* @summary JarInputStream doesn't provide certificates for some file under META-INF
|
||||
* @modules java.base/sun.security.tools.keytool
|
||||
* jdk.jartool/sun.security.tools.jarsigner
|
||||
* @run junit ExtraFileInMetaInf
|
||||
*/
|
||||
|
||||
import org.junit.jupiter.api.BeforeAll;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import java.util.jar.*;
|
||||
import java.io.*;
|
||||
import java.util.zip.ZipEntry;
|
||||
import java.util.zip.ZipOutputStream;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertNotNull;
|
||||
import static org.junit.jupiter.api.Assertions.fail;
|
||||
|
||||
public class ExtraFileInMetaInf {
|
||||
|
||||
@BeforeAll
|
||||
static void setup() throws Exception {
|
||||
// Create a zip file with 2 entries
|
||||
try (ZipOutputStream zos =
|
||||
new ZipOutputStream(new FileOutputStream("x.jar"))) {
|
||||
zos.putNextEntry(new ZipEntry("META-INF/SUB/file"));
|
||||
zos.write(new byte[10]);
|
||||
zos.putNextEntry(new ZipEntry("x"));
|
||||
zos.write(new byte[10]);
|
||||
}
|
||||
|
||||
// Sign it
|
||||
new File("ks").delete();
|
||||
sun.security.tools.keytool.Main.main(
|
||||
("-keystore ks -storepass changeit -keypass changeit " +
|
||||
"-keyalg rsa -alias a -dname CN=A -genkeypair").split(" "));
|
||||
sun.security.tools.jarsigner.Main.main(
|
||||
"-keystore ks -storepass changeit x.jar a".split(" "));
|
||||
}
|
||||
|
||||
@Test
|
||||
void checkSignedTest() throws IOException {
|
||||
// Check if the entries are signed
|
||||
try (JarInputStream jis =
|
||||
new JarInputStream(new FileInputStream("x.jar"))) {
|
||||
JarEntry je;
|
||||
while ((je = jis.getNextJarEntry()) != null) {
|
||||
String name = je.toString();
|
||||
if (name.equals("META-INF/SUB/file") || name.equals("x")) {
|
||||
while (jis.read(new byte[1000]) >= 0);
|
||||
assertNotNull(je.getCertificates(), name + " not signed");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
94
test/jdk/java/util/jar/JarInputStream/ScanSignedJar.java
Normal file
94
test/jdk/java/util/jar/JarInputStream/ScanSignedJar.java
Normal file
|
|
@ -0,0 +1,94 @@
|
|||
/*
|
||||
* Copyright (c) 2005, 2026, 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 6284489
|
||||
* @summary Confirm that JarEntry.getCertificates identifies signed entries.
|
||||
* @run junit ScanSignedJar
|
||||
*/
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.net.URL;
|
||||
import java.security.CodeSigner;
|
||||
import java.security.cert.Certificate;
|
||||
import java.util.jar.*;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.fail;
|
||||
|
||||
/*
|
||||
* Confirm that the signed entries in a JAR file are identified correctly
|
||||
* when JarEntry.getCertificates is used to extract the signer's certificates.
|
||||
*
|
||||
* NOTE: the original problem occurred only when entries were extracted using
|
||||
* the JarInputStream.getNextJarEntry method; it never occurred when
|
||||
* entries were extracted using the JarFile.entries method.
|
||||
*/
|
||||
public class ScanSignedJar {
|
||||
|
||||
private static final String JAR_LOCATION =
|
||||
"file:" +
|
||||
System.getProperty("test.src", ".") +
|
||||
System.getProperty("file.separator") +
|
||||
"signed.jar";
|
||||
|
||||
@Test
|
||||
void signedJarTest() throws IOException {
|
||||
System.out.println("Opening " + JAR_LOCATION + "...");
|
||||
JarInputStream inStream =
|
||||
new JarInputStream(new URL(JAR_LOCATION).openStream(), true);
|
||||
JarEntry entry;
|
||||
byte[] buffer = new byte[1024];
|
||||
|
||||
while ((entry = inStream.getNextJarEntry()) != null) {
|
||||
|
||||
// need to read the entry's data to see the certs.
|
||||
while(inStream.read(buffer) != -1)
|
||||
;
|
||||
|
||||
String name = entry.getName();
|
||||
long size = entry.getSize();
|
||||
Certificate[] certificates = entry.getCertificates();
|
||||
CodeSigner[] signers = entry.getCodeSigners();
|
||||
|
||||
if (signers == null && certificates == null) {
|
||||
System.out.println("[unsigned]\t" + name + "\t(" + size +
|
||||
" bytes)");
|
||||
if (name.equals("Count.class")) {
|
||||
fail("Count.class should be signed");
|
||||
}
|
||||
} else if (signers != null && certificates != null) {
|
||||
System.out.println("[" + signers.length +
|
||||
(signers.length == 1 ? " signer" : " signers") + "]\t" +
|
||||
name + "\t(" + size + " bytes)");
|
||||
} else {
|
||||
System.out.println("[*ERROR*]\t" + name + "\t(" + size +
|
||||
" bytes)");
|
||||
fail("Cannot determine whether the entry is " +
|
||||
"signed or unsigned (signers[] doesn't match certs[]).");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,57 @@
|
|||
/*
|
||||
* Copyright (c) 2010, 2026, 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 6544278
|
||||
* @summary Confirm the JarInputStream throws the SecurityException when
|
||||
* verifying an indexed jar file with corrupted signature
|
||||
* @run junit TestIndexedJarWithBadSignature
|
||||
*/
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.FileInputStream;
|
||||
import java.util.jar.JarEntry;
|
||||
import java.util.jar.JarInputStream;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertThrows;
|
||||
|
||||
public class TestIndexedJarWithBadSignature {
|
||||
|
||||
@Test
|
||||
void securityExceptionTest() throws IOException {
|
||||
try (JarInputStream jis = new JarInputStream(
|
||||
new FileInputStream(System.getProperty("test.src", ".") +
|
||||
System.getProperty("file.separator") +
|
||||
"BadSignedJar.jar"))) {
|
||||
assertThrows(SecurityException.class, () -> {
|
||||
JarEntry je1;
|
||||
while ((je1 = jis.getNextJarEntry()) != null) {
|
||||
System.out.println("Jar Entry1==>" + je1.getName());
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
BIN
test/jdk/java/util/jar/JarInputStream/signed.jar
Normal file
BIN
test/jdk/java/util/jar/JarInputStream/signed.jar
Normal file
Binary file not shown.
Loading…
Add table
Add a link
Reference in a new issue