Merge pull request #147 from arykov/main

xeraph · web-flow · commit f260b46d4df9 · 2021-12-19T03:01:11.000+09:00
Nifi nar format support
diff --git a/src/main/java/com/logpresso/scanner/utils/ZipUtils.java b/src/main/java/com/logpresso/scanner/utils/ZipUtils.java
@@ -26,8 +26,9 @@ public static boolean isScanTarget(String path, boolean scanZip) {
 
 		// ear = Java EE archive, aar = Android archive
 		// rar = Java EE resource adapter archive (not WinRAR)
+		// nar = NiFi jar
 		return loweredPath.endsWith(".jar") || loweredPath.endsWith(".war") || loweredPath.endsWith(".ear")
-				|| loweredPath.endsWith(".aar") || loweredPath.endsWith(".rar");
+				|| loweredPath.endsWith(".aar") || loweredPath.endsWith(".rar") || loweredPath.endsWith(".nar");
 	}
 
 	public static void ensureClose(ZipFile zipFile) {

Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,9 @@ public static boolean isScanTarget(String path, boolean scanZip) {`
`26`	`26`
`27`	`27`	`// ear = Java EE archive, aar = Android archive`
`28`	`28`	`// rar = Java EE resource adapter archive (not WinRAR)`
	`29`	`+ // nar = NiFi jar`
`29`	`30`	`return loweredPath.endsWith(".jar") \|\| loweredPath.endsWith(".war") \|\| loweredPath.endsWith(".ear")`
`30`		`- \|\| loweredPath.endsWith(".aar") \|\| loweredPath.endsWith(".rar");`
	`31`	`+ \|\| loweredPath.endsWith(".aar") \|\| loweredPath.endsWith(".rar") \|\| loweredPath.endsWith(".nar");`
`31`	`32`	`}`
`32`	`33`
`33`	`34`	`public static void ensureClose(ZipFile zipFile) {`