From bf98387000976805b05c872197057e5fe26a2406 Mon Sep 17 00:00:00 2001
From: Looly <loolly@gmail.com>
Date: Fri, 29 Jul 2022 22:04:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Ezip=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E8=A7=A3=E5=8E=8B=E5=A4=A7=E5=B0=8F=E9=99=90=E5=88=B6=EF=BC=8C?=
 =?UTF-8?q?=E9=98=B2=E6=AD=A2zip=E7=82=B8=E5=BC=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  |  1 +
 .../java/cn/hutool/core/util/ZipUtil.java     | 36 +++++++++----------
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c73e610d4..91e852be2 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,7 @@
 * 【core   】     完善了codec包下一些方法的入参空校验（pr#719@Gitee）
 * 【extra  】     完善QrCodeUtil对于DATA_MATRIX生成的形状随机不可指定的功能（pr#722@Gitee）
 * 【core   】     修改NetUtil.ipv6ToBigInteger，原方法标记为过期（pr#2485@Github）
+* 【core   】     ZipUtil新增zip文件解压大小限制，防止zip炸弹（pr#726@Gitee）
 * 
 ### 🐞Bug修复
 * 【core   】     修复CollUtil里面关于可变参数传null造成的crash问题（pr#2428@Github）
diff --git a/hutool-core/src/main/java/cn/hutool/core/util/ZipUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/ZipUtil.java
index 1c797a6db..35ab96187 100755
--- a/hutool-core/src/main/java/cn/hutool/core/util/ZipUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/util/ZipUtil.java
@@ -124,7 +124,7 @@ public class ZipUtil {
 			}
 		} catch (FileAlreadyExistsException ignored) {
 			// 不覆盖情况下，文件已存在, 跳过
-		} catch (IOException e){
+		} catch (IOException e) {
 			throw new IORuntimeException(e);
 		}
 	}
@@ -262,6 +262,7 @@ public class ZipUtil {
 	 */
 	public static File zip(File zipFile, Charset charset, boolean withSrcDir, FileFilter filter, File... srcFiles) throws IORuntimeException {
 		validateFiles(zipFile, srcFiles);
+		//noinspection resource
 		ZipWriter.of(zipFile, charset).add(withSrcDir, filter, srcFiles).close();
 		return zipFile;
 	}
@@ -432,6 +433,7 @@ public class ZipUtil {
 	 * @since 5.5.2
 	 */
 	public static File zip(File zipFile, Charset charset, Resource... resources) throws UtilException {
+		//noinspection resource
 		ZipWriter.of(zipFile, charset).add(resources).close();
 		return zipFile;
 	}
@@ -548,15 +550,7 @@ public class ZipUtil {
 	 * @since 4.5.8
 	 */
 	public static File unzip(ZipFile zipFile, File outFile) throws IORuntimeException {
-		if (outFile.exists() && outFile.isFile()) {
-			throw new IllegalArgumentException(
-					StrUtil.format("Target path [{}] exist!", outFile.getAbsolutePath()));
-		}
-
-		try (final ZipReader reader = new ZipReader(zipFile)) {
-			reader.readTo(outFile);
-		}
-		return outFile;
+		return unzip(zipFile, outFile, -1);
 	}
 
 	/**
@@ -564,23 +558,27 @@ public class ZipUtil {
 	 *
 	 * @param zipFile zip文件，附带编码信息，使用完毕自动关闭
 	 * @param outFile 解压到的目录
-	 * @param size 警戒线大小(B)
+	 * @param limit   限制解压文件大小(单位B)
 	 * @return 解压的目录
 	 * @throws IORuntimeException IO异常
 	 * @since 5.8.5
 	 */
-	public static File unzip(ZipFile zipFile, File outFile, long size) throws IORuntimeException {
+	public static File unzip(ZipFile zipFile, File outFile, long limit) throws IORuntimeException {
 		if (outFile.exists() && outFile.isFile()) {
 			throw new IllegalArgumentException(
 					StrUtil.format("Target path [{}] exist!", outFile.getAbsolutePath()));
 		}
-		Enumeration<? extends ZipEntry> zipEntries = zipFile.entries();
-		long zipFileSize = 0L;
-		while(zipEntries.hasMoreElements()) {
-			ZipEntry zipEntry = zipEntries.nextElement();
-			zipFileSize += zipEntry.getSize();
-			if (zipFileSize > size) {
-				throw new IllegalArgumentException("The file size exceeds the limit");
+
+		// pr#726@Gitee
+		if (limit > 0) {
+			final Enumeration<? extends ZipEntry> zipEntries = zipFile.entries();
+			long zipFileSize = 0L;
+			while (zipEntries.hasMoreElements()) {
+				ZipEntry zipEntry = zipEntries.nextElement();
+				zipFileSize += zipEntry.getSize();
+				if (zipFileSize > limit) {
+					throw new IllegalArgumentException("The file size exceeds the limit");
+				}
 			}
 		}