mirror of
https://git.freebsd.org/ports.git
synced 2025-06-14 09:10:32 -04:00
83c1e8c44a
in or below the current working directory. Fixes a security problem with jar(1). This fix may change to be compatible with whatever fix Sun applies when they release the next version of 1.5. . Bump PORTREVISION for this fix. Security: http://vuxml.FreeBSD.org/18e5428f-ae7c-11d9-837d-000e0c2e438a.html Reviewed by: maintainer timeout
58 lines
2 KiB
Java
58 lines
2 KiB
Java
$FreeBSD$
|
|
|
|
--- ../../j2se/src/share/classes/sun/tools/jar/Main.java 8 Nov 2004 22:27:32 -0000 1.1.1.1
|
|
+++ ../../j2se/src/share/classes/sun/tools/jar/Main.java 20 Apr 2005 16:50:17 -0000
|
|
@@ -31,6 +31,7 @@
|
|
Hashtable filesTable = new Hashtable();
|
|
Vector paths = new Vector();
|
|
Vector v;
|
|
+ String cwd;
|
|
CRC32 crc32 = new CRC32();
|
|
/* cflag: create
|
|
* uflag: update
|
|
@@ -670,6 +671,19 @@
|
|
* Extracts specified entries from JAR file.
|
|
*/
|
|
void extract(InputStream in, String files[]) throws IOException {
|
|
+ // Current working directory
|
|
+
|
|
+ cwd = System.getProperty("user.dir");
|
|
+ if (cwd == null) {
|
|
+ fatalError(getMsg("error.no.cwd"));
|
|
+ }
|
|
+ cwd = (new File(cwd)).getCanonicalPath();
|
|
+ if (!cwd.endsWith(File.separator)) {
|
|
+ cwd += File.separator;
|
|
+ }
|
|
+
|
|
+ // Extract the files
|
|
+
|
|
ZipInputStream zis = new ZipInputStream(in);
|
|
ZipEntry e;
|
|
while ((e = zis.getNextEntry()) != null) {
|
|
@@ -694,6 +708,10 @@
|
|
void extractFile(ZipInputStream zis, ZipEntry e) throws IOException {
|
|
String name = e.getName();
|
|
File f = new File(e.getName().replace('/', File.separatorChar));
|
|
+ if (!f.getCanonicalPath().startsWith(cwd)) {
|
|
+ output(formatMsg("out.ignore.entry", name));
|
|
+ return;
|
|
+ }
|
|
if (e.isDirectory()) {
|
|
if (!f.exists() && !f.mkdirs() || !f.isDirectory()) {
|
|
throw new IOException(formatMsg("error.create.dir", f.getPath()));
|
|
@@ -704,6 +722,10 @@
|
|
} else {
|
|
if (f.getParent() != null) {
|
|
File d = new File(f.getParent());
|
|
+ if (!d.getCanonicalPath().startsWith(cwd)) {
|
|
+ output(formatMsg("out.ignore.entry", name));
|
|
+ return;
|
|
+ }
|
|
if (!d.exists() && !d.mkdirs() || !d.isDirectory()) {
|
|
throw new IOException(formatMsg("error.create.dir", d.getPath()));
|
|
}
|
|
Index: j2se/src/share/classes/sun/tools/jar/resources/jar.properties
|
|
===================================================================
|
|
RCS file: /var/jcvs/javasrc_1_5_scsl/j2se/src/share/classes/sun/tools/jar/resources/jar.properties,v
|
|
retrieving revision 1.1.1.1
|