Skip to content

Java: Improve sanitizer for java/zipslip #16550

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aschackmull merged 2 commits into from
May 22, 2024
Merged

Java: Improve sanitizer for java/zipslip #16550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d82acf5
Java: Add simple type sanitization to java/zipslip.
aschackmull May 21, 2024
7828cb8
Java: Add change note.
aschackmull May 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion java/ql/lib/semmle/code/java/security/ZipSlipQuery.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import semmle.code.java.security.PathSanitizer
private import semmle.code.java.dataflow.ExternalFlow
private import semmle.code.java.dataflow.FlowSources
private import semmle.code.java.security.PathCreation
private import semmle.code.java.security.Sanitizers

/**
* A method that returns the name of an archive entry.
Expand Down Expand Up @@ -39,7 +40,10 @@ module ZipSlipConfig implements DataFlow::ConfigSig {

predicate isSink(DataFlow::Node sink) { sink instanceof FileCreationSink }

predicate isBarrier(DataFlow::Node node) { node instanceof PathInjectionSanitizer }
predicate isBarrier(DataFlow::Node node) {
node instanceof SimpleTypeSanitizer or
node instanceof PathInjectionSanitizer
}
}

/** Tracks flow from archive entries to file creation. */
Expand Down
4 changes: 4 additions & 0 deletions java/ql/src/change-notes/2024-05-22-zipslip-number-sanitizer.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
category: minorAnalysis
---
* The sanitizer of the query `java/zipslip` has been improved to include nodes that are safe due to having certain safe types. This reduces false positives.