nested patching works now

Former-commit-id: 449f700
Former-commit-id: dc5ab77722ed7ee49bf0a5e460198c1783e7efe6

Author: breadchris

tools/log4shell/commands/patch.go

@@ -194,6 +194,8 @@ func tail(s []string) []string {
 }
 
 func addFileToZip(zipWriter *zip.Writer, existingHeader zip.FileHeader, filename string) (err error) {
+	defer zipWriter.Flush()
+
 	fileToZip, err := os.Open(filename)
 	if err != nil {
 		log.Error().
@@ -224,6 +226,7 @@ func addFileToZip(zipWriter *zip.Writer, existingHeader zip.FileHeader, filename
 			Msg("Unable to create zip header")
 		return
 	}
+
 	_, err = io.Copy(writer, fileToZip)
 	if err != nil {
 		log.Error().
@@ -266,19 +269,20 @@ func filterOutJndiLookupFromZip(
 	if err != nil {
 		return
 	}
-	nestedZipWriter.Flush()
 
 	if zipWriter == nil {
 		filename = outZip.Name()
 		validOutputFile = true
 		return
 	}
 
+	nestedZipWriter.Close()
+	outZip.Close()
+
 	err = addFileToZip(zipWriter, existingHeader, outZip.Name())
 	if err != nil {
 		return
 	}
-	zipWriter.Flush()
 	return
 }
 
@@ -288,6 +292,8 @@ func copyAndFilterFilesFromZip(
 	writer *zip.Writer,
 	nestedPaths []string,
 ) (err error) {
+	defer writer.Flush()
+
 	nestedPath := head(nestedPaths)
 	for _, member := range zipReader.File {
 		if member.Name == nestedPath {
@@ -333,6 +339,15 @@ func copyAndFilterFilesFromZip(
 		}
 
 		if member.FileInfo().IsDir() {
+			_, err = writer.Create(member.Name)
+			if err != nil {
+				log.Error().
+					Err(err).
+					Str("memberName", member.Name).
+					Str("member", fmt.Sprintf("%+v", member.FileHeader)).
+					Msg("Error while copying zip dir.")
+				return
+			}
 			continue
 		}
 

tools/log4shell/test/vulnerable-apps/patched.jar.REMOVED.git-id

@@ -0,0 +1 @@
+172a1004a051c61f3a8abe3ea3ee002e290f15a2

tools/log4shell/test/vulnerable-apps/vulnerable.jar.REMOVED.git-id

@@ -1 +1 @@
-214373a78b4024e557c297e5081f9305b65c9587
+0578ffb72bc2ade6a743bc18d4d2e03123a1ea64