Skip to content

Commit f0686f7

Browse files
committed
fixup! Adjusted codemod
1 parent 8440c7d commit f0686f7

File tree

1 file changed

+12
-13
lines changed

1 file changed

+12
-13
lines changed

framework/codemodder-base/src/main/java/io/codemodder/remediation/zipslip/ZipEntryStartFixStrategy.java

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
import com.github.javaparser.ast.expr.MethodCallExpr;
1111
import io.codemodder.remediation.RemediationStrategy;
1212
import io.codemodder.remediation.SuccessOrReason;
13-
14-
import java.lang.invoke.MethodHandleInfo;
1513
import java.util.Optional;
1614

1715
/** Fixes ZipSlip vulnerabilities where a ZipEntry starts the data flow. */
@@ -72,16 +70,17 @@ String sanitizeZipFilename(String entryName) {
7270

7371
/** Return true if it appears to be a ZipEntry#getName() call. */
7472
static boolean match(final Node node) {
75-
return
76-
Optional.of(node)
77-
.map(n -> n instanceof MethodCallExpr mce ? mce : null)
78-
.filter(mce -> mce.hasScope())
79-
.filter(mce -> "getName".equals(mce.getNameAsString()))
80-
// Not already sanitized
81-
.filter(mce -> mce.getParentNode()
82-
.map(p -> p instanceof MethodCallExpr m ? m : null)
83-
.filter(m -> "sanitizeZipFilename".equals(m.getNameAsString()))
84-
.isEmpty())
85-
.isPresent();
73+
return Optional.of(node)
74+
.map(n -> n instanceof MethodCallExpr mce ? mce : null)
75+
.filter(mce -> mce.hasScope())
76+
.filter(mce -> "getName".equals(mce.getNameAsString()))
77+
// Not already sanitized
78+
.filter(
79+
mce ->
80+
mce.getParentNode()
81+
.map(p -> p instanceof MethodCallExpr m ? m : null)
82+
.filter(m -> "sanitizeZipFilename".equals(m.getNameAsString()))
83+
.isEmpty())
84+
.isPresent();
8685
}
8786
}

0 commit comments

Comments
 (0)